mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

glibc-tests: Avoid reproducibility issues

Browse Source 
Currently, there are hardcoded paths in the binaries installed by this
recipe, at least one some architectures. Change the compile definitions to
point to more appropriate paths. Ideally we'd rework this patch into a form
acceptable to upstream but I'm not entirely sure what that would look like
right now.

(From OE-Core rev: 96f6badee73f35ededcb7d0172db07fcc305df0d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ede7ab3bbf87cc7d7e713d435ea8a88035c2e46e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-07-03 15:59:25 +01:00
parent 652801de54
commit c0b6724170
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-core/glibc/glibc-tests_2.35.bb
View File

@@ -5,6 +5,7 @@ inherit ptest features_check
REQUIRED_DISTRO_FEATURES = "ptest"
SRC_URI:append = " \
file://reproducible-paths.patch \
file://run-ptest \
"
@@ -31,6 +32,8 @@ RRECOMMENDS:${PN} = ""
RDEPENDS:${PN} = " glibc sed"
DEPENDS:append = " sed"
export oe_srcdir="${exec_prefix}/src/debug/glibc/${PV}/"
# Just build tests for target - do not run them
do_check:append () {
oe_runmake -i check run-built-tests=no

23
meta/recipes-core/glibc/glibc/reproducible-paths.patch Normal file
View File

@@ -0,0 +1,23 @@
Avoid hardcoded build time paths in the output binaries by replacing the compile
definitions with the output locations.
Upstream-Status: Inappropriate [would need reworking somehow to be acceptable upstream]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Index: git/support/Makefile
===================================================================
--- git.orig/support/Makefile
+++ git/support/Makefile
@@ -216,9 +216,9 @@ libsupport-inhibit-o += .o
endif
CFLAGS-support_paths.c = \
- -DSRCDIR_PATH=\"`cd .. ; pwd`\" \
- -DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
- -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
+ -DSRCDIR_PATH=\"$(oe_srcdir)\" \
+ -DOBJDIR_PATH=\"$(libdir)/glibc-tests/ptest/tests/glibc-ptest\" \
+ -DOBJDIR_ELF_LDSO_PATH=\"$(slibdir)/$(rtld-installed-name)\" \
-DINSTDIR_PATH=\"$(prefix)\" \
-DLIBDIR_PATH=\"$(libdir)\" \
-DBINDIR_PATH=\"$(bindir)\" \