starlingx/integ
Code Issues Proposed changes

Merge "Revert "systemd: fix build after meson upgrade""

Browse Source
This commit is contained in:
Zuul 2023-11-30 23:01:26 +00:00 committed by Gerrit Code Review
commit 0aa365b12b
4 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
base/systemd/debian/deb_patches/0002-systemd-add-dependency-on-rsync.patch
View File

@ -1,25 +0,0 @@
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

1
base/systemd/debian/deb_patches/series
View File

@ -1,2 +1 @@
0001-Update-symbols-file-for-libsystemd0.patch
0002-systemd-add-dependency-on-rsync.patch

34
base/systemd/debian/patches/928-change-operator-combining-bools-from-to-and.patch
View File

@ -1,34 +0,0 @@
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

3
base/systemd/debian/patches/series
View File

@ -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