Skip to contentSkip to conversation

sdbus-c++-libsystemd: Upgrade to 250.9 systemd release

PATCH New Khem Raj 1 participant 1 message Dec 21, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 sdbus-c++-libsystemd: Upgrade to 250.9 systemd release

Fix build with latest musl
Drop upstreamed patches

---
 ...il-Remove-asserts-on-dirent64-dirent.patch | 38 ++++++++++
 ...lude-linux-fs.h-to-resolve-fsconfig_.patch | 74 -------------------
 ...ass-correct-parameters-to-getdents64.patch | 50 -------------
 ...250.3.bb => sdbus-c++-libsystemd_250.9.bb} |  5 +-
 4 files changed, 40 insertions(+), 127 deletions(-)
 create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-dirent-util-Remove-asserts-on-dirent64-dirent.patch
 delete mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch
 delete mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-pass-correct-parameters-to-getdents64.patch
 rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-libsystemd_250.3.bb => sdbus-c++-libsystemd_250.9.bb} (94%)
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-dirent-util-Remove-asserts-on-dirent64-dirent.patch new file +38 -0
new file mode 100644
index 0000000000..517886c727
@@ -0,0 +1,38 @@
+From 19cc68d4a89b59889be442d2997ff030cdc3de73 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 20 Dec 2022 20:11:17 -0800
+Subject: [PATCH] dirent-util: Remove asserts on dirent64 == dirent
+
+We already have assert_cc(_FILE_OFFSET_BITS == 64) which ensures that 64bit LFS functions are same as their original counterparts
+
+Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/25809]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/basic/dirent-util.h | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
+index 04bc53003f..4cb317184d 100644
+--- a/src/basic/dirent-util.h
++++ b/src/basic/dirent-util.h
+@@ -35,17 +35,6 @@ struct dirent *readdir_no_dot(DIR *dirp);
+ /* Only if 64bit off_t is enabled struct dirent + struct dirent64 are actually the same. We require this, and
+  * we want them to be interchangeable to make getdents64() work, hence verify that. */
+ assert_cc(_FILE_OFFSET_BITS == 64);
+-assert_cc(sizeof(struct dirent) == sizeof(struct dirent64));
+-assert_cc(offsetof(struct dirent, d_ino) == offsetof(struct dirent64, d_ino));
+-assert_cc(sizeof_field(struct dirent, d_ino) == sizeof_field(struct dirent64, d_ino));
+-assert_cc(offsetof(struct dirent, d_off) == offsetof(struct dirent64, d_off));
+-assert_cc(sizeof_field(struct dirent, d_off) == sizeof_field(struct dirent64, d_off));
+-assert_cc(offsetof(struct dirent, d_reclen) == offsetof(struct dirent64, d_reclen));
+-assert_cc(sizeof_field(struct dirent, d_reclen) == sizeof_field(struct dirent64, d_reclen));
+-assert_cc(offsetof(struct dirent, d_type) == offsetof(struct dirent64, d_type));
+-assert_cc(sizeof_field(struct dirent, d_type) == sizeof_field(struct dirent64, d_type));
+-assert_cc(offsetof(struct dirent, d_name) == offsetof(struct dirent64, d_name));
+-assert_cc(sizeof_field(struct dirent, d_name) == sizeof_field(struct dirent64, d_name));
+ 
+ #define FOREACH_DIRENT_IN_BUFFER(de, buf, sz)                           \
+         for (void *_end = (uint8_t*) ({ (de) = (buf); }) + (sz);        \
+-- 
+2.39.0
+
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch deleted +0 -74

74 lines not on this page · raw message

meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-pass-correct-parameters-to-getdents64.patch deleted +0 -50

50 lines not on this page · raw message

meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.9.bb renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb +2 -3
similarity index 94%
rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.9.bb
index 853cc20b67..14e927d075 100644
@@ -10,11 +10,11 @@ inherit meson pkgconfig
 
 DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native"
 
-SRCREV = "73be9643910c3f7f3ff84765d63060846c110016"
+SRCREV = "1d5e0e9910500f3c3584485f77bfc35e601036e3"
 SRCBRANCH = "v250-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
            file://static-libsystemd-pkgconfig.patch \
-           file://0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch \
+           file://0001-dirent-util-Remove-asserts-on-dirent64-dirent.patch \
            "
 
 # patches needed by musl
@@ -44,7 +44,6 @@ SRC_URI_MUSL = "\
                file://0025-Handle-__cpu_mask-usage.patch \
                file://0026-Handle-missing-gshadow.patch \
                file://0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \
-               file://0001-pass-correct-parameters-to-getdents64.patch \
                file://0002-Add-sys-stat.h-for-S_IFDIR.patch \
                file://0001-Adjust-for-musl-headers.patch \
                "
Signature · 1 line
2.39.0