Skip to contentSkip to conversation

libnl update and friends

PATCH In review Saul Wold 1 participant 5 messages Dec 4, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

v2 cover libnl update and friends

Mihai sent these patches a couple weeks ago, and they got stuck someplace, so I am resending them here.

Sau!

v2: Just the patches please!

Mihai Prica (3):
libnl: upgrade to 3.2.14
wpa-supplicant: configured to work with libnl 3.2.14
libpcap: PR bump because of PU for libnl

 meta/recipes-connectivity/libpcap/libpcap.inc      |  2 +-
 .../wpa-supplicant/wpa-supplicant-1.0.inc          |  1 +
 .../wpa-supplicant-1.0/defconfig-gnutls            |  2 +-
 .../wpa-supplicant/wpa-supplicant_1.0.bb           |  2 +-
 .../libnl/{libnl-2.0 => libnl}/fix-pc-file.patch   | 14 ++++----
 .../fix-pktloc_syntax_h-race.patch                 | 27 ++++++++------
 meta/recipes-support/libnl/libnl_2.0.bb            | 27 --------------
 meta/recipes-support/libnl/libnl_3.2.14.bb         | 41 ++++++++++++++++++++++
 8 files changed, 69 insertions(+), 47 deletions(-)
 rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pc-file.patch (52%)
 rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pktloc_syntax_h-race.patch (57%)
 delete mode 100644 meta/recipes-support/libnl/libnl_2.0.bb
 create mode 100644 meta/recipes-support/libnl/libnl_3.2.14.bb
Signature · 1 line
1.8.0
author
#1 lore raw

PATCH v2 1/3 libnl: upgrade to 3.2.14

From: Mihai Prica <[email protected]>

* Based on the 3.2.9 recipe from meta-oe
* Modified the patches to work with the new name of the library file (libnl-3.so)

---
 .../libnl/{libnl-2.0 => libnl}/fix-pc-file.patch   | 14 ++++----
 .../fix-pktloc_syntax_h-race.patch                 | 27 ++++++++------
 meta/recipes-support/libnl/libnl_2.0.bb            | 27 --------------
 meta/recipes-support/libnl/libnl_3.2.14.bb         | 41 ++++++++++++++++++++++
 4 files changed, 65 insertions(+), 44 deletions(-)
 rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pc-file.patch (52%)
 rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pktloc_syntax_h-race.patch (57%)
 delete mode 100644 meta/recipes-support/libnl/libnl_2.0.bb
 create mode 100644 meta/recipes-support/libnl/libnl_3.2.14.bb
meta/recipes-support/libnl/libnl/fix-pc-file.patch renamed from meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch +7 -7
similarity index 52%
rename from meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
rename to meta/recipes-support/libnl/libnl/fix-pc-file.patch
index 85afe8f..fe8b833 100644
@@ -4,14 +4,14 @@ Some packages are asking only for libnl-2.0, but expects to get also
 libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
 
 Signed-off-by: Martin Jansa <[email protected]>
-Index: libnl-2.0/libnl-2.0.pc.in
+Index: libnl-3.2.14/libnl-3.0.pc.in
 ===================================================================
---- libnl-2.0.orig/libnl-2.0.pc.in
-+++ libnl-2.0/libnl-2.0.pc.in
-@@ -6,5 +6,5 @@
+--- libnl-3.2.14.orig/libnl-3.0.pc.in
++++ libnl-3.2.14/libnl-3.0.pc.in
+@@ -6,5 +6,5 @@ includedir=@includedir@
  Name: libnl
  Description: Convenience library for netlink sockets
  Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lnl
-+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route
- Cflags: -I${includedir}
+-Libs: -L${libdir} -lnl-@MAJ_VERSION@
++Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
+ Cflags: -I${includedir}/libnl@MAJ_VERSION@
meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch renamed from meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch +17 -10
similarity index 57%
rename from meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
rename to meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
index ea32e82..332ec01 100644
@@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
 
 Signed-off-by: Martin Jansa <[email protected]>
 
-Index: libnl-2.0/lib/Makefile.am
+Index: libnl-3.2.14/lib/Makefile.am
 ===================================================================
---- libnl-2.0.orig/lib/Makefile.am
-+++ libnl-2.0/lib/Makefile.am
-@@ -27,11 +27,16 @@ CLEANFILES = \
- 	route/pktloc_grammar.c route/pktloc_grammar.h \
- 	route/pktloc_syntax.c route/pktloc_syntax.h
+--- libnl-3.2.14.orig/lib/Makefile.am
++++ libnl-3.2.14/lib/Makefile.am
+@@ -39,9 +39,12 @@ CLEANFILES = \
  
-+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
-+
  # Hack to avoid using ylwrap. It does not function correctly in combination
  # with --header-file=
 +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
 +route/pktloc_grammar.h: route/pktloc_grammar.c
  route/pktloc_grammar.c: route/pktloc_grammar.l
- 	$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
+ 	$(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
  
 +route/pktloc_syntax.h: route/pktloc_syntax.c
  route/pktloc_syntax.c: route/pktloc_syntax.y
- 	$(YACC) -d $(YFLAGS) -o $@ $^
+ 	$(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
  
+@@ -89,7 +92,9 @@ BUILT_SOURCES = \
+ 	route/cls/ematch_grammar.c \
+ 	route/cls/ematch_syntax.c \
+ 	route/pktloc_grammar.c \
+-	route/pktloc_syntax.c
++   route/pktloc_syntax.c \
++   route/pktloc_syntax.h \
++   route/pktloc_grammar.h
+ 
+ EXTRA_DIST = \
+ 	route/pktloc_grammar.l \
meta/recipes-support/libnl/libnl_2.0.bb deleted +0 -27
deleted file mode 100644
index c96e7db..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-SECTION = "libs/network"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
-
-DEPENDS = "flex-native bison-native"
-PE = "1"
-PR = "r6"
-
-SRC_URI = "\
-  http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
-  file://fix-pktloc_syntax_h-race.patch \
-  file://fix-pc-file.patch \
-"
-
-SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
-SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
-FILES_${PN}-route = "${libdir}/libnl-route.so.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
-FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
-FILES_${PN}-cli   = "${libdir}/libnl-cli.so.*"
meta/recipes-support/libnl/libnl_3.2.14.bb new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
1.8.0
author
#3 lore raw

PATCH v2 2/3 wpa-supplicant: configured to work with libnl 3.2.14

In reply to Saul Wold

From: Mihai Prica <[email protected]>

* Updated the configuration file for libnl-3
* Added python include dir path to configuration file

---
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc         | 1 +
 .../wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls                  | 2 +-
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc +1 -0
index 485a2dd..0966051 100644
@@ -25,6 +25,7 @@ FILES_${PN} += "${datadir}/dbus-1/system-services/*"
 CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
+    echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> ${WORKDIR}/defconfig-gnutls
 	install -m 0755 ${WORKDIR}/defconfig-gnutls .config
 }
 
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls +1 -1
index e03338f..e041b4d 100644
@@ -81,7 +81,7 @@ CONFIG_DRIVER_HOSTAP=y
 CONFIG_DRIVER_WEXT=y
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_LIBNL20=y
+CONFIG_LIBNL32=y
 CONFIG_DRIVER_NL80211=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb +1 -1
index 36ee25c..1150075 100644
@@ -1,6 +1,6 @@
 require wpa-supplicant-1.0.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
 SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"
Signature · 1 line
1.8.0
author
#4 lore raw

PATCH v2 3/3 libpcap: PR bump because of PU for libnl

In reply to Saul Wold

From: Mihai Prica <[email protected]>

---
 meta/recipes-connectivity/libpcap/libpcap.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/libpcap/libpcap.inc +1 -1
index 5381ef0..882c62c 100644
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native libnl"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
 PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
 
-INC_PR = "r3"
+INC_PR = "r4"
 
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
 
Signature · 1 line
1.8.0
author
#2 lore raw

Re: [PATCH 1/3 v2] libnl: upgrade to 3.2.14

In reply to Saul Wold
Quoted 103 lines · Saul Wold

From: Mihai Prica <[email protected]>

* Based on the 3.2.9 recipe from meta-oe
* Modified the patches to work with the new name of the library file (libnl-3.so)

---
  .../libnl/{libnl-2.0 => libnl}/fix-pc-file.patch   | 14 ++++----
  .../fix-pktloc_syntax_h-race.patch                 | 27 ++++++++------
  meta/recipes-support/libnl/libnl_2.0.bb            | 27 --------------
  meta/recipes-support/libnl/libnl_3.2.14.bb         | 41 ++++++++++++++++++++++
  4 files changed, 65 insertions(+), 44 deletions(-)

rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pc-file.patch (52%) rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pktloc_syntax_h-race.patch (57%) delete mode 100644 meta/recipes-support/libnl/libnl_2.0.bb
create mode 100644 meta/recipes-support/libnl/libnl_3.2.14.bb

meta/recipes-support/libnl/libnl/fix-pc-file.patch renamed from meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch +7 -7
similarity index 52%
rename from meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
rename to meta/recipes-support/libnl/libnl/fix-pc-file.patch
index 85afe8f..fe8b833 100644
@@ -4,14 +4,14 @@ Some packages are asking only for libnl-2.0, but expects to get also
  libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
 
  Signed-off-by: Martin Jansa <[email protected]>
-Index: libnl-2.0/libnl-2.0.pc.in
+Index: libnl-3.2.14/libnl-3.0.pc.in
  ===================================================================
---- libnl-2.0.orig/libnl-2.0.pc.in
-+++ libnl-2.0/libnl-2.0.pc.in
-@@ -6,5 +6,5 @@
+--- libnl-3.2.14.orig/libnl-3.0.pc.in
++++ libnl-3.2.14/libnl-3.0.pc.in
+@@ -6,5 +6,5 @@ includedir=@includedir@
   Name: libnl
   Description: Convenience library for netlink sockets
   Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lnl
-+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route
- Cflags: -I${includedir}
+-Libs: -L${libdir} -lnl-@MAJ_VERSION@
++Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
+ Cflags: -I${includedir}/libnl@MAJ_VERSION@
meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch renamed from meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch +17 -10
similarity index 57%
rename from meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
rename to meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
index ea32e82..332ec01 100644
@@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
 
  Signed-off-by: Martin Jansa <[email protected]>
 
-Index: libnl-2.0/lib/Makefile.am
+Index: libnl-3.2.14/lib/Makefile.am
  ===================================================================
---- libnl-2.0.orig/lib/Makefile.am
-+++ libnl-2.0/lib/Makefile.am
-@@ -27,11 +27,16 @@ CLEANFILES = \
- 	route/pktloc_grammar.c route/pktloc_grammar.h \
- 	route/pktloc_syntax.c route/pktloc_syntax.h
+--- libnl-3.2.14.orig/lib/Makefile.am
++++ libnl-3.2.14/lib/Makefile.am
+@@ -39,9 +39,12 @@ CLEANFILES = \
 
-+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
-+
   # Hack to avoid using ylwrap. It does not function correctly in combination
   # with --header-file=
  +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
  +route/pktloc_grammar.h: route/pktloc_grammar.c
   route/pktloc_grammar.c: route/pktloc_grammar.l
- 	$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
+ 	$(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
 
  +route/pktloc_syntax.h: route/pktloc_syntax.c
   route/pktloc_syntax.c: route/pktloc_syntax.y
- 	$(YACC) -d $(YFLAGS) -o $@ $^
+ 	$(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
 
+@@ -89,7 +92,9 @@ BUILT_SOURCES = \
+ 	route/cls/ematch_grammar.c \
+ 	route/cls/ematch_syntax.c \
+ 	route/pktloc_grammar.c \
+-	route/pktloc_syntax.c
++   route/pktloc_syntax.c \
++   route/pktloc_syntax.h \
++   route/pktloc_grammar.h
+
+ EXTRA_DIST = \
+ 	route/pktloc_grammar.l \
meta/recipes-support/libnl/libnl_2.0.bb deleted +0 -1
deleted file mode 100644
index c96e7db..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."

meta/recipes-support/libnl/libnl_2.0.bb line 11

Quoted 10 lines
meta/recipes-support/libnl/libnl_2.0.bb deleted +0 -10
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-SECTION = "libs/network"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
-
-DEPENDS = "flex-native bison-native"
-PE = "1"
-PR = "r6"
-

I did not catch this at first because it came as, but you need to preserve the PE for package updates, it stands for Package Epoch and needs to be preserved.

Sau!

Quoted 64 lines
meta/recipes-support/libnl/libnl_2.0.bb deleted +0 -16
-SRC_URI = "\
-  http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
-  file://fix-pktloc_syntax_h-race.patch \
-  file://fix-pc-file.patch \
-"
-
-SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
-SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
-FILES_${PN}-route = "${libdir}/libnl-route.so.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
-FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
-FILES_${PN}-cli   = "${libdir}/libnl-cli.so.*"
meta/recipes-support/libnl/libnl_3.2.14.bb new file +41 -0
new file mode 100644
index 0000000..70920f3
@@ -0,0 +1,41 @@
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
+HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+SECTION = "libs/network"
+
+PR = "r0"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "flex-native bison-native"
+
+SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
+           file://fix-pktloc_syntax_h-race.patch \
+           file://fix-pc-file.patch "
+
+SRC_URI[md5sum] = "81d44f530aa0af1638a220c413baec05"
+SRC_URI[sha256sum] = "6bb043eea08765bada37a053d932f073db9d51e7a8cd419e237c785ba6369e2c"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${libdir}/libnl-3.so.* \
+               ${libdir}/libnl.so.* \
+               ${sysconfdir}"
+RREPLACES_${PN} = "libnl2"
+RCONFLICTS_${PN} = "libnl2"
+FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
+FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
+                    ${libdir}/libnl/cli/*/*.la"
+FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
+
+PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl"
+FILES_${PN}-cli   = "${libdir}/libnl-cli-3.so.* \
+                     ${libdir}/libnl/cli/*/*.so.* \
+                     ${sbindir}/nl-*"
+FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
+FILES_${PN}-nf    = "${libdir}/libnl-nf-3.so.*"
+FILES_${PN}-genl  = "${libdir}/libnl-genl-3.so.* \
+                     ${libdir}/libnl-genl.so.* \
+                     ${sbindir}/genl-ctrl-list"
+RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
+RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"