Thanks, applied as f265e5f316dc651992807ddae040087abeec3d15. Michael
[sent from post-receive hook] On Sun, 30 Jan 2022 16:49:54 +0100, Christian Melki <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 <[email protected]> > -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 <[email protected]> > -Origin: upstream; > https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1 > -Signed-off-by: Roland Hieber <[email protected]> > ---- > - 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 <[email protected]> > +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 <[email protected]> > +--- > + 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
