summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-06-06 15:07:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-07 09:11:49 +0100
commit1095ee1f623f9c3ab05ee62ac6fffebb95e7c39c (patch)
treecd230ddfbb42dff950c7a3f0cfc8d4f00d11912d /meta/recipes-extended
parente7c39ae9cf41cf50113f672a243f6b6c33075164 (diff)
downloadpoky-1095ee1f623f9c3ab05ee62ac6fffebb95e7c39c.tar.gz
bash: Replace uninative loader path in ptest
The Makefile used for bash-ptest can pick up the path to the uninative loader through BUILD_LDFLAGS. This includes the full path to the uninative loader, which is not reproducible. Replace it with /bin/false. It doesn't appear as if these native programs are used in the test suites and if there are likely to be other problems related to building them using the BUILD_* flags. (From OE-Core rev: 1208ff934a2bb6378aa8b219345110a0d56bf767) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/bash/bash.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index dbb803ddef..4cf1054967 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -78,8 +78,13 @@ do_install_ptest () {
78 -e 's|${DEBUG_PREFIX_MAP}||g' \ 78 -e 's|${DEBUG_PREFIX_MAP}||g' \
79 -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" \ 79 -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" \
80 -e 's:${HOSTTOOLS_DIR}/::g' \ 80 -e 's:${HOSTTOOLS_DIR}/::g' \
81 -e 's:${UNINATIVE_LOADER}:${base_bindir}/false:g' \
81 ${D}${PTEST_PATH}/Makefile 82 ${D}${PTEST_PATH}/Makefile
82} 83}
84# The uninative loader is different on i386 & x86_64 hosts. Since it is only
85# being replaced with /bin/false anyway, it doesn't need to be part of the task
86# hash
87do_install_ptest[vardepsexclude] += "UNINATIVE_LOADER"
83 88
84pkg_postinst_${PN} () { 89pkg_postinst_${PN} () {
85 grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells 90 grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells