igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122

PATCH New Matt Weber 3 participants 4 messages May 19, 2016 – Jun 9, 2016

lore

Share & tools

lore

Matt Weber

author

2016-05-19 14:38 UTC #0 lore raw

PATCH v4 1/1 igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122

Adds uclinux support.

Fixes the following musl use standard unsigned integer types autobuilder failures.
http://autobuild.buildroot.net/results/c6a/c6a6eec34cffb2c7876595b36fb8a01f475583f9/
http://autobuild.buildroot.net/results/943/9432748bf7b1e24db9fcb0a8cce6942fcdf6be5b/
http://autobuild.buildroot.net/results/083/083c61f43c2f1f0dec69d44583b447a0520933b7/

Signed-off-by Matthew Weber <[email protected]>

--
v3 -> v4
- Squashed bump and uclinux removal patches (Suggested by Baruch/Thomas)
- Removes uclinux 0001- patch as the work was upstreamed
- Removed previous hash value from hash file (Suggested by Thomas)

v2-> v3
- New upstream contains required changes, bumping version

v1 -> v2
(Suggested by Thomas)
- Updated patch comment to correctly represent the origin and latest issue tracking
- Updated title to reflect patch purpose

---
 package/igmpproxy/0001-uclinux.patch | 16 ----------------
 package/igmpproxy/igmpproxy.hash     |  2 +-
 package/igmpproxy/igmpproxy.mk       |  5 ++---
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 package/igmpproxy/0001-uclinux.patch

package/igmpproxy/0001-uclinux.patch deleted +0 ~~-16~~

deleted file mode 100644
index 7fa4a23..0000000
@@ -1,16 +0,0 @@
-configure.ac: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura igmpproxy-0.1.orig/configure.ac igmpproxy-0.1/configure.ac
---- igmpproxy-0.1.orig/configure.ac	2014-03-12 18:43:02.369323771 -0300
-+++ igmpproxy-0.1/configure.ac	2014-03-12 18:43:22.129979179 -0300
-@@ -7,7 +7,7 @@
- 
- AC_CANONICAL_HOST
- case $host_os in
--	linux*) os=linux;;
-+	linux*|uclinux*) os=linux;;
- 	freebsd*) os=freebsd;;
- 	netbsd*) os=netbsd;;
- 	openbsd*) os=openbsd;;

package/igmpproxy/igmpproxy.hash +1 -1

index f7d3b1e..98dc242 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae  igmpproxy-0.1.tar.gz
+sha256  2be2171cf273678810283937f7752dc9b8402456d0a03ee55f06ca52fadf075f  igmpproxy-a731683d1a65956fa05024b0597b105fe6a3a122.tar.gz

package/igmpproxy/igmpproxy.mk +2 -3

index cdf3774..9816872 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-IGMPPROXY_VERSION = 0.1
-IGMPPROXY_SITE = http://downloads.sourceforge.net/project/igmpproxy/igmpproxy/$(IGMPPROXY_VERSION)
-# igmpproxy-01-uclinux.patch
+IGMPPROXY_VERSION = a731683d1a65956fa05024b0597b105fe6a3a122
+IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION))
 IGMPPROXY_AUTORECONF = YES
 IGMPPROXY_LICENSE = GPLv2+
 IGMPPROXY_LICENSE_FILES = COPYING

Signature · 1 line

1.9.1

Jörg Krause

2016-05-19 19:13 UTC #1 lore raw

PATCH v4 1/1 igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122

Quoted 87 lines · Matt Weber

Adds uclinux support.
Fixes the following musl use standard unsigned integer types autobuilder failures.
http://autobuild.buildroot.net/results/c6a/c6a6eec34cffb2c7876595b36f
b8a01f475583f9/
http://autobuild.buildroot.net/results/943/9432748bf7b1e24db9fcb0a8cc
e6942fcdf6be5b/
http://autobuild.buildroot.net/results/083/083c61f43c2f1f0dec69d44583
b447a0520933b7/
Signed-off-by Matthew Weber <[email protected]>
--
v3 -> v4
?- Squashed bump and uclinux removal patches (Suggested by Baruch/Thomas)
???- Removes uclinux 0001- patch as the work was upstreamed ?- Removed previous hash value from hash file (Suggested by Thomas)
v2-> v3
?- New upstream contains required changes, bumping version
v1 -> v2
(Suggested by Thomas)
?- Updated patch comment to correctly represent the origin ???and latest issue tracking
?- Updated title to reflect patch purpose
---
?package/igmpproxy/0001-uclinux.patch | 16 ----------------
?package/igmpproxy/igmpproxy.hash?????|??2 +-
?package/igmpproxy/igmpproxy.mk???????|??5 ++---
?3 files changed, 3 insertions(+), 20 deletions(-) ?delete mode 100644 package/igmpproxy/0001-uclinux.patch
package/igmpproxy/0001-uclinux.patch deleted +0 -5
deleted file mode 100644
index 7fa4a23..0000000
@@ -1,16 +0,0 @@
-configure.ac: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura igmpproxy-0.1.orig/configure.ac igmpproxy-
0.1/configure.ac
---- igmpproxy-0.1.orig/configure.ac 2014-03-12
18:43:02.369323771 -0300
-+++ igmpproxy-0.1/configure.ac 2014-03-12 18:43:22.129979179
-0300
-@@ -7,7 +7,7 @@
-?
- AC_CANONICAL_HOST
- case $host_os in
-- linux*) os=linux;;
-+ linux*|uclinux*) os=linux;;
-? freebsd*) os=freebsd;;
-? netbsd*) os=netbsd;;
-? openbsd*) os=openbsd;;
package/igmpproxy/igmpproxy.hash +0 -0
index f7d3b1e..98dc242 100644
@@ -1,2 +1,2 @@
?# Locally computed:
-sha256??ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7e e6ae??igmpproxy-0.1.tar.gz +sha256??2be2171cf273678810283937f7752dc9b8402456d0a03ee55f06ca52fadf 075f??igmpproxy-a731683d1a65956fa05024b0597b105fe6a3a122.tar.gz
package/igmpproxy/igmpproxy.mk +0 -0
index cdf3774..9816872 100644
@@ -4,9 +4,8 @@
?# ?####################################################################
############
?
package/igmpproxy/igmpproxy.mk +0 -2
-IGMPPROXY_VERSION = 0.1
-IGMPPROXY_SITE = http://downloads.sourceforge.net/project/igmpproxy/
igmpproxy/$(IGMPPROXY_VERSION)
package/igmpproxy/igmpproxy.mk +2 -1
-# igmpproxy-01-uclinux.patch
+IGMPPROXY_VERSION = a731683d1a65956fa05024b0597b105fe6a3a122
+IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION))

