summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Royds <douglas.royds@taitradio.com>2018-11-28 17:53:16 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-03 12:20:01 +0000
commit916f9d2eb2b4d9e176df9f4d2281a0bde6e50f67 (patch)
treef116af2a483db2cef6058c018e2cf90d9b9660ef
parent8e02319bd06e4b809f8510f2c0152e3522dae325 (diff)
downloadpoky-916f9d2eb2b4d9e176df9f4d2281a0bde6e50f67.tar.gz
strace: Strip build host tool details from installed ptest Makefile
Adopt new PTEST_BUILD_HOST_PATTERN mechanism. (From OE-Core rev: f6ba7888138b6acecd3335cbfc3fa51272d69e57) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/strace/strace_4.25.bb11
1 files changed, 1 insertions, 10 deletions
diff --git a/meta/recipes-devtools/strace/strace_4.25.bb b/meta/recipes-devtools/strace/strace_4.25.bb
index 117ebfbf72..58f6cf6e30 100644
--- a/meta/recipes-devtools/strace/strace_4.25.bb
+++ b/meta/recipes-devtools/strace/strace_4.25.bb
@@ -32,6 +32,7 @@ EXTRA_OECONF += "--enable-mpers=no"
32CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" 32CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"
33 33
34TESTDIR = "tests" 34TESTDIR = "tests"
35PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD)"
35 36
36do_install_append() { 37do_install_append() {
37 # We don't ship strace-graph here because it needs perl 38 # We don't ship strace-graph here because it needs perl
@@ -46,16 +47,6 @@ do_install_ptest() {
46 oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} 47 oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
47 install -m 755 ${S}/test-driver ${D}${PTEST_PATH} 48 install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
48 install -m 644 ${B}/config.h ${D}${PTEST_PATH} 49 install -m 644 ${B}/config.h ${D}${PTEST_PATH}
49 sed -i -e '/^src/s/strace.*[1-9]/ptest/' \
50 -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
51 -e 's|${DEBUG_PREFIX_MAP}||g' \
52 -e 's:${HOSTTOOLS_DIR}/::g' \
53 -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
54 -e 's:${RECIPE_SYSROOT}::g' \
55 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
56 -e '/^DEB_CHANGELOGTIME/d' \
57 -e '/^RPM_CHANGELOGTIME/d' \
58 ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
59} 50}
60 51
61RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" 52RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed"