From bda580b806fbbe5ac6ac31657c7bfabf2c32b6cb Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 30 Jul 2026 05:34:38 +0000 Subject: [PATCH] pseudo: upgrade 1.9.8 -> 1.9.10 2a5521e Makefile.in: Bump to 1.9.10 28c0fb3 test: various: Move to makefile compilation a965bfc test-bash-exec-env: Add bash env test case bdf1c01 test/test-openat2-func.c: Remove unusuaed saved_errno 2b2d160 pseudo_util.c: strchr now returns const char 5b88e91 pseudo_client: remove the unused pseudo_prefix_dir_fd f2b420c pseudo_client: step around all of pseudo's own fds in closefrom 8907027 pseudo_client: step fully past pseudo's own fds when computing startfd b3958b0 makewrappers: Avoid efault workaround if using AT_EMPTY_PATH c63f439 ports/linux/guts: Add __open64_2 wrapper 4194895 Makefile.in: Bump to 1.9.9 --- .../pseudo/files/older-glibc-symbols.patch | 57 ------------------- meta/recipes-devtools/pseudo/pseudo_git.bb | 5 +- 2 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch diff --git a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch deleted file mode 100644 index f42b32b8d9..0000000000 --- a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch +++ /dev/null @@ -1,57 +0,0 @@ -If we link against a newer glibc 2.34 and then try and our LD_PRELOAD is run against a -binary on a host with an older libc, we see symbol errors since in glibc 2.34, pthread -and dl are merged into libc itself. - -We need to use the older form of linking so use glibc binaries from an older release -to force this. We only use minimal symbols from these anyway. - -pthread_atfork is problematic, particularly on arm so use the internal glibc routine -it maps too. This was always present in the main libc from 2.3.2 onwards. - -Yes this is horrible. Better solutions welcome. - -There is more info in the bug: [YOCTO #14521] - -Upstream-Status: Inappropriate [this patch is native and nativesdk] -Signed-off-by: Richard Purdie - -Tweak library search order, make prebuilt lib ahead of recipe lib -Signed-off-by: Hongxu Jia ---- - Makefile.in | 2 +- - pseudo_wrappers.c | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in ---- a/Makefile.in -+++ b/Makefile.in -@@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN) - libpseudo: $(LIBPSEUDO) - - $(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_client_scanf.o pseudo_ipc.o $(SHOBJS) | $(LIB) -- $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ -+ $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ - pseudo_client.o pseudo_client_scanf.o pseudo_ipc.o \ - $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS) - -diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c ---- a/pseudo_wrappers.c -+++ b/pseudo_wrappers.c -@@ -100,10 +100,13 @@ static void libpseudo_atfork_child(void) - pseudo_mutex_holder = 0; - } - -+extern void *__dso_handle; -+extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *); -+ - static void - _libpseudo_init(void) { - if (!_libpseudo_initted) -- pthread_atfork(NULL, NULL, libpseudo_atfork_child); -+ __register_atfork (NULL, NULL, libpseudo_atfork_child, &__dso_handle == NULL ? NULL : __dso_handle); - - pseudo_getlock(); - pseudo_antimagic(); --- -2.27.0 - diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 9f02d90568..c0346ab09e 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -3,6 +3,7 @@ require pseudo.inc SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https;branch=master \ file://fallback-passwd \ file://fallback-group \ + http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/prebuilt;name=prebuilt \ " SRC_URI:append:class-native = " \ http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/prebuilt;name=prebuilt \ @@ -12,8 +13,8 @@ SRC_URI:append:class-nativesdk = " \ file://older-glibc-symbols.patch" SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" -SRCREV = "ca47829825f297d7bf83665c0541a9de4aa78009" -PV = "1.9.8+git" +SRCREV = "00077a9e3be3e6497b17d42ec483d8c11cd18843" +PV = "1.9.10" # largefile and 64bit time_t support adds these macros via compiler flags globally # remove them for pseudo since pseudo intercepts some of the functions which will be -- 2.47.1