From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 30 Jan 2022 16:53:03 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nECVj-000pLD-H6 for lore@lore.pengutronix.de; Sun, 30 Jan 2022 16:53:03 +0100 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 1nECVd-0001di-Mk; Sun, 30 Jan 2022 16:52:57 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nECSi-0006VW-Iu; Sun, 30 Jan 2022 16:49:56 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nECSi-00DSCX-IF; Sun, 30 Jan 2022 16:49:55 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nECSh-0002ZC-4T; Sun, 30 Jan 2022 16:49:55 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 30 Jan 2022 16:49:55 +0100 Message-Id: <20220130154955.9822-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220129192549.2632671-1-christian.melki@t2data.com> References: <20220129192549.2632671-1-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] pps-tools: Version bump. 1.0.2 -> 1.0.3 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: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 Thanks, applied as f265e5f316dc651992807ddae040087abeec3d15. Michael [sent from post-receive hook] On Sun, 30 Jan 2022 16:49:54 +0100, Christian Melki wrote: > * Update pps-tools. Very minor bugfix release. > * Remove old patch as that one got fixed upstream. > * Add a patch to remove inclusion of SYSROOT. > > Signed-off-by: Christian Melki > Message-Id: <20220129192549.2632671-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch > deleted file mode 100644 > index 97498dc22e1b..000000000000 > --- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -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=/tmp/koin install > -install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc > -install: failed to access '/tmp/koin/usr/bin': No such file or directory > - > -Using the -D option of install fixes this: > - > -$ make DESTDIR=/tmp/koin install > -install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc > -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/b3eae485a8c759d1ce1727076b2c287deb5f24e1 > -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/series > deleted file mode 100644 > index 7b3c7762325f..000000000000 > --- a/patches/pps-tools-1.0.2/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# 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/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch b/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch > new file mode 100644 > index 000000000000..6bb31aff647e > --- /dev/null > +++ b/patches/pps-tools-1.0.3/0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch > @@ -0,0 +1,29 @@ > +From: Christian Melki > +Date: Sat, 29 Jan 2022 19:22:44 +0100 > +Subject: [PATCH] Makefile: Remove obstructive use of SYSROOT variable. > + > +Ptxdist declares a SYSROOT env variable which is picked up here. > +But it is used as a cc --sysroot variable. > +This offsets searches for std headers and causes breakage. > +Remove it. Not needed. > + > +Signed-off-by: Christian Melki > +--- > + Makefile | 4 ---- > + 1 file changed, 4 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index a57a325bc133..30672f79585c 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -3,10 +3,6 @@ TARGETS = ppstest ppsctl ppswatch ppsldisc > + CFLAGS += -Wall -O2 -D_GNU_SOURCE > + CFLAGS += -ggdb > + CFLAGS += -fPIC > +-ifdef SYSROOT > +-CFLAGS += --sysroot $(SYSROOT) > +-endif > +- > + LDLIBS += -lm > + > + # -- Actions section -- > diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series > new file mode 100644 > index 000000000000..8376d9c987fd > --- /dev/null > +++ b/patches/pps-tools-1.0.3/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Makefile-Remove-obstructive-use-of-SYSROOT-variable.patch > +# 7d2c06910f16bd177a79768e6f4195f6 - git-ptx-patches magic > diff --git a/rules/pps-tools.make b/rules/pps-tools.make > index 65a06c7d128b..7896591545ea 100644 > --- a/rules/pps-tools.make > +++ b/rules/pps-tools.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools > # > # Paths and names > # > -PPS_TOOLS_VERSION := 1.0.2 > -PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7 > +PPS_TOOLS_VERSION := 1.0.3 > +PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d > PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION) > PPS_TOOLS_SUFFIX := tar.gz > PPS_TOOLS_URL := https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_SUFFIX) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de