From 9a3d4fb04d661ab447896561bfbe1e84912a2426 Mon Sep 17 00:00:00 2001
From: Davi Frossard <dbarrosf@windriver.com>
Date: Mon, 4 Dec 2023 07:13:27 -0500
Subject: [PATCH] systemd: fix build after meson upgrade

Fix the following build issues after meson is
upgraded to 1.0.1-5.

* 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:
mesonbuild/meson@43302d3

Fixes: systemd#20632

* Add dependency on rsync

Story: 2010781
Task: 48183

Depends-on: https://review.opendev.org/c/starlingx/tools/+/902324

Signed-off-by: Dan Streetman
Signed-off-by: david.liu <david.liu@windriver.com>
Change-Id: I2064b9f01252139ece252494a007cc00a8b4cb7b
---
 ...0002-systemd-add-dependency-on-rsync.patch | 25 ++++++++++++++
 base/systemd/debian/deb_patches/series        |  1 +
 ...operator-combining-bools-from-to-and.patch | 34 +++++++++++++++++++
 base/systemd/debian/patches/series            |  3 ++
 4 files changed, 63 insertions(+)
 create mode 100644 base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch
 create mode 100644 base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch

diff --git a/base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch b/base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch
new file mode 100644
index 000000000..bde545ec4
--- /dev/null
+++ b/base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch
@@ -0,0 +1,25 @@
+From 01f1df726f1bf2aaf460c009f925a9984c2b2ef3 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Sat, 17 Jun 2023 00:46:10 -0700
+Subject: [PATCH] systemd: add dependency on rsync
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ debian/control | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/debian/control b/debian/control
+index 6174db7..57acfea 100644
+--- a/debian/control
++++ b/debian/control
+@@ -55,6 +55,7 @@ Build-Depends: debhelper-compat (= 13),
+                python3-lxml:native,
+                python3-pyparsing <!nocheck>,
+                python3-evdev <!nocheck>,
++               rsync,
+                tzdata <!nocheck>,
+                libcap2-bin <!nocheck>,
+                iproute2 <!nocheck>,
+-- 
+2.39.0
+
diff --git a/base/systemd/debian/deb_patches/series b/base/systemd/debian/deb_patches/series
index 18d1298b6..e7fb2b2f1 100644
--- a/base/systemd/debian/deb_patches/series
+++ b/base/systemd/debian/deb_patches/series
@@ -1 +1,2 @@
 0001-Update-symbols-file-for-libsystemd0.patch
+0002-systemd-add-dependency-on-rsync.patch
diff --git a/base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch b/base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch
new file mode 100644
index 000000000..6b0440a98
--- /dev/null
+++ b/base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch
@@ -0,0 +1,34 @@
+From 364625df3f176e8c810ae5eab2a10aa448123989 Mon Sep 17 00:00:00 2001
+From: "david.liu" <david.liu@windriver.com>
+Date: Fri, 16 Jun 2023 17:15:42 +0800
+Subject: [PATCH] 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:
+mesonbuild/meson@43302d3
+
+Fixes: systemd#20632
+
+Signed-off-by: Dan Streetman
+Signed-off-by: david.liu <david.liu@windriver.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 580964c..98b0ec2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -43,7 +43,7 @@ conf.set('BUILD_MODE', 'BUILD_MODE_' + get_option('mode').to_upper(),
+ 
+ want_ossfuzz = get_option('oss-fuzz')
+ want_libfuzzer = get_option('llvm-fuzz')
+-if want_ossfuzz + want_libfuzzer > 1
++if want_ossfuzz and want_libfuzzer > 1
+         error('only one of oss-fuzz or llvm-fuzz can be specified')
+ endif
+ 
+-- 
+2.30.2
+
diff --git a/base/systemd/debian/patches/series b/base/systemd/debian/patches/series
index eb19fd66d..5b046172d 100644
--- a/base/systemd/debian/patches/series
+++ b/base/systemd/debian/patches/series
@@ -31,3 +31,6 @@ skip-some-testcases.patch
 
 # Fix SAS paths for multiple disks
 0015-Port-udev-old-sas-paths-creation-from-RHEL.patch
+
+# Change operator combining bools from + to and
+928-change-operator-combining-bools-from-to-and.patch