Skip to contentSkip to conversation

iprutils: rename patches to follow the new name convention

PATCH New Romain Naour 3 participants 7 messages Dec 12, 2014 – Dec 16, 2014

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH v2 1/3 iprutils: rename patches to follow the new name convention

Signed-off-by Romain Naour <[email protected]>

---
v2: no change

 ...iprutils-0001-Don-t-use-gettext.patch => 0001-Don-t-use-gettext.patch} | 0
 ...nviro.patch => 0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch} | 0
 ...ies-i.patch => 0003-Fix-static-build-by-passing-the-libraries-i.patch} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename package/iprutils/{iprutils-0001-Don-t-use-gettext.patch => 0001-Don-t-use-gettext.patch} (100%)
 rename package/iprutils/{iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch => 0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch} (100%)
 rename package/iprutils/{iprutils-0003-Fix-static-build-by-passing-the-libraries-i.patch => 0003-Fix-static-build-by-passing-the-libraries-i.patch} (100%)
package/iprutils/0001-Don-t-use-gettext.patch renamed from package/iprutils/iprutils-0001-Don-t-use-gettext.patch +0 -0
similarity index 100%
rename from package/iprutils/iprutils-0001-Don-t-use-gettext.patch
rename to package/iprutils/0001-Don-t-use-gettext.patch
package/iprutils/0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch renamed from package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch +0 -0
similarity index 100%
rename from package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
rename to package/iprutils/0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
package/iprutils/0003-Fix-static-build-by-passing-the-libraries-i.patch renamed from package/iprutils/iprutils-0003-Fix-static-build-by-passing-the-libraries-i.patch +0 -0
similarity index 100%
rename from package/iprutils/iprutils-0003-Fix-static-build-by-passing-the-libraries-i.patch
rename to package/iprutils/0003-Fix-static-build-by-passing-the-libraries-i.patch
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH v2 2/3 iprutils: Don't include host headers

Use ncurses5-config to find ncurses headers.

Fixes:
ERROR: unsafe header/library path used in cross-compilation: '/usr/include/ncurses'

Signed-off-by Romain Naour <[email protected]>

---
v2: use ncurses5-config to find ncurses headers
instead of overwriting INCLUDEDIR

 ...n-t-include-host-headers-when-cross-compi.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch
package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch new file +26 -0
new file mode 100644
index 0000000..bca5ec0
@@ -0,0 +1,26 @@
+From 0c42685f45b9f01944a64e36cc6aee8192b622c2 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 13 Dec 2014 00:14:19 +0100
+Subject: [PATCH 1/1] iprutils: Don't include host headers when cross-compiling
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 18cea94..a4e702a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ # materials are made available under the terms of the
+ # Common Public License v1.0 which accompanies this distribution.
+ 
+-INCLUDEDIR = -I. -I/usr/include/ncurses
++INCLUDEDIR = -I. `ncurses5-config --cflags`
+ CC = gcc
+ 
+ include version.mk
+-- 
+1.9.3
+
Signature · 1 line
1.9.3
#2 lore raw

PATCH v2 2/3 iprutils: Don't include host headers

Quoted 31 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

Use ncurses5-config to find ncurses headers.
Fixes:
ERROR: unsafe header/library path used in cross-compilation: '/usr/include/ncurses'

Signed-off-by Romain Naour <[email protected]>

---
v2: use ncurses5-config to find ncurses headers
instead of overwriting INCLUDEDIR

 ...n-t-include-host-headers-when-cross-compi.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch
package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch new file +10 -0
new file mode 100644
index 0000000..bca5ec0
@@ -0,0 +1,26 @@
+From 0c42685f45b9f01944a64e36cc6aee8192b622c2 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 13 Dec 2014 00:14:19 +0100
+Subject: [PATCH 1/1] iprutils: Don't include host headers when cross-compiling
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+

package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch line 20

Quoted 10 lines
package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch new file +10 -0
+diff --git a/Makefile b/Makefile
+index 18cea94..a4e702a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ # materials are made available under the terms of the
+ # Common Public License v1.0 which accompanies this distribution.
+ 
+-INCLUDEDIR = -I. -I/usr/include/ncurses
++INCLUDEDIR = -I. `ncurses5-config --cflags`

