Return-Path: Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 2AADE60582 for ; Thu, 6 Feb 2020 22:15:12 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id w15so303214wru.4 for ; Thu, 06 Feb 2020 14:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lW8AKXHvh/TVygC1hPJsFkNprYRsq5dZ9WMWdAg6NTA=; b=ZAyYoqXfGncmyWy2GDmXHlC+IKMM1uctwWx7O/ABZ1JFArRSkpSwGOkcuoBhY96qTC 7lS9IhS8MMUwNT7mwTXNr4sGh8pAJIj5MJOLRnj014EbTXkjs+cyt8ArVnQ2QstiCm4O 24E3XPiPzDOrDO5HcUH28CQRAuXyKEe8hX8kLcNhVWec+rMroDy8d5LDPkweP7/O+50q S3p71JKHmNUZ8XuZzAM79AVfu3TGIy7DR2+e2LXkMwvH7oHKlECIK3cQk0Bqd7vNOjz8 caUiccuJHn9vrtHcbRngFkxD4l/WA9fVskU5OhelMKLAWW5uG3SNsgXXGWdFC07DUEgk zGmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lW8AKXHvh/TVygC1hPJsFkNprYRsq5dZ9WMWdAg6NTA=; b=a9z00o3gcnFZwQUkM73zvopm9k0b0iT0eA/nmm66x7owPhpiKQaV50P+wyqJ33LLXR zm9WWnVYNO7bcradACSfC+UcTmuTCMsbWEXz9BkGkjjaZIQ8/Spt+jHVVkXEv34/mma+ DcCoftwkdQUK0gxiDkWZH2XeGEq87D1SWHGSgTr8P3ThRP2/emX4orGGYSkJdawiAlov x6HmQJ62OJq2JMG7c0CjoVfEOEIgdeid16kS77OMZ77qBGsteondSNemJQu/QFnvC0ju Xw8rh3K9Ov57PKoe6tltRAgCJ2ZlVdgbllQ29gWjiArKouob42m10qXwpC94BseMhPm2 cn4w== X-Gm-Message-State: APjAAAX3SeTAWyTr7iPgZbuLuzfbnryCsx8FwuNQFQ8lDxWcgzCwQs10 eT93cl6J0gJAX+5+4Y7ozgv/mtzX X-Google-Smtp-Source: APXvYqxvRt4cZW8pDqe6uvkQ9nsybrNjonbvkvSUstAle3W1vdP+/xu8yM4eddoy85U069SOGrCUcw== X-Received: by 2002:adf:f80c:: with SMTP id s12mr138674wrp.1.1581027312403; Thu, 06 Feb 2020 14:15:12 -0800 (PST) Received: from linux-f9zs.box (cable-95-168-152-69.cust.telecolumbus.net. [95.168.152.69]) by smtp.gmail.com with ESMTPSA id w1sm868249wro.72.2020.02.06.14.15.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 14:15:11 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 6 Feb 2020 23:14:38 +0100 Message-Id: <20200206221438.2090-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [PATCH] perl: do not install files that contain build host specific data 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: Thu, 06 Feb 2020 22:15:12 -0000 Content-Transfer-Encoding: 8bit This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.1.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057762..9e708f791d 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 3634122686..dcdabb692d 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -144,6 +144,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- 2.25.0