mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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: 994e508b2a0ede8b5cc4fe39444cf25dc9a53faf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
601b05a298
commit
c8e4047fa2
|
@ -1,44 +0,0 @@
|
||||||
From b5545c08e6c674c49aef14b47a56a3e92df4d2a7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 17 Feb 2016 07:36:34 +0000
|
|
||||||
Subject: [pseudo][PATCH] configure: Prune PIE flags
|
|
||||||
|
|
||||||
LDFLAGS are not taken from environment and CFLAGS is used for LDFLAGS
|
|
||||||
however when using security options -fpie and -pie options are coming
|
|
||||||
as part of ARCH_FLAGS and they get into LDFLAGS of shared objects as
|
|
||||||
well so we end up with conflicting options -shared -pie, which gold
|
|
||||||
rejects outright and bfd linker lets the one appearning last in cmdline
|
|
||||||
take effect. This create quite a unpleasant situation in OE when
|
|
||||||
security flags are enabled and gold or not-gold options are used
|
|
||||||
it errors out but errors are not same.
|
|
||||||
|
|
||||||
Anyway, with this patch we filter pie options from ARCH_FLAGS
|
|
||||||
ouright and take control of generating PIC objects
|
|
||||||
|
|
||||||
Helps with errors like
|
|
||||||
|
|
||||||
| /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
|
|
||||||
| /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
|
|
||||||
| collect2: error: ld returned 1 exit status
|
|
||||||
| make: *** [lib/pseudo/lib64/libpseudo.so] Error 1
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Submitted
|
|
||||||
|
|
||||||
configure | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index e5ef9ce..83b0890 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -339,3 +339,5 @@ sed -e '
|
|
||||||
s,@ARCH@,'"$opt_arch"',g
|
|
||||||
s,@BITS@,'"$opt_bits"',g
|
|
||||||
' < Makefile.in > Makefile
|
|
||||||
+
|
|
||||||
+sed -i -e 's/\-[f]*pie//g' Makefile
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by
|
|
||||||
_GNU_SOURCE but we have to set that for other definitions. Therefore play with defines
|
|
||||||
to turn this off within pseudo_wrappers.c. Elsewhere we can switch to _DEFAULT_SOURCE
|
|
||||||
rather than _GNU_SOURCE.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Index: git/pseudo_wrappers.c
|
|
||||||
===================================================================
|
|
||||||
--- git.orig/pseudo_wrappers.c
|
|
||||||
+++ git/pseudo_wrappers.c
|
|
||||||
@@ -6,6 +6,18 @@
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+/* glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by
|
|
||||||
+ * _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines
|
|
||||||
+ * to turn this off.
|
|
||||||
+ */
|
|
||||||
+#include <features.h>
|
|
||||||
+#undef __GLIBC_USE_ISOC2X
|
|
||||||
+#undef __GLIBC_USE_C2X_STRTOL
|
|
||||||
+#define __GLIBC_USE_C2X_STRTOL 0
|
|
||||||
+#undef __GLIBC_USE_ISOC23
|
|
||||||
+#undef __GLIBC_USE_C23_STRTOL
|
|
||||||
+#define __GLIBC_USE_C23_STRTOL 0
|
|
||||||
+
|
|
||||||
#include <assert.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <limits.h>
|
|
||||||
Index: git/pseudo_util.c
|
|
||||||
===================================================================
|
|
||||||
--- git.orig/pseudo_util.c
|
|
||||||
+++ git/pseudo_util.c
|
|
||||||
@@ -8,6 +8,17 @@
|
|
||||||
*/
|
|
||||||
/* we need access to RTLD_NEXT for a horrible workaround */
|
|
||||||
#define _GNU_SOURCE
|
|
||||||
+/* glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by
|
|
||||||
+ * _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines
|
|
||||||
+ * to turn this off.
|
|
||||||
+ */
|
|
||||||
+#include <features.h>
|
|
||||||
+#undef __GLIBC_USE_ISOC2X
|
|
||||||
+#undef __GLIBC_USE_C2X_STRTOL
|
|
||||||
+#define __GLIBC_USE_C2X_STRTOL 0
|
|
||||||
+#undef __GLIBC_USE_ISOC23
|
|
||||||
+#undef __GLIBC_USE_C23_STRTOL
|
|
||||||
+#define __GLIBC_USE_C23_STRTOL 0
|
|
||||||
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <errno.h>
|
|
||||||
Index: git/pseudo_client.c
|
|
||||||
===================================================================
|
|
||||||
--- git.orig/pseudo_client.c
|
|
||||||
+++ git/pseudo_client.c
|
|
||||||
@@ -6,7 +6,7 @@
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
-#define _GNU_SOURCE
|
|
||||||
+#define _DEFAULT_SOURCE
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <signal.h>
|
|
|
@ -28,10 +28,10 @@ diff --git a/Makefile.in b/Makefile.in
|
||||||
@@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN)
|
@@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN)
|
||||||
libpseudo: $(LIBPSEUDO)
|
libpseudo: $(LIBPSEUDO)
|
||||||
|
|
||||||
$(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB)
|
$(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_client_scanf.o pseudo_ipc.o $(SHOBJS) | $(LIB)
|
||||||
- $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
|
- $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
|
||||||
+ $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
|
+ $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
|
||||||
pseudo_client.o pseudo_ipc.o \
|
pseudo_client.o pseudo_client_scanf.o pseudo_ipc.o \
|
||||||
$(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
|
$(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
|
||||||
|
|
||||||
diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c
|
diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
require pseudo.inc
|
require pseudo.inc
|
||||||
|
|
||||||
SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
|
SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
|
||||||
file://0001-configure-Prune-PIE-flags.patch \
|
|
||||||
file://glibc238.patch \
|
|
||||||
file://fallback-passwd \
|
file://fallback-passwd \
|
||||||
file://fallback-group \
|
file://fallback-group \
|
||||||
"
|
"
|
||||||
|
@ -14,7 +12,7 @@ SRC_URI:append:class-nativesdk = " \
|
||||||
file://older-glibc-symbols.patch"
|
file://older-glibc-symbols.patch"
|
||||||
SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
|
SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
|
||||||
|
|
||||||
SRCREV = "28dcefb809ce95db997811b5662f0b893b9923e0"
|
SRCREV = "3fac97341f0f8270ca28a91098d0a58ca306a6bd"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
PV = "1.9.0+git"
|
PV = "1.9.0+git"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user