[oe-commits] [openembedded-core] 10/12: bash: Replace uninative loader path in ptest

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 1208ff934a2bb6378aa8b219345110a0d56bf767
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Thu Jun 6 15:07:41 2019 -0500

    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.
    
    Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/bash/bash.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index dbb803d..4cf1054 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -78,8 +78,13 @@ do_install_ptest () {
 	    -e 's|${DEBUG_PREFIX_MAP}||g' \
 	    -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" \
 	    -e 's:${HOSTTOOLS_DIR}/::g' \
+	    -e 's:${UNINATIVE_LOADER}:${base_bindir}/false:g' \
 	     ${D}${PTEST_PATH}/Makefile
 }
+# The uninative loader is different on i386 & x86_64 hosts. Since it is only
+# being replaced with /bin/false anyway, it doesn't need to be part of the task
+# hash
+do_install_ptest[vardepsexclude] += "UNINATIVE_LOADER"
 
 pkg_postinst_${PN} () {
 	grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.