From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 923FC6BC15 for ; Wed, 13 Feb 2019 05:44:41 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id x1D5if9U015897 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 12 Feb 2019 21:44:41 -0800 (PST) Received: from [128.224.162.194] (128.224.162.194) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.435.0; Tue, 12 Feb 2019 21:44:41 -0800 To: , , References: <20190201084020.113386-1-mingli.yu@windriver.com> From: "Yu, Mingli" Message-ID: <5C63B096.7050403@windriver.com> Date: Wed, 13 Feb 2019 13:52:22 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20190201084020.113386-1-mingli.yu@windriver.com> X-Originating-IP: [128.224.162.194] Subject: Re: [PATCH] systemd: improve reproducibility X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2019 05:44:41 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Ping. On 2019年02月01日 16:40, mingli.yu@windriver.com wrote: > From: Mingli Yu > > 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] > > Signed-off-by: Mingli Yu > --- > .../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 > > diff --git a/meta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patch b/meta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patch > new file mode 100644 > index 00000000000..3d7aa7fc238 > --- /dev/null > +++ b/meta/recipes-core/systemd/systemd/0001-test-improve-reproducibility.patch > @@ -0,0 +1,40 @@ > +From f28a0e2a5f6a9ace858219c6f2513a5280acab48 Mon Sep 17 00:00:00 2001 > +From: Mingli Yu > +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 > +--- > + 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 > + > diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb > index f843f588bdb..62ca9b146e7 100644 > --- a/meta/recipes-core/systemd/systemd_239.bb > +++ b/meta/recipes-core/systemd/systemd_239.bb > @@ -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 >