From b93eb72530e88515b7ad440e3e2b0c1398821266 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Nov 30 2021 20:39:35 +0000 Subject: 249.4-2.10: re-enable fdisk and repart now that deps are fixed fdisk was originally disabled because CentOS 8's version was missing https://github.com/util-linux/util-linux/commit/2f35c1ead621f42f32f7777232568cb03185b473. This has since been backported to util-linux-2.32.1-26 so let's re-enable fdisk and repart to match Fedora. --- diff --git a/SOURCES/libfdisk_version_for_centos.patch b/SOURCES/libfdisk_version_for_centos.patch new file mode 100644 index 0000000..1a8535b --- /dev/null +++ b/SOURCES/libfdisk_version_for_centos.patch @@ -0,0 +1,25 @@ +From 69443affcaa711a9a3355994458542d3732631a5 Mon Sep 17 00:00:00 2001 +From: Anita Zhang +Date: Tue, 30 Nov 2021 12:08:50 -0800 +Subject: [PATCH] Re-enable repart if libfdisk ver. has range fix + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6263e7c0fc..35e6c4f376 100644 +--- a/meson.build ++++ b/meson.build +@@ -1011,7 +1011,7 @@ libmount = dependency('mount', + want_libfdisk = get_option('fdisk') + if want_libfdisk != 'false' and not skip_deps + libfdisk = dependency('fdisk', +- version : '>= 2.33', ++ version : '>= 2.32.1', + required : want_libfdisk == 'true') + have = libfdisk.found() + else +-- +2.31.1 + diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index b8ab3ca..9177887 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -40,7 +40,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd %if %{without inplace} Version: 249.4 -Release: 2.9%{?dist} +Release: 2.10%{?dist} %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -147,6 +147,8 @@ Patch0021: 21221.patch Patch0501: https://github.com/systemd/systemd/pull/17050/commits/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch # Downgrade sysv-generator messages from warning to debug Patch0502: 0001-sysv-generator-downgrade-log-warning-about-autogener.patch +# Update libfdisk dep version to 2.32.1-26 (has the fix for repart tests to pass) +Patch0503: libfdisk_version_for_centos.patch %ifarch %{ix86} x86_64 aarch64 %global have_gnu_efi 1 @@ -157,7 +159,7 @@ BuildRequires: gcc-c++ BuildRequires: coreutils BuildRequires: libcap-devel BuildRequires: libmount-devel -BuildRequires: libfdisk-devel +BuildRequires: libfdisk-devel >= 2.32.1-26 BuildRequires: libpwquality-devel BuildRequires: pam-devel BuildRequires: libselinux-devel @@ -489,6 +491,7 @@ CONFIGURE_OPTS=( -Dkmod=true -Dxkbcommon=true -Dblkid=true + -Dfdisk=true -Dseccomp=true -Dima=true -Dselinux=true @@ -580,8 +583,6 @@ CONFIGURE_OPTS=( -Dp11kit=false -Duserdb=false -Dhomed=false - -Drepart=false - -Dfdisk=false -Dpwquality=false -Dqrencode=false -Dlibfido2=false @@ -1088,6 +1089,10 @@ fi %endif %changelog +* Tue Nov 30 2021 Anita Zhang - 249.4-2.10 +- Re-enable fdisk and repart since util-linux-2.32.1-26 in C8s has the fix + it needs for tests to pass. + * Wed Nov 24 2021 Davide Cavalca - 249.4-2.9 - Disable legacy iptables support