From 2664926ff154aacfb274e3055e81ba41190fa403 Mon Sep 17 00:00:00 2001 From: Douglas Royds Date: Thu, 29 Nov 2018 10:13:19 +1300 Subject: 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. Signed-off-by: Douglas Royds Signed-off-by: Richard Purdie --- meta/recipes-support/attr/attr.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/recipes-support') 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" ALTERNATIVE_${PN} = "setfattr" ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" +PTEST_BUILD_HOST_FILES = "builddefs" +PTEST_BUILD_HOST_PATTERN = "^RPM" + do_install_ptest() { tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) mkdir ${D}${PTEST_PATH}/include @@ -36,12 +39,6 @@ do_install_ptest() { do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ done sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile - - # Remove any build host references - sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -i ${D}${PTEST_PATH}/include/builddefs } RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" -- cgit 1.2.3-korg