systemd: improve reproducibility
PATCH 1/1 systemd: improve reproducibility
From: Mingli Yu <[email protected]>
Considering it's meanlingness to get test dir in
compiled env, remove ABS_BUILD_DIR and ABS_SRC_DIR
lines in src/shared/tests.c to improve reproducibility
to fix below issue:
WARNING: systemd-1_239-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/systemd/1_239-r0/packages-split/systemd/lib/systemd/libsystemd-shared-239.so in package contained reference to tmpdir [buildpaths]
--- .../0001-test-improve-reproducibility.patch | 40 +++++++++++++++++++ meta/recipes-core/systemd/systemd_239.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patch
meta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patch new file +40 -0
@@ -0,0 +1,40 @@ +From f28a0e2a5f6a9ace858219c6f2513a5280acab48 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Fri, 1 Feb 2019 00:18:04 -0800 +Subject: [PATCH] test.c: improve reproducibility + +It's meanlingness to run test in compiled env, +so uncoment the lines to avoid introducing +ABS_BUILD_DIR and ABS_SRC_DIR to improve +reproducibility to fix below issue: +WARNING: systemd-1_239-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/systemd/1_239-r0/packages-split/systemd/lib/systemd/libsystemd-shared-239.so in package contained reference to tmpdir [buildpaths] + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <[email protected]> +--- + src/shared/tests.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/shared/tests.c b/src/shared/tests.c +index 6b3df0aa07..7ac25eefea 100644 +--- a/src/shared/tests.c ++++ b/src/shared/tests.c +@@ -37,12 +37,8 @@ const char* get_testdata_dir(const char *suffix) { + _cleanup_free_ char *exedir = NULL; + assert_se(readlink_and_make_absolute("/proc/self/exe", &exedir) >= 0); + +- /* Check if we're running from the builddir. If so, use the compiled in path. */ +- if (path_startswith(exedir, ABS_BUILD_DIR)) +- assert_se(snprintf(testdir, sizeof(testdir), "%s/test", ABS_SRC_DIR) > 0); +- else +- /* Try relative path, according to the install-test layout */ +- assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0); ++ /* Try relative path, according to the install-test layout */ ++ assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0); + + /* test this without the suffix, as it may contain a glob */ + if (access(testdir, F_OK) < 0) { +-- +2.17.1 +
meta/recipes-core/systemd/systemd_239.bb +1 -0
@@ -41,6 +41,7 @@ SRC_URI += "file://touchscreen.rules \ file://0024-journald-do-not-store-the-iovec-entry-for-process-co.patch \ file://0025-journald-set-a-limit-on-the-number-of-fields.patch \ file://0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch \ + file://0001-test-improve-reproducibility.patch \ " # patches made for musl are only applied on TCLIBC is musl
Signature · 1 line
2.17.1
Ping.
Quoted 74 lines · On 2019年02月01日 16:40, [email protected] wrote:
From: Mingli Yu <[email protected]>
Considering it's meanlingness to get test dir in
compiled env, removeABS_BUILD_DIRandABS_SRC_DIR
lines insrc/shared/tests.cto improve reproducibility
to fix below issue:
WARNING: systemd-1_239-r0do_package_qa: QA Issue: File /work/core2-64-wrs-linux/systemd/1_239-r0/packages-split/systemd/lib/systemd/libsystemd-shared-239.so in package contained reference to tmpdir [buildpaths]Signed-off-by Mingli Yu <[email protected]>--- .../0001-test-improve-reproducibility.patch | 40 +++++++++++++++++++ meta/recipes-core/systemd/systemd_239.bb | 1 + 2 files changed, 41 insertions(+)create mode 100644
meta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patchmeta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patch new file +40
-0@@ -0,0 +1,40 @@ +From f28a0e2a5f6a9ace858219c6f2513a5280acab48 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Fri, 1 Feb 2019 00:18:04 -0800 +Subject: [PATCH] test.c: improve reproducibility + +It's meanlingness to run test in compiled env, +so uncoment the lines to avoid introducing +ABS_BUILD_DIR and ABS_SRC_DIR to improve +reproducibility to fix below issue: +WARNING: systemd-1_239-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/systemd/1_239-r0/packages-split/systemd/lib/systemd/libsystemd-shared-239.so in package contained reference to tmpdir [buildpaths] + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <[email protected]> +--- + src/shared/tests.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/shared/tests.c b/src/shared/tests.c +index 6b3df0aa07..7ac25eefea 100644 +--- a/src/shared/tests.c ++++ b/src/shared/tests.c +@@ -37,12 +37,8 @@ const char* get_testdata_dir(const char *suffix) { + _cleanup_free_ char *exedir = NULL; + assert_se(readlink_and_make_absolute("/proc/self/exe", &exedir) >= 0); + +- /* Check if we're running from the builddir. If so, use the compiled in path. */ +- if (path_startswith(exedir, ABS_BUILD_DIR)) +- assert_se(snprintf(testdir, sizeof(testdir), "%s/test", ABS_SRC_DIR) > 0); +- else +- /* Try relative path, according to the install-test layout */ +- assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0); ++ /* Try relative path, according to the install-test layout */ ++ assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0); + + /* test this without the suffix, as it may contain a glob */ + if (access(testdir, F_OK) < 0) { +-- +2.17.1 +meta/recipes-core/systemd/systemd_239.bb +1
-0@@ -41,6 +41,7 @@ SRC_URI += "file://touchscreen.rules \ file://0024-journald-do-not-store-the-iovec-entry-for-process-co.patch \ file://0025-journald-set-a-limit-on-the-number-of-fields.patch \ file://0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch \ + file://0001-test-improve-reproducibility.patch \ " # patches made for musl are only applied on TCLIBC is musl