diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-06 10:01:21 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2026-01-26 09:45:39 +0000 |
| commit | 80593d0ce1edd25489f85021024374c11df3edee (patch) | |
| tree | df1cfef96432f09e6e0c413c5b290c7cd82129d9 /meta | |
| parent | 4581b795c68aefc719fcfed7805000204382b284 (diff) | |
| download | poky-80593d0ce1edd25489f85021024374c11df3edee.tar.gz | |
pseudo: Upgrade to version 1.9.1
This brings in:
* nftw, nftw64: add wrapper
* ftw, nftw, ftw64, nftw64: add tests
* Move ftw and ftw64 to calling ntfw and nftw64
* makewrappers: Introduce 'array' support
* pseudo_util.c: Avoid warning when we intentionally discard const
* pseudo_client.c: Fix warning
* yocto-older-glibc-symbols.path: Add as a reference patch
* pseudo/pseudo_client: Add wrapper functions to operate correctly with glibc 2.38 onwards
* configure: Prune PIE flags
* test/test-parallel-rename.sh: Add parallel rename test
* test/test-parallel-symlinks.sh: Add parallel symlink test
* ports/linux/guts: Add .gitignore to ignore generated files
(From OE-Core rev: a019d270cd6f41c751e685f36581c00e65287b9d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 994e508b2a0ede8b5cc4fe39444cf25dc9a53faf)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
4 files changed, 3 insertions, 114 deletions
diff --git a/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch b/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch deleted file mode 100644 index 43504eaab9..0000000000 --- a/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From b5545c08e6c674c49aef14b47a56a3e92df4d2a7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 17 Feb 2016 07:36:34 +0000 | ||
| 4 | Subject: [pseudo][PATCH] configure: Prune PIE flags | ||
| 5 | |||
| 6 | LDFLAGS are not taken from environment and CFLAGS is used for LDFLAGS | ||
| 7 | however when using security options -fpie and -pie options are coming | ||
| 8 | as part of ARCH_FLAGS and they get into LDFLAGS of shared objects as | ||
| 9 | well so we end up with conflicting options -shared -pie, which gold | ||
| 10 | rejects outright and bfd linker lets the one appearning last in cmdline | ||
| 11 | take effect. This create quite a unpleasant situation in OE when | ||
| 12 | security flags are enabled and gold or not-gold options are used | ||
| 13 | it errors out but errors are not same. | ||
| 14 | |||
| 15 | Anyway, with this patch we filter pie options from ARCH_FLAGS | ||
| 16 | ouright and take control of generating PIC objects | ||
| 17 | |||
| 18 | Helps with errors like | ||
| 19 | |||
| 20 | | /mnt/oe/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/5.3.0/ld: pseudo_client.o: relocation R_X86_64_PC32 against symbol `pseudo_util_debug_flags' can not be used when making a shared object; recompile with -fPIC | ||
| 21 | | /mnt/oe/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/5.3.0/ld: final link failed: Bad value | ||
| 22 | | collect2: error: ld returned 1 exit status | ||
| 23 | | make: *** [lib/pseudo/lib64/libpseudo.so] Error 1 | ||
| 24 | |||
| 25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 26 | --- | ||
| 27 | Upstream-Status: Submitted | ||
| 28 | |||
| 29 | configure | 2 ++ | ||
| 30 | 1 file changed, 2 insertions(+) | ||
| 31 | |||
| 32 | diff --git a/configure b/configure | ||
| 33 | index e5ef9ce..83b0890 100755 | ||
| 34 | --- a/configure | ||
| 35 | +++ b/configure | ||
| 36 | @@ -339,3 +339,5 @@ sed -e ' | ||
| 37 | s,@ARCH@,'"$opt_arch"',g | ||
| 38 | s,@BITS@,'"$opt_bits"',g | ||
| 39 | ' < Makefile.in > Makefile | ||
| 40 | + | ||
| 41 | +sed -i -e 's/\-[f]*pie//g' Makefile | ||
| 42 | -- | ||
| 43 | 1.8.3.1 | ||
| 44 | |||
diff --git a/meta/recipes-devtools/pseudo/files/glibc238.patch b/meta/recipes-devtools/pseudo/files/glibc238.patch deleted file mode 100644 index dfb5c283f6..0000000000 --- a/meta/recipes-devtools/pseudo/files/glibc238.patch +++ /dev/null | |||
| @@ -1,65 +0,0 @@ | |||
| 1 | glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by | ||
| 2 | _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines | ||
| 3 | to turn this off within pseudo_wrappers.c. Elsewhere we can switch to _DEFAULT_SOURCE | ||
| 4 | rather than _GNU_SOURCE. | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Index: git/pseudo_wrappers.c | ||
| 9 | =================================================================== | ||
| 10 | --- git.orig/pseudo_wrappers.c | ||
| 11 | +++ git/pseudo_wrappers.c | ||
| 12 | @@ -6,6 +6,18 @@ | ||
| 13 | * SPDX-License-Identifier: LGPL-2.1-only | ||
| 14 | * | ||
| 15 | */ | ||
| 16 | +/* glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by | ||
| 17 | + * _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines | ||
| 18 | + * to turn this off. | ||
| 19 | + */ | ||
| 20 | +#include <features.h> | ||
| 21 | +#undef __GLIBC_USE_ISOC2X | ||
| 22 | +#undef __GLIBC_USE_C2X_STRTOL | ||
| 23 | +#define __GLIBC_USE_C2X_STRTOL 0 | ||
| 24 | +#undef __GLIBC_USE_ISOC23 | ||
| 25 | +#undef __GLIBC_USE_C23_STRTOL | ||
| 26 | +#define __GLIBC_USE_C23_STRTOL 0 | ||
| 27 | + | ||
| 28 | #include <assert.h> | ||
| 29 | #include <stdlib.h> | ||
| 30 | #include <limits.h> | ||
| 31 | Index: git/pseudo_util.c | ||
| 32 | =================================================================== | ||
| 33 | --- git.orig/pseudo_util.c | ||
| 34 | +++ git/pseudo_util.c | ||
| 35 | @@ -8,6 +8,17 @@ | ||
| 36 | */ | ||
| 37 | /* we need access to RTLD_NEXT for a horrible workaround */ | ||
| 38 | #define _GNU_SOURCE | ||
| 39 | +/* glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by | ||
| 40 | + * _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines | ||
| 41 | + * to turn this off. | ||
| 42 | + */ | ||
| 43 | +#include <features.h> | ||
| 44 | +#undef __GLIBC_USE_ISOC2X | ||
| 45 | +#undef __GLIBC_USE_C2X_STRTOL | ||
| 46 | +#define __GLIBC_USE_C2X_STRTOL 0 | ||
| 47 | +#undef __GLIBC_USE_ISOC23 | ||
| 48 | +#undef __GLIBC_USE_C23_STRTOL | ||
| 49 | +#define __GLIBC_USE_C23_STRTOL 0 | ||
| 50 | |||
| 51 | #include <ctype.h> | ||
| 52 | #include <errno.h> | ||
| 53 | Index: git/pseudo_client.c | ||
| 54 | =================================================================== | ||
| 55 | --- git.orig/pseudo_client.c | ||
| 56 | +++ git/pseudo_client.c | ||
| 57 | @@ -6,7 +6,7 @@ | ||
| 58 | * SPDX-License-Identifier: LGPL-2.1-only | ||
| 59 | * | ||
| 60 | */ | ||
| 61 | -#define _GNU_SOURCE | ||
| 62 | +#define _DEFAULT_SOURCE | ||
| 63 | |||
| 64 | #include <stdio.h> | ||
| 65 | #include <signal.h> | ||
diff --git a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch index c453b5f735..f42b32b8d9 100644 --- a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch +++ b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch | |||
| @@ -28,10 +28,10 @@ diff --git a/Makefile.in b/Makefile.in | |||
| 28 | @@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN) | 28 | @@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN) |
| 29 | libpseudo: $(LIBPSEUDO) | 29 | libpseudo: $(LIBPSEUDO) |
| 30 | 30 | ||
| 31 | $(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB) | 31 | $(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_client_scanf.o pseudo_ipc.o $(SHOBJS) | $(LIB) |
| 32 | - $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ | 32 | - $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ |
| 33 | + $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ | 33 | + $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \ |
| 34 | pseudo_client.o pseudo_ipc.o \ | 34 | pseudo_client.o pseudo_client_scanf.o pseudo_ipc.o \ |
| 35 | $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS) | 35 | $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS) |
| 36 | 36 | ||
| 37 | diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c | 37 | diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c |
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 87c62e0678..5e2a8bf328 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | require pseudo.inc | 1 | require pseudo.inc |
| 2 | 2 | ||
| 3 | SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \ | 3 | SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \ |
| 4 | file://0001-configure-Prune-PIE-flags.patch \ | ||
| 5 | file://glibc238.patch \ | ||
| 6 | file://fallback-passwd \ | 4 | file://fallback-passwd \ |
| 7 | file://fallback-group \ | 5 | file://fallback-group \ |
| 8 | " | 6 | " |
| @@ -14,7 +12,7 @@ SRC_URI:append:class-nativesdk = " \ | |||
| 14 | file://older-glibc-symbols.patch" | 12 | file://older-glibc-symbols.patch" |
| 15 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" | 13 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" |
| 16 | 14 | ||
| 17 | SRCREV = "28dcefb809ce95db997811b5662f0b893b9923e0" | 15 | SRCREV = "3fac97341f0f8270ca28a91098d0a58ca306a6bd" |
| 18 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
| 19 | PV = "1.9.0+git" | 17 | PV = "1.9.0+git" |
| 20 | 18 | ||
