mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: jon@ringle.org
To: ptxdist@pengutronix.de
Cc: Jon Ringle <jringle@gridpoint.com>
Subject: [ptxdist] [PATCH 2/2] host-coreutils: build touch
Date: Mon,  6 Oct 2014 22:42:17 -0400	[thread overview]
Message-ID: <1412649737-28949-2-git-send-email-jon@ringle.org> (raw)
In-Reply-To: <1412649737-28949-1-git-send-email-jon@ringle.org>

From: Jon Ringle <jringle@gridpoint.com>

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 <jringle@gridpoint.com>
---
 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
ptxdist@pengutronix.de

  reply	other threads:[~2014-10-07  2:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-07  2:42 [ptxdist] [PATCH 1/2] systemd: coredumpctl and configuration files jon
2014-10-07  2:42 ` jon [this message]
2014-10-14  5:23   ` [ptxdist] [PATCH 2/2] host-coreutils: build touch Jon Ringle
2014-10-14  5:32     ` Michael Olbrich
2014-10-14 13:17       ` Jon Ringle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412649737-28949-2-git-send-email-jon@ringle.org \
    --to=jon@ringle.org \
    --cc=jringle@gridpoint.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox