| Message ID | 20180621084908.27568-1-palavrov@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a | expand |
Hello Atanas, thanks for the patch, looks good, only some minor nits below... On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com> wrote: > From: Atanas Palavrov <palavrov@gmail.com> > > Updating wiringPi to version 2.46 which supports RPi3B+ > > Signed-off-by: Atanas Palavrov <palavrov@gmail.com> > --- > .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- > ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- > package/wiringpi/wiringpi.hash | 2 +- > package/wiringpi/wiringpi.mk | 2 +- > 4 files changed, 19 insertions(+), 16 deletions(-) > > diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch > index 520555c8e8..7d5b4b6007 100644 > --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch > +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch > @@ -1,7 +1,7 @@ > -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 > +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 > From: Peter Seiderer <ps.report@gmx.net> > Date: Wed, 2 Dec 2015 00:22:26 +0100 > -Subject: [PATCH] Adjust for buildroot build. > +Subject: [PATCH 1/2] Adjust for buildroot build. Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. > > - enable CC override > - fix devLib/gpio include path for local build (without installing first) > @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net> Add something like: [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] Signed-off-by: Atanas Palavrov <palavrov@gmail.com> to the reabased patch... > --- > devLib/Makefile | 9 +++++---- > gpio/Makefile | 14 +++++++++----- > - wiringPi/Makefile | 7 ++++--- > - 3 files changed, 18 insertions(+), 12 deletions(-) > + wiringPi/Makefile | 9 +++++---- > + 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/devLib/Makefile b/devLib/Makefile > index cf665d6..3fb41e8 100644 > @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 > > .PHONY: install-static > diff --git a/gpio/Makefile b/gpio/Makefile > -index f41a005..7095fa5 100644 > +index 9ec160d..360d64c 100644 > --- a/gpio/Makefile > +++ b/gpio/Makefile > @@ -32,11 +32,11 @@ endif > @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 > $Q echo [Compile] $< > $Q $(CC) -c $(CFLAGS) $< -o $@ > diff --git a/wiringPi/Makefile b/wiringPi/Makefile > -index e1868b9..68c950e 100644 > +index 287fa58..d51edc2 100644 > --- a/wiringPi/Makefile > +++ b/wiringPi/Makefile > -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) > +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) > > #DEBUG = -g -O0 > DEBUG = -O2 > @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 > INCLUDE = -I. > DEFS = -D_GNU_SOURCE > -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC > +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC > +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC > ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC No need to add the '+=' to the commented out CFLAGS version... > > LIBS = -lm -lpthread -lrt -lcrypt > > -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) > +@@ -76,6 +76,7 @@ static: > $(DYNAMIC): $(OBJ) > $Q echo "[Link (Dynamic)]" > $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) > @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 > > .c.o: > $Q echo [Compile] $< > -@@ -104,7 +105,7 @@ install: $(DYNAMIC) > +@@ -101,7 +102,7 @@ install: $(DYNAMIC) > $Q echo "[Install Dynamic Lib]" > $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib > $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) > @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 > + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so > $Q $(LDCONFIG) > > - .PHONY: install-static > + .PHONY: install-deb > -- > -2.11.0 > +2.17.0 > > diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > index c9c4385d48..6ed7a438b5 100644 > --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > @@ -1,7 +1,8 @@ > -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 > +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 > From: Peter Seiderer <ps.report@gmx.net> > Date: Mon, 20 Mar 2017 20:51:20 +0100 > -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines > +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud > + defines > > For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h > containing: > @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 > default: > return -2 ; > -- > -2.11.0 > +2.17.0 No need to rebase the second patch (still applies unchanged).... > > diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash > index f4832e5fa8..62e67a6d6a 100644 > --- a/package/wiringpi/wiringpi.hash > +++ b/package/wiringpi/wiringpi.hash > @@ -1,2 +1,2 @@ > # Locally calculated > -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz > +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz > diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk > index f2e9e246d9..11abd62b0b 100644 > --- a/package/wiringpi/wiringpi.mk > +++ b/package/wiringpi/wiringpi.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) Above comment no longer needed.... > -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 > +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a > WIRINGPI_SITE = git://git.drogon.net/wiringPi > > WIRINGPI_LICENSE = LGPL-3.0+ Without the second patch update and the minor nits fixed you can add my Reviewed-by: Peter Seiderer <ps.report@gmx.net> on the next patch iteration... Regards, Peter
Hello Peter, > On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report@gmx.net> wrote: > > Hello Atanas, > > thanks for the patch, looks good, only some minor nits below… You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits. > > On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> wrote: > >> From: Atanas Palavrov <palavrov@gmail.com> >> >> Updating wiringPi to version 2.46 which supports RPi3B+ >> >> Signed-off-by: Atanas Palavrov <palavrov@gmail.com> >> --- >> .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- >> ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- >> package/wiringpi/wiringpi.hash | 2 +- >> package/wiringpi/wiringpi.mk | 2 +- >> 4 files changed, 19 insertions(+), 16 deletions(-) >> >> diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >> index 520555c8e8..7d5b4b6007 100644 >> --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch >> +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >> @@ -1,7 +1,7 @@ >> -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 >> +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 >> From: Peter Seiderer <ps.report@gmx.net> >> Date: Wed, 2 Dec 2015 00:22:26 +0100 >> -Subject: [PATCH] Adjust for buildroot build. >> +Subject: [PATCH 1/2] Adjust for buildroot build. > > Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. Yup, this will reduce the noise, will regenerate the patches with -N >> >> - enable CC override >> - fix devLib/gpio include path for local build (without installing first) >> @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > > Add something like: > > [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] > Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > > to the reabased patch… OK > >> --- >> devLib/Makefile | 9 +++++---- >> gpio/Makefile | 14 +++++++++----- >> - wiringPi/Makefile | 7 ++++--- >> - 3 files changed, 18 insertions(+), 12 deletions(-) >> + wiringPi/Makefile | 9 +++++---- >> + 3 files changed, 19 insertions(+), 13 deletions(-) >> >> diff --git a/devLib/Makefile b/devLib/Makefile >> index cf665d6..3fb41e8 100644 >> @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 >> >> .PHONY: install-static >> diff --git a/gpio/Makefile b/gpio/Makefile >> -index f41a005..7095fa5 100644 >> +index 9ec160d..360d64c 100644 >> --- a/gpio/Makefile >> +++ b/gpio/Makefile >> @@ -32,11 +32,11 @@ endif >> @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 >> $Q echo [Compile] $< >> $Q $(CC) -c $(CFLAGS) $< -o $@ >> diff --git a/wiringPi/Makefile b/wiringPi/Makefile >> -index e1868b9..68c950e 100644 >> +index 287fa58..d51edc2 100644 >> --- a/wiringPi/Makefile >> +++ b/wiringPi/Makefile >> -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) >> +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) >> >> #DEBUG = -g -O0 >> DEBUG = -O2 >> @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 >> INCLUDE = -I. >> DEFS = -D_GNU_SOURCE >> -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >> +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >> +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >> ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC > > No need to add the '+=' to the commented out CFLAGS version… No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ... >> >> LIBS = -lm -lpthread -lrt -lcrypt >> >> -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) >> +@@ -76,6 +76,7 @@ static: >> $(DYNAMIC): $(OBJ) >> $Q echo "[Link (Dynamic)]" >> $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) >> @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 >> >> .c.o: >> $Q echo [Compile] $< >> -@@ -104,7 +105,7 @@ install: $(DYNAMIC) >> +@@ -101,7 +102,7 @@ install: $(DYNAMIC) >> $Q echo "[Install Dynamic Lib]" >> $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib >> $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) >> @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 >> + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so >> $Q $(LDCONFIG) >> >> - .PHONY: install-static >> + .PHONY: install-deb >> -- >> -2.11.0 >> +2.17.0 >> >> diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >> index c9c4385d48..6ed7a438b5 100644 >> --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >> +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >> @@ -1,7 +1,8 @@ >> -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 >> +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 >> From: Peter Seiderer <ps.report@gmx.net> >> Date: Mon, 20 Mar 2017 20:51:20 +0100 >> -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines >> +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud >> + defines >> >> For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h >> containing: >> @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 >> default: >> return -2 ; >> -- >> -2.11.0 >> +2.17.0 > > No need to rebase the second patch (still applies unchanged)…. That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it: 1. Check the *.mk file to get the package source and clone it locally 2. Checkout to the package commit sha1 and create a temp branch 3. Apply all existing patches with `git am` 4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process 5. Generate new patch with `git format-patch` and update the buildroot package 6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files. > >> >> diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash >> index f4832e5fa8..62e67a6d6a 100644 >> --- a/package/wiringpi/wiringpi.hash >> +++ b/package/wiringpi/wiringpi.hash >> @@ -1,2 +1,2 @@ >> # Locally calculated >> -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz >> +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz >> diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk >> index f2e9e246d9..11abd62b0b 100644 >> --- a/package/wiringpi/wiringpi.mk >> +++ b/package/wiringpi/wiringpi.mk >> @@ -5,7 +5,7 @@ >> ################################################################################ >> >> # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) > > Above comment no longer needed…. Removed and put back the version number (2.46) instead of the commit SHA1 > >> -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 >> +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a >> WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi> >> >> WIRINGPI_LICENSE = LGPL-3.0+ > > Without the second patch update and the minor nits fixed you can add my > > Reviewed-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > > on the next patch iteration… Guess, that it should be in a new message, right? > > Regards, > Peter Regards, Atanas <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Hello Peter,<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On 21 Jun 2018, at 21:13, Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Hello Atanas,</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">thanks for the patch, looks good, only some minor nits below…</span></div></blockquote><div>You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits.</div><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <</span><a href="mailto:palavrov@gmail.com" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">palavrov@gmail.com</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">> wrote:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">From: Atanas Palavrov <<a href="mailto:palavrov@gmail.com" class="">palavrov@gmail.com</a>><br class=""><br class=""> Updating wiringPi to version 2.46 which supports RPi3B+<br class=""><br class="">Signed-off-by: Atanas Palavrov <<a href="mailto:palavrov@gmail.com" class="">palavrov@gmail.com</a>><br class="">---<br class="">.../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++---------<br class="">...erial-fix-compile-for-missing-baud-d.patch | 7 +++---<br class="">package/wiringpi/wiringpi.hash | 2 +-<br class="">package/wiringpi/wiringpi.mk | 2 +-<br class="">4 files changed, 19 insertions(+), 16 deletions(-)<br class=""><br class="">diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch<br class="">index 520555c8e8..7d5b4b6007 100644<br class="">--- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch<br class="">+++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch<br class="">@@ -1,7 +1,7 @@<br class="">-From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001<br class="">+From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001<br class="">From: Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>><br class="">Date: Wed, 2 Dec 2015 00:22:26 +0100<br class="">-Subject: [PATCH] Adjust for buildroot build.<br class="">+Subject: [PATCH 1/2] Adjust for buildroot build.<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject)..</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote>Yup, this will reduce the noise, will regenerate the patches with -N<br class=""><blockquote type="cite" class=""><div class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""> - enable CC override<br class=""> - fix devLib/gpio include path for local build (without installing first)<br class="">@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>><br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Add something like:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span class="Apple-tab-span" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: pre; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"> </span><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span class="Apple-tab-span" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: pre; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"> </span><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Signed-off-by: Atanas Palavrov <</span><a href="mailto:palavrov@gmail.com" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">palavrov@gmail.com</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">></span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">to the reabased patch…</span></div></blockquote>OK<br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">---<br class=""> devLib/Makefile | 9 +++++----<br class=""> gpio/Makefile | 14 +++++++++-----<br class="">- wiringPi/Makefile | 7 ++++---<br class="">- 3 files changed, 18 insertions(+), 12 deletions(-)<br class="">+ wiringPi/Makefile | 9 +++++----<br class="">+ 3 files changed, 19 insertions(+), 13 deletions(-)<br class=""><br class="">diff --git a/devLib/Makefile b/devLib/Makefile<br class="">index cf665d6..3fb41e8 100644<br class="">@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644<br class=""><br class=""> .PHONY:<span class="Apple-tab-span" style="white-space: pre;"> </span>install-static<br class="">diff --git a/gpio/Makefile b/gpio/Makefile<br class="">-index f41a005..7095fa5 100644<br class="">+index 9ec160d..360d64c 100644<br class="">--- a/gpio/Makefile<br class="">+++ b/gpio/Makefile<br class="">@@ -32,11 +32,11 @@ endif<br class="">@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo [Compile] $<<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q $(CC) -c $(CFLAGS) $< -o $@<br class="">diff --git a/wiringPi/Makefile b/wiringPi/Makefile<br class="">-index e1868b9..68c950e 100644<br class="">+index 287fa58..d51edc2 100644<br class="">--- a/wiringPi/Makefile<br class="">+++ b/wiringPi/Makefile<br class="">-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)<br class="">+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)<br class=""><br class=""> #DEBUG<span class="Apple-tab-span" style="white-space: pre;"> </span>= -g -O0<br class=""> DEBUG<span class="Apple-tab-span" style="white-space: pre;"> </span>= -O2<br class="">@@ -101,11 +101,13 @@ index e1868b9..68c950e 100644<br class=""> INCLUDE<span class="Apple-tab-span" style="white-space: pre;"> </span>= -I.<br class=""> DEFS<span class="Apple-tab-span" style="white-space: pre;"> </span>= -D_GNU_SOURCE<br class="">-CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC<br class="">+-#CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC<br class="">+CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC<br class="">++#CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">No need to add the '+=' to the commented out CFLAGS version…</span></div></blockquote>No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ...<br class=""><blockquote type="cite" class=""><div class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""> LIBS = -lm -lpthread -lrt -lcrypt<br class=""><br class="">-@@ -79,6 +79,7 @@ $(STATIC):<span class="Apple-tab-span" style="white-space: pre;"> </span>$(OBJ)<br class="">+@@ -76,6 +76,7 @@ static:<br class=""> $(DYNAMIC):<span class="Apple-tab-span" style="white-space: pre;"> </span>$(OBJ)<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo "[Link (Dynamic)]"<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)<br class="">@@ -113,7 +115,7 @@ index e1868b9..68c950e 100644<br class=""><br class=""> .c.o:<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo [Compile] $<<br class="">-@@ -104,7 +105,7 @@ install:<span class="Apple-tab-span" style="white-space: pre;"> </span>$(DYNAMIC)<br class="">+@@ -101,7 +102,7 @@ install:<span class="Apple-tab-span" style="white-space: pre;"> </span>$(DYNAMIC)<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo "[Install Dynamic Lib]"<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q install -m 0755 -d<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>$(DESTDIR)$(PREFIX)/lib<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q install -m 0755 libwiringPi.so.$(VERSION)<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)<br class="">@@ -121,7 +123,7 @@ index e1868b9..68c950e 100644<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>$Q ln -sf libwiringPi.so.$(VERSION)<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>$(DESTDIR)$(PREFIX)/lib/libwiringPi.so<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q $(LDCONFIG)<br class=""><br class="">- .PHONY:<span class="Apple-tab-span" style="white-space: pre;"> </span>install-static<br class="">+ .PHONY:<span class="Apple-tab-span" style="white-space: pre;"> </span>install-deb<br class="">--<span class="Apple-converted-space"> </span><br class="">-2.11.0<br class="">+2.17.0<br class=""><br class="">diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch<br class="">index c9c4385d48..6ed7a438b5 100644<br class="">--- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch<br class="">+++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch<br class="">@@ -1,7 +1,8 @@<br class="">-From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001<br class="">+From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001<br class="">From: Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>><br class="">Date: Mon, 20 Mar 2017 20:51:20 +0100<br class="">-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines<br class="">+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud<br class="">+ defines<br class=""><br class="">For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h<br class="">containing:<br class="">@@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644<br class=""> default:<br class=""> return -2 ;<br class="">--<span class="Apple-converted-space"> </span><br class="">-2.11.0<br class="">+2.17.0<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">No need to rebase the second patch (still applies unchanged)….</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote>That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it:</div><div><br class=""></div><div>1. Check the *.mk file to get the package source and clone it locally</div><div>2. Checkout to the package commit sha1 and create a temp branch</div><div>3. Apply all existing patches with `git am`</div><div>4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process</div><div>5. Generate new patch with `git format-patch` and update the buildroot package</div><div>6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc </div><div><br class=""></div><div>That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files.</div><div><br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class="">diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash<br class="">index f4832e5fa8..62e67a6d6a 100644<br class="">--- a/package/wiringpi/wiringpi.hash<br class="">+++ b/package/wiringpi/wiringpi.hash<br class="">@@ -1,2 +1,2 @@<br class=""># Locally calculated<br class="">-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz<br class="">+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz<br class="">diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk<br class="">index f2e9e246d9..11abd62b0b 100644<br class="">--- a/package/wiringpi/wiringpi.mk<br class="">+++ b/package/wiringpi/wiringpi.mk<br class="">@@ -5,7 +5,7 @@<br class="">################################################################################<br class=""><br class=""># using git commit id instead of (wrong) 2.44 git tag (Bug 10391)<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Above comment no longer needed….</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote>Removed and put back the version number (2.46) instead of the commit SHA1<br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15<br class="">+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a<br class="">WIRINGPI_SITE =<span class="Apple-converted-space"> </span><a href="git://git.drogon.net/wiringPi" class="">git://git.drogon.net/wiringPi</a><br class=""><br class="">WIRINGPI_LICENSE = LGPL-3.0+<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Without the second patch update and the minor nits fixed you can add my</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Reviewed-by: Peter Seiderer <</span><a href="mailto:ps.report@gmx.net" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">ps.report@gmx.net</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">></span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">on the next patch iteration…</span></div></blockquote>Guess, that it should be in a new message, right?<br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Regards,</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Peter</span></div></blockquote><br class=""></div>Regards,<div class="">Atanas</div></body></html>
Well, seems that I did a mess with the new email in patchwork. My idea was to reuse `git send-mail`. I’m attaching the same patch here to discover if patchwork will be smart enough to update the existing patch - didn’t get how to use it from the docs ... > On 22 Jun 2018, at 9:17, Atanas Palavrov <palavrov@gmail.com> wrote: > > Hello Peter, > >> On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> wrote: >> >> Hello Atanas, >> >> thanks for the patch, looks good, only some minor nits below… > You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits. >> >> On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> wrote: >> >>> From: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>> >>> Updating wiringPi to version 2.46 which supports RPi3B+ >>> >>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>> --- >>> .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- >>> ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- >>> package/wiringpi/wiringpi.hash | 2 +- >>> package/wiringpi/wiringpi.mk | 2 +- >>> 4 files changed, 19 insertions(+), 16 deletions(-) >>> >>> diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>> index 520555c8e8..7d5b4b6007 100644 >>> --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>> +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>> @@ -1,7 +1,7 @@ >>> -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 >>> +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 >>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>> Date: Wed, 2 Dec 2015 00:22:26 +0100 >>> -Subject: [PATCH] Adjust for buildroot build. >>> +Subject: [PATCH 1/2] Adjust for buildroot build. >> >> Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. > Yup, this will reduce the noise, will regenerate the patches with -N >>> >>> - enable CC override >>> - fix devLib/gpio include path for local build (without installing first) >>> @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >> >> Add something like: >> >> [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] >> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >> >> to the reabased patch… > OK >> >>> --- >>> devLib/Makefile | 9 +++++---- >>> gpio/Makefile | 14 +++++++++----- >>> - wiringPi/Makefile | 7 ++++--- >>> - 3 files changed, 18 insertions(+), 12 deletions(-) >>> + wiringPi/Makefile | 9 +++++---- >>> + 3 files changed, 19 insertions(+), 13 deletions(-) >>> >>> diff --git a/devLib/Makefile b/devLib/Makefile >>> index cf665d6..3fb41e8 100644 >>> @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 >>> >>> .PHONY: install-static >>> diff --git a/gpio/Makefile b/gpio/Makefile >>> -index f41a005..7095fa5 100644 >>> +index 9ec160d..360d64c 100644 >>> --- a/gpio/Makefile >>> +++ b/gpio/Makefile >>> @@ -32,11 +32,11 @@ endif >>> @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 >>> $Q echo [Compile] $< >>> $Q $(CC) -c $(CFLAGS) $< -o $@ >>> diff --git a/wiringPi/Makefile b/wiringPi/Makefile >>> -index e1868b9..68c950e 100644 >>> +index 287fa58..d51edc2 100644 >>> --- a/wiringPi/Makefile >>> +++ b/wiringPi/Makefile >>> -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) >>> +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) >>> >>> #DEBUG = -g -O0 >>> DEBUG = -O2 >>> @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 >>> INCLUDE = -I. >>> DEFS = -D_GNU_SOURCE >>> -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >>> +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >>> +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >>> ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >> >> No need to add the '+=' to the commented out CFLAGS version… > No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ... >>> >>> LIBS = -lm -lpthread -lrt -lcrypt >>> >>> -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) >>> +@@ -76,6 +76,7 @@ static: >>> $(DYNAMIC): $(OBJ) >>> $Q echo "[Link (Dynamic)]" >>> $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) >>> @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 >>> >>> .c.o: >>> $Q echo [Compile] $< >>> -@@ -104,7 +105,7 @@ install: $(DYNAMIC) >>> +@@ -101,7 +102,7 @@ install: $(DYNAMIC) >>> $Q echo "[Install Dynamic Lib]" >>> $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib >>> $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) >>> @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 >>> + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so >>> $Q $(LDCONFIG) >>> >>> - .PHONY: install-static >>> + .PHONY: install-deb >>> -- >>> -2.11.0 >>> +2.17.0 >>> >>> diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>> index c9c4385d48..6ed7a438b5 100644 >>> --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>> +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>> @@ -1,7 +1,8 @@ >>> -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 >>> +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 >>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>> Date: Mon, 20 Mar 2017 20:51:20 +0100 >>> -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines >>> +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud >>> + defines >>> >>> For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h >>> containing: >>> @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 >>> default: >>> return -2 ; >>> -- >>> -2.11.0 >>> +2.17.0 >> >> No need to rebase the second patch (still applies unchanged)…. > That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it: > > 1. Check the *.mk file to get the package source and clone it locally > 2. Checkout to the package commit sha1 and create a temp branch > 3. Apply all existing patches with `git am` > 4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process > 5. Generate new patch with `git format-patch` and update the buildroot package > 6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc > > That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files. > >> >>> >>> diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash >>> index f4832e5fa8..62e67a6d6a 100644 >>> --- a/package/wiringpi/wiringpi.hash >>> +++ b/package/wiringpi/wiringpi.hash >>> @@ -1,2 +1,2 @@ >>> # Locally calculated >>> -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz >>> +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz >>> diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk >>> index f2e9e246d9..11abd62b0b 100644 >>> --- a/package/wiringpi/wiringpi.mk >>> +++ b/package/wiringpi/wiringpi.mk >>> @@ -5,7 +5,7 @@ >>> ################################################################################ >>> >>> # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) >> >> Above comment no longer needed…. > Removed and put back the version number (2.46) instead of the commit SHA1 >> >>> -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 >>> +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a >>> WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi> >>> >>> WIRINGPI_LICENSE = LGPL-3.0+ >> >> Without the second patch update and the minor nits fixed you can add my >> >> Reviewed-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >> >> on the next patch iteration… > Guess, that it should be in a new message, right? >> >> Regards, >> Peter > > Regards, > Atanas <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div class="">Well, seems that I did a mess with the new email in patchwork. My idea was to reuse `git send-mail`.</div><div class="">I’m attaching the same patch here to discover if patchwork will be smart enough to update the existing patch - didn’t get how to use it from the docs ...</div><div class=""><br class=""></div></body></html> <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On 22 Jun 2018, at 9:17, Atanas Palavrov <<a href="mailto:palavrov@gmail.com" class="">palavrov@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Hello Peter,</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""><blockquote type="cite" class=""><div class="">On 21 Jun 2018, at 21:13, Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Hello Atanas,</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">thanks for the patch, looks good, only some minor nits below…</span></div></blockquote><div class="">You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits.</div><blockquote type="cite" class=""><div class=""><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <</span><a href="mailto:palavrov@gmail.com" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;">palavrov@gmail.com</a><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">> wrote:</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><blockquote type="cite" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;">From: Atanas Palavrov <<a href="mailto:palavrov@gmail.com" class="">palavrov@gmail.com</a>><br class=""><br class=""> Updating wiringPi to version 2.46 which supports RPi3B+<br class=""><br class="">Signed-off-by: Atanas Palavrov <<a href="mailto:palavrov@gmail.com" class="">palavrov@gmail.com</a>><br class="">---<br class="">.../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++---------<br class="">...erial-fix-compile-for-missing-baud-d.patch | 7 +++---<br class="">package/wiringpi/wiringpi.hash | 2 +-<br class="">package/wiringpi/wiringpi.mk | 2 +-<br class="">4 files changed, 19 insertions(+), 16 deletions(-)<br class=""><br class="">diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch<br class="">index 520555c8e8..7d5b4b6007 100644<br class="">--- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch<br class="">+++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch<br class="">@@ -1,7 +1,7 @@<br class="">-From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001<br class="">+From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001<br class="">From: Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>><br class="">Date: Wed, 2 Dec 2015 00:22:26 +0100<br class="">-Subject: [PATCH] Adjust for buildroot build.<br class="">+Subject: [PATCH 1/2] Adjust for buildroot build.<br class=""></blockquote><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject)..</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"></div></blockquote>Yup, this will reduce the noise, will regenerate the patches with -N<br class=""><blockquote type="cite" class=""><div class=""><blockquote type="cite" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class=""> - enable CC override<br class=""> - fix devLib/gpio include path for local build (without installing first)<br class="">@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>><br class=""></blockquote><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Add something like:</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="Apple-tab-span" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: pre; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"> </span><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="Apple-tab-span" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: pre; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"> </span><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Signed-off-by: Atanas Palavrov <</span><a href="mailto:palavrov@gmail.com" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;">palavrov@gmail.com</a><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">></span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">to the reabased patch…</span></div></blockquote>OK<br class=""><blockquote type="cite" class=""><div class=""><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><blockquote type="cite" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;">---<br class=""> devLib/Makefile | 9 +++++----<br class=""> gpio/Makefile | 14 +++++++++-----<br class="">- wiringPi/Makefile | 7 ++++---<br class="">- 3 files changed, 18 insertions(+), 12 deletions(-)<br class="">+ wiringPi/Makefile | 9 +++++----<br class="">+ 3 files changed, 19 insertions(+), 13 deletions(-)<br class=""><br class="">diff --git a/devLib/Makefile b/devLib/Makefile<br class="">index cf665d6..3fb41e8 100644<br class="">@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644<br class=""><br class=""> .PHONY:<span class="Apple-tab-span" style="white-space: pre;"> </span>install-static<br class="">diff --git a/gpio/Makefile b/gpio/Makefile<br class="">-index f41a005..7095fa5 100644<br class="">+index 9ec160d..360d64c 100644<br class="">--- a/gpio/Makefile<br class="">+++ b/gpio/Makefile<br class="">@@ -32,11 +32,11 @@ endif<br class="">@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo [Compile] $<<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q $(CC) -c $(CFLAGS) $< -o $@<br class="">diff --git a/wiringPi/Makefile b/wiringPi/Makefile<br class="">-index e1868b9..68c950e 100644<br class="">+index 287fa58..d51edc2 100644<br class="">--- a/wiringPi/Makefile<br class="">+++ b/wiringPi/Makefile<br class="">-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)<br class="">+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)<br class=""><br class=""> #DEBUG<span class="Apple-tab-span" style="white-space: pre;"> </span>= -g -O0<br class=""> DEBUG<span class="Apple-tab-span" style="white-space: pre;"> </span>= -O2<br class="">@@ -101,11 +101,13 @@ index e1868b9..68c950e 100644<br class=""> INCLUDE<span class="Apple-tab-span" style="white-space: pre;"> </span>= -I.<br class=""> DEFS<span class="Apple-tab-span" style="white-space: pre;"> </span>= -D_GNU_SOURCE<br class="">-CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC<br class="">+-#CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC<br class="">+CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC<br class="">++#CFLAGS<span class="Apple-tab-span" style="white-space: pre;"> </span>+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC<br class=""></blockquote><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">No need to add the '+=' to the commented out CFLAGS version…</span></div></blockquote>No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ...<br class=""><blockquote type="cite" class=""><div class=""><blockquote type="cite" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class=""> LIBS = -lm -lpthread -lrt -lcrypt<br class=""><br class="">-@@ -79,6 +79,7 @@ $(STATIC):<span class="Apple-tab-span" style="white-space: pre;"> </span>$(OBJ)<br class="">+@@ -76,6 +76,7 @@ static:<br class=""> $(DYNAMIC):<span class="Apple-tab-span" style="white-space: pre;"> </span>$(OBJ)<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo "[Link (Dynamic)]"<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)<br class="">@@ -113,7 +115,7 @@ index e1868b9..68c950e 100644<br class=""><br class=""> .c.o:<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo [Compile] $<<br class="">-@@ -104,7 +105,7 @@ install:<span class="Apple-tab-span" style="white-space: pre;"> </span>$(DYNAMIC)<br class="">+@@ -101,7 +102,7 @@ install:<span class="Apple-tab-span" style="white-space: pre;"> </span>$(DYNAMIC)<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q echo "[Install Dynamic Lib]"<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q install -m 0755 -d<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>$(DESTDIR)$(PREFIX)/lib<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q install -m 0755 libwiringPi.so.$(VERSION)<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)<br class="">@@ -121,7 +123,7 @@ index e1868b9..68c950e 100644<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>$Q ln -sf libwiringPi.so.$(VERSION)<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span>$(DESTDIR)$(PREFIX)/lib/libwiringPi.so<br class=""> <span class="Apple-tab-span" style="white-space: pre;"> </span>$Q $(LDCONFIG)<br class=""><br class="">- .PHONY:<span class="Apple-tab-span" style="white-space: pre;"> </span>install-static<br class="">+ .PHONY:<span class="Apple-tab-span" style="white-space: pre;"> </span>install-deb<br class="">--<span class="Apple-converted-space"> </span><br class="">-2.11.0<br class="">+2.17.0<br class=""><br class="">diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch<br class="">index c9c4385d48..6ed7a438b5 100644<br class="">--- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch<br class="">+++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch<br class="">@@ -1,7 +1,8 @@<br class="">-From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001<br class="">+From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001<br class="">From: Peter Seiderer <<a href="mailto:ps.report@gmx.net" class="">ps.report@gmx.net</a>><br class="">Date: Mon, 20 Mar 2017 20:51:20 +0100<br class="">-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines<br class="">+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud<br class="">+ defines<br class=""><br class="">For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h<br class="">containing:<br class="">@@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644<br class=""> default:<br class=""> return -2 ;<br class="">--<span class="Apple-converted-space"> </span><br class="">-2.11.0<br class="">+2.17.0<br class=""></blockquote><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">No need to rebase the second patch (still applies unchanged)….</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"></div></blockquote>That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it:</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""></div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">1. Check the *.mk file to get the package source and clone it locally</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">2. Checkout to the package commit sha1 and create a temp branch</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">3. Apply all existing patches with `git am`</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">5. Generate new patch with `git format-patch` and update the buildroot package</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc </div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""></div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files.</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""><blockquote type="cite" class=""><div class=""><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><blockquote type="cite" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="">diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash<br class="">index f4832e5fa8..62e67a6d6a 100644<br class="">--- a/package/wiringpi/wiringpi.hash<br class="">+++ b/package/wiringpi/wiringpi.hash<br class="">@@ -1,2 +1,2 @@<br class=""># Locally calculated<br class="">-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz<br class="">+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz<br class="">diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk<br class="">index f2e9e246d9..11abd62b0b 100644<br class="">--- a/package/wiringpi/wiringpi.mk<br class="">+++ b/package/wiringpi/wiringpi.mk<br class="">@@ -5,7 +5,7 @@<br class="">################################################################################<br class=""><br class=""># using git commit id instead of (wrong) 2.44 git tag (Bug 10391)<br class=""></blockquote><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Above comment no longer needed….</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"></div></blockquote>Removed and put back the version number (2.46) instead of the commit SHA1<br class=""><blockquote type="cite" class=""><div class=""><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><blockquote type="cite" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;">-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15<br class="">+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a<br class="">WIRINGPI_SITE =<span class="Apple-converted-space"> </span><a href="git://git.drogon.net/wiringPi" class="">git://git.drogon.net/wiringPi</a><br class=""><br class="">WIRINGPI_LICENSE = LGPL-3.0+<br class=""></blockquote><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Without the second patch update and the minor nits fixed you can add my</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Reviewed-by: Peter Seiderer <</span><a href="mailto:ps.report@gmx.net" class="" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;">ps.report@gmx.net</a><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">></span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">on the next patch iteration…</span></div></blockquote>Guess, that it should be in a new message, right?<br class=""><blockquote type="cite" class=""><div class=""><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Regards,</span><br class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;"><span class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;">Peter</span></div></blockquote><br class=""></div><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Regards,</span><div class="" style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;">Atanas</div></div></blockquote></div><br class=""></body></html>
Hi Atanas, On Fri, Jun 22, 2018 at 12:15:59PM +0200, Atanas Palavrov wrote: > Well, seems that I did a mess with the new email in patchwork. My idea was > to reuse `git send-mail`. > I’m attaching the same patch here to discover if patchwork will be smart > enough to update the existing patch - didn’t get how to use it from the docs > ... You can't update the content of an existing patchwork entry. The usual procedure is to send another patch that is marked in the subject line as v2, v3, etc. You can use the -v command line parameter of 'git send-email' (actually 'git format-patch') for that. Then, you update the status of the previous patch to 'Superseded'. You need to create an account for yourself on patchwork using the same email address as the sender of the patch. This would allow you to change the status of your patches on patchwork. Hope this helps, baruch > > On 22 Jun 2018, at 9:17, Atanas Palavrov <palavrov@gmail.com> wrote: > > > > Hello Peter, > > > >> On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> wrote: > >> > >> Hello Atanas, > >> > >> thanks for the patch, looks good, only some minor nits below… > > You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits. > >> > >> On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> wrote: > >> > >>> From: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > >>> > >>> Updating wiringPi to version 2.46 which supports RPi3B+ > >>> > >>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > >>> --- > >>> .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- > >>> ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- > >>> package/wiringpi/wiringpi.hash | 2 +- > >>> package/wiringpi/wiringpi.mk | 2 +- > >>> 4 files changed, 19 insertions(+), 16 deletions(-) > >>> > >>> diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch > >>> index 520555c8e8..7d5b4b6007 100644 > >>> --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch > >>> +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch > >>> @@ -1,7 +1,7 @@ > >>> -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 > >>> +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 > >>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >>> Date: Wed, 2 Dec 2015 00:22:26 +0100 > >>> -Subject: [PATCH] Adjust for buildroot build. > >>> +Subject: [PATCH 1/2] Adjust for buildroot build. > >> > >> Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. > > Yup, this will reduce the noise, will regenerate the patches with -N > >>> > >>> - enable CC override > >>> - fix devLib/gpio include path for local build (without installing first) > >>> @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >> > >> Add something like: > >> > >> [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] > >> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > >> > >> to the reabased patch… > > OK > >> > >>> --- > >>> devLib/Makefile | 9 +++++---- > >>> gpio/Makefile | 14 +++++++++----- > >>> - wiringPi/Makefile | 7 ++++--- > >>> - 3 files changed, 18 insertions(+), 12 deletions(-) > >>> + wiringPi/Makefile | 9 +++++---- > >>> + 3 files changed, 19 insertions(+), 13 deletions(-) > >>> > >>> diff --git a/devLib/Makefile b/devLib/Makefile > >>> index cf665d6..3fb41e8 100644 > >>> @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 > >>> > >>> .PHONY: install-static > >>> diff --git a/gpio/Makefile b/gpio/Makefile > >>> -index f41a005..7095fa5 100644 > >>> +index 9ec160d..360d64c 100644 > >>> --- a/gpio/Makefile > >>> +++ b/gpio/Makefile > >>> @@ -32,11 +32,11 @@ endif > >>> @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 > >>> $Q echo [Compile] $< > >>> $Q $(CC) -c $(CFLAGS) $< -o $@ > >>> diff --git a/wiringPi/Makefile b/wiringPi/Makefile > >>> -index e1868b9..68c950e 100644 > >>> +index 287fa58..d51edc2 100644 > >>> --- a/wiringPi/Makefile > >>> +++ b/wiringPi/Makefile > >>> -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) > >>> +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) > >>> > >>> #DEBUG = -g -O0 > >>> DEBUG = -O2 > >>> @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 > >>> INCLUDE = -I. > >>> DEFS = -D_GNU_SOURCE > >>> -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC > >>> +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC > >>> +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC > >>> ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC > >> > >> No need to add the '+=' to the commented out CFLAGS version… > > No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ... > >>> > >>> LIBS = -lm -lpthread -lrt -lcrypt > >>> > >>> -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) > >>> +@@ -76,6 +76,7 @@ static: > >>> $(DYNAMIC): $(OBJ) > >>> $Q echo "[Link (Dynamic)]" > >>> $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) > >>> @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 > >>> > >>> .c.o: > >>> $Q echo [Compile] $< > >>> -@@ -104,7 +105,7 @@ install: $(DYNAMIC) > >>> +@@ -101,7 +102,7 @@ install: $(DYNAMIC) > >>> $Q echo "[Install Dynamic Lib]" > >>> $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib > >>> $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) > >>> @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 > >>> + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so > >>> $Q $(LDCONFIG) > >>> > >>> - .PHONY: install-static > >>> + .PHONY: install-deb > >>> -- > >>> -2.11.0 > >>> +2.17.0 > >>> > >>> diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > >>> index c9c4385d48..6ed7a438b5 100644 > >>> --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > >>> +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > >>> @@ -1,7 +1,8 @@ > >>> -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 > >>> +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 > >>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >>> Date: Mon, 20 Mar 2017 20:51:20 +0100 > >>> -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines > >>> +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud > >>> + defines > >>> > >>> For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h > >>> containing: > >>> @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 > >>> default: > >>> return -2 ; > >>> -- > >>> -2.11.0 > >>> +2.17.0 > >> > >> No need to rebase the second patch (still applies unchanged)…. > > That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it: > > > > 1. Check the *.mk file to get the package source and clone it locally > > 2. Checkout to the package commit sha1 and create a temp branch > > 3. Apply all existing patches with `git am` > > 4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process > > 5. Generate new patch with `git format-patch` and update the buildroot package > > 6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc > > > > That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files. > > > >> > >>> > >>> diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash > >>> index f4832e5fa8..62e67a6d6a 100644 > >>> --- a/package/wiringpi/wiringpi.hash > >>> +++ b/package/wiringpi/wiringpi.hash > >>> @@ -1,2 +1,2 @@ > >>> # Locally calculated > >>> -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz > >>> +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz > >>> diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk > >>> index f2e9e246d9..11abd62b0b 100644 > >>> --- a/package/wiringpi/wiringpi.mk > >>> +++ b/package/wiringpi/wiringpi.mk > >>> @@ -5,7 +5,7 @@ > >>> ################################################################################ > >>> > >>> # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) > >> > >> Above comment no longer needed…. > > Removed and put back the version number (2.46) instead of the commit SHA1 > >> > >>> -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 > >>> +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a > >>> WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi> > >>> > >>> WIRINGPI_LICENSE = LGPL-3.0+ > >> > >> Without the second patch update and the minor nits fixed you can add my > >> > >> Reviewed-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >> > >> on the next patch iteration… > > Guess, that it should be in a new message, right? > >> > >> Regards, > >> Peter > > > > Regards, > > Atanas
Got it, how to proceed now? - to start a third patch marked with v2 - to mark the first one as superseded even when my second patch is not marked with v2 - something else? (I don’t want to make bigger mess that it is now) > On 22 Jun 2018, at 13:20, Baruch Siach <baruch@tkos.co.il> wrote: > > Hi Atanas, > > On Fri, Jun 22, 2018 at 12:15:59PM +0200, Atanas Palavrov wrote: >> Well, seems that I did a mess with the new email in patchwork. My idea was >> to reuse `git send-mail`. >> I’m attaching the same patch here to discover if patchwork will be smart >> enough to update the existing patch - didn’t get how to use it from the docs >> ... > > You can't update the content of an existing patchwork entry. > > The usual procedure is to send another patch that is marked in the subject > line as v2, v3, etc. You can use the -v command line parameter of 'git > send-email' (actually 'git format-patch') for that. > > Then, you update the status of the previous patch to 'Superseded'. You need to > create an account for yourself on patchwork using the same email address as > the sender of the patch. This would allow you to change the status of your > patches on patchwork. > > Hope this helps, > baruch > >>> On 22 Jun 2018, at 9:17, Atanas Palavrov <palavrov@gmail.com> wrote: >>> >>> Hello Peter, >>> >>>> On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> wrote: >>>> >>>> Hello Atanas, >>>> >>>> thanks for the patch, looks good, only some minor nits below… >>> You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits. >>>> >>>> On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> wrote: >>>> >>>>> From: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>>>> >>>>> Updating wiringPi to version 2.46 which supports RPi3B+ >>>>> >>>>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>>>> --- >>>>> .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- >>>>> ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- >>>>> package/wiringpi/wiringpi.hash | 2 +- >>>>> package/wiringpi/wiringpi.mk | 2 +- >>>>> 4 files changed, 19 insertions(+), 16 deletions(-) >>>>> >>>>> diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>>>> index 520555c8e8..7d5b4b6007 100644 >>>>> --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>>>> +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>>>> @@ -1,7 +1,7 @@ >>>>> -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 >>>>> +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 >>>>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>>> Date: Wed, 2 Dec 2015 00:22:26 +0100 >>>>> -Subject: [PATCH] Adjust for buildroot build. >>>>> +Subject: [PATCH 1/2] Adjust for buildroot build. >>>> >>>> Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. >>> Yup, this will reduce the noise, will regenerate the patches with -N >>>>> >>>>> - enable CC override >>>>> - fix devLib/gpio include path for local build (without installing first) >>>>> @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>> >>>> Add something like: >>>> >>>> [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] >>>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>>> >>>> to the reabased patch… >>> OK >>>> >>>>> --- >>>>> devLib/Makefile | 9 +++++---- >>>>> gpio/Makefile | 14 +++++++++----- >>>>> - wiringPi/Makefile | 7 ++++--- >>>>> - 3 files changed, 18 insertions(+), 12 deletions(-) >>>>> + wiringPi/Makefile | 9 +++++---- >>>>> + 3 files changed, 19 insertions(+), 13 deletions(-) >>>>> >>>>> diff --git a/devLib/Makefile b/devLib/Makefile >>>>> index cf665d6..3fb41e8 100644 >>>>> @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 >>>>> >>>>> .PHONY: install-static >>>>> diff --git a/gpio/Makefile b/gpio/Makefile >>>>> -index f41a005..7095fa5 100644 >>>>> +index 9ec160d..360d64c 100644 >>>>> --- a/gpio/Makefile >>>>> +++ b/gpio/Makefile >>>>> @@ -32,11 +32,11 @@ endif >>>>> @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 >>>>> $Q echo [Compile] $< >>>>> $Q $(CC) -c $(CFLAGS) $< -o $@ >>>>> diff --git a/wiringPi/Makefile b/wiringPi/Makefile >>>>> -index e1868b9..68c950e 100644 >>>>> +index 287fa58..d51edc2 100644 >>>>> --- a/wiringPi/Makefile >>>>> +++ b/wiringPi/Makefile >>>>> -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) >>>>> +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) >>>>> >>>>> #DEBUG = -g -O0 >>>>> DEBUG = -O2 >>>>> @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 >>>>> INCLUDE = -I. >>>>> DEFS = -D_GNU_SOURCE >>>>> -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >>>>> +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >>>>> +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >>>>> ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >>>> >>>> No need to add the '+=' to the commented out CFLAGS version… >>> No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ... >>>>> >>>>> LIBS = -lm -lpthread -lrt -lcrypt >>>>> >>>>> -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) >>>>> +@@ -76,6 +76,7 @@ static: >>>>> $(DYNAMIC): $(OBJ) >>>>> $Q echo "[Link (Dynamic)]" >>>>> $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) >>>>> @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 >>>>> >>>>> .c.o: >>>>> $Q echo [Compile] $< >>>>> -@@ -104,7 +105,7 @@ install: $(DYNAMIC) >>>>> +@@ -101,7 +102,7 @@ install: $(DYNAMIC) >>>>> $Q echo "[Install Dynamic Lib]" >>>>> $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib >>>>> $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) >>>>> @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 >>>>> + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so >>>>> $Q $(LDCONFIG) >>>>> >>>>> - .PHONY: install-static >>>>> + .PHONY: install-deb >>>>> -- >>>>> -2.11.0 >>>>> +2.17.0 >>>>> >>>>> diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>>>> index c9c4385d48..6ed7a438b5 100644 >>>>> --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>>>> +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>>>> @@ -1,7 +1,8 @@ >>>>> -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 >>>>> +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 >>>>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>>> Date: Mon, 20 Mar 2017 20:51:20 +0100 >>>>> -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines >>>>> +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud >>>>> + defines >>>>> >>>>> For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h >>>>> containing: >>>>> @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 >>>>> default: >>>>> return -2 ; >>>>> -- >>>>> -2.11.0 >>>>> +2.17.0 >>>> >>>> No need to rebase the second patch (still applies unchanged)…. >>> That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it: >>> >>> 1. Check the *.mk file to get the package source and clone it locally >>> 2. Checkout to the package commit sha1 and create a temp branch >>> 3. Apply all existing patches with `git am` >>> 4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process >>> 5. Generate new patch with `git format-patch` and update the buildroot package >>> 6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc >>> >>> That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files. >>> >>>> >>>>> >>>>> diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash >>>>> index f4832e5fa8..62e67a6d6a 100644 >>>>> --- a/package/wiringpi/wiringpi.hash >>>>> +++ b/package/wiringpi/wiringpi.hash >>>>> @@ -1,2 +1,2 @@ >>>>> # Locally calculated >>>>> -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz >>>>> +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz >>>>> diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk >>>>> index f2e9e246d9..11abd62b0b 100644 >>>>> --- a/package/wiringpi/wiringpi.mk >>>>> +++ b/package/wiringpi/wiringpi.mk >>>>> @@ -5,7 +5,7 @@ >>>>> ################################################################################ >>>>> >>>>> # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) >>>> >>>> Above comment no longer needed…. >>> Removed and put back the version number (2.46) instead of the commit SHA1 >>>> >>>>> -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 >>>>> +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a >>>>> WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi> >>>>> >>>>> WIRINGPI_LICENSE = LGPL-3.0+ >>>> >>>> Without the second patch update and the minor nits fixed you can add my >>>> >>>> Reviewed-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>> >>>> on the next patch iteration… >>> Guess, that it should be in a new message, right? >>>> >>>> Regards, >>>> Peter >>> >>> Regards, >>> Atanas > > -- > http://baruch.siach.name/blog/ ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
> From: "Baruch Siach" <baruch@tkos.co.il> > To: "Atanas Palavrov" <palavrov@gmail.com> > Cc: "Peter Seiderer" <ps.report@gmx.net>, "buildroot" <buildroot@buildroot.org> > Sent: Friday, June 22, 2018 8:20:49 AM > Subject: Re: [Buildroot] [PATCH 1/1] wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a > Hi Atanas, > > On Fri, Jun 22, 2018 at 12:15:59PM +0200, Atanas Palavrov wrote: >> Well, seems that I did a mess with the new email in patchwork. My idea was >> to reuse `git send-mail`. >> I’m attaching the same patch here to discover if patchwork will be smart >> enough to update the existing patch - didn’t get how to use it from the docs >> ... > > You can't update the content of an existing patchwork entry. > > The usual procedure is to send another patch that is marked in the subject > line as v2, v3, etc. You can use the -v command line parameter of 'git > send-email' (actually 'git format-patch') for that. > > Then, you update the status of the previous patch to 'Superseded'. You need to > create an account for yourself on patchwork using the same email address as > the sender of the patch. This would allow you to change the status of your > patches on patchwork. You can also link additional email addresses, so you can use both work and personal email accounts. This is also useful if you move to another job or your company changes the domain name, like recently happened with Free Electrons, which was renamed to Bootlin.
Hi Atenas, On Fri, Jun 22, 2018 at 01:39:07PM +0200, Atanas Palavrov wrote: > Got it, how to proceed now? > > - to start a third patch marked with v2 I'd mark this patch as v3, to avoid confusion. > - to mark the first one as superseded even when my second patch is not marked with v2 > - something else? Just mark all older patchwork entries of the same patch as Superseded. baruch > (I don’t want to make bigger mess that it is now) > > > On 22 Jun 2018, at 13:20, Baruch Siach <baruch@tkos.co.il> wrote: > > On Fri, Jun 22, 2018 at 12:15:59PM +0200, Atanas Palavrov wrote: > >> Well, seems that I did a mess with the new email in patchwork. My idea was > >> to reuse `git send-mail`. > >> I’m attaching the same patch here to discover if patchwork will be smart > >> enough to update the existing patch - didn’t get how to use it from the docs > >> ... > > > > You can't update the content of an existing patchwork entry. > > > > The usual procedure is to send another patch that is marked in the subject > > line as v2, v3, etc. You can use the -v command line parameter of 'git > > send-email' (actually 'git format-patch') for that. > > > > Then, you update the status of the previous patch to 'Superseded'. You need to > > create an account for yourself on patchwork using the same email address as > > the sender of the patch. This would allow you to change the status of your > > patches on patchwork. > > > > Hope this helps, > > baruch > > > >>> On 22 Jun 2018, at 9:17, Atanas Palavrov <palavrov@gmail.com> wrote: > >>> > >>> Hello Peter, > >>> > >>>> On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> wrote: > >>>> > >>>> Hello Atanas, > >>>> > >>>> thanks for the patch, looks good, only some minor nits below… > >>> You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits. > >>>> > >>>> On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> wrote: > >>>> > >>>>> From: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > >>>>> > >>>>> Updating wiringPi to version 2.46 which supports RPi3B+ > >>>>> > >>>>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > >>>>> --- > >>>>> .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- > >>>>> ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- > >>>>> package/wiringpi/wiringpi.hash | 2 +- > >>>>> package/wiringpi/wiringpi.mk | 2 +- > >>>>> 4 files changed, 19 insertions(+), 16 deletions(-) > >>>>> > >>>>> diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch > >>>>> index 520555c8e8..7d5b4b6007 100644 > >>>>> --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch > >>>>> +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch > >>>>> @@ -1,7 +1,7 @@ > >>>>> -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 > >>>>> +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 > >>>>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >>>>> Date: Wed, 2 Dec 2015 00:22:26 +0100 > >>>>> -Subject: [PATCH] Adjust for buildroot build. > >>>>> +Subject: [PATCH 1/2] Adjust for buildroot build. > >>>> > >>>> Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. > >>> Yup, this will reduce the noise, will regenerate the patches with -N > >>>>> > >>>>> - enable CC override > >>>>> - fix devLib/gpio include path for local build (without installing first) > >>>>> @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >>>> > >>>> Add something like: > >>>> > >>>> [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] > >>>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> > >>>> > >>>> to the reabased patch… > >>> OK > >>>> > >>>>> --- > >>>>> devLib/Makefile | 9 +++++---- > >>>>> gpio/Makefile | 14 +++++++++----- > >>>>> - wiringPi/Makefile | 7 ++++--- > >>>>> - 3 files changed, 18 insertions(+), 12 deletions(-) > >>>>> + wiringPi/Makefile | 9 +++++---- > >>>>> + 3 files changed, 19 insertions(+), 13 deletions(-) > >>>>> > >>>>> diff --git a/devLib/Makefile b/devLib/Makefile > >>>>> index cf665d6..3fb41e8 100644 > >>>>> @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 > >>>>> > >>>>> .PHONY: install-static > >>>>> diff --git a/gpio/Makefile b/gpio/Makefile > >>>>> -index f41a005..7095fa5 100644 > >>>>> +index 9ec160d..360d64c 100644 > >>>>> --- a/gpio/Makefile > >>>>> +++ b/gpio/Makefile > >>>>> @@ -32,11 +32,11 @@ endif > >>>>> @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 > >>>>> $Q echo [Compile] $< > >>>>> $Q $(CC) -c $(CFLAGS) $< -o $@ > >>>>> diff --git a/wiringPi/Makefile b/wiringPi/Makefile > >>>>> -index e1868b9..68c950e 100644 > >>>>> +index 287fa58..d51edc2 100644 > >>>>> --- a/wiringPi/Makefile > >>>>> +++ b/wiringPi/Makefile > >>>>> -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) > >>>>> +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) > >>>>> > >>>>> #DEBUG = -g -O0 > >>>>> DEBUG = -O2 > >>>>> @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 > >>>>> INCLUDE = -I. > >>>>> DEFS = -D_GNU_SOURCE > >>>>> -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC > >>>>> +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC > >>>>> +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC > >>>>> ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC > >>>> > >>>> No need to add the '+=' to the commented out CFLAGS version… > >>> No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ... > >>>>> > >>>>> LIBS = -lm -lpthread -lrt -lcrypt > >>>>> > >>>>> -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) > >>>>> +@@ -76,6 +76,7 @@ static: > >>>>> $(DYNAMIC): $(OBJ) > >>>>> $Q echo "[Link (Dynamic)]" > >>>>> $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) > >>>>> @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 > >>>>> > >>>>> .c.o: > >>>>> $Q echo [Compile] $< > >>>>> -@@ -104,7 +105,7 @@ install: $(DYNAMIC) > >>>>> +@@ -101,7 +102,7 @@ install: $(DYNAMIC) > >>>>> $Q echo "[Install Dynamic Lib]" > >>>>> $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib > >>>>> $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) > >>>>> @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 > >>>>> + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so > >>>>> $Q $(LDCONFIG) > >>>>> > >>>>> - .PHONY: install-static > >>>>> + .PHONY: install-deb > >>>>> -- > >>>>> -2.11.0 > >>>>> +2.17.0 > >>>>> > >>>>> diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > >>>>> index c9c4385d48..6ed7a438b5 100644 > >>>>> --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > >>>>> +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch > >>>>> @@ -1,7 +1,8 @@ > >>>>> -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 > >>>>> +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 > >>>>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >>>>> Date: Mon, 20 Mar 2017 20:51:20 +0100 > >>>>> -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines > >>>>> +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud > >>>>> + defines > >>>>> > >>>>> For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h > >>>>> containing: > >>>>> @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 > >>>>> default: > >>>>> return -2 ; > >>>>> -- > >>>>> -2.11.0 > >>>>> +2.17.0 > >>>> > >>>> No need to rebase the second patch (still applies unchanged)…. > >>> That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it: > >>> > >>> 1. Check the *.mk file to get the package source and clone it locally > >>> 2. Checkout to the package commit sha1 and create a temp branch > >>> 3. Apply all existing patches with `git am` > >>> 4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process > >>> 5. Generate new patch with `git format-patch` and update the buildroot package > >>> 6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc > >>> > >>> That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files. > >>> > >>>> > >>>>> > >>>>> diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash > >>>>> index f4832e5fa8..62e67a6d6a 100644 > >>>>> --- a/package/wiringpi/wiringpi.hash > >>>>> +++ b/package/wiringpi/wiringpi.hash > >>>>> @@ -1,2 +1,2 @@ > >>>>> # Locally calculated > >>>>> -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz > >>>>> +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz > >>>>> diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk > >>>>> index f2e9e246d9..11abd62b0b 100644 > >>>>> --- a/package/wiringpi/wiringpi.mk > >>>>> +++ b/package/wiringpi/wiringpi.mk > >>>>> @@ -5,7 +5,7 @@ > >>>>> ################################################################################ > >>>>> > >>>>> # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) > >>>> > >>>> Above comment no longer needed…. > >>> Removed and put back the version number (2.46) instead of the commit SHA1 > >>>> > >>>>> -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 > >>>>> +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a > >>>>> WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi> > >>>>> > >>>>> WIRINGPI_LICENSE = LGPL-3.0+ > >>>> > >>>> Without the second patch update and the minor nits fixed you can add my > >>>> > >>>> Reviewed-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> > >>>> > >>>> on the next patch iteration… > >>> Guess, that it should be in a new message, right? > >>>> > >>>> Regards, > >>>> Peter > >>> > >>> Regards, > >>> Atanas
Hi Baruch, Then it would be better just to mark the second patch and that is - the one which replace 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a with 2.46 > On 22 Jun 2018, at 13:50, Baruch Siach <baruch@tkos.co.il> wrote: > > Hi Atenas, > > On Fri, Jun 22, 2018 at 01:39:07PM +0200, Atanas Palavrov wrote: >> Got it, how to proceed now? >> >> - to start a third patch marked with v2 > > I'd mark this patch as v3, to avoid confusion. > >> - to mark the first one as superseded even when my second patch is not marked with v2 >> - something else? > > Just mark all older patchwork entries of the same patch as Superseded. > > baruch > >> (I don’t want to make bigger mess that it is now) >> >>> On 22 Jun 2018, at 13:20, Baruch Siach <baruch@tkos.co.il> wrote: >>> On Fri, Jun 22, 2018 at 12:15:59PM +0200, Atanas Palavrov wrote: >>>> Well, seems that I did a mess with the new email in patchwork. My idea was >>>> to reuse `git send-mail`. >>>> I’m attaching the same patch here to discover if patchwork will be smart >>>> enough to update the existing patch - didn’t get how to use it from the docs >>>> ... >>> >>> You can't update the content of an existing patchwork entry. >>> >>> The usual procedure is to send another patch that is marked in the subject >>> line as v2, v3, etc. You can use the -v command line parameter of 'git >>> send-email' (actually 'git format-patch') for that. >>> >>> Then, you update the status of the previous patch to 'Superseded'. You need to >>> create an account for yourself on patchwork using the same email address as >>> the sender of the patch. This would allow you to change the status of your >>> patches on patchwork. >>> >>> Hope this helps, >>> baruch >>> >>>>> On 22 Jun 2018, at 9:17, Atanas Palavrov <palavrov@gmail.com> wrote: >>>>> >>>>> Hello Peter, >>>>> >>>>>> On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> wrote: >>>>>> >>>>>> Hello Atanas, >>>>>> >>>>>> thanks for the patch, looks good, only some minor nits below… >>>>> You are welcome, it is my first contribution to buildroot so please excuse me for all the minor nits. >>>>>> >>>>>> On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> wrote: >>>>>> >>>>>>> From: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>>>>>> >>>>>>> Updating wiringPi to version 2.46 which supports RPi3B+ >>>>>>> >>>>>>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>>>>>> --- >>>>>>> .../0001-Adjust-for-buildroot-build.patch | 24 ++++++++++--------- >>>>>>> ...erial-fix-compile-for-missing-baud-d.patch | 7 +++--- >>>>>>> package/wiringpi/wiringpi.hash | 2 +- >>>>>>> package/wiringpi/wiringpi.mk | 2 +- >>>>>>> 4 files changed, 19 insertions(+), 16 deletions(-) >>>>>>> >>>>>>> diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>>>>>> index 520555c8e8..7d5b4b6007 100644 >>>>>>> --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>>>>>> +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch >>>>>>> @@ -1,7 +1,7 @@ >>>>>>> -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 >>>>>>> +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 >>>>>>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>>>>> Date: Wed, 2 Dec 2015 00:22:26 +0100 >>>>>>> -Subject: [PATCH] Adjust for buildroot build. >>>>>>> +Subject: [PATCH 1/2] Adjust for buildroot build. >>>>>> >>>>>> Patches generated with git format-patch -N are preferred (gives 'PATCH' instead of 'PATCH 1/2' subject).. >>>>> Yup, this will reduce the noise, will regenerate the patches with -N >>>>>>> >>>>>>> - enable CC override >>>>>>> - fix devLib/gpio include path for local build (without installing first) >>>>>>> @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>>>> >>>>>> Add something like: >>>>>> >>>>>> [Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a] >>>>>> Signed-off-by: Atanas Palavrov <palavrov@gmail.com <mailto:palavrov@gmail.com>> >>>>>> >>>>>> to the reabased patch… >>>>> OK >>>>>> >>>>>>> --- >>>>>>> devLib/Makefile | 9 +++++---- >>>>>>> gpio/Makefile | 14 +++++++++----- >>>>>>> - wiringPi/Makefile | 7 ++++--- >>>>>>> - 3 files changed, 18 insertions(+), 12 deletions(-) >>>>>>> + wiringPi/Makefile | 9 +++++---- >>>>>>> + 3 files changed, 19 insertions(+), 13 deletions(-) >>>>>>> >>>>>>> diff --git a/devLib/Makefile b/devLib/Makefile >>>>>>> index cf665d6..3fb41e8 100644 >>>>>>> @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 >>>>>>> >>>>>>> .PHONY: install-static >>>>>>> diff --git a/gpio/Makefile b/gpio/Makefile >>>>>>> -index f41a005..7095fa5 100644 >>>>>>> +index 9ec160d..360d64c 100644 >>>>>>> --- a/gpio/Makefile >>>>>>> +++ b/gpio/Makefile >>>>>>> @@ -32,11 +32,11 @@ endif >>>>>>> @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 >>>>>>> $Q echo [Compile] $< >>>>>>> $Q $(CC) -c $(CFLAGS) $< -o $@ >>>>>>> diff --git a/wiringPi/Makefile b/wiringPi/Makefile >>>>>>> -index e1868b9..68c950e 100644 >>>>>>> +index 287fa58..d51edc2 100644 >>>>>>> --- a/wiringPi/Makefile >>>>>>> +++ b/wiringPi/Makefile >>>>>>> -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) >>>>>>> +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) >>>>>>> >>>>>>> #DEBUG = -g -O0 >>>>>>> DEBUG = -O2 >>>>>>> @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 >>>>>>> INCLUDE = -I. >>>>>>> DEFS = -D_GNU_SOURCE >>>>>>> -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >>>>>>> +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >>>>>>> +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC >>>>>>> ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC >>>>>> >>>>>> No need to add the '+=' to the commented out CFLAGS version… >>>>> No problem, I did it just to make the patch consistent to the original changes. It is a habit that I have from too long ... >>>>>>> >>>>>>> LIBS = -lm -lpthread -lrt -lcrypt >>>>>>> >>>>>>> -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) >>>>>>> +@@ -76,6 +76,7 @@ static: >>>>>>> $(DYNAMIC): $(OBJ) >>>>>>> $Q echo "[Link (Dynamic)]" >>>>>>> $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) >>>>>>> @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 >>>>>>> >>>>>>> .c.o: >>>>>>> $Q echo [Compile] $< >>>>>>> -@@ -104,7 +105,7 @@ install: $(DYNAMIC) >>>>>>> +@@ -101,7 +102,7 @@ install: $(DYNAMIC) >>>>>>> $Q echo "[Install Dynamic Lib]" >>>>>>> $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib >>>>>>> $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) >>>>>>> @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 >>>>>>> + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so >>>>>>> $Q $(LDCONFIG) >>>>>>> >>>>>>> - .PHONY: install-static >>>>>>> + .PHONY: install-deb >>>>>>> -- >>>>>>> -2.11.0 >>>>>>> +2.17.0 >>>>>>> >>>>>>> diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>>>>>> index c9c4385d48..6ed7a438b5 100644 >>>>>>> --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>>>>>> +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch >>>>>>> @@ -1,7 +1,8 @@ >>>>>>> -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 >>>>>>> +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 >>>>>>> From: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>>>>> Date: Mon, 20 Mar 2017 20:51:20 +0100 >>>>>>> -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines >>>>>>> +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud >>>>>>> + defines >>>>>>> >>>>>>> For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h >>>>>>> containing: >>>>>>> @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 >>>>>>> default: >>>>>>> return -2 ; >>>>>>> -- >>>>>>> -2.11.0 >>>>>>> +2.17.0 >>>>>> >>>>>> No need to rebase the second patch (still applies unchanged)…. >>>>> That one is a side effect from my rebase workflow. I’ll explain it step by step here so you’ll got the reasoning behind it: >>>>> >>>>> 1. Check the *.mk file to get the package source and clone it locally >>>>> 2. Checkout to the package commit sha1 and create a temp branch >>>>> 3. Apply all existing patches with `git am` >>>>> 4. Rebase the temp branch to the desired one (usually origin/master) fixing all conflicts during the process >>>>> 5. Generate new patch with `git format-patch` and update the buildroot package >>>>> 6. Test the build and add more fixup commits if necessary then regenerate the patch and retest, etc >>>>> >>>>> That way is easy to handle all cases but it has a side effect to add noise in all non conflicting patches - is there a easy way to avoid that? The only way that I got in mind is to do `git add —patch` and then reject all non significant changes in the patch files. >>>>> >>>>>> >>>>>>> >>>>>>> diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash >>>>>>> index f4832e5fa8..62e67a6d6a 100644 >>>>>>> --- a/package/wiringpi/wiringpi.hash >>>>>>> +++ b/package/wiringpi/wiringpi.hash >>>>>>> @@ -1,2 +1,2 @@ >>>>>>> # Locally calculated >>>>>>> -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz >>>>>>> +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz >>>>>>> diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk >>>>>>> index f2e9e246d9..11abd62b0b 100644 >>>>>>> --- a/package/wiringpi/wiringpi.mk >>>>>>> +++ b/package/wiringpi/wiringpi.mk >>>>>>> @@ -5,7 +5,7 @@ >>>>>>> ################################################################################ >>>>>>> >>>>>>> # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) >>>>>> >>>>>> Above comment no longer needed…. >>>>> Removed and put back the version number (2.46) instead of the commit SHA1 >>>>>> >>>>>>> -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 >>>>>>> +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a >>>>>>> WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi> >>>>>>> >>>>>>> WIRINGPI_LICENSE = LGPL-3.0+ >>>>>> >>>>>> Without the second patch update and the minor nits fixed you can add my >>>>>> >>>>>> Reviewed-by: Peter Seiderer <ps.report@gmx.net <mailto:ps.report@gmx.net>> >>>>>> >>>>>> on the next patch iteration… >>>>> Guess, that it should be in a new message, right? >>>>>> >>>>>> Regards, >>>>>> Peter >>>>> >>>>> Regards, >>>>> Atanas > > -- > http://baruch.siach.name/blog/ ~. .~ Tk Open Systems > =}------------------------------------------------ooO--U--Ooo------------{= > - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch index 520555c8e8..7d5b4b6007 100644 --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch @@ -1,7 +1,7 @@ -From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001 +From 80bb549ea1bd52b25cf3d46315e070657791ed95 Mon Sep 17 00:00:00 2001 From: Peter Seiderer <ps.report@gmx.net> Date: Wed, 2 Dec 2015 00:22:26 +0100 -Subject: [PATCH] Adjust for buildroot build. +Subject: [PATCH 1/2] Adjust for buildroot build. - enable CC override - fix devLib/gpio include path for local build (without installing first) @@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- devLib/Makefile | 9 +++++---- gpio/Makefile | 14 +++++++++----- - wiringPi/Makefile | 7 ++++--- - 3 files changed, 18 insertions(+), 12 deletions(-) + wiringPi/Makefile | 9 +++++---- + 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/devLib/Makefile b/devLib/Makefile index cf665d6..3fb41e8 100644 @@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644 .PHONY: install-static diff --git a/gpio/Makefile b/gpio/Makefile -index f41a005..7095fa5 100644 +index 9ec160d..360d64c 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -32,11 +32,11 @@ endif @@ -89,10 +89,10 @@ index f41a005..7095fa5 100644 $Q echo [Compile] $< $Q $(CC) -c $(CFLAGS) $< -o $@ diff --git a/wiringPi/Makefile b/wiringPi/Makefile -index e1868b9..68c950e 100644 +index 287fa58..d51edc2 100644 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) +@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION) #DEBUG = -g -O0 DEBUG = -O2 @@ -101,11 +101,13 @@ index e1868b9..68c950e 100644 INCLUDE = -I. DEFS = -D_GNU_SOURCE -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC +CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC ++#CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC LIBS = -lm -lpthread -lrt -lcrypt -@@ -79,6 +79,7 @@ $(STATIC): $(OBJ) +@@ -76,6 +76,7 @@ static: $(DYNAMIC): $(OBJ) $Q echo "[Link (Dynamic)]" $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ) @@ -113,7 +115,7 @@ index e1868b9..68c950e 100644 .c.o: $Q echo [Compile] $< -@@ -104,7 +105,7 @@ install: $(DYNAMIC) +@@ -101,7 +102,7 @@ install: $(DYNAMIC) $Q echo "[Install Dynamic Lib]" $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) @@ -121,7 +123,7 @@ index e1868b9..68c950e 100644 + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so $Q $(LDCONFIG) - .PHONY: install-static + .PHONY: install-deb -- -2.11.0 +2.17.0 diff --git a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index c9c4385d48..6ed7a438b5 100644 --- a/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +++ b/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch @@ -1,7 +1,8 @@ -From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001 +From 363665caafd88724febac371ac7df95f021baafc Mon Sep 17 00:00:00 2001 From: Peter Seiderer <ps.report@gmx.net> Date: Mon, 20 Mar 2017 20:51:20 +0100 -Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines +Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud + defines For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing: @@ -43,5 +44,5 @@ index e1587ad..4ac8d1e 100644 default: return -2 ; -- -2.11.0 +2.17.0 diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash index f4832e5fa8..62e67a6d6a 100644 --- a/package/wiringpi/wiringpi.hash +++ b/package/wiringpi/wiringpi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz +sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk index f2e9e246d9..11abd62b0b 100644 --- a/package/wiringpi/wiringpi.mk +++ b/package/wiringpi/wiringpi.mk @@ -5,7 +5,7 @@ ################################################################################ # using git commit id instead of (wrong) 2.44 git tag (Bug 10391) -WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15 +WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a WIRINGPI_SITE = git://git.drogon.net/wiringPi WIRINGPI_LICENSE = LGPL-3.0+