[PATCH 1/6] strace: Fix reproducibility issues

[PATCH 1/6] strace: Fix reproducibility issues

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

gen_tests script encodes its full path to itself in each script

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 .../0001-strace-fix-reproducibilty-issues.patch    | 39 ++++++++++++++++++++++
 meta/recipes-devtools/strace/strace_5.5.bb         |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch

diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
new file mode 100644
index 0000000000..c4c176e6bc
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
@@ -0,0 +1,39 @@
+From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman <jpuhlman@mvista.com>
+Date: Wed, 11 Mar 2020 19:56:55 +0000
+Subject: [PATCH] strace: fix reproducibilty issues
+
+The full path to the gen_tests.sh script is encoded in the tests
+
+Upstream-Status: Pending
+
+Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
+---
+ tests/gen_tests.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh
+index 5e1e7c9..1e65eac 100755
+--- a/tests/gen_tests.sh
++++ b/tests/gen_tests.sh
+@@ -46,7 +46,7 @@ while read -r name arg0 args; do {
+ 
+ 	hdr="\
+ #!/bin/sh -efu
+-# Generated by $0 from $input ($name $arg0 $args); do not edit."
++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit."
+ 
+ 	case "$arg0" in
+ 		+*)
+@@ -80,7 +80,7 @@ while read -r name arg0 args; do {
+ 
+ if [ -n "$names" ]; then
+ 	{
+-		printf '# Generated by %s from %s; do not edit.\n' "$0" "$input"
++		printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input"
+ 		printf 'GEN_TESTS ='
+ 		printf ' %s.gen.test' $names
+ 		echo
+-- 
+2.24.1
+
diff --git a/meta/recipes-devtools/strace/strace_5.5.bb b/meta/recipes-devtools/strace/strace_5.5.bb
index 6e7d63949d..ae552da028 100644
--- a/meta/recipes-devtools/strace/strace_5.5.bb
+++ b/meta/recipes-devtools/strace/strace_5.5.bb
@@ -13,6 +13,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
            file://ptest-spacesave.patch \
            file://uintptr_t.patch \
+           file://0001-strace-fix-reproducibilty-issues.patch \
            "
 SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
 SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
-- 
2.13.3

[PATCH 2/6] qemu: Fix reproducibilty issues

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

tests/qemu-iotests/common.env is generated from configure which
we pass ${HOSTTOOLS_DIR}/python3 as our python to use, which gets
copied into the ptests. Correct python3 path.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 meta/recipes-devtools/qemu/qemu.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index f3342eaf28..e6dbc6d05a 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -56,6 +56,8 @@ do_install_ptest() {
 	# Don't check the file genreated by configure
 	sed -i -e '/wildcard config-host.mak/d' \
 	       -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
+        sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
+            ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env 
 }
 
 # QEMU_TARGETS is overridable variable
-- 
2.13.3

[PATCH 3/6] ltp: fix reproducibilty issues

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

Man pages are copied in to the target filesystem from the configured
build, which leaks paths in to the work directory

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb
index 5be9489a75..3e6cbc63f3 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -68,6 +68,12 @@ do_install(){
 
     # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
     cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
+
+    # Makefile were configured in the build system
+    find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \
+         -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
+         -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
+         -e 's@[^ ]*--sysroot=[^ "]*@@g' 
 }
 
 RDEPENDS_${PN} = "\
-- 
2.13.3

[PATCH 4/6] gtk-doc: Fix reproducibity issues

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

path to pkg-config and python3 encoded in scripts

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index 50d4d99722..b508e62741 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
@@ -36,6 +36,17 @@ do_configure_prepend() {
         sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac
 }
 
+do_install_append () {
+    # configure values for python3 and pkg-config encoded in scripts
+    for fn in ${bindir}/gtkdoc-depscan \
+        ${bindir}/gtkdoc-mkhtml2 \
+        ${datadir}/gtk-doc/python/gtkdoc/config.py; do 
+        sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \
+            -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
+            -i ${D}$fn
+    done
+}
+
 FILES_${PN} += "${datadir}/sgml"
 FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-doc = ""
@@ -48,3 +59,4 @@ gtkdoc_makefiles_sysroot_preprocess() {
            -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
            ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make
 }
+
-- 
2.13.3

[PATCH 5/6] dnf: fix reproducibilty issue

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

Script points to native python3

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 ...001-set-python-path-for-completion_helper.patch | 24 ++++++++++++++++++++++
 meta/recipes-devtools/dnf/dnf_4.2.2.bb             |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch

diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch
new file mode 100644
index 0000000000..448f6408bc
--- /dev/null
+++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch
@@ -0,0 +1,24 @@
+From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman <jpuhlman@mvista.com>
+Date: Wed, 11 Mar 2020 22:10:02 +0000
+Subject: [PATCH] set python path for completion_helper
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
+---
+ dnf/cli/completion_helper.py.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in
+index 351226759..2835cd3b6 100644
+--- a/dnf/cli/completion_helper.py.in
++++ b/dnf/cli/completion_helper.py.in
+@@ -1,4 +1,4 @@
+-#!@PYTHON_EXECUTABLE@
++#!/usr/bin/env python3
+ #
+ # This file is part of dnf.
+ #
+-- 
+2.23.0
+
diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb
index 5244e10cfc..a046ffc05d 100644
--- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
            file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            file://0030-Run-python-scripts-using-env.patch \
            file://Fix-SyntaxWarning.patch \
+           file://0001-set-python-path-for-completion_helper.patch \
            "
 
 SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d"
-- 
2.13.3

[PATCH 6/6] boost: fix reproducibilty issues

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

fix cmake file references of image dir path

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 meta/recipes-support/boost/boost.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index e15dce4e1d..8eb9494381 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -202,6 +202,11 @@ do_install() {
 		fi
 	done
 
+        # Cmake files reference full paths to image
+        find ${D}${libdir}/cmake -type f | \
+             grep 'cmake$' | \
+             xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i
+
 }
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.13.3