Skip to contentSkip to conversation

libnl: add patch to fix bmon build breakage

PATCH New Gustavo Zacarias 3 participants 5 messages Apr 17, 2015 – Apr 18, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 libnl: add patch to fix bmon build breakage

Revert a 3.2.26 patch that breaks the bmon build (among possibly others). Fixes:
http://autobuild.buildroot.net/results/296/296bcaf4fd1fadcab71881d6d00a8763bfa91a41/

Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...remove-unnecessary-include-of-private-lin.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/libnl/0001-Revert-route-remove-unnecessary-include-of-private-lin.patch
package/libnl/0001-Revert-route-remove-unnecessary-include-of-private-lin.patch new file +44 -0
new file mode 100644
index 0000000..3520899
@@ -0,0 +1,44 @@
+From 61310ce3f2b6c5c21be8c788848f083e4c58d138 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Fri, 17 Apr 2015 07:20:48 -0300
+Subject: [PATCH] Revert "route: remove unnecessary include of private
+ linux/if.h"
+
+It breaks rtnl_link_get_flags() checks against IFF_* defines that aren't
+defined.
+
+This reverts commit 50a76998ac36ace3716d3c979b352fac73cfc80a.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+ include/netlink/route/link.h | 1 +
+ src/nl-link-set.c            | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/netlink/route/link.h b/include/netlink/route/link.h
+index 8f74f42..a7aa88b 100644
+--- a/include/netlink/route/link.h
++++ b/include/netlink/route/link.h
+@@ -15,6 +15,7 @@
+ #include <netlink/netlink.h>
+ #include <netlink/cache.h>
+ #include <netlink/addr.h>
++#include <linux/if.h>
+ #include <sys/types.h>
+ 
+ #ifdef __cplusplus
+diff --git a/src/nl-link-set.c b/src/nl-link-set.c
+index 6a6bac8..bbb60f9 100644
+--- a/src/nl-link-set.c
++++ b/src/nl-link-set.c
+@@ -9,7 +9,6 @@
+  * Copyright (c) 2003-2010 Thomas Graf <[email protected]>
+  */
+ 
+-#include <linux/if.h>
+ #include <netlink/cli/utils.h>
+ #include <netlink/cli/link.h>
+ 
+-- 
+2.0.5
+
Signature · 1 line
2.0.5
author
#1 lore raw

PATCH 2/2 bmon: drop stray AUTORECONF from last bump

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/bmon/bmon.mk | 2 --
 1 file changed, 2 deletions(-)
package/bmon/bmon.mk +0 -2
index b1dc399..e430bf6 100644
@@ -9,8 +9,6 @@ BMON_SITE = https://github.com/tgraf/bmon/releases/download/v$(BMON_VERSION)
 BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses
 BMON_LICENSE = BSD-2c, MIT
 BMON_LICENSE_FILES = LICENSE.BSD LICENSE.MIT
-# For 0001-build-uclinux-is-also-linux.patch
-BMON_AUTORECONF = YES
 
 # link dynamically unless explicitly requested otherwise
 ifeq ($(BR2_STATIC_LIBS),)
Signature · 1 line
2.0.5
#2 lore raw

PATCH 2/2 bmon: drop stray AUTORECONF from last bump

Gustavo, All,

On 2015-04-17 07:26 -0300, Gustavo Zacarias spake thusly:

Quoted 1 line
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 package/bmon/bmon.mk | 2 --
 1 file changed, 2 deletions(-)
package/bmon/bmon.mk +0 -2
index b1dc399..e430bf6 100644
@@ -9,8 +9,6 @@ BMON_SITE = https://github.com/tgraf/bmon/releases/download/v$(BMON_VERSION)
 BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses
 BMON_LICENSE = BSD-2c, MIT
 BMON_LICENSE_FILES = LICENSE.BSD LICENSE.MIT
-# For 0001-build-uclinux-is-also-linux.patch
-BMON_AUTORECONF = YES
 
 # link dynamically unless explicitly requested otherwise
 ifeq ($(BR2_STATIC_LIBS),)
Signature · 6 lines
2.0.5

_______________________________________________
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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/2 libnl: add patch to fix bmon build breakage

In reply to Gustavo Zacarias

gustavo, All,

On 2015-04-17 07:26 -0300, Gustavo Zacarias spake thusly:

Quoted 3 lines

Revert a 3.2.26 patch that breaks the bmon build (among possibly others). Fixes:
http://autobuild.buildroot.net/results/296/296bcaf4fd1fadcab71881d6d00a8763bfa91a41/

I wonder if that should not be bmon that should be patched to include that header wherever necessary, instead of reverting a commit from libnl?

Regards,
Yann E. MORIN.

Quoted 63 lines
Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...remove-unnecessary-include-of-private-lin.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/libnl/0001-Revert-route-remove-unnecessary-include-of-private-lin.patch
package/libnl/0001-Revert-route-remove-unnecessary-include-of-private-lin.patch new file +44 -0
new file mode 100644
index 0000000..3520899
@@ -0,0 +1,44 @@
+From 61310ce3f2b6c5c21be8c788848f083e4c58d138 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Fri, 17 Apr 2015 07:20:48 -0300
+Subject: [PATCH] Revert "route: remove unnecessary include of private
+ linux/if.h"
+
+It breaks rtnl_link_get_flags() checks against IFF_* defines that aren't
+defined.
+
+This reverts commit 50a76998ac36ace3716d3c979b352fac73cfc80a.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+ include/netlink/route/link.h | 1 +
+ src/nl-link-set.c            | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/netlink/route/link.h b/include/netlink/route/link.h
+index 8f74f42..a7aa88b 100644
+--- a/include/netlink/route/link.h
++++ b/include/netlink/route/link.h
+@@ -15,6 +15,7 @@
+ #include <netlink/netlink.h>
+ #include <netlink/cache.h>
+ #include <netlink/addr.h>
++#include <linux/if.h>
+ #include <sys/types.h>
+ 
+ #ifdef __cplusplus
+diff --git a/src/nl-link-set.c b/src/nl-link-set.c
+index 6a6bac8..bbb60f9 100644
+--- a/src/nl-link-set.c
++++ b/src/nl-link-set.c
+@@ -9,7 +9,6 @@
+  * Copyright (c) 2003-2010 Thomas Graf <[email protected]>
+  */
+ 
+-#include <linux/if.h>
+ #include <netlink/cli/utils.h>
+ #include <netlink/cli/link.h>
+ 
+-- 
+2.0.5
+
Signature · 6 lines
2.0.5

_______________________________________________
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.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/2 libnl: add patch to fix bmon build breakage

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias

Revert a 3.2.26 patch that breaks the bmon build (among possibly others). Fixes:
http://autobuild.buildroot.net/results/296/296bcaf4fd1fadcab71881d6d00a8763bfa91a41/

Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...remove-unnecessary-include-of-private-lin.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/libnl/0001-Revert-route-remove-unnecessary-include-of-private-lin.patch

Both applied, thanks.

However, for the libnl patch, can it be fixed upstream? Or should it really be fixed in bmon?

Thanks,

Thomas

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