Thanks, but this doesn't work in the context of Buildroot. We want to use $(STAGING_DIR)/usr/bin/ncurses5-config, but that isn't in the PATH (and shouldn't be as it may contain binaries for the target).

I know Thomas wanted you to do this as an upstreamable patch, but it would require either introducing a way of overriding what ncurses-config script to run or the output of the command.

In the mean time I've checked in something like your v1, E.G. simply override INCLUDEDIR on the make cmdline.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v2 2/3 iprutils: Don't include host headers

Peter, Romain, All,

On 2014-12-14 20:42 +0100, Peter Korsgaard spake thusly:

Quoted 46 lines
Quoted 31 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

Use ncurses5-config to find ncurses headers.
Fixes:
ERROR: unsafe header/library path used in cross-compilation: '/usr/include/ncurses'

Signed-off-by Romain Naour <[email protected]>

---
v2: use ncurses5-config to find ncurses headers
instead of overwriting INCLUDEDIR

 ...n-t-include-host-headers-when-cross-compi.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch
package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch new file +10 -0
new file mode 100644
index 0000000..bca5ec0
@@ -0,0 +1,26 @@
+From 0c42685f45b9f01944a64e36cc6aee8192b622c2 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sat, 13 Dec 2014 00:14:19 +0100
+Subject: [PATCH 1/1] iprutils: Don't include host headers when cross-compiling
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+

package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch line 20

Quoted 10 lines
package/iprutils/0004-Don-t-include-host-headers-when-cross-compi.patch new file +10 -0
+diff --git a/Makefile b/Makefile
+index 18cea94..a4e702a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ # materials are made available under the terms of the
+ # Common Public License v1.0 which accompanies this distribution.
+ 
+-INCLUDEDIR = -I. -I/usr/include/ncurses
++INCLUDEDIR = -I. `ncurses5-config --cflags`

Thanks, but this doesn't work in the context of Buildroot. We want to use $(STAGING_DIR)/usr/bin/ncurses5-config, but that isn't in the PATH (and shouldn't be as it may contain binaries for the target).

Quoted 3 lines

I know Thomas wanted you to do this as an upstreamable patch, but it would require either introducing a way of overriding what ncurses-config script to run or the output of the command.

What about:

    INCLUDEDIR = -I. `${NCURSES_CONFIG:-ncurses5-config} --cflags`

Regards,
Yann E. MORIN.

Quoted 9 lines

In the mean time I've checked in something like your v1, E.G. simply override INCLUDEDIR on the make cmdline.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#4 lore raw

PATCH v2 3/3 iprutils: bump to version 2.4.5

In reply to Romain Naour

Rebase patch 0003 on top of 2.4.5 release.

Signed-off-by Romain Naour <[email protected]>

---
v2: no change

 ...x-static-build-by-passing-the-libraries-i.patch | 27 +++++++++++++++++-----
 package/iprutils/iprutils.mk                       |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)
package/iprutils/0003-Fix-static-build-by-passing-the-libraries-i.patch +21 -6
index e176ab6..5ea7d1b 100644
@@ -1,4 +1,8 @@
-iprutils: Fix static build by passing the libraries in the right order
+From 1f62dd91314b0ce6378aeafb2a03566002036326 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <[email protected]>
+Date: Thu, 11 Dec 2014 23:36:55 +0100
+Subject: [PATCH 3/3] iprutils: Fix static build by passing the libraries in
+ the right order
 
 This mistake was causing failures like this one:
 

@@ -7,14 +11,25 @@ m_post.c:(.text+0x60): undefined reference to `wattr_on'
 http://autobuild.buildroot.net/results/500/5004e7b230635e0605acdd17d2b7d2d01fc5075c/build-end.log
 
 Signed-off-by: Vicente Olivert Riera <[email protected]>
---- iprutils-2.4.2/Makefile.orig	2014-09-17 18:14:52.435367860 +0100
-+++ iprutils-2.4.2/Makefile	2014-09-17 18:15:09.367652526 +0100
-@@ -16,7 +16,7 @@ TAR = cd .. && tar -zcpf iprutils-$(UTIL
+[Romain: rebase on top of 2.4.5]
+Signed-off-by: Romain Naour <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 66c4942..18cea94 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@ TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude .git --exclude
  all: iprconfig iprupdate iprdump iprinit iprdbg docs 
  
  iprconfig: iprconfig.c iprlib.o iprconfig.h
--	$(CC) $(CFLAGS) $(INCLUDEDIR) -o iprconfig iprconfig.c iprlib.o $(LDFLAGS) -lform -lpanel -lncurses -lmenu
-+	$(CC) $(CFLAGS) $(INCLUDEDIR) -o iprconfig iprconfig.c iprlib.o $(LDFLAGS) -lform -lpanel -lmenu -lncurses
+-	$(CC) $(CFLAGS) $(INCLUDEDIR) -o iprconfig iprconfig.c iprlib.o $(LDFLAGS) -lform -lpanel -lncurses -lmenu -lm
++	$(CC) $(CFLAGS) $(INCLUDEDIR) -o iprconfig iprconfig.c iprlib.o $(LDFLAGS) -lform -lpanel -lmenu -lncurses -lm
  
  iprupdate: iprupdate.c iprlib.o
  	$(CC) $(CFLAGS) $(INCLUDEDIR) -o iprupdate iprlib.o iprupdate.c $(LDFLAGS)
+-- 
+1.9.3
+
package/iprutils/iprutils.mk +1 -1
index 53516b6..0de72a2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPRUTILS_VERSION = 2.4.2
+IPRUTILS_VERSION = 2.4.5
 IPRUTILS_SITE = http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/$(IPRUTILS_VERSION)
 IPRUTILS_SOURCE = iprutils-$(IPRUTILS_VERSION)-src.tgz
 IPRUTILS_DEPENDENCIES = ncurses libsysfs pciutils
Signature · 1 line
1.9.3
#5 lore raw

PATCH v2 3/3 iprutils: bump to version 2.4.5

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

Rebase patch 0003 on top of 2.4.5 release.

Signed-off-by Romain Naour <[email protected]>

Committed, thanks.

Given the random download issues we're having with sourceforge lately, it would have been good to add a .hash file.

Signature · 1 line
Bye, Peter Korsgaard