From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- poky/meta/recipes-support/attr/acl_2.2.52.bb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'poky/meta/recipes-support/attr/acl_2.2.52.bb') diff --git a/poky/meta/recipes-support/attr/acl_2.2.52.bb b/poky/meta/recipes-support/attr/acl_2.2.52.bb index 8b89de9b4..6bc77d868 100644 --- a/poky/meta/recipes-support/attr/acl_2.2.52.bb +++ b/poky/meta/recipes-support/attr/acl_2.2.52.bb @@ -39,15 +39,12 @@ do_install_append() { inherit ptest +PTEST_BUILD_HOST_FILES = "builddefs" +PTEST_BUILD_HOST_PATTERN = "^RPM" do_install_ptest() { tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) - mkdir ${D}${PTEST_PATH}/include - cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ - # 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 + install -d ${D}${PTEST_PATH}/include + install -m 644 ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ } RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" -- cgit v1.2.3