From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE3D5C433FE for ; Tue, 7 Sep 2021 13:00:59 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4271961057 for ; Tue, 7 Sep 2021 13:00:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4271961057 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.buildroot.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E40526067A; Tue, 7 Sep 2021 13:00:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12mfPCRN8_7Z; Tue, 7 Sep 2021 13:00:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3BC3A60635; Tue, 7 Sep 2021 13:00:57 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 42E881BF334 for ; Tue, 7 Sep 2021 13:00:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3257F404B1 for ; Tue, 7 Sep 2021 13:00:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o-iEflAGp1oW for ; Tue, 7 Sep 2021 13:00:55 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.122]) by smtp4.osuosl.org (Postfix) with ESMTP id 8881C40282 for ; Tue, 7 Sep 2021 13:00:55 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id D02ED887F3; Tue, 7 Sep 2021 12:59:26 +0000 (UTC) From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 7 Sep 2021 14:39:35 +0200 X-Git-Refname: refs/heads/2021.05.x X-Git-Oldrev: e2883e25729aae21024a38a3acfbe9f510ef04c3 X-Git-Newrev: 5126808849792039dcb9cde0c8d183ef48b68ef6 X-Patchwork-Hint: ignore Message-Id: <20210907125926.D02ED887F3@busybox.osuosl.org> Subject: [Buildroot] [git commit branch/2021.05.x] package/coreutils: Prevent overwriting of fakedate X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" commit: https://git.buildroot.net/buildroot/commit/?id=5126808849792039dcb9cde0c8d183ef48b68ef6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.05.x When BR2_REPRODUCIBLE is set and host-coreutils needs to be built, the fakedate script installed to 'host/bin/date' will be overwritten by host-coreutils. Besides, we do not need our host-coreutils for 'date' at all; we really rely on the host system to provide it. Unconditionally disable installing the 'date' binary in host-coreutils. Note that we explicitly request only ln and realpath to be installed, but the coreutils buildsystem does not strictly obey to that, as was already noticed in 885e6fdb8a40 (package/coreutils: introduce a host variant), which added that comment above HOST_COREUTILS_CONF_OPTS: # Explicitly install ln and realpath, which we *are* insterested in. # A lot of other programs still get installed, however, but disabling # them does not gain much at build time, and is a loooong list that is # difficult to maintain... So, we also update that comment to explain why we still anyway disable installation of 'date'. Signed-off-by: Conrad Ratschan [yann.morin.1998@free.fr: - unconditionally disable installing date - extend comment and commit log to explain why we need --enable-no-install-program=date despite the existing --enable-install-program=ln,realpath ] Signed-off-by: Yann E. MORIN (cherry picked from commit bdf792910945f287beda6d9262492f1910646a61) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 65234a113e..3ec3c847c2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -154,7 +154,8 @@ COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION # Explicitly install ln and realpath, which we *are* insterested in. # A lot of other programs still get installed, however, but disabling # them does not gain much at build time, and is a loooong list that is -# difficult to maintain... +# difficult to maintain... Just avoid overwriting fakedate when creating +# a reproducible build HOST_COREUTILS_CONF_OPTS = \ --disable-acl \ --disable-libcap \ @@ -162,7 +163,8 @@ HOST_COREUTILS_CONF_OPTS = \ --disable-single-binary \ --disable-xattr \ --without-gmp \ - --enable-install-program=ln,realpath + --enable-install-program=ln,realpath \ + --enable-no-install-program=date $(eval $(autotools-package)) $(eval $(host-autotools-package)) _______________________________________________ buildroot mailing list buildroot@lists.buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot