diff --git a/.gitignore b/.gitignore index 6fea26c..c428ea1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /livecd-tools-26.1.tar.gz /livecd-tools-27.0.tar.gz /livecd-tools-27.1.tar.gz +/livecd-tools-28.0.tar.gz diff --git a/0001-Pass-package_types-to-dnf-base-group_install-as-tupl.patch b/0001-Pass-package_types-to-dnf-base-group_install-as-tupl.patch deleted file mode 100644 index 25d723a..0000000 --- a/0001-Pass-package_types-to-dnf-base-group_install-as-tupl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8b7b4f65bb443cff1aa263cf7af44c9ec3243fb8 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 8 Oct 2020 12:57:10 -0700 -Subject: [PATCH] Pass package_types to dnf base group_install as tuple, not - set - -I believe this is probably the cause of -https://bugzilla.redhat.com/show_bug.cgi?id=1886567 , which broke -Rawhide and F33 composes today. dnf itself seems to always pass -this as a list or a tuple. The dnf API docs say "`pkg_types` is a -sequence of strings determining the kinds of packages to be -installed"; according to Python docs, lists, tuples and range -types are "sequences", but sets are not, so technically we are -out of bounds here. I believe this worked before this dnf commit: -https://github.com/rpm-software-management/dnf/commit/4d991f61 -and upstream *could* probably tweak things to accept sets again, -but it seems reasonable to fix it here. - -Signed-off-by: Adam Williamson ---- - imgcreate/dnfinst.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/imgcreate/dnfinst.py b/imgcreate/dnfinst.py -index 06a5b24..8a74494 100644 ---- a/imgcreate/dnfinst.py -+++ b/imgcreate/dnfinst.py -@@ -129,7 +129,7 @@ class DnfLiveCD(dnf.Base): - elif include == GROUP_ALL: - package_types.add('optional') - try: -- self.group_install(grp.id, package_types, exclude=exclude) -+ self.group_install(grp.id, tuple(package_types), exclude=exclude) - except dnf.exceptions.CompsError as e: - # DNF raises this when it is already selected - pass --- -2.28.0 - diff --git a/livecd-tools.spec b/livecd-tools.spec index 7cd63ff..c85bbab 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -16,18 +16,14 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 27.1 -Release: 9%{?dist} +Version: 28.0 +Release: 1%{?dist} %if 0%{?fedora} Epoch: 1 %endif License: GPLv2 URL: https://github.com/livecd-tools/livecd-tools Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz -# Fix `DnfLiveCD.selectGroup` with DNF 4.4.0+ -# https://github.com/livecd-tools/livecd-tools/pull/168 -# https://bugzilla.redhat.com/show_bug.cgi?id=1886567 -Patch0: 0001-Pass-package_types-to-dnf-base-group_install-as-tupl.patch BuildRequires: make %if %{with python2} @@ -224,6 +220,29 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-* %endif %changelog +* Sun May 08 2021 Neal Gompa - 1:28.0-1 +- Release 28.0 (ngompa13) +- HACKING: Fix URL for the Git repository (ngompa13) +- imgcreate/live: Add missing variable "_isDracut" (ngompa13) +- imgcreate/live: Use the right EFI binaries for x86 images (ngompa13) +- imgcreate/live: Add AArch64 support (ngompa13) +- imgcreate/live: Rework ISO creation to split x86 specific parts out (ngompa13) +- Add missing files to uninstall section of makefile (quanterium) +- Separate the errors for no ks specified and file not found (bcotton) +- Pass package_types to dnf base group_install as tuple, not set (awilliam) +- imgcreate: Allow more SquashFS compression options. (fgrose) +- BindChrootMount: Expand this class to include bind mounting of files. (fgrose) +- Obsolete osmin.img processing. (fgrose) +- live.py: harmonize xorrisofs arguments with lorax live/x86.tmpl (fgrose) +- imgcreate/kickstart: Use urlgrabber again instead of urllib (ngompa13) +- Make --livedir & --multi handling more robust. (fgrose) +- editliveos: Use USERNAME now instead of LOGNAME. (fgrose) +- livecd-iso-to-disk: Update test for 'gio' presence. (fgrose) +- live.py: Store EFI boot images in /images/. (fgrose) +- livecd-iso-to-disk: Use -E, --exit-if-exists option to udevadm settle. (fgrose) +- live.py: Update xorrisofs_options for x86 images. (fgrose) +- editliveos: Rework installing packages into image (khoidinhtrinh) + * Tue Jan 26 2021 Fedora Release Engineering - 1:27.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8cab806..851b681 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (livecd-tools-27.1.tar.gz) = f5a744248d04b89e930e35fd52917412c6e97a800c4da6f9064a74a1bd7fd37bcc64eb38c222018d7e4fcb0686ede79ac4f3db5ea2b70fb7d062e79b441a2bd1 +SHA512 (livecd-tools-28.0.tar.gz) = d8ea7f47572303b65e3b12bc46b83a3f368c8a589836c44e3935d3c6cb62067ceb42f5ce08e2560dffd953ca8a1f5670038a6ddd1b4b4f3e4805e12cf1e1ad40