Skip to contentSkip to conversation

iprutils: rename patches to follow the new name convention

PATCH Superseded Romain Naour 2 participants 5 messages Dec 11, 2014 – Dec 12, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

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

Signed-off-by Romain Naour <[email protected]>
---
 ...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 2/3 iprutils: Don't include host headers

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

Signed-off-by Romain Naour <[email protected]>
---
 package/iprutils/iprutils.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/iprutils/iprutils.mk +5 -2
index 53516b6..0721fbf 100644
@@ -12,11 +12,14 @@ IPRUTILS_LICENSE = Common Public License Version 1.0
 IPRUTILS_LICENSE_FILES = LICENSE
 
 define IPRUTILS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		INCLUDEDIR="-I. -I$(STAGING_DIR)/usr/include/ncurses" \
+		-C $(@D) all
 endef
 
 define IPRUTILS_INSTALL_TARGET_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) INSTALL_MOD_PATH=$(TARGET_DIR) -C $(@D) install
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) INSTALL_MOD_PATH=$(TARGET_DIR) \
+		-C $(@D) install
 endef
 
 $(eval $(generic-package))
Signature · 1 line
1.9.3
#2 lore raw

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

Dear Romain Naour,

Quoted 13 lines · Romain Naour

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

Signed-off-by Romain Naour <[email protected]>
---
 package/iprutils/iprutils.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/iprutils/iprutils.mk +0 -0
index 53516b6..0721fbf 100644

package/iprutils/iprutils.mk IPRUTILS_LICENSE = Common Public License Version 1.0 · line 17

Quoted 7 lines
package/iprutils/iprutils.mk +3 -1
@@ -12,11 +12,14 @@ IPRUTILS_LICENSE = Common Public License Version 1.0
 IPRUTILS_LICENSE_FILES = LICENSE
 
 define IPRUTILS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		INCLUDEDIR="-I. -I$(STAGING_DIR)/usr/include/ncurses" \
+		-C $(@D) all

Thanks. Shouldn't we instead patch the Makefile itself, and submit the change upstream?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

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

Hi Thomas,

Le 12/12/2014 09:58, Thomas Petazzoni a ?crit :

Quoted 18 lines

Dear Romain Naour,

Quoted 15 lines · Romain Naour

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

Signed-off-by Romain Naour <[email protected]>
---
 package/iprutils/iprutils.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/iprutils/iprutils.mk +0 -0
index 53516b6..0721fbf 100644
@@ -12,11 +12,14 @@ IPRUTILS_LICENSE = Common Public License Version 1.0
 IPRUTILS_LICENSE_FILES = LICENSE
Quoted 9 lines

package/iprutils/iprutils.mk IPRUTILS_LICENSE = Common Public License Version 1.0 · line 17

Quoted 5 lines
package/iprutils/iprutils.mk +3 -1
 define IPRUTILS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		INCLUDEDIR="-I. -I$(STAGING_DIR)/usr/include/ncurses" \
+		-C $(@D) all

Thanks. Shouldn't we instead patch the Makefile itself, and submit the change upstream?

It seems that Viencent's patches are not yet commited in iprutils. So, I'll push all patches to my sourceforge account and post a message in the forum.

Best regards,
Romain Naour

author
#4 lore raw

PATCH 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]>
---
 ...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 0721fbf..0f9ec2a 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