diff options
author | Douglas Royds <douglas.royds@taitradio.com> | 2018-11-29 10:13:19 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-03 12:20:01 +0000 |
commit | 42fedcd96f41521a4c0b57684c1da64d2f1fdf3f (patch) | |
tree | 96e5d0d660ea087208c1dcdfb3732eb8ab5b2edf | |
parent | ea9f050cbc526c6516aaf5e057370715df6ab242 (diff) | |
download | poky-42fedcd96f41521a4c0b57684c1da64d2f1fdf3f.tar.gz |
attr: Strip build host paths and tool versions from ptest files
Using the new PTEST_BUILD_HOST_FILES mechanism.
Specifically remove reference to build host rpm version, if any.
(From OE-Core rev: 2664926ff154aacfb274e3055e81ba41190fa403)
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/attr/attr.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 9fc0f33cce..cfa38a7196 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc | |||
@@ -29,6 +29,9 @@ ALTERNATIVE_PRIORITY = "100" | |||
29 | ALTERNATIVE_${PN} = "setfattr" | 29 | ALTERNATIVE_${PN} = "setfattr" |
30 | ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" | 30 | ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" |
31 | 31 | ||
32 | PTEST_BUILD_HOST_FILES = "builddefs" | ||
33 | PTEST_BUILD_HOST_PATTERN = "^RPM" | ||
34 | |||
32 | do_install_ptest() { | 35 | do_install_ptest() { |
33 | tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) | 36 | tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) |
34 | mkdir ${D}${PTEST_PATH}/include | 37 | mkdir ${D}${PTEST_PATH}/include |
@@ -36,12 +39,6 @@ do_install_ptest() { | |||
36 | do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ | 39 | do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ |
37 | done | 40 | done |
38 | sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile | 41 | sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile |
39 | |||
40 | # Remove any build host references | ||
41 | sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ | ||
42 | -e 's:${HOSTTOOLS_DIR}/::g' \ | ||
43 | -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ | ||
44 | -i ${D}${PTEST_PATH}/include/builddefs | ||
45 | } | 42 | } |
46 | 43 | ||
47 | RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" | 44 | RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" |