From: Jon Ringle <[email protected]> As of commit ec2b023f4b5207eec76f711d8d8e5fe2854fee6c, ptxdist now depends upon touch having --no-dereference, but older versions of touch do not have this option, resulting int the following error message:
touch: unrecognized option '--no-dereference' Try `touch --help' for more information. So, we will install one that does support --no-dereference Signed-off-by: Jon Ringle <[email protected]> --- rules/host-coreutils.make | 6 +++--- rules/post/virtual.make | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rules/host-coreutils.make b/rules/host-coreutils.make index f6fe941..2bcd8a0 100644 --- a/rules/host-coreutils.make +++ b/rules/host-coreutils.make @@ -25,7 +25,7 @@ HOST_COREUTILS_SKIP := \ nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx \ pwd readlink realpath rm rmdir runcon seq sha1sum sha224sum \ sha256sum sha384sum sha512sum shred shuf sleep sort split stat \ - stdbuf stty sum sync tac tail tee test [ timeout touch tr true \ + stdbuf stty sum sync tac tail tee test [ timeout tr true \ truncate tsort tty uname unexpand uniq unlink uptime users vdir \ wc who whoami yes @@ -42,7 +42,7 @@ HOST_COREUTILS_CONF_OPT := \ --disable-libsmack \ --disable-xattr \ --disable-libcap \ - --enable-install-program=ln \ + --enable-install-program=ln,touch \ --enable-no-install-program=$(subst $(space),$(comma),$(strip $(HOST_COREUTILS_SKIP))) \ --disable-nls \ --without-openssl \ @@ -55,7 +55,7 @@ HOST_COREUTILS_CONF_OPT := \ $(STATEDIR)/host-coreutils.install: @$(call targetinfo) @$(call world/install, HOST_COREUTILS) - @find $(HOST_COREUTILS_PKGDIR) -type f -executable ! -name ln | xargs rm + @find $(HOST_COREUTILS_PKGDIR) -type f -executable ! \( -name ln -o -name touch \) | xargs rm @$(call touch) # vim: syntax=make diff --git a/rules/post/virtual.make b/rules/post/virtual.make index 2d5a2b5..5bc7232 100644 --- a/rules/post/virtual.make +++ b/rules/post/virtual.make @@ -41,6 +41,10 @@ ifdef PTXCONF_HOST_CHRPATH $(STATEDIR)/virtual-host-tools.install: $(STATEDIR)/host-chrpath.install.post endif +ifdef PTXCONF_HOST_COREUTILS +$(STATEDIR)/virtual-host-tools.install: $(STATEDIR)/host-coreutils.install.post +endif + $(STATEDIR)/virtual-host-tools.install: @$(call targetinfo) @$(call touch) -- 1.8.5.4 -- ptxdist mailing list [email protected]