Quoted 3 lines

?IGMPPROXY_AUTORECONF = YES
?IGMPPROXY_LICENSE = GPLv2+
?IGMPPROXY_LICENSE_FILES = COPYING

I personally prefer to stick to a release tag as a version and add the necessary patches than use some hast tag as version.

Maybe we could change this into something like this:

IGMPPROXY_VERSION = 0.1
IGMPPROXY_SITE =?$(call github,pali,igmpproxy,$(IGMPPROXY_VERSION))

# Use standard unsigned integer types for fixing musl build IGMPPROXY_PATCH =?https://github.com/pali/igmpproxy/commit/33a69727c936 e81aff312d1f92ab5681a77b095d.patch
# Fix ucLinux support
IGMPPROXY_PATCH +=?https://github.com/pali/igmpproxy/commit/0e3af272c87 d77cc81740436fcf6bc69e0c3c215.patch

Best regards,
J?rg Krause

Thomas Petazzoni

2016-06-09 22:11 UTC #2 lore raw

PATCH v4 1/1 igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122

Hello,

Quoted 6 lines · J?rg Krause

# Use standard unsigned integer types for fixing musl build IGMPPROXY_PATCH =?https://github.com/pali/igmpproxy/commit/33a69727c936 e81aff312d1f92ab5681a77b095d.patch
# Fix ucLinux support
IGMPPROXY_PATCH +=?https://github.com/pali/igmpproxy/commit/0e3af272c87 d77cc81740436fcf6bc69e0c3c215.patch

Unfortunately, this doesn't work, because 33a69727c936e81aff312d1f92ab5681a77b095d.patch fails to apply, most likely because it depends on other commits:

Quoted 1 line

Quoted 1 line
Quoted 1 line
igmpproxy 0.1 Patching

support/scripts/apply-patches.sh /home/thomas/projets/buildroot/output/build/igmpproxy-0.1 /home/thomas/dl 33a69727c936e81aff312d1f92ab5681a77b095d.patch

Applying 33a69727c936e81aff312d1f92ab5681a77b095d.patch using patch:
patching file src/igmp.c
Hunk #1 FAILED at 79.
Hunk #2 FAILED at 230.
2 out of 2 hunks FAILED -- saving rejects to file src/igmp.c.rej
patching file src/kern.c
patching file src/lib.c
patching file src/os-dragonfly.h
patching file src/os-freebsd.h
patching file src/os-linux.h
patching file src/os-netbsd.h
patching file src/os-openbsd.h
Patch failed! Please fix 33a69727c936e81aff312d1f92ab5681a77b095d.patch!
package/pkg-generic.mk:159: recipe for target '/home/thomas/projets/buildroot/output/build/igmpproxy-0.1/.stamp_patched' failed

We could also integrate those commits in IGMPPROXY_PATCH, or we could adjust the patch and keep it in package/igmpproxy/. All in all, I think Matt's original solution is good enough, so I applied his patch.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2016-06-09 22:11 UTC #3 lore raw

PATCH v4 1/1 igmpproxy: bump version to a731683d1a65956fa05024b0597b105fe6a3a122

In reply to Matt Weber

Hello,

Quoted 23 lines · Matt Weber

Adds uclinux support.
Fixes the following musl use standard unsigned integer types autobuilder failures.
http://autobuild.buildroot.net/results/c6a/c6a6eec34cffb2c7876595b36fb8a01f475583f9/
http://autobuild.buildroot.net/results/943/9432748bf7b1e24db9fcb0a8cce6942fcdf6be5b/
http://autobuild.buildroot.net/results/083/083c61f43c2f1f0dec69d44583b447a0520933b7/
Signed-off-by Matthew Weber <[email protected]>
--
v3 -> v4
- Squashed bump and uclinux removal patches (Suggested by Baruch/Thomas)
- Removes uclinux 0001- patch as the work was upstreamed
- Removed previous hash value from hash file (Suggested by Thomas)
v2-> v3
- New upstream contains required changes, bumping version
v1 -> v2
(Suggested by Thomas)
- Updated patch comment to correctly represent the origin and latest issue tracking
- Updated title to reflect patch purpose

Quoted 6 lines

---
 package/igmpproxy/0001-uclinux.patch | 16 ----------------
 package/igmpproxy/igmpproxy.hash     |  2 +-
 package/igmpproxy/igmpproxy.mk       |  5 ++---
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 package/igmpproxy/0001-uclinux.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com