From bdf792910945f287beda6d9262492f1910646a61 Mon Sep 17 00:00:00 2001 From: Conrad Ratschan Date: Fri, 27 Aug 2021 16:14:26 -0500 Subject: [PATCH] package/coreutils: Prevent overwriting of fakedate 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 --- 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)) -- 2.30.2