From d58efaa4faa3e34500b7c0e25b5864338569a499 Mon Sep 17 00:00:00 2001
From: wangyuhang <wangyuhang27@huawei.com>
Date: Tue, 21 Jun 2022 15:50:25 +0800
Subject: [PATCH] fix build fail on meson-0.6 1. delete invalid meson build
 option 2. meson.build: change operator combining bools from + to and

---
 ...ge-operator-combining-bools-from-to-.patch | 35 +++++++++++++++++++
 systemd.spec                                  | 10 ++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 backport-meson.build-change-operator-combining-bools-from-to-.patch

diff --git a/backport-meson.build-change-operator-combining-bools-from-to-.patch b/backport-meson.build-change-operator-combining-bools-from-to-.patch
new file mode 100644
index 0000000..55fe2f5
--- /dev/null
+++ b/backport-meson.build-change-operator-combining-bools-from-to-.patch
@@ -0,0 +1,35 @@
+From c29537f39e4f413a6cbfe9669fa121bdd6d8b36f Mon Sep 17 00:00:00 2001
+From: Dan Streetman <ddstreet@canonical.com>
+Date: Fri, 3 Sep 2021 12:43:33 -0400
+Subject: [PATCH] meson.build: change operator combining bools from + to and
+
+upstream meson stopped allowing combining boolean with the plus
+operator, and now requires using the logical and operator
+
+reference:
+https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c
+
+Fixes: #20632
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6e1a8b1e50..0fe996adba 100644
+--- a/meson.build
++++ b/meson.build
+@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
+ 
+ want_ossfuzz = get_option('oss-fuzz')
+ want_libfuzzer = get_option('llvm-fuzz')
+-if want_ossfuzz + want_libfuzzer > 1
++if want_ossfuzz and want_libfuzzer
+         error('only one of oss-fuzz or llvm-fuzz can be specified')
+ endif
+ 
+-- 
+2.33.0
+
diff --git a/systemd.spec b/systemd.spec
index 0de4da8..f01c477 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,7 +20,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        249
-Release:        28
+Release:        29
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -104,6 +104,7 @@ Patch6024:      backport-core-service-also-check-path-in-exec-commands.patch
 Patch6025:      backport-Add-meson-option-to-disable-urlify.patch
 Patch6026:      backport-logind.conf-Fix-name-of-option-RuntimeDirectoryInode.patch
 Patch6027:      backport-unit-coldplug-both-job-and-nop_job-if-possible.patch
+Patch6028:      backport-meson.build-change-operator-combining-bools-from-to-.patch
 
 BuildRequires:  gcc, gcc-c++
 BuildRequires:  libcap-devel, libmount-devel, pam-devel, libselinux-devel
@@ -342,7 +343,6 @@ CONFIGURE_OPTS=(
         -Ddefault-mdns=yes
         -Ddefault-llmnr=yes
         -Dhtml=false
-        -Dlibbpf=false
         -Dlibfido2=false
         -Dopenssl=false
         -Dpwquality=false
@@ -350,7 +350,6 @@ CONFIGURE_OPTS=(
         -Dzstd=false
         -Dbpf-framework=false
         -Drepart=false
-        -Dlegacy-pkla=false
         -Dcompat-mutable-uid-boundaries=false
         -Dvalgrind=false
         -Dfexecve=false
@@ -1509,6 +1508,11 @@ fi
 %{_libdir}/security/pam_systemd.so
 
 %changelog
+* Tue Jun 21 2022 wangyuhang<wangyuhang27@huawei.com> -249-29
+- fix build fail on meson-0.6
+  1. delete invalid meson build option
+  2. meson.build: change operator combining bools from + to and
+
 * Fri Jun 17 2022 wangyuhang<wangyuhang27@huawei.com> -249-28
 - revert rpm: restart services in %posttrans
   fix spelling errors in systemd.spec, fdev -> udev