From f1d49ea941b1aa139965a0973fa0c1836200be50 Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Thu, 30 Nov 2023 21:18:16 +0000 Subject: [PATCH] Revert "systemd: fix build after meson upgrade" This reverts commit 6dbae8b47eb34b9bcfbd0f8c2e4b9e7964763957. Reason for revert: Goes together with this other revert https://review.opendev.org/c/starlingx/tools/+/902237 Change-Id: I46e6a6841c1527268a20dfca67fcef2932c9eb35 --- ...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 deletions(-) delete mode 100644 base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch delete 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 deleted file mode 100644 index bde545ec4..000000000 --- a/base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 01f1df726f1bf2aaf460c009f925a9984c2b2ef3 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Sat, 17 Jun 2023 00:46:10 -0700 -Subject: [PATCH] systemd: add dependency on rsync - -Signed-off-by: Jackie Huang ---- - 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 , - python3-evdev , -+ rsync, - tzdata , - libcap2-bin , - iproute2 , --- -2.39.0 - diff --git a/base/systemd/debian/deb_patches/series b/base/systemd/debian/deb_patches/series index e7fb2b2f1..18d1298b6 100644 --- a/base/systemd/debian/deb_patches/series +++ b/base/systemd/debian/deb_patches/series @@ -1,2 +1 @@ 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 deleted file mode 100644 index 6b0440a98..000000000 --- a/base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 364625df3f176e8c810ae5eab2a10aa448123989 Mon Sep 17 00:00:00 2001 -From: "david.liu" -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 ---- - 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 5b046172d..eb19fd66d 100644 --- a/base/systemd/debian/patches/series +++ b/base/systemd/debian/patches/series @@ -31,6 +31,3 @@ 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