diff options
| author | Juro Bystricky <juro.bystricky@intel.com> | 2017-08-28 13:28:20 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-31 17:41:41 +0100 |
| commit | dabbfe23de0615a958fac31b83684ade024cf17d (patch) | |
| tree | b21b7064491d05a7739ef54d339d95602890c99d | |
| parent | 176bbbf8127e0b4a2ed8df2f7b203849210d5282 (diff) | |
| download | poky-dabbfe23de0615a958fac31b83684ade024cf17d.tar.gz | |
bash.inc: improve reproducibility
Remove all host build references from the following bash packages:
bash-ptest, bash-bashbug, bash-dev, bash-loadable.
[YOCTO #11918]
(From OE-Core rev: 26a29d85648b68bb1d2badd59de76f850054e059)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/bash/bash.inc | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 92916d9a6a..f6cb7e4047 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc | |||
| @@ -48,16 +48,32 @@ do_install_append () { | |||
| 48 | fi | 48 | fi |
| 49 | } | 49 | } |
| 50 | do_install_append_class-target () { | 50 | do_install_append_class-target () { |
| 51 | # Clean host path in bashbug | 51 | # Clean buildhost references in bashbug |
| 52 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ | 52 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ |
| 53 | -e "s,-I${WORKDIR}/\S* ,,g" ${D}${bindir}/bashbug | 53 | -e "s,-I${WORKDIR}/\S* ,,g" \ |
| 54 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | ||
| 55 | ${D}${bindir}/bashbug | ||
| 56 | |||
| 57 | # Clean buildhost references in bash.pc | ||
| 58 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ | ||
| 59 | ${D}${libdir}/pkgconfig/bash.pc | ||
| 60 | |||
| 61 | # Clean buildhost references in Makefile.inc | ||
| 62 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ | ||
| 63 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | ||
| 64 | -e 's:${HOSTTOOLS_DIR}/::g' \ | ||
| 65 | -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ | ||
| 66 | ${D}${libdir}/bash/Makefile.inc | ||
| 54 | } | 67 | } |
| 55 | 68 | ||
| 56 | do_install_ptest () { | 69 | do_install_ptest () { |
| 57 | make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test | 70 | make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test |
| 58 | cp ${B}/Makefile ${D}${PTEST_PATH} | 71 | cp ${B}/Makefile ${D}${PTEST_PATH} |
| 59 | sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ | 72 | sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ |
| 60 | -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" ${D}${PTEST_PATH}/Makefile | 73 | -e 's|${DEBUG_PREFIX_MAP}||g' \ |
| 74 | -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" \ | ||
| 75 | -e 's:${HOSTTOOLS_DIR}/::g' \ | ||
| 76 | ${D}${PTEST_PATH}/Makefile | ||
| 61 | } | 77 | } |
| 62 | 78 | ||
| 63 | pkg_postinst_${PN} () { | 79 | pkg_postinst_${PN} () { |
