<div dir="ltr">Hi,<div><br></div><div>This upgrade is failing on the autobuilders:</div><div><br></div>DEBUG: Executing shell function do_install_ptest_base<br>install: failed to access ‘TOPDIR/tmp/work/mips64-poky-linux/lttng-tools/2.9.3-r0/image/usr/lib/lttng-tools/ptest/tests/destructive’: No such file or directory<div><br></div><div>Ross</div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On 10 January 2017 at 23:06, Nathan Lynch <span dir="ltr"><<a href="mailto:nathan_lynch@mentor.com" target="_blank">nathan_lynch@mentor.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Notable recipe changes:<br>
<br>
* switch to using release tarball<br>
* brokensep no longer required<br>
* drop upstreamed error.h patch<br>
* change do_install_ptest to selectively copy build artifacts to<br>
install tree.<br>
* use backported patch to address file-rdeps warning<br>
<br>
Signed-off-by: Nathan Lynch <<a href="mailto:nathan_lynch@mentor.com">nathan_lynch@mentor.com</a>><br>
---<br>
.../0001-Fix-error.h-common-<wbr>error.h.patch | 33 -----<br>
meta/recipes-kernel/lttng/<wbr>lttng-tools/run-ptest | 5 +-<br>
.../utils-remove-bogus-<wbr>interpreter.patch | 35 +++++<br>
.../{<a href="http://lttng-tools_git.bb" rel="noreferrer" target="_blank">lttng-tools_git.bb</a> => <a href="http://lttng-tools_2.9.3.bb" rel="noreferrer" target="_blank">lttng-tools_2.9.3.bb</a>} | 142 +++++++++++----------<br>
4 files changed, 112 insertions(+), 103 deletions(-)<br>
delete mode 100644 meta/recipes-kernel/lttng/<wbr>lttng-tools/0001-Fix-error.h-<wbr>common-error.h.patch<br>
create mode 100644 meta/recipes-kernel/lttng/<wbr>lttng-tools/utils-remove-<wbr>bogus-interpreter.patch<br>
rename meta/recipes-kernel/lttng/{<a href="http://lttng-tools_git.bb" rel="noreferrer" target="_blank">ltt<wbr>ng-tools_git.bb</a> => <a href="http://lttng-tools_2.9.3.bb" rel="noreferrer" target="_blank">lttng-tools_2.9.3.bb</a>} (39%)<br>
<br>
diff --git a/meta/recipes-kernel/lttng/<wbr>lttng-tools/0001-Fix-error.h-<wbr>common-error.h.patch b/meta/recipes-kernel/lttng/<wbr>lttng-tools/0001-Fix-error.h-<wbr>common-error.h.patch<br>
deleted file mode 100644<br>
index 6c8a9b211a08..000000000000<br>
--- a/meta/recipes-kernel/lttng/<wbr>lttng-tools/0001-Fix-error.h-<wbr>common-error.h.patch<br>
+++ /dev/null<br>
@@ -1,33 +0,0 @@<br>
-From 6712db617fe9155ea236f6840c2bd1<wbr>8dbec4c871 Mon Sep 17 00:00:00 2001<br>
-From: Michael Jeanson <<a href="mailto:mjeanson@efficios.com">mjeanson@efficios.com</a>><br>
-Date: Wed, 15 Jun 2016 17:18:03 -0400<br>
-Subject: [PATCH] Fix: error.h -> common/error.h<br>
-MIME-Version: 1.0<br>
-Content-Type: text/plain; charset=UTF-8<br>
-Content-Transfer-Encoding: 8bit<br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Signed-off-by: Michael Jeanson <<a href="mailto:mjeanson@efficios.com">mjeanson@efficios.com</a>><br>
-Signed-off-by: Jérémie Galarneau <<a href="mailto:jeremie.galarneau@efficios.com">jeremie.galarneau@efficios.<wbr>com</a>><br>
-Signed-off-by: Peter Liu <<a href="mailto:peter.x.liu@external.atlascopco.com">peter.x.liu@external.<wbr>atlascopco.com</a>><br>
----<br>
- src/bin/lttng-sessiond/agent.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/src/bin/lttng-sessiond/<wbr>agent.c b/src/bin/lttng-sessiond/<wbr>agent.c<br>
-index 7cbbbde..310a7e8 100644<br>
---- a/src/bin/lttng-sessiond/<wbr>agent.c<br>
-+++ b/src/bin/lttng-sessiond/<wbr>agent.c<br>
-@@ -29,7 +29,7 @@<br>
- #include "agent.h"<br>
- #include "ust-app.h"<br>
- #include "utils.h"<br>
--#include "error.h"<br>
-+#include "common/error.h"<br>
-<br>
- #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)<br>
-<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/lttng/<wbr>lttng-tools/run-ptest b/meta/recipes-kernel/lttng/<wbr>lttng-tools/run-ptest<br>
index 6230063442d6..705030ee53b8 100755<br>
--- a/meta/recipes-kernel/lttng/<wbr>lttng-tools/run-ptest<br>
+++ b/meta/recipes-kernel/lttng/<wbr>lttng-tools/run-ptest<br>
@@ -1,5 +1,6 @@<br>
#!/bin/sh<br>
# Without --ignore-exit, the tap harness causes any FAILs within a<br>
# test plan to raise ERRORs; this is just noise.<br>
-makeargs="LOG_DRIVER_FLAGS=--<wbr>ignore-exit"<br>
-make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null<br>
+makeargs="LOG_DRIVER_FLAGS=--<wbr>ignore-exit top_srcdir=$PWD top_builddir=$PWD"<br>
+make -k -t all >/dev/null 2>&1<br>
+exec make -s $makeargs check 2>/dev/null<br>
diff --git a/meta/recipes-kernel/lttng/<wbr>lttng-tools/utils-remove-<wbr>bogus-interpreter.patch b/meta/recipes-kernel/lttng/<wbr>lttng-tools/utils-remove-<wbr>bogus-interpreter.patch<br>
new file mode 100644<br>
index 000000000000..f08198208d4f<br>
--- /dev/null<br>
+++ b/meta/recipes-kernel/lttng/<wbr>lttng-tools/utils-remove-<wbr>bogus-interpreter.patch<br>
@@ -0,0 +1,35 @@<br>
+From 4545eae3bccb0f5a97509d1405a280<wbr>00029a8d7d Mon Sep 17 00:00:00 2001<br>
+From: Nathan Lynch <<a href="mailto:nathan_lynch@mentor.com">nathan_lynch@mentor.com</a>><br>
+Date: Mon, 9 Jan 2017 16:14:28 -0600<br>
+Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell<br>
+ library<br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain; charset=UTF-8<br>
+Content-Transfer-Encoding: 8bit<br>
+<br>
+tests/utils/utils.sh is always sourced, never executed, and<br>
+/src/bin/bash is not a typical path for a shell interpreter. Just<br>
+delete it.<br>
+<br>
+Signed-off-by: Nathan Lynch <<a href="mailto:nathan_lynch@mentor.com">nathan_lynch@mentor.com</a>><br>
+Signed-off-by: Jérémie Galarneau <<a href="mailto:jeremie.galarneau@efficios.com">jeremie.galarneau@efficios.<wbr>com</a>><br>
+---<br>
+<br>
+Upstream-Status: Backport<br>
+<br>
+ tests/utils/utils.sh | 2 --<br>
+ 1 file changed, 2 deletions(-)<br>
+<br>
+diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh<br>
+index 05d88650e9f3..9db0640b70f3 100644<br>
+--- a/tests/utils/utils.sh<br>
++++ b/tests/utils/utils.sh<br>
+@@ -1,5 +1,3 @@<br>
+-#!/src/bin/bash<br>
+-#<br>
+ # Copyright (C) - 2012 David Goulet <<a href="mailto:dgoulet@efficios.com">dgoulet@efficios.com</a>><br>
+ #<br>
+ # This library is free software; you can redistribute it and/or modify it under<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-kernel/lttng/<a href="http://lttng-tools_git.bb" rel="noreferrer" target="_blank">lt<wbr>tng-tools_git.bb</a> b/meta/recipes-kernel/lttng/<a href="http://lttng-tools_2.9.3.bb" rel="noreferrer" target="_blank">lt<wbr>tng-tools_2.9.3.bb</a><br>
similarity index 39%<br>
rename from meta/recipes-kernel/lttng/<a href="http://lttng-tools_git.bb" rel="noreferrer" target="_blank">lttn<wbr>g-tools_git.bb</a><br>
rename to meta/recipes-kernel/lttng/<a href="http://lttng-tools_2.9.3.bb" rel="noreferrer" target="_blank">lttn<wbr>g-tools_2.9.3.bb</a><br>
index 29fd75b21705..0506feb0136c 100644<br>
--- a/meta/recipes-kernel/lttng/<a href="http://lttng-tools_git.bb" rel="noreferrer" target="_blank">lt<wbr>tng-tools_git.bb</a><br>
+++ b/meta/recipes-kernel/lttng/<a href="http://lttng-tools_2.9.3.bb" rel="noreferrer" target="_blank">lt<wbr>tng-tools_2.9.3.bb</a><br>
@@ -15,9 +15,6 @@ RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps"<br>
# <a href="http://babelstats.pl" rel="noreferrer" target="_blank">babelstats.pl</a> wants getopt-long<br>
RDEPENDS_${PN}-ptest += "perl-module-getopt-long"<br>
<br>
-SRCREV = "<wbr>d11e0dba0df9024b8613c51e167a37<wbr>9b91e8b20b"<br>
-PV = "2.8.1+git${SRCPV}"<br>
-<br>
PYTHON_OPTION = "am_cv_python_pyexecdir='${<wbr>PYTHON_SITEPACKAGES_DIR}' \<br>
am_cv_python_pythondir='${<wbr>PYTHON_SITEPACKAGES_DIR}' \<br>
PYTHON_INCLUDE='-I${STAGING_<wbr>INCDIR}/python${PYTHON_<wbr>BASEVERSION}${PYTHON_ABI}' \<br>
@@ -29,14 +26,15 @@ PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"<br>
PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"<br>
PACKAGECONFIG_remove_libc-musl = "lttng-ust"<br>
<br>
-SRC_URI = "git://<a href="http://git.lttng.org/lttng-tools.git;branch=stable-2.8" rel="noreferrer" target="_blank">git.lttng.org/lttng-<wbr>tools.git;branch=stable-2.8</a> \<br>
- file://0001-Fix-error.h-<wbr>common-error.h.patch \<br>
+SRC_URI = "<a href="https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2" rel="noreferrer" target="_blank">https://lttng.org/files/<wbr>lttng-tools/lttng-tools-${PV}.<wbr>tar.bz2</a> \<br>
file://x32.patch \<br>
+ file://utils-remove-bogus-<wbr>interpreter.patch \<br>
file://run-ptest"<br>
<br>
-S = "${WORKDIR}/git"<br>
+SRC_URI[md5sum] = "<wbr>19fdcc5e9c307ef66581a2743a08a5<wbr>41"<br>
+SRC_URI[sha256sum] = "<wbr>a6e6baaaa977dcbc9bce6b675881ee<wbr>c664599b86f0d905a7b0b508539407<wbr>b24e"<br>
<br>
-inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages<br>
+inherit autotools ptest pkgconfig useradd python3-dir manpages<br>
<br>
USERADD_PACKAGES = "${PN}"<br>
GROUPADD_PARAM_${PN} = "tracing"<br>
@@ -53,68 +51,76 @@ INSANE_SKIP_${PN} = "libexec dev-so"<br>
INSANE_SKIP_${PN}-dbg = "libexec"<br>
<br>
do_configure_prepend () {<br>
- # Delete a shipped m4 file that overrides our patched one<br>
- rm -f ${S}/m4/libxml.m4<br>
+ # Delete a shipped m4 file that overrides our patched one<br>
+ rm -f ${S}/m4/libxml.m4<br>
}<br>
<br>
do_install_ptest () {<br>
- mkdir -p ${D}${PTEST_PATH}<br>
-<br>
- cp -a -T ${B} ${D}${PTEST_PATH}<br>
-<br>
- # Prevent attempts to update Makefiles during test runs, and<br>
- # silence "Making check in $SUBDIR" messages.<br>
- find ${D}${PTEST_PATH} -name Makefile -type f -exec \<br>
- sed -i -e 's!^Makefile:!_Makefile:!' \<br>
- -e '/echo "Making $$target in $$subdir"; \\/d' {} +<br>
-<br>
- # Prevent attempts to update version.h during test runs.<br>
- sed -i -e '/^\.PHONY: version\.h$/d' ${D}${PTEST_PATH}/include/<wbr>Makefile<br>
-<br>
- # Silence "Making check in $SUBDIR" messages.<br>
- find ${D}${PTEST_PATH} -name Makefile -type f -exec \<br>
- sed -i -e '/echo "Making $$target in $$subdir"; \\/d' {} +<br>
-<br>
- # Substitute links to installed binaries.<br>
- for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do<br>
- orig="${D}${PTEST_PATH}/src/<wbr>bin/${prog}/${prog}"<br>
- rm "$orig"<br>
- case "$prog" in<br>
- lttng-consumerd)<br>
- ln -s "${libdir}/lttng/libexec/$<wbr>prog" "$orig"<br>
- ;;<br>
- *)<br>
- ln -s "${bindir}/$prog" "$orig"<br>
- ;;<br>
- esac<br>
- done<br>
-<br>
- # Remove libtool artifacts.<br>
- find ${D}${PTEST_PATH} \( -name '*.l[ao]' -o -name '*.lai' \) -delete<br>
-<br>
- # Remove object files and archives.<br>
- find ${D}${PTEST_PATH} -name '*.[oa]' -type f -delete<br>
-<br>
- # Remove Makefile.am and Makefile.in.<br>
- find ${D}${PTEST_PATH} -name 'Makefile.*' -type f -delete<br>
-<br>
- # Remove autom4te.cache.<br>
- rm -rf ${D}${PTEST_PATH}/autom4te.<wbr>cache<br>
-<br>
- # Replace libtool wrapper scripts (which won't work on the<br>
- # target) with their corresponding binaries.<br>
- for prog in unit/ini_config/ini_config \<br>
- regression/tools/live/live_<wbr>test \<br>
- regression/tools/health/<wbr>health_check ; do<br>
- basename=${prog##*/}<br>
- ldir=${D}${PTEST_PATH}/tests/$<wbr>{prog%/*}<br>
- mv -f ${ldir}/.libs/${basename} ${ldir}<br>
- done<br>
-<br>
- # <a href="http://checkpatch.pl" rel="noreferrer" target="_blank">checkpatch.pl</a> is unneeded on target and causes file-rdeps QA<br>
- # warnings.<br>
- rm -f ${D}${PTEST_PATH}/extras/<a href="http://checkpatch.pl" rel="noreferrer" target="_blank">check<wbr>patch.pl</a><br>
-<br>
- # Remove built libraries as they confuse the packages' runtime dependency resolution<br>
- rm -rf ${D}${PTEST_PATH}/src/lib/<wbr>lttng-ctl/.libs/<br>
+ for f in Makefile tests/Makefile tests/utils/utils.sh ; do<br>
+ install -D "${B}/$f" "${D}${PTEST_PATH}/$f"<br>
+ done<br>
+<br>
+ for f in config/tap-driver.sh config/test-driver ; do<br>
+ install -D "${S}/$f" "${D}${PTEST_PATH}/$f"<br>
+ done<br>
+<br>
+ # Prevent 'make check' from recursing into non-test subdirectories.<br>
+ sed -i -e 's!^SUBDIRS = .*!SUBDIRS = tests!' "${D}${PTEST_PATH}/Makefile"<br>
+<br>
+ # We don't need these<br>
+ sed -i -e '/dist_noinst_SCRIPTS = /,/^$/d' "${D}${PTEST_PATH}/tests/<wbr>Makefile"<br>
+<br>
+ # We shouldn't need to build anything in tests/utils<br>
+ sed -i -e 's!am__append_1 = . utils!am__append_1 = . !' \<br>
+ "${D}${PTEST_PATH}/tests/<wbr>Makefile"<br>
+<br>
+ # Copy the tests directory tree and the executables and<br>
+ # Makefiles found within.<br>
+ for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do<br>
+ find "${B}/tests/$d" -maxdepth 1 -executable -type f \<br>
+ -exec install -D -t "${D}${PTEST_PATH}/tests/$d" {} +<br>
+ test -r "${B}/tests/$d/Makefile" && \<br>
+ install -D -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"<br>
+ done<br>
+<br>
+ # We shouldn't need to build anything in tests/regression/tools<br>
+ sed -i -e 's!^SUBDIRS = tools !SUBDIRS = !' \<br>
+ "${D}${PTEST_PATH}/tests/<wbr>regression/Makefile"<br>
+<br>
+ # Prevent attempts to update Makefiles during test runs, and<br>
+ # silence "Making check in $SUBDIR" messages.<br>
+ find "${D}${PTEST_PATH}" -name Makefile -type f -exec \<br>
+ sed -i -e '/Makefile:/,/^$/d' -e '/%: %.in/,/^$/d' \<br>
+ -e '/echo "Making $$target in $$subdir"; \\/d' \<br>
+ -e 's/^srcdir = \(.*\)/srcdir = ./' \<br>
+ -e 's/^builddir = \(.*\)/builddir = ./' \<br>
+ -e 's/^all-am:.*/all-am:/' \<br>
+ {} +<br>
+<br>
+ # These objects trigger [rpaths] QA checks; the test harness<br>
+ # skips the associated tests if they're missing, so delete<br>
+ # them.<br>
+ objs=""<br>
+ objs="$objs regression/ust/ust-dl/libbar.<wbr>so"<br>
+ objs="$objs regression/ust/ust-dl/libfoo.<wbr>so"<br>
+ for obj in $objs ; do<br>
+ rm -f "${D}${PTEST_PATH}/tests/${<wbr>obj}"<br>
+ done<br>
+<br>
+ find "${D}${PTEST_PATH}" -name Makefile -type f -exec \<br>
+ touch -r "${B}/Makefile" {} +<br>
+<br>
+ # Substitute links to installed binaries.<br>
+ for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do<br>
+ exedir="${D}${PTEST_PATH}/src/<wbr>bin/${prog}"<br>
+ install -d "$exedir"<br>
+ case "$prog" in<br>
+ lttng-consumerd)<br>
+ ln -s "${libdir}/lttng/libexec/$<wbr>prog" "$exedir"<br>
+ ;;<br>
+ *)<br>
+ ln -s "${bindir}/$prog" "$exedir"<br>
+ ;;<br>
+ esac<br>
+ done<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>