From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 04 Jun 2021 11:23:10 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lp62o-0005d3-Gc for lore@lore.pengutronix.de; Fri, 04 Jun 2021 11:23:10 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lp62o-00087l-2w; Fri, 04 Jun 2021 11:23:10 +0200 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lp62i-00087X-08; Fri, 04 Jun 2021 11:23:04 +0200 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lp62h-0007LV-Mv; Fri, 04 Jun 2021 11:23:03 +0200 Date: Fri, 4 Jun 2021 11:23:03 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Message-ID: <20210604092303.GE12506@pengutronix.de> Mail-Followup-To: ptxdist@pengutronix.de, Roland Hieber References: <20210531115708.4173-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210531115708.4173-1-rhi@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 11:21:29 up 106 days, 12:45, 120 users, load average: 0.07, 0.12, 0.15 User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH 1/3] pps-tools: new package X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Mon, May 31, 2021 at 01:57:06PM +0200, Roland Hieber wrote: > Signed-off-by: Roland Hieber > --- > ...le-fix-installation-to-empty-DESTDIR.patch | 40 ++++++++++ > patches/pps-tools-1.0.2/series | 4 + > rules/pps-tools.in | 10 +++ > rules/pps-tools.make | 80 +++++++++++++++++++ > 4 files changed, 134 insertions(+) > create mode 100644 patches/pps-tools-1.0.2/0001-Makefile-fix-installatio= n-to-empty-DESTDIR.patch > create mode 100644 patches/pps-tools-1.0.2/series > create mode 100644 rules/pps-tools.in > create mode 100644 rules/pps-tools.make > = > diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-em= pty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-= to-empty-DESTDIR.patch > new file mode 100644 > index 000000000000..97498dc22e1b > --- /dev/null > +++ b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DES= TDIR.patch > @@ -0,0 +1,40 @@ > +From: Thomas Petazzoni > +Date: Mon, 3 Dec 2018 13:55:02 +0100 > +Subject: [PATCH] Makefile: fix installation to empty DESTDIR > + > +When DESTDIR is empty, or at least does not contain usr/bin or > +usr/include, the installation fails, because install does not create > +those intermediate directories: > + > +$ make DESTDIR=3D/tmp/koin install > +install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsl= disc > +install: failed to access '/tmp/koin/usr/bin': No such file or directory > + > +Using the -D option of install fixes this: > + > +$ make DESTDIR=3D/tmp/koin install > +install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch p= psldisc > +install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h > + > +Signed-off-by: Thomas Petazzoni > +Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a= 8c759d1ce1727076b2c287deb5f24e1 > +Signed-off-by: Roland Hieber > +--- > + Makefile | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index 939466885e9f..30672f79585c 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -19,8 +19,8 @@ include .depend > + endif > + = > + install : all > +- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) > +- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h > ++ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) > ++ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h > + = > + uninstall : > + for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done > diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/ser= ies > new file mode 100644 > index 000000000000..7b3c7762325f > --- /dev/null > +++ b/patches/pps-tools-1.0.2/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Makefile-fix-installation-to-empty-DESTDIR.patch > +# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic > diff --git a/rules/pps-tools.in b/rules/pps-tools.in > new file mode 100644 > index 000000000000..8b50b475de47 > --- /dev/null > +++ b/rules/pps-tools.in > @@ -0,0 +1,10 @@ > +## SECTION=3Dshell_and_console > + > +config PPS_TOOLS > + tristate > + prompt "pps-tools" > + select LIBC_M > + help > + The pps-tools provide applications to configure and test pulse per > + second devices. They also provide the official PPS API header > + timepps.h. > diff --git a/rules/pps-tools.make b/rules/pps-tools.make > new file mode 100644 > index 000000000000..94b2c3b7dfd4 > --- /dev/null > +++ b/rules/pps-tools.make > @@ -0,0 +1,80 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2020 by Daniel Gl=F6ckner > +# Copyright (C) 2021 Roland Hieber, Pengutronix > +# > +# For further information about the PTXdist project and license conditio= ns > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PPS_TOOLS) +=3D pps-tools > + > +# > +# Paths and names > +# > +PPS_TOOLS_VERSION :=3D 1.0.2 > +PPS_TOOLS_MD5 :=3D 6eddfeb151cffe8751f4766e428b8eb7 > +PPS_TOOLS :=3D pps-tools-$(PPS_TOOLS_VERSION) > +PPS_TOOLS_SUFFIX :=3D tar.gz > +PPS_TOOLS_URL :=3D https://github.com/redlab-i/pps-tools/archive/v$(PPS= _TOOLS_VERSION).$(PPS_TOOLS_SUFFIX) > +PPS_TOOLS_SOURCE :=3D $(SRCDIR)/$(PPS_TOOLS).$(PPS_TOOLS_SUFFIX) > +PPS_TOOLS_DIR :=3D $(BUILDDIR)/$(PPS_TOOLS) > +PPS_TOOLS_LICENSE :=3D GPL-2.0-or-later > +PPS_TOOLS_LICENSE_FILES :=3D \ > + file://COPYING;md5=3D751419260aa954499f7abaabaa882bbe \ > + file://ppsctl.c;startline=3D6;endline=3D14;md5=3D681a7c053fa782c41658ac= 9fc7dd1579 > + > +# ----------------------------------------------------------------------= ------ > +# Prepare > +# ----------------------------------------------------------------------= ------ > + > +PPS_TOOLS_CONF_TOOL :=3D NO > + > +# ----------------------------------------------------------------------= ------ > +# Compile > +# ----------------------------------------------------------------------= ------ > + > +PPS_TOOLS_MAKE_ENV :=3D $(CROSS_ENV) > + > +$(STATEDIR)/pps-tools.compile: > + @$(call targetinfo) > + > + @# Everything depends on .depends, which is made by but also included > + @# in the Makefile, so make sure that "make install" does not rebuild > + @# everything > + @cd ${PPS_TOOLS_DIR} && \ > + ${PPS_TOOLS_MAKE_ENV} \ > + ${MAKE} .depend > + @cd ${PPS_TOOLS_DIR} && \ > + ${PPS_TOOLS_MAKE_ENV} \ > + ${MAKE} ${PARALLELMFLAGS} all @$(call compile, PPS_TOOLS, .depend) @$(call world/compile, PPS_TOOLS) > + > + @$(call touch) > + > +# ----------------------------------------------------------------------= ------ > +# Target-Install > +# ----------------------------------------------------------------------= ------ > + > +$(STATEDIR)/pps-tools.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, pps-tools) > + @$(call install_fixup, pps-tools,PRIORITY,optional) > + @$(call install_fixup, pps-tools,SECTION,base) > + @$(call install_fixup, pps-tools,AUTHOR,"Daniel Gl=F6ckner ") > + @$(call install_fixup, pps-tools,DESCRIPTION,missing) > + > + @$(call install_copy, pps-tools, 0, 0, 0755, -, /usr/bin/ppsfind) > + @$(call install_copy, pps-tools, 0, 0, 0755, -, /usr/bin/ppstest) > + @$(call install_copy, pps-tools, 0, 0, 0755, -, /usr/bin/ppsctl) > + @$(call install_copy, pps-tools, 0, 0, 0755, -, /usr/bin/ppswatch) > + @$(call install_copy, pps-tools, 0, 0, 0755, -, /usr/bin/ppsldisc) > + > + @$(call install_finish, pps-tools) > + > + @$(call touch) > + > +# vim: syntax=3Dmake > -- = > 2.29.2 > = > = > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request= @pengutronix.de -- = Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@p= engutronix.de