Skip to contentSkip to conversation

libnl Update and friends

PATCH Superseded Saul Wold 1 participant 12 messages Dec 4, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

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!

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 1/4 gst-meta-base: pull in X11 plugins when using X11

From: Ross Burton <[email protected]>

The splitting out of X11 plugins wasn't complete, which lead to no X11 plugins being installed.

If the X11 distro feature is present, make gst-meta-base depend on gst-meta-x11-base. Also make -x11-base RDEPEND on xvimagesink for video playback performance.

[ YOCTO #3458 ]

---
 meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb +5 -2
index 2fb39d5..21243c6 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 
-PR = "r11"
+PR = "r12"
 
 PACKAGES = "\
     gst-meta-base \
@@ -17,6 +17,7 @@ PACKAGES = "\
 ALLOW_EMPTY = "1"
 
 RDEPENDS_gst-meta-base = "\
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \
     gstreamer \
     gst-plugins-base-playbin \
     gst-plugins-base-decodebin \
@@ -32,7 +33,9 @@ RDEPENDS_gst-meta-base = "\
     gst-plugins-good-autodetect \
     gst-plugins-good-souphttpsrc"
 
-RDEPENDS_gst-meta-x11-base = "${@base_contains('DISTRO_FEATURES', 'x11', 'gst-plugins-base-ximagesink', '', d)}"
+RDEPENDS_gst-meta-x11-base = "\
+    gst-plugins-base-ximagesink \
+    gst-plugins-base-xvimagesink"
 
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
Signature · 1 line
1.8.0
author
#2 lore raw

Re: [PATCH 1/4] gst-meta-base: pull in X11 plugins when using X11

My bad, I send mulitple copies due to sheer stupidity today. Sorry about that.

Ingore this whole thread, will resent a v2!

Sau!

Quoted 50 lines · Saul Wold

From: Ross Burton <[email protected]>

The splitting out of X11 plugins wasn't complete, which lead to no X11 plugins being installed.

If the X11 distro feature is present, make gst-meta-base depend on gst-meta-x11-base. Also make -x11-base RDEPEND on xvimagesink for video playback performance.

[ YOCTO #3458 ]

---
  meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb +5 -2
index 2fb39d5..21243c6 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                      file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 
-PR = "r11"
+PR = "r12"
 
  PACKAGES = "\
      gst-meta-base \
@@ -17,6 +17,7 @@ PACKAGES = "\
  ALLOW_EMPTY = "1"
 
  RDEPENDS_gst-meta-base = "\
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \
      gstreamer \
      gst-plugins-base-playbin \
      gst-plugins-base-decodebin \
@@ -32,7 +33,9 @@ RDEPENDS_gst-meta-base = "\
      gst-plugins-good-autodetect \
      gst-plugins-good-souphttpsrc"
 
-RDEPENDS_gst-meta-x11-base = "${@base_contains('DISTRO_FEATURES', 'x11', 'gst-plugins-base-ximagesink', '', d)}"
+RDEPENDS_gst-meta-x11-base = "\
+    gst-plugins-base-ximagesink \
+    gst-plugins-base-xvimagesink"
 
  RDEPENDS_gst-meta-audio = "\
      gst-meta-base \
author
#3 lore raw

PATCH 1/3 libnl: upgrade to 3.2.14

In reply to 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 -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
#4 lore raw

PATCH 1/2 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
#5 lore raw

PATCH 2/4 libnl: upgrade to 3.2.14

In reply to 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 -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
#6 lore raw

PATCH 2/2 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
#7 lore raw

PATCH 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
#8 lore raw

PATCH 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
#9 lore raw

PATCH 3/4 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
#10 lore raw

PATCH 4/4 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
#11 lore raw

PATCH 4/4 sstate: fetch .siginfo files from SSTATE_MIRROR

In reply to Saul Wold

This would be useful for doing siginfo compares to understand why a build is not reusing something when using SSTATE_MIRROR. No error will be reported if it fails to find the .siginfo file

[YOCTO #2898]

---
 meta/classes/sstate.bbclass | 4 ++++
 1 file changed, 4 insertions(+)
meta/classes/sstate.bbclass +4 -0
index 832b39e..6b4b5a1 100644
@@ -212,10 +212,14 @@ def sstate_installpkg(ss, d):
 
     sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name'])
     sstatefetch = d.getVar('SSTATE_PKGNAME', True) + '_' + ss['name'] + ".tgz"
+    siginfofetch = d.getVar('SSTATE_PKGNAME', True) + '_' + ss['name'] + ".tgz.siginfo"
     sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz"
+    siginfopkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz.siginfo"
 
     if not os.path.exists(sstatepkg):
         pstaging_fetch(sstatefetch, sstatepkg, d)
+    if not os.path.exists(siginfopkg):
+        pstaging_fetch(siginfofetch, siginfopkg, d)
 
     if not os.path.isfile(sstatepkg):
         bb.note("Staging package %s does not exist" % sstatepkg)
Signature · 1 line
1.8.0