From 518d9b73f4afdb3f086385872616aa955bc43c9700817e50a16c857393396235 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 15 Nov 2022 08:31:18 +0000 Subject: [PATCH] Add temporarly 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch until this patch is mainstreamed. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1325 --- ...st-kernel-install-only-when-Dkernel-.patch | 29 +++++++++++++++++++ systemd.changes | 4 +++ systemd.spec | 14 ++++----- 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch diff --git a/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch new file mode 100644 index 00000000..3217bafa --- /dev/null +++ b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch @@ -0,0 +1,29 @@ +From c34a72017fe66998f7bd40b5e90d27accd69376c Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 15 Nov 2022 09:04:42 +0100 +Subject: [PATCH 6000/6000] meson: install test-kernel-install only when + -Dkernel-install=true + +This patch fixes the following build failure: + + meson.build:3853:8: ERROR: Unknown variable "test_kernel_install_sh". +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 00daeac1b6..0fd0129820 100644 +--- a/meson.build ++++ b/meson.build +@@ -3968,7 +3968,7 @@ exe = custom_target( + install_dir : bindir) + public_programs += exe + +-if want_tests != 'false' ++if want_tests != 'false' and want_kernel_install + test('test-kernel-install', + test_kernel_install_sh, + args : [exe.full_path(), loaderentry_install]) +-- +2.35.3 + diff --git a/systemd.changes b/systemd.changes index 044a9b1a..29d0fb98 100644 --- a/systemd.changes +++ b/systemd.changes @@ -11,6 +11,10 @@ Mon Nov 14 11:15:06 UTC 2022 - Franck Bui * The new tools systemd-measure and systemd-pcrphase have been added to the experimental sub-package for now. + * Add temporarly + 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch until this + patch is mainstreamed. + ------------------------------------------------------------------- Tue Nov 8 16:33:26 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b2f821df..e44bd068 100644 --- a/systemd.spec +++ b/systemd.spec @@ -106,7 +106,7 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: meson >= 0.43 +BuildRequires: meson >= 0.53.2 BuildRequires: pam-devel BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this BR. Also @@ -211,12 +211,12 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Temporary workaround until bsc#1197178 is addressed. Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch -# Patches listed below are put in quarantine. Normally all changes -# must go to upstream first and then are cherry-picked in the SUSE git -# repository. But in very few cases, some stuff might be broken in -# upstream and need an urgent fix. Even in this case, the patches are -# temporary and should be removed as soon as a fix is merged by -# upstream. +# Patches listed below are put in quarantine. Normally all changes must go to +# upstream first and then are cherry-picked in the SUSE git repository. But for +# very few cases, some stuff might be broken in upstream and need to be fixed +# quickly. But even in these cases, the patches are temporary and should be +# removed as soon as a fix is merged by upstream. +Patch6000: 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch %description Systemd is a system and service manager, compatible with SysV and LSB