* [PATCH 1/4] gst-meta-base: pull in X11 plugins when using X11
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:31 ` Saul Wold
2012-12-04 23:29 ` [PATCH 1/3] libnl: upgrade to 3.2.14 Saul Wold
` (8 subsequent siblings)
9 siblings, 1 reply; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@intel.com>
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 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 2fb39d5..21243c6 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -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 \
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] gst-meta-base: pull in X11 plugins when using X11
2012-12-04 23:29 ` [PATCH 1/4] gst-meta-base: pull in X11 plugins when using X11 Saul Wold
@ 2012-12-04 23:31 ` Saul Wold
0 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:31 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
My bad, I send mulitple copies due to sheer stupidity today. Sorry
about that.
Ingore this whole thread, will resent a v2!
Sau!
On 12/04/2012 03:29 PM, Saul Wold wrote:
> From: Ross Burton <ross.burton@intel.com>
>
> 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 ]
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
> index 2fb39d5..21243c6 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
> @@ -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 \
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] libnl: upgrade to 3.2.14
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
2012-12-04 23:29 ` [PATCH 1/4] gst-meta-base: pull in X11 plugins when using X11 Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 1/2] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
* 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)
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../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
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
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
--- a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
+++ b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
@@ -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 <martin.jansa@gmail.com>
-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@
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
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
--- a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
+++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
@@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-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 \
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
deleted file mode 100644
index c96e7db..0000000
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ /dev/null
@@ -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.*"
diff --git a/meta/recipes-support/libnl/libnl_3.2.14.bb b/meta/recipes-support/libnl/libnl_3.2.14.bb
new file mode 100644
index 0000000..70920f3
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl_3.2.14.bb
@@ -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"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 1/2] wpa-supplicant: configured to work with libnl 3.2.14
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
2012-12-04 23:29 ` [PATCH 1/4] gst-meta-base: pull in X11 plugins when using X11 Saul Wold
2012-12-04 23:29 ` [PATCH 1/3] libnl: upgrade to 3.2.14 Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 2/4] libnl: upgrade to 3.2.14 Saul Wold
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
* Updated the configuration file for libnl-3
* Added python include dir path to configuration file
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
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(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
index 485a2dd..0966051 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
@@ -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
}
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
index e03338f..e041b4d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
@@ -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)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
index 36ee25c..1150075 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-1.0.inc
-PR = "r2"
+PR = "r3"
SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/4] libnl: upgrade to 3.2.14
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (2 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 1/2] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 2/2] libpcap: PR bump because of PU for libnl Saul Wold
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
* 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)
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../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
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
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
--- a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
+++ b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
@@ -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 <martin.jansa@gmail.com>
-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@
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
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
--- a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
+++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
@@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-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 \
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
deleted file mode 100644
index c96e7db..0000000
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ /dev/null
@@ -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.*"
diff --git a/meta/recipes-support/libnl/libnl_3.2.14.bb b/meta/recipes-support/libnl/libnl_3.2.14.bb
new file mode 100644
index 0000000..70920f3
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl_3.2.14.bb
@@ -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"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/2] libpcap: PR bump because of PU for libnl
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (3 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 2/4] libnl: upgrade to 3.2.14 Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 2/3] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/libpcap/libpcap.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 5381ef0..882c62c 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -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"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/3] wpa-supplicant: configured to work with libnl 3.2.14
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (4 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 2/2] libpcap: PR bump because of PU for libnl Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 3/3] libpcap: PR bump because of PU for libnl Saul Wold
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
* Updated the configuration file for libnl-3
* Added python include dir path to configuration file
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
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(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
index 485a2dd..0966051 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
@@ -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
}
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
index e03338f..e041b4d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
@@ -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)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
index 36ee25c..1150075 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-1.0.inc
-PR = "r2"
+PR = "r3"
SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/3] libpcap: PR bump because of PU for libnl
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (5 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 2/3] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 3/4] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/libpcap/libpcap.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 5381ef0..882c62c 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -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"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/4] wpa-supplicant: configured to work with libnl 3.2.14
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (6 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 3/3] libpcap: PR bump because of PU for libnl Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 4/4] libpcap: PR bump because of PU for libnl Saul Wold
2012-12-04 23:29 ` [PATCH 4/4] sstate: fetch .siginfo files from SSTATE_MIRROR Saul Wold
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
* Updated the configuration file for libnl-3
* Added python include dir path to configuration file
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
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(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
index 485a2dd..0966051 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
@@ -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
}
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
index e03338f..e041b4d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
@@ -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)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
index 36ee25c..1150075 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-1.0.inc
-PR = "r2"
+PR = "r3"
SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/4] libpcap: PR bump because of PU for libnl
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (7 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 3/4] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
2012-12-04 23:29 ` [PATCH 4/4] sstate: fetch .siginfo files from SSTATE_MIRROR Saul Wold
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
From: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/libpcap/libpcap.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 5381ef0..882c62c 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -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"
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/4] sstate: fetch .siginfo files from SSTATE_MIRROR
2012-12-04 23:29 [PATCH 0/3] libnl Update and friends Saul Wold
` (8 preceding siblings ...)
2012-12-04 23:29 ` [PATCH 4/4] libpcap: PR bump because of PU for libnl Saul Wold
@ 2012-12-04 23:29 ` Saul Wold
9 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-12-04 23:29 UTC (permalink / raw)
To: openembedded-core
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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/sstate.bbclass | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 832b39e..6b4b5a1 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -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)
--
1.8.0
^ permalink raw reply related [flat|nested] 12+ messages in thread