wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

PATCH New Atanas Palavrov 4 participants 9 messages Jun 21, 2018 – Jun 22, 2018

lore

Share & tools

lore

Atanas Palavrov

author

2018-06-21 08:49 UTC #0 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

From: Atanas Palavrov <[email protected]>

Updating wiringPi to version 2.46 which supports RPi3B+

Signed-off-by Atanas Palavrov <[email protected]>

---
 .../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(-)

package/wiringpi/0001-Adjust-for-buildroot-build.patch +13 ~~-11~~

index 520555c8e8..7d5b4b6007 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 ---
  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

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +4 -3

index c9c4385d48..6ed7a438b5 100644
@@ -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 <[email protected]>
 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

package/wiringpi/wiringpi.hash +1 -1

index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz

package/wiringpi/wiringpi.mk +1 -1

index f2e9e246d9..11abd62b0b 100644
@@ -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+

Signature · 1 line

2.17.1

Peter Seiderer

2018-06-21 19:13 UTC #1 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

Hello Atanas,

thanks for the patch, looks good, only some minor nits below...

Quoted 17 lines · Atanas Palavrov

From: Atanas Palavrov <[email protected]>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <[email protected]>
---
 .../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(-)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
index 520555c8e8..7d5b4b6007 100644

package/wiringpi/0001-Adjust-for-buildroot-build.patch line 4

Quoted 6 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch +2 -2

@@ -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 <[email protected]>
 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)..

package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <[email protected]>

Quoted 4 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0

  - enable CC override
  - fix devLib/gpio include path for local build (without installing first)

@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <[email protected]>

Add something like:

	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <[email protected]>

to the reabased patch...

Quoted 33 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch +5 -5

 ---
  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

package/wiringpi/0001-Adjust-for-buildroot-build.patch index e1868b9..68c950e 100644 · line 106

Quoted 6 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch +2 -0

@@ -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...

Quoted 43 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch +4 -4

  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

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +3 -2

index c9c4385d48..6ed7a438b5 100644
@@ -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 <[email protected]>
 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:

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 47

Quoted 5 lines

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1
@@ -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)....

Quoted 14 lines

package/wiringpi/wiringpi.hash +1 -1

index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz

package/wiringpi/wiringpi.mk +0 -0

index f2e9e246d9..11abd62b0b 100644

package/wiringpi/wiringpi.mk line 7

Quoted 3 lines

package/wiringpi/wiringpi.mk +0 -0

@@ -5,7 +5,7 @@
 ################################################################################
 
 # using git commit id instead of (wrong) 2.44 git tag (Bug 10391)

Above comment no longer needed....

package/wiringpi/wiringpi.mk line 11

Quoted 5 lines

package/wiringpi/wiringpi.mk +1 -1

-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 <[email protected]>

on the next patch iteration...

Regards,
Peter

Atanas Palavrov

author

2018-06-22 07:17 UTC #2 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

Hello Peter,

Quoted 5 lines · Peter Seiderer

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.

Quoted 15 lines · On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov at gmail.com…

Quoted 13 lines
From: Atanas Palavrov <[email protected]>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <[email protected]>
---
.../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(-)

Quoted 13 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch line 4
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
index 520555c8e8..7d5b4b6007 100644
@@ -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 <[email protected]>
Date: Wed, 2 Dec 2015 00:22:26 +0100
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
-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

Quoted 11 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Quoted 4 lines
- enable CC override
- fix devLib/gpio include path for local build (without installing first)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Add something like:
	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
to the reabased patch?

Quoted 31 lines

package/wiringpi/0001-Adjust-for-buildroot-build.patch +2 -3

---
 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(-)

devLib/Makefile +0 -0

index cf665d6..3fb41e8 100644
@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644
 
 .PHONY:	install-static

gpio/Makefile +1 -1

-index f41a005..7095fa5 100644
+index 9ec160d..360d64c 100644

gpio/Makefile +0 -0

@@ -32,11 +32,11 @@ endif

@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644
 	$Q echo [Compile] $<
 	$Q $(CC) -c $(CFLAGS) $< -o $@

wiringPi/Makefile +1 -1

-index e1868b9..68c950e 100644
+index 287fa58..d51edc2 100644

wiringPi/Makefile +1 -1

-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)

Quoted 11 lines

wiringPi/Makefile index e1868b9..68c950e 100644 · line 105

Quoted 9 lines

#DEBUG = -g -O0
DEBUG = -O2

wiringPi/Makefile +3 -1

@@ -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 ...

Quoted 40 lines

wiringPi/Makefile +5 -5

 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

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1

index c9c4385d48..6ed7a438b5 100644
@@ -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 <[email protected]>
Date: Mon, 20 Mar 2017 20:51:20 +0100

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +2 -1

-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud
+ defines

Quoted 10 lines

package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 46
Quoted 8 lines
For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing:
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -2
@@ -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.

Quoted 17 lines

package/wiringpi/wiringpi.hash +1 -1

index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz

package/wiringpi/wiringpi.mk +0 -0

index f2e9e246d9..11abd62b0b 100644
@@ -5,7 +5,7 @@
 ################################################################################

Quoted 3 lines

package/wiringpi/wiringpi.mk line 7
Quoted 1 line
package/wiringpi/wiringpi.mk +0 -0
 # 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

Quoted 5 lines

Quoted 5 lines
package/wiringpi/wiringpi.mk +1 -1
-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi>

Quoted 7 lines

Quoted 1 line
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 at gmx.net <mailto:[email protected]>>
on the next patch iteration?

Guess, that it should be in a new message, right?

Quoted 3 lines

Regards,
Peter

Regards,
Atanas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180622/017089bc/attachment.html>

Atanas Palavrov

author

2018-06-22 10:15 UTC #3 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

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 ...

Quoted 187 lines · Atanas Palavrov

Hello Peter,
Quoted 5 lines · On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report at gmx.net…
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.
Quoted 15 lines · On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov at gmail.com…
Quoted 13 lines
From: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
---
.../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(-)
Quoted 13 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch line 4
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
index 520555c8e8..7d5b4b6007 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Wed, 2 Dec 2015 00:22:26 +0100
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
-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
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Quoted 4 lines
- enable CC override
- fix devLib/gpio include path for local build (without installing first)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Add something like:
	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
to the reabased patch?
OK
Quoted 31 lines
Quoted 31 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +2 -3
---
 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(-)
 
devLib/Makefile +0 -0
index cf665d6..3fb41e8 100644
@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644
 
 .PHONY:	install-static
gpio/Makefile +1 -1
-index f41a005..7095fa5 100644
+index 9ec160d..360d64c 100644
gpio/Makefile +0 -0
@@ -32,11 +32,11 @@ endif
@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644
 	$Q echo [Compile] $<
 	$Q $(CC) -c $(CFLAGS) $< -o $@
wiringPi/Makefile +1 -1
-index e1868b9..68c950e 100644
+index 287fa58..d51edc2 100644
wiringPi/Makefile +1 -1
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)
Quoted 11 lines
wiringPi/Makefile index e1868b9..68c950e 100644 · line 105
Quoted 9 lines
#DEBUG = -g -O0
DEBUG = -O2
wiringPi/Makefile +3 -1
@@ -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 ...
Quoted 40 lines
Quoted 40 lines
wiringPi/Makefile +5 -5
 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
 
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1
index c9c4385d48..6ed7a438b5 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Mon, 20 Mar 2017 20:51:20 +0100
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +2 -1
-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud
+ defines
Quoted 10 lines
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 46
Quoted 8 lines
For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing:
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -2
@@ -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.
Quoted 17 lines
Quoted 17 lines
package/wiringpi/wiringpi.hash +1 -1
index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz
package/wiringpi/wiringpi.mk +0 -0
index f2e9e246d9..11abd62b0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
Quoted 3 lines
package/wiringpi/wiringpi.mk line 7
Quoted 1 line
package/wiringpi/wiringpi.mk +0 -0
 # 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
Quoted 11 lines
Quoted 6 lines
package/wiringpi/wiringpi.mk +1 -1
-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 at gmx.net <mailto:[email protected]>>

Quoted 8 lines

Quoted 1 line
on the next patch iteration?
Guess, that it should be in a new message, right?
Quoted 3 lines
Regards,
Peter
Regards,
Atanas

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180622/2e8e3738/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-wiringpi-bump-version-to-2.46.patch
Type: application/octet-stream
Size: 3979 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180622/2e8e3738/attachment.obj>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180622/2e8e3738/attachment-0001.html>

Baruch Siach

2018-06-22 11:20 UTC #4 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

Hi Atanas,

Quoted 5 lines · Atanas Palavrov

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

Quoted 195 lines

Quoted 195 lines · Atanas Palavrov
Hello Peter,
Quoted 5 lines · On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report at gmx.net…
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.
Quoted 15 lines · On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov at gmail.com…
Quoted 13 lines
From: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
---
.../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(-)
Quoted 13 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch line 4
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
index 520555c8e8..7d5b4b6007 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Wed, 2 Dec 2015 00:22:26 +0100
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
-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
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Quoted 4 lines
- enable CC override
- fix devLib/gpio include path for local build (without installing first)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Add something like:
	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
to the reabased patch?
OK
Quoted 31 lines
Quoted 31 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +2 -3
---
 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(-)
 
devLib/Makefile +0 -0
index cf665d6..3fb41e8 100644
@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644
 
 .PHONY:	install-static
gpio/Makefile +1 -1
-index f41a005..7095fa5 100644
+index 9ec160d..360d64c 100644
gpio/Makefile +0 -0
@@ -32,11 +32,11 @@ endif
@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644
 	$Q echo [Compile] $<
 	$Q $(CC) -c $(CFLAGS) $< -o $@
wiringPi/Makefile +1 -1
-index e1868b9..68c950e 100644
+index 287fa58..d51edc2 100644
wiringPi/Makefile +1 -1
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)
Quoted 11 lines
wiringPi/Makefile index e1868b9..68c950e 100644 · line 105
Quoted 9 lines
#DEBUG = -g -O0
DEBUG = -O2
wiringPi/Makefile +3 -1
@@ -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 ...
Quoted 40 lines
Quoted 40 lines
wiringPi/Makefile +5 -5
 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
 
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1
index c9c4385d48..6ed7a438b5 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Mon, 20 Mar 2017 20:51:20 +0100
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +2 -1
-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud
+ defines
Quoted 10 lines
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 46
Quoted 8 lines
For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing:
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -2
@@ -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.
Quoted 17 lines
Quoted 17 lines
package/wiringpi/wiringpi.hash +1 -1
index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz
package/wiringpi/wiringpi.mk +0 -0
index f2e9e246d9..11abd62b0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
Quoted 3 lines
package/wiringpi/wiringpi.mk line 7
Quoted 1 line
package/wiringpi/wiringpi.mk +0 -0
 # 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
Quoted 5 lines
Quoted 5 lines
package/wiringpi/wiringpi.mk +1 -1
-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi>
Quoted 7 lines
Quoted 1 line
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 at gmx.net <mailto:[email protected]>>
on the next patch iteration?
Guess, that it should be in a new message, right?
Quoted 3 lines
Regards,
Peter
Regards,
Atanas

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Atanas Palavrov

author

2018-06-22 11:39 UTC #5 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

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)

Quoted 225 lines · Baruch Siach

Hi Atanas,
Quoted 5 lines · Atanas Palavrov
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
Quoted 195 lines
Quoted 195 lines · Atanas Palavrov
Hello Peter,
Quoted 5 lines · On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report at gmx.net…
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.
Quoted 15 lines · On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov at gmail.com…
Quoted 13 lines
From: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
---
.../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(-)
Quoted 13 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch line 4
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
index 520555c8e8..7d5b4b6007 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Wed, 2 Dec 2015 00:22:26 +0100
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
-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
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Quoted 4 lines
- enable CC override
- fix devLib/gpio include path for local build (without installing first)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Add something like:
	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
to the reabased patch?
OK
Quoted 31 lines
Quoted 31 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -1
---
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(-)
devLib/Makefile +0 -0
index cf665d6..3fb41e8 100644
@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644
 
.PHONY: install-static
gpio/Makefile +1 -1
-index f41a005..7095fa5 100644
+index 9ec160d..360d64c 100644
gpio/Makefile +0 -0
@@ -32,11 +32,11 @@ endif
@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644
 	$Q echo [Compile] $<
 	$Q $(CC) -c $(CFLAGS) $< -o $@
wiringPi/Makefile +1 -1
-index e1868b9..68c950e 100644
+index 287fa58..d51edc2 100644
wiringPi/Makefile +1 -1
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)
Quoted 11 lines
wiringPi/Makefile
Quoted 9 lines
#DEBUG = -g -O0
DEBUG = -O2
wiringPi/Makefile +0 -0
@@ -101,11 +101,13 @@ index e1868b9..68c950e 100644
INCLUDE = -I.
DEFS = -D_GNU_SOURCE
wiringPi/Makefile +3 -1
-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 ...
Quoted 40 lines
Quoted 40 lines
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)
wiringPi/Makefile +0 -0
@@ -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)
wiringPi/Makefile +3 -3
@@ -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
 
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1
index c9c4385d48..6ed7a438b5 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Mon, 20 Mar 2017 20:51:20 +0100
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +2 -1
-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud
+ defines
Quoted 10 lines
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 46
Quoted 8 lines
For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing:
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -2
@@ -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.
Quoted 17 lines
Quoted 17 lines
package/wiringpi/wiringpi.hash +1 -1
index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz
package/wiringpi/wiringpi.mk +0 -0
index f2e9e246d9..11abd62b0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
Quoted 3 lines
package/wiringpi/wiringpi.mk line 7
Quoted 1 line
package/wiringpi/wiringpi.mk +0 -0
 # 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
Quoted 5 lines
Quoted 5 lines
package/wiringpi/wiringpi.mk +1 -1
-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi>
Quoted 7 lines
Quoted 1 line
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 at gmx.net <mailto:[email protected]>>
on the next patch iteration?
Guess, that it should be in a new message, right?
Quoted 3 lines
Regards,
Peter
Regards,
Atanas
Signature · 3 lines
    http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
  - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Baruch Siach

2018-06-22 11:50 UTC #6 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

Hi Atenas,

Quoted 3 lines · Atanas Palavrov

Got it, how to proceed now?
- to start a third patch marked with v2

I'd mark this patch as v3, to avoid confusion.

Quoted 2 lines

- 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

Quoted 219 lines

(I don?t want to make bigger mess that it is now)
Quoted 217 lines · Baruch Siach
Quoted 5 lines · Atanas Palavrov
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
Quoted 195 lines
Quoted 195 lines · Atanas Palavrov
Hello Peter,
Quoted 5 lines · On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report at gmx.net…
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.
Quoted 15 lines · On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov at gmail.com…
Quoted 13 lines
From: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
---
.../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(-)
Quoted 13 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch line 4
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
index 520555c8e8..7d5b4b6007 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Wed, 2 Dec 2015 00:22:26 +0100
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
-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
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Quoted 4 lines
- enable CC override
- fix devLib/gpio include path for local build (without installing first)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Add something like:
	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
to the reabased patch?
OK
Quoted 31 lines
Quoted 31 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -1
---
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(-)
devLib/Makefile +0 -0
index cf665d6..3fb41e8 100644
@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644
 
.PHONY: install-static
gpio/Makefile +1 -1
-index f41a005..7095fa5 100644
+index 9ec160d..360d64c 100644
gpio/Makefile +0 -0
@@ -32,11 +32,11 @@ endif
@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644
 	$Q echo [Compile] $<
 	$Q $(CC) -c $(CFLAGS) $< -o $@
wiringPi/Makefile +1 -1
-index e1868b9..68c950e 100644
+index 287fa58..d51edc2 100644
wiringPi/Makefile +1 -1
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)
Quoted 11 lines
wiringPi/Makefile
Quoted 9 lines
#DEBUG = -g -O0
DEBUG = -O2
wiringPi/Makefile +0 -0
@@ -101,11 +101,13 @@ index e1868b9..68c950e 100644
INCLUDE = -I.
DEFS = -D_GNU_SOURCE
wiringPi/Makefile +3 -1
-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 ...
Quoted 40 lines
Quoted 40 lines
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)
wiringPi/Makefile +0 -0
@@ -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)
wiringPi/Makefile +3 -3
@@ -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
 
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1
index c9c4385d48..6ed7a438b5 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Mon, 20 Mar 2017 20:51:20 +0100
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +2 -1
-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud
+ defines
Quoted 10 lines
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 46
Quoted 8 lines
For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing:
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -2
@@ -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.
Quoted 17 lines
Quoted 17 lines
package/wiringpi/wiringpi.hash +1 -1
index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz
package/wiringpi/wiringpi.mk +0 -0
index f2e9e246d9..11abd62b0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
Quoted 3 lines
package/wiringpi/wiringpi.mk line 7
Quoted 1 line
package/wiringpi/wiringpi.mk +0 -0
 # 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
Quoted 5 lines
Quoted 5 lines
package/wiringpi/wiringpi.mk +1 -1
-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi>
Quoted 7 lines
Quoted 1 line
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 at gmx.net <mailto:[email protected]>>
on the next patch iteration?
Guess, that it should be in a new message, right?
Quoted 3 lines
Regards,
Peter
Regards,
Atanas

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Atanas Palavrov

author

2018-06-22 12:01 UTC #7 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

Hi Baruch,

Then it would be better just to mark the second patch and that is - the one which replace 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a with 2.46

Quoted 242 lines · Baruch Siach

Hi Atenas,
Quoted 3 lines · Atanas Palavrov
Got it, how to proceed now?
- to start a third patch marked with v2
I'd mark this patch as v3, to avoid confusion.
Quoted 2 lines
- 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
Quoted 219 lines
(I don?t want to make bigger mess that it is now)
Quoted 217 lines · Baruch Siach
Quoted 5 lines · Atanas Palavrov
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
Quoted 195 lines
Quoted 195 lines · Atanas Palavrov
Hello Peter,
Quoted 5 lines · On 21 Jun 2018, at 21:13, Peter Seiderer <ps.report at gmx.net…
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.
Quoted 15 lines · On Thu, 21 Jun 2018 11:49:08 +0300, Atanas Palavrov <palavrov at gmail.com…
Quoted 13 lines
From: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
Updating wiringPi to version 2.46 which supports RPi3B+
Signed-off-by Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
---
.../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(-)
Quoted 13 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
index 520555c8e8..7d5b4b6007 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Wed, 2 Dec 2015 00:22:26 +0100
package/wiringpi/0001-Adjust-for-buildroot-build.patch +1 -1
-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
Quoted 11 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Quoted 4 lines
- enable CC override
- fix devLib/gpio include path for local build (without installing first)
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -0
@@ -15,8 +15,8 @@ Signed-off-by: Peter Seiderer <ps.report at gmx.net <mailto:[email protected]>>
Add something like:
	[Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a]
	Signed-off-by: Atanas Palavrov <palavrov at gmail.com <mailto:[email protected]>>
to the reabased patch?
OK
Quoted 31 lines
Quoted 31 lines
package/wiringpi/0001-Adjust-for-buildroot-build.patch +0 -1
---
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(-)
devLib/Makefile +0 -0
index cf665d6..3fb41e8 100644
@@ -54,7 +54,7 @@ index cf665d6..3fb41e8 100644
 
.PHONY: install-static
gpio/Makefile +1 -1
-index f41a005..7095fa5 100644
+index 9ec160d..360d64c 100644
gpio/Makefile +0 -0
@@ -32,11 +32,11 @@ endif
@@ -89,10 +89,10 @@ index f41a005..7095fa5 100644
 	$Q echo [Compile] $<
 	$Q $(CC) -c $(CFLAGS) $< -o $@
wiringPi/Makefile +1 -1
-index e1868b9..68c950e 100644
+index 287fa58..d51edc2 100644
wiringPi/Makefile +1 -1
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
+@@ -36,11 +36,11 @@ DYNAMIC=libwiringPi.so.$(VERSION)
Quoted 11 lines
wiringPi/Makefile
Quoted 9 lines
#DEBUG = -g -O0
DEBUG = -O2
wiringPi/Makefile +0 -0
@@ -101,11 +101,13 @@ index e1868b9..68c950e 100644
INCLUDE = -I.
DEFS = -D_GNU_SOURCE
wiringPi/Makefile +3 -1
-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 ...
Quoted 40 lines
Quoted 40 lines
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)
wiringPi/Makefile +0 -0
@@ -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)
wiringPi/Makefile +3 -3
@@ -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
 
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -1
index c9c4385d48..6ed7a438b5 100644
@@ -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 at gmx.net <mailto:[email protected]>>
Date: Mon, 20 Mar 2017 20:51:20 +0100
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +2 -1
-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+Subject: [PATCH 2/2] wiringPi/wiringSerial: fix compile for missing baud
+ defines
Quoted 10 lines
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch index e1587ad..4ac8d1e 100644 · line 46
Quoted 8 lines
For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h containing:
package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch +1 -2
@@ -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.
Quoted 17 lines
Quoted 17 lines
package/wiringpi/wiringpi.hash +1 -1
index f4832e5fa8..62e67a6d6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
+sha256 c21c1ff87206a2ce1e4a4d515ac36015735d114205d455afefff8a84fdc54710 wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a.tar.gz
package/wiringpi/wiringpi.mk +0 -0
index f2e9e246d9..11abd62b0b 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
Quoted 3 lines
package/wiringpi/wiringpi.mk line 7
Quoted 1 line
package/wiringpi/wiringpi.mk +0 -0
 # 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
Quoted 5 lines
Quoted 5 lines
package/wiringpi/wiringpi.mk +1 -1
-WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
+WIRINGPI_VERSION = 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
WIRINGPI_SITE = git://git.drogon.net/wiringPi <git://git.drogon.net/wiringPi>
Quoted 7 lines
Quoted 1 line
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 at gmx.net <mailto:[email protected]>>
on the next patch iteration?
Guess, that it should be in a new message, right?
Quoted 3 lines
Regards,
Peter
Regards,
Atanas
Signature · 3 lines
    http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
  - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Carlos Santos

2018-06-22 11:39 UTC #8 lore raw

PATCH 1/1 wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a

In reply to Baruch Siach

Quoted 17 lines

From: "Baruch Siach" <[email protected]>
To: "Atanas Palavrov" <[email protected]>
Cc: "Peter Seiderer" <[email protected]>, "buildroot" <[email protected]>
Sent: Friday, June 22, 2018 8:20:49 AM
Subject: Re: [Buildroot] [PATCH 1/1] wiringpi: bump version to 8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
Hi Atanas,
Quoted 5 lines · Atanas Palavrov
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.

Quoted 8 lines

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.

Signature · 3 lines

Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer