import pungi-4.8.0-1.el10

i10ce changed/i10ce/pungi-4.8.0-1.el10
Arkady L. Shane 1 month ago
parent 5f90aad306
commit 4f24b0a9f6
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

2
.gitignore vendored

@ -1 +1 @@
SOURCES/pungi-4.3.8.tar.bz2
SOURCES/pungi-4.8.0.tar.bz2

@ -1 +1 @@
426d78b1eea28f716e7f403aed3b64a0b8e00711 SOURCES/pungi-4.3.8.tar.bz2
d7120b3cbae1add62e62a4f702286e257948c80c SOURCES/pungi-4.8.0.tar.bz2

@ -1,50 +0,0 @@
From df408e43ace861fdc2c016aca002bc2e23232837 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <evgeniy.zamriy@softline.com>
Date: Thu, 27 Jul 2023 23:48:40 +0300
Subject: [PATCH] Add charset detection to tweak_configs
This patch is required for making Pungi work with isolinux.cfg
files in cp866 encoding.
---
pungi/phases/buildinstall.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py
index 354c47a..a6efc59 100644
--- a/pungi/phases/buildinstall.py
+++ b/pungi/phases/buildinstall.py
@@ -22,6 +22,7 @@ import re
from six.moves import cPickle as pickle
from copy import copy
+import chardet
from kobo.threads import ThreadPool, WorkerThread
from kobo.shortcuts import run, force_list
import kobo.rpmlib
@@ -383,8 +384,10 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
if not os.path.exists(config_path):
continue
- with open(config_path, "r") as f:
- data = original_data = f.read()
+ with open(config_path, "rb") as f:
+ byte_data = f.read()
+ encoding = chardet.detect(byte_data)["encoding"]
+ data = original_data = byte_data.decode(encoding)
os.unlink(config_path) # break hadlink by removing file writing a new one
# double-escape volid in yaboot.conf
@@ -398,8 +401,8 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
data = re.sub(r":LABEL=[^ \n]*", r":LABEL=%s%s" % (new_volid, ks), data)
data = re.sub(r"(search .* -l) '[^'\n]*'", r"\1 '%s'" % volid, data)
- with open(config_path, "w") as f:
- f.write(data)
+ with open(config_path, "wb") as f:
+ f.write(data.encode(encoding))
if data != original_data:
found_configs.append(config)
--
2.41.0

@ -1,20 +1,16 @@
%{?python_enable_dependency_generator}
Name: pungi
Version: 4.3.8
Release: 1%{?dist}.inferit
Version: 4.8.0
Release: 1%{?dist}
Summary: Distribution compose tool
License: GPL-2.0-only
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
# MSVSphere patches
Patch1001: 0001-Add-charset-detection-to-tweak_configs.patch
BuildRequires: make
BuildRequires: python3-pytest
BuildRequires: python3-mock
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-productmd >= 1.28
@ -38,6 +34,7 @@ BuildRequires: python3-gobject
BuildRequires: python3-createrepo_c
BuildRequires: python3-dogpile-cache
BuildRequires: python3-parameterized
BuildRequires: python3-flufl-lock
#deps for doc building
BuildRequires: python3-sphinx
@ -58,9 +55,9 @@ Requires: python3-libmodulemd >= 2.8.0
Requires: python3-gobject
Requires: python3-createrepo_c
Requires: python3-PyYAML
Requires: python3-productmd >= 1.28
# MSVSphere changes
Requires: python3-chardet
Requires: python3-productmd >= 1.38
Requires: python3-flufl-lock
Requires: xorriso
# This package is not available on i686, hence we cannot require it
# See https://bugzilla.redhat.com/show_bug.cgi?id=1743421
@ -76,7 +73,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
%package utils
Summary: Utilities for working with finished composes
Requires: pungi = %{version}-%{release}
Requires: python3-fedmsg
Requires: python3-fedora-messaging
%description utils
These utilities work with finished composes produced by Pungi. They can be used
@ -108,8 +105,6 @@ gzip _build/man/pungi.1
%{__install} -d %{buildroot}%{_mandir}/man1
%{__install} -m 0644 doc/_build/man/pungi.1.gz %{buildroot}%{_mandir}/man1
rm %{buildroot}%{_bindir}/pungi
%check
%pytest
@ -123,8 +118,9 @@ rm %{buildroot}%{_bindir}/pungi
%{_bindir}/%{name}-make-ostree
%{_mandir}/man1/pungi.1.gz
%{_datadir}/pungi
/var/cache/pungi
%dir %attr(1777, root, root) /var/cache/pungi/createrepo_c
%{_localstatedir}/cache/pungi
%dir %attr(1777, root, root) %{_localstatedir}/cache/pungi/createrepo_c
%{_tmpfilesdir}/pungi-clean-cache.conf
%files -n python3-%{name}
%{python3_sitelib}/%{name}
@ -137,15 +133,203 @@ rm %{buildroot}%{_bindir}/pungi
%{_bindir}/%{name}-config-validate
%{_bindir}/%{name}-fedmsg-notification
%{_bindir}/%{name}-notification-report-progress
%{_bindir}/%{name}-orchestrate
%{_bindir}/%{name}-patch-iso
%{_bindir}/%{name}-compare-depsolving
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%{_bindir}/%{name}-cache-cleanup
%changelog
* Thu Jul 27 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 4.3.8-1.inferit
- buildinstall: Added bootloader configs charset detection patch
- Added python3-chardet requirement
* Wed Jan 01 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 4.8.0-1
- Rebuilt for MSVSphere 10
* Fri Nov 29 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.8.0-1
- Drop spec file (lsedlar)
- Remove python 2.7 from tox configuration (lsedlar)
- Remove forgotten multilib module for yum (lsedlar)
- Drop usage of six (lsedlar)
- Ensure ostree phase threads are stopped (lsedlar)
- scm: Clone git submodules (lsedlar)
- Drop unittest2 (lsedlar)
- Remove pungi/gather.py and associated code (lsedlar)
- Reduce legacy pungi script to gather phase only (#1792) (awilliam)
- Install dnf4 into test image (lsedlar)
- ostree_container: make filename configurable, include arch (awilliam)
- Correct subvariant handling for ostree_container phase (awilliam)
- Drop compatibility helper for dnf.Package.source_name (lsedlar)
* Tue Nov 19 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-8
- Backport #1798 to infer types/formats for new FEX backing images
* Tue Nov 19 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-7
- Backport #1796 to speed up compose some more
* Thu Nov 14 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-6
- Rebuild with no changes to bump past release used in infra tag
* Wed Oct 16 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-5
- Backport patches for subvariant and filename for ostree_container
- Backport patch to split ostree phases out and improve compose speed
* Mon Oct 07 2024 Adam Williamson <awilliam@redhat.com> - 4.7.0-4
- Backport patches to fix GCE image format not to be 'docker'
* Thu Aug 29 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.7.0-3
- Backport patch for setting kiwibuild image type in metadata
* Wed Aug 28 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.7.0-2
- Backport patch with kiwibuild options version and repo_releasever
* Thu Aug 22 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.7.0-1
- kiwibuild: Add support for type, type attr and bundle format (lsedlar)
- createiso: Block reuse if unsigned packages are allowed (lsedlar)
- Allow live_images phase to still be skipped (lsedlar)
- createiso: Recompute .treeinfo checksums for images (lsedlar)
- Drop support for signing rpm-wrapped artifacts (lsedlar)
- Remove live_images.py (LiveImagesPhase) (awilliam)
- Clean up requirements (lsedlar)
- Update pungi.spec for py3 (hlin)
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jul 12 2024 Haibo Lin <hlin@redhat.com> - 4.6.3-1
- Fix formatting of long line (lsedlar)
- unified-isos: Resolve symlinks (lsedlar)
- gather: Skip lookaside packages from local lookaside repo (lsedlar)
- pkgset: Avoid adding modules to unavailable arches (hlin)
- iso: Extract volume id with xorriso if available (lsedlar)
- De-duplicate log messages for ostree and ostree_container phases (awilliam)
- Handle tracebacks as str or bytes (lsedlar)
- ostree/container: add missing --version arg (awilliam)
- Block pkgset reuse on module defaults change (lsedlar)
- Include task ID in DONE message for OSBS phase (awilliam)
- Various phases: consistent format of failure message (awilliam)
- Update tests to exercise kiwi specific metadata (lsedlar)
- Kiwi: translate virtualbox and azure productmd formats (awilliam)
- kiwibuild: Add tests for the basic functionality (lsedlar)
- kiwibuild: Remove repos as dicts (lsedlar)
- Fix additional image metadata (lsedlar)
- Drop kiwibuild_version option (lsedlar)
- Update docs with kiwibuild options (lsedlar)
- kiwibuild: allow setting description scm and path at phase level (awilliam)
- Use latest Fedora for python 3 test environment (lsedlar)
- Install unittest2 only on python 2 (lsedlar)
- Fix 'failable' handling for kiwibuild phase (awilliam)
- image_build: Accept Kiwi extension for Azure VHD images (jeremycline)
- image_build: accept Kiwi vagrant image name format (awilliam)
* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 4.6.2-7
- Rebuilt for Python 3.13
* Fri May 31 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.2-6
- Rebuild to bump release over f40-infra build
* Fri May 31 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.2-2
- Add dependency on xorriso, fixes rhbz#2278677
* Tue Apr 30 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.2-1
- Phases/osbuild: support passing 'customizations' for image builds (thozza)
- dnf: Load filelists for actual solver too (lsedlar)
- kiwibuild: Tell Koji which arches are allowed to fail (lsedlar)
- kiwibuild: Update documentation with more details (lsedlar)
- kiwibuild: Add kiwibuild global options (lsedlar)
- kiwibuild: Process images same as image-build (lsedlar)
- kiwibuild: Add subvariant configuration (lsedlar)
- kiwibuild: Work around missing arch in build data (lsedlar)
- Support KiwiBuild (hlin)
- ostree/container: Set version in treefile 'automatic-version-prefix' (tim)
- dnf: Explicitly load filelists (lsedlar)
- Fix buildinstall reuse with pungi_buildinstall plugin (lsedlar)
- Fix filters for DNF query (lsedlar)
- gather-dnf: Support dotarch in filter_packages (lsedlar)
- gather: Support dotarch notation for debuginfo packages (lsedlar)
- Correctly set input and fultree_exclude flags for debuginfo (lsedlar)
* Fri Feb 09 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.1-1
- Make python3-mock dependency optional (lsedlar)
- Make latest black happy (lsedlar)
- Update tox configuration (lsedlar)
- Fix scm tests to not use user configuration (lsedlar)
- Add workaround for old requests in kojiwrapper (lsedlar)
- Use pungi_buildinstall without NFS (lsedlar)
- checks: don't require "repo" in the "ostree" schema (awilliam)
- ostree_container: Use unique temporary directory (lsedlar)
* Fri Jan 26 2024 Maxwell G <maxwell@gtmx.me> - 4.6.0-5
- Remove python3-mock dependency
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-3.fc39
- Stop requiring repo option in ostree phase
* Thu Jan 18 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-2
- ostree_container: Use unique temporary directory
* Wed Dec 13 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-1
- Add ostree container to image metadata (lsedlar)
- Updates for ostree-container phase (lsedlar)
- Add ostree native container support (tim)
- Improve autodetection of productmd image type for osbuild images (awilliam)
- pkgset: ignore events for modular content tags (lsedlar)
- pkgset: Ignore duplicated module builds (lsedlar)
- Drop buildinstall method (abisoi)
- Add step to send UMB message (lzhuang)
- Fix minor Ruff/flake8 warnings (tim)
- osbuild: manifest type in config (cmdr)
* Mon Sep 25 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.0-7
- Backport patch for explicit setting of osbuild image type in metadata
* Thu Aug 31 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.0-1
- kojiwrapper: Stop being smart about local access (lsedlar)
- Fix unittest errors (ounsal)
- Add integrity checking for builds (lsedlar)
- Add script for cleaning up the cache (lsedlar)
- Add ability to download images (lsedlar)
- Add support for not having koji volume mounted locally (lsedlar)
- Remove repository cloning multiple times (abisoi)
- Support require_all_comps_packages on DNF backend (lsedlar)
- Fix new warnings from flake8 (lsedlar)
* Tue Jul 25 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.4.1-1
- ostree: Add configuration for custom runroot packages (lsedlar)
- pkgset: Emit better error for missing modulemd file (lsedlar)
- Add support for git-credential-helper (lsedlar)
- Support OIDC Client Credentials authentication to CTS (hlin)
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jul 19 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.4.0-3
- Backport ostree runroot package additions
* Mon Jun 19 2023 Python Maint <python-maint@redhat.com> - 4.4.0-2
- Rebuilt for Python 3.12
* Wed Jun 07 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.4.0-1
- gather-dnf: Run latest() later (lsedlar)
- iso: Support joliet long names (lsedlar)
- Drop pungi-orchestrator code (lsedlar)
- isos: Ensure proper file ownership and permissions (lsedlar)
- gather: Always get latest packages (lsedlar)
- Add back compatibility with jsonschema <3.0.0 (lsedlar)
- Remove useless debug message (lsedlar)
- Remove fedmsg from requirements (lsedlar)
- gather: Support dotarch in DNF backend (lsedlar)
- Fix compatibility with createrepo_c 0.21.1 (lsedlar)
- comps: Apply arch filtering to environment/optionlist (lsedlar)
- Add config file for cleaning up cache files (hlin)
* Wed May 17 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.8-3
- Rebuild without fedmsg dependency
* Wed May 03 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.8-1
- Set priority for Fedora messages
* Thu Mar 30 2023 Haibo Lin <hlin@redhat.com> - 4.3.8-1
- createiso: Update possibly changed file on DVD (lsedlar)

Loading…
Cancel
Save