* [ptxdist] [PATCH 1/2] systemd: coredumpctl and configuration files
@ 2014-10-07 2:42 jon
2014-10-07 2:42 ` [ptxdist] [PATCH 2/2] host-coreutils: build touch jon
0 siblings, 1 reply; 5+ messages in thread
From: jon @ 2014-10-07 2:42 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
From: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
rules/systemd.make | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/rules/systemd.make b/rules/systemd.make
index 6a7bf3a..7df6535 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -291,6 +291,12 @@ endif
@$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
@$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
+ifdef PTXCONF_SYSTEMD_COREDUMP
+ @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-coredump.conf)
+ @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/coredumpctl)
+ @$(call install_alternative, systemd, 0, 0, 0644, /etc/systemd/coredump.conf)
+endif
+
@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/services/)
@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
ifdef PTXCONF_SYSTEMD_LOCALES
--
1.8.5.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] host-coreutils: build touch
2014-10-07 2:42 [ptxdist] [PATCH 1/2] systemd: coredumpctl and configuration files jon
@ 2014-10-07 2:42 ` jon
2014-10-14 5:23 ` Jon Ringle
0 siblings, 1 reply; 5+ messages in thread
From: jon @ 2014-10-07 2:42 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] host-coreutils: build touch
2014-10-07 2:42 ` [ptxdist] [PATCH 2/2] host-coreutils: build touch jon
@ 2014-10-14 5:23 ` Jon Ringle
2014-10-14 5:32 ` Michael Olbrich
0 siblings, 1 reply; 5+ messages in thread
From: Jon Ringle @ 2014-10-14 5:23 UTC (permalink / raw)
To: ptxdist
I've found that the below patch isn't good enough. The HOST_COREUTILS
only gets installed if systemd is selected. But I need the 'touch'
provided by HOST_COREUTILS to get installed before any targetinstall
rule gets run. I'm not sure how to make this happen though...
Jon
On Mon, Oct 6, 2014 at 10:42 PM, <jon@ringle.org> wrote:
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] host-coreutils: build touch
2014-10-14 5:23 ` Jon Ringle
@ 2014-10-14 5:32 ` Michael Olbrich
2014-10-14 13:17 ` Jon Ringle
0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2014-10-14 5:32 UTC (permalink / raw)
To: ptxdist
On Tue, Oct 14, 2014 at 01:23:36AM -0400, Jon Ringle wrote:
> I've found that the below patch isn't good enough. The HOST_COREUTILS
> only gets installed if systemd is selected. But I need the 'touch'
> provided by HOST_COREUTILS to get installed before any targetinstall
> rule gets run. I'm not sure how to make this happen though...
Indeed. '--no-dereference' for touch was introduced in 2009. That's rather
old. Maybe we should just check and only use it, if it's available. The
original commit was made to minimize the differences between two builds of
a BSP. Having a few links with changing timestaps is not too bad. But I
think we should add 'touch' to coreutils checks in configure.ac.
Michael
> On Mon, Oct 6, 2014 at 10:42 PM, <jon@ringle.org> wrote:
> > 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
>
--
engutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] host-coreutils: build touch
2014-10-14 5:32 ` Michael Olbrich
@ 2014-10-14 13:17 ` Jon Ringle
0 siblings, 0 replies; 5+ messages in thread
From: Jon Ringle @ 2014-10-14 13:17 UTC (permalink / raw)
To: ptxdist
> On Oct 14, 2014, at 1:32 AM, Michael Olbrich <m.olbrich@pengutronix.de> wrote:
>
>> On Tue, Oct 14, 2014 at 01:23:36AM -0400, Jon Ringle wrote:
>> I've found that the below patch isn't good enough. The HOST_COREUTILS
>> only gets installed if systemd is selected. But I need the 'touch'
>> provided by HOST_COREUTILS to get installed before any targetinstall
>> rule gets run. I'm not sure how to make this happen though...
>
> Indeed. '--no-dereference' for touch was introduced in 2009. That's rather
> old. Maybe we should just check and only use it, if it's available. The
> original commit was made to minimize the differences between two builds of
> a BSP. Having a few links with changing timestaps is not too bad. But I
> think we should add 'touch' to coreutils checks in configure.ac.
>
It is in Ubuntu-10.04, which is on our build server. Our IT dept will be upgrading the server in Q1 of 2015 when the LTS support for it runs out. Until then I need to live with needing to build on this build server with the old touch.
Jon
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-10-14 13:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-07 2:42 [ptxdist] [PATCH 1/2] systemd: coredumpctl and configuration files jon
2014-10-07 2:42 ` [ptxdist] [PATCH 2/2] host-coreutils: build touch jon
2014-10-14 5:23 ` Jon Ringle
2014-10-14 5:32 ` Michael Olbrich
2014-10-14 13:17 ` Jon Ringle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox