diff options
author | Douglas Royds <douglas.royds@taitradio.com> | 2018-11-29 10:13:18 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-03 12:20:01 +0000 |
commit | ea9f050cbc526c6516aaf5e057370715df6ab242 (patch) | |
tree | 3513e96019b50bfe94a9d0122fec2b92f63cef16 /meta | |
parent | fc5d914379dfa2f10ed80b30c60fa2fb6f7982a9 (diff) | |
download | poky-ea9f050cbc526c6516aaf5e057370715df6ab242.tar.gz |
acl: Strip build host tool details from installed ptest file
Adopt the PTEST_BUILD_HOST_FILES mechanism to strip build host paths from the
installed builddefs file. Also strip the record of the build host rpm version.
(From OE-Core rev: 800953bcd4ce9c4e4f768bc0de504b91d5be99cb)
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/attr/acl_2.2.52.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb index 318308a009..6bc77d868d 100644 --- a/meta/recipes-support/attr/acl_2.2.52.bb +++ b/meta/recipes-support/attr/acl_2.2.52.bb | |||
@@ -39,15 +39,12 @@ do_install_append() { | |||
39 | 39 | ||
40 | inherit ptest | 40 | inherit ptest |
41 | 41 | ||
42 | PTEST_BUILD_HOST_FILES = "builddefs" | ||
43 | PTEST_BUILD_HOST_PATTERN = "^RPM" | ||
42 | do_install_ptest() { | 44 | do_install_ptest() { |
43 | tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) | 45 | tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) |
44 | install -d ${D}${PTEST_PATH}/include | 46 | install -d ${D}${PTEST_PATH}/include |
45 | install -m 644 ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ | 47 | install -m 644 ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ |
46 | # Remove any build host references | ||
47 | sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ | ||
48 | -e 's:${HOSTTOOLS_DIR}/::g' \ | ||
49 | -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ | ||
50 | -i ${D}${PTEST_PATH}/include/builddefs | ||
51 | } | 48 | } |
52 | 49 | ||
53 | RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" | 50 | RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" |