From ce99022f7b7c6b545cdbfac2436e578d41ca3162 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Sep 12 2024 00:00:30 +0000 Subject: Version 256.6 Bump version and remove already present ukify patch --- diff --git a/34154.patch b/34154.patch deleted file mode 100644 index acab80c..0000000 --- a/34154.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e3486e1494ab4bc23df39cae8b4bda6182265408 Mon Sep 17 00:00:00 2001 -From: Daan De Meyer -Date: Wed, 28 Aug 2024 14:08:30 +0200 -Subject: [PATCH] ukify: Skip test on architectures without UEFI - ---- - src/ukify/test/test_ukify.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py -index bbd26c0d42343..a08996cb55cf6 100755 ---- a/src/ukify/test/test_ukify.py -+++ b/src/ukify/test/test_ukify.py -@@ -45,6 +45,13 @@ - sys.path.append(os.path.dirname(__file__) + '/..') - import ukify - -+# Skip if we're running on an architecture that does not use UEFI. -+try: -+ ukify.guess_efi_arch() -+except ValueError as e: -+ print(str(e), file=sys.stderr) -+ sys.exit(77) -+ - build_root = os.getenv('PROJECT_BUILD_ROOT') - try: - slow_tests = bool(int(os.getenv('SYSTEMD_SLOW_TESTS', '1'))) diff --git a/sources b/sources index 87067ab..ad04ada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-256.5.tar.gz) = 40558194e05a17b218adf3d6df48b738c866855d43d09c1e9381c2c568a44a8f1617b64476736fc7e34416ad9e8d25dc023cf9de090b4ef9079866919377009f +SHA512 (systemd-256.6.tar.gz) = 99d0fad02cab3559e081dabc2797d1d66bbc21daf9aaec847aeb6bce289456ff9c8599a34563c9bfa3826db36ae9ab30836b09bae00bf1a410b54d0bad9bd4dc diff --git a/systemd.spec b/systemd.spec index 614db47..2e4c79d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. -Version: %{?version_override}%{!?version_override:256.5} +Version: %{?version_override}%{!?version_override:256.6} Release: %autorelease %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -120,9 +120,6 @@ Patch0010: https://github.com/systemd/systemd/pull/26494.patch # Requested in https://bugzilla.redhat.com/show_bug.cgi?id=2298422 Patch0011: https://github.com/systemd/systemd/pull/33738.patch -# Make test-ukify skip itself on architectures without UEFI. -Patch0012: https://github.com/systemd/systemd/pull/34154.patch - # Those are downstream-only patches, but we don't want them in packit builds: # https://bugzilla.redhat.com/show_bug.cgi?id=2251843 Patch0491: https://github.com/systemd/systemd/pull/30846.patch