diff options
31 files changed, 176 insertions, 75 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 59ad0be135..415e44961c 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -53,7 +53,6 @@ INHERIT += "recipe_sanity" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso" -ANGSTROM_BLACKLIST_pn-libnl = "libnld has been replaced by libnl2" ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script" ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script" ANGSTROM_BLACKLIST_pn-qt4-x11-free-gles = "qt4-x11-free is fine even without gles" @@ -79,7 +78,6 @@ ANGSTROM_BLACKLIST_pn-linux-jlime-current = "strange kernel, spank maintainer" ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintainer" ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" - CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" #The shr-mirrors.bbclass repleaces this diff --git a/recipes/bluez/bluez4_4.75.bb b/recipes/bluez/bluez4_4.75.bb index 20b5a6ac81..269f7d75a0 100644 --- a/recipes/bluez/bluez4_4.75.bb +++ b/recipes/bluez/bluez4_4.75.bb @@ -4,7 +4,6 @@ SRC_URI[md5sum] = "ee95086aef5955b25f1226b9e45bd6be" SRC_URI[sha256sum] = "fd861de5c966dc563e6a1c34400bb0c0fe1277e37655ab3ce3f48356035f61b8" DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" DEPENDS += "libnl libsndfile1" diff --git a/recipes/bluez/bluez4_4.84.bb b/recipes/bluez/bluez4_4.84.bb index b964f2724e..729f38ce11 100644 --- a/recipes/bluez/bluez4_4.84.bb +++ b/recipes/bluez/bluez4_4.84.bb @@ -3,9 +3,6 @@ require bluez4.inc SRC_URI[md5sum] = "95e66f26f69aa425d27718f487b6bc74" SRC_URI[sha256sum] = "2913b0b09738295547c1bfdcca9e1da456c9ad6950cc499b1ee83b330bf8a5b6" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" - DEPENDS += "libsndfile1" PR = "${INC_PR}.0" diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index e25d64a98d..7306b1b805 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" SECTION = "libs/network" LICENSE = "GPL" # we need to define the depends here, the dynamic stuff is too late -DEPENDS = "libnl2 wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" +DEPENDS = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb index a7bf286720..1f1df9cba2 100644 --- a/recipes/connman/connman_0.46.bb +++ b/recipes/connman/connman_0.46.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r5" +PR = "r6" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_0.51.bb b/recipes/connman/connman_0.51.bb index f1c50038b8..036a710939 100644 --- a/recipes/connman/connman_0.51.bb +++ b/recipes/connman/connman_0.51.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_0.65.bb b/recipes/connman/connman_0.65.bb index 78e42875d8..880d775f3e 100644 --- a/recipes/connman/connman_0.65.bb +++ b/recipes/connman/connman_0.65.bb @@ -1,7 +1,7 @@ require connman.inc # connman requires libXtables now DEPENDS += "iptables" -PR = "r0" +PR = "r1" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_0.68.bb b/recipes/connman/connman_0.68.bb index ead215d315..093a5a5f5b 100644 --- a/recipes/connman/connman_0.68.bb +++ b/recipes/connman/connman_0.68.bb @@ -1,7 +1,7 @@ require connman.inc # connman requires libXtables now DEPENDS += "iptables" -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 39ffac652b..283eb6befd 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -27,7 +27,7 @@ require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r2" +PR = "r3" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index c99bd8e20d..1d751ca1c3 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,8 +1,8 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "libnl2" +DEPENDS += "libnl" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.9.10+gitr${SRCPV}" PE = "1" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" diff --git a/recipes/hostap/hostap-daemon_0.7.3.bb b/recipes/hostap/hostap-daemon_0.7.3.bb index 2dfec3537e..10b1389590 100644 --- a/recipes/hostap/hostap-daemon_0.7.3.bb +++ b/recipes/hostap/hostap-daemon_0.7.3.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "libnl2 openssl" -PR = "r1" +DEPENDS = "libnl openssl" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -21,7 +21,6 @@ INITSCRIPT_NAME=hostapd do_configure() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config - echo 'CFLAGS += "-I${STAGING_INCDIR}/libnl2"' >> ${S}/.config } do_compile() { diff --git a/recipes/iw/iw_0.9.20.bb b/recipes/iw/iw_0.9.20.bb index 0b6a768667..7048091c8f 100644 --- a/recipes/iw/iw_0.9.20.bb +++ b/recipes/iw/iw_0.9.20.bb @@ -3,18 +3,15 @@ HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw" SECTION = "base" PRIORITY = "optional" LICENSE = "BSD" -PR = "r2" +PR = "r3" -DEPENDS = "libnl2 pkgconfig" +DEPENDS = "libnl pkgconfig" SRC_URI = " \ http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ file://kill-git-version-check.patch \ " -# We stage libnl2 header files not directly as they clash with libnl files. Once -# we only use libnl2 and stage the headers at the normal place we can remove -# this. -CFLAGS += "-I${STAGING_INCDIR}/libnl2/ -DCONFIG_LIBNL20" +CFLAGS += "-DCONFIG_LIBNL20" do_compile() { oe_runmake diff --git a/recipes/libnl/files/fix-pc-file.patch b/recipes/libnl/files/fix-pc-file.patch deleted file mode 100644 index 77f3e88562..0000000000 --- a/recipes/libnl/files/fix-pc-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: git/libnl-2.0.pc.in -=================================================================== ---- git.orig/libnl-2.0.pc.in -+++ git/libnl-2.0.pc.in -@@ -6,5 +6,5 @@ - 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} diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc new file mode 100644 index 0000000000..6f502b1019 --- /dev/null +++ b/recipes/libnl/libnl.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" +SECTION = "libs/network" +LICENSE = "LGPL" +HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" + +INC_PR = "r5" + +inherit autotools pkgconfig + diff --git a/recipes/libnl/libnl2/fix-pc-file.patch b/recipes/libnl/libnl/fix-pc-file.patch index 17666fbadf..17666fbadf 100644 --- a/recipes/libnl/libnl2/fix-pc-file.patch +++ b/recipes/libnl/libnl/fix-pc-file.patch diff --git a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch b/recipes/libnl/libnl/fix-pktloc-dep-race.patch index ee217441b6..ee217441b6 100644 --- a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch +++ b/recipes/libnl/libnl/fix-pktloc-dep-race.patch diff --git a/recipes/libnl/libnl1-1.1/build.only.static.lib.patch b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file mode 100644 index 0000000000..770a3924f7 --- /dev/null +++ b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch @@ -0,0 +1,79 @@ +diff -uNr libnl-1.1.orig//lib/Makefile libnl-1.1/lib/Makefile +--- libnl-1.1.orig//lib/Makefile 2011-03-23 15:50:32.310534329 +0100 ++++ libnl-1.1/lib/Makefile 2011-03-23 15:50:43.926534326 +0100 +@@ -33,18 +33,24 @@ + DEPS := $(CIN:%.c=%.d) + OBJ := $(CIN:%.c=%.o) + CFLAGS += -fPIC ++OUT_LIB := $(PACKAGE_NAME)1.a + OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION) + LN_SLIB := $(PACKAGE_NAME).so + LN1_SLIB := $(LN_SLIB).1 + + export + +-.PHONY: all clean install librtn.a $(OUT_SLIB) ++.PHONY: all clean install librtn.a $(OUT_SLIB) $(OUT_LIB) + + + all: +- @echo " MAKE $(OUT_SLIB)"; \ +- $(MAKE) $(OUT_SLIB) ++ @echo " MAKE $(OUT_LIB)"; \ ++ $(MAKE) $(OUT_LIB) ++ ++$(OUT_LIB): ../Makefile.opts $(OBJ) ++ @echo " LD $(OUT_LIB)"; \ ++ echo $(AR) rs $(OUT_LIB) $(OBJ) ++ $(AR) rs $(OUT_LIB) $(OBJ) + + $(OUT_SLIB): ../Makefile.opts $(OBJ) + @echo " LD $(OUT_SLIB)"; \ +@@ -56,8 +62,8 @@ + + clean: + @echo " CLEAN lib"; \ +- $(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \ +- $(RM) -f $(DEPS) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB) ++ $(RM) -f $(OBJ) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB); \ ++ $(RM) -f $(DEPS) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB) + + distclean: + @echo " DISTCLEAN lib"; \ +@@ -65,11 +71,7 @@ + + install: +- mkdir -p $(DESTDIR)$(libdir)/ +- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir) +- rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB) +- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB) +- rm -f $(DESTDIR)$(libdir)/$(LN_SLIB) +- $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB) ++ mkdir -p $(DESTDIR)$(libdir)/libnl1 ++ install -m 0644 $(OUT_LIB) $(DESTDIR)$(libdir)/libnl1 + + $(DEPS): ../Makefile.opts + +diff -uNr libnl-1.1.orig//Makefile libnl-1.1/Makefile +--- libnl-1.1.orig//Makefile 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/Makefile 2011-03-23 16:53:12.438533242 +0100 +@@ -13,7 +13,7 @@ + include Makefile.opts + endif + +-SUBDIRS := lib include doc src tests ++SUBDIRS := lib include doc + .PHONY: all clean distclean install gendoc $(SUBDIRS) + + all: Makefile.opts +diff -uNr libnl-1.1.orig//libnl-1.pc.in libnl-1.1/libnl-1.pc.in +--- libnl-1.1.orig//libnl-1.pc.in 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/libnl-1.pc.in 2011-03-23 16:57:18.084533174 +0100 +@@ -6,5 +6,5 @@ + Name: libnl + Description: Convenience library for netlink sockets + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lnl +-Cflags: ++Libs: -L${libdir}/libnl1 -lnl1 -lm ++Cflags: -I${includedir}/libnl1 diff --git a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch index beb63617ac..beb63617ac 100644 --- a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch +++ b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch diff --git a/recipes/libnl/files/fix-includes.patch b/recipes/libnl/libnl1-1.1/fix-includes.patch index b172fd2f86..b172fd2f86 100644 --- a/recipes/libnl/files/fix-includes.patch +++ b/recipes/libnl/libnl1-1.1/fix-includes.patch diff --git a/recipes/libnl/files/local-includes.patch b/recipes/libnl/libnl1-1.1/local-includes.patch index 85659db6d7..85659db6d7 100644 --- a/recipes/libnl/files/local-includes.patch +++ b/recipes/libnl/libnl1-1.1/local-includes.patch diff --git a/recipes/libnl/files/netlink-local-fix.patch b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch index 51c6736025..51c6736025 100644 --- a/recipes/libnl/files/netlink-local-fix.patch +++ b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch diff --git a/recipes/libnl/files/respect-ldflags.patch b/recipes/libnl/libnl1-1.1/respect-ldflags.patch index ba97dc6724..ba97dc6724 100644 --- a/recipes/libnl/files/respect-ldflags.patch +++ b/recipes/libnl/libnl1-1.1/respect-ldflags.patch diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl1_1.1.bb index f1b2a9d485..3569867cc0 100644 --- a/recipes/libnl/libnl_1.1.bb +++ b/recipes/libnl/libnl1_1.1.bb @@ -1,11 +1,9 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" +require libnl.inc -PR = "r4" +PR = "${INC_PR}.0" -inherit autotools pkgconfig +# move it to extra subdirectory +includedir = "${prefix}/include/libnl1" CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' @@ -16,8 +14,9 @@ SRC_URI = "\ file://respect-ldflags.patch \ file://netlink-local-fix.patch \ file://dont-link-libnl-from-sysroot.patch \ + file://build.only.static.lib.patch \ " - +S = "${WORKDIR}/libnl-${PV}" SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1" SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3" diff --git a/recipes/libnl/libnl2_2.0.bb b/recipes/libnl/libnl_2.0.bb index 7e9336e68a..d1cbc0beeb 100644 --- a/recipes/libnl/libnl2_2.0.bb +++ b/recipes/libnl/libnl_2.0.bb @@ -1,22 +1,15 @@ -DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" +require libnl.inc PE = "1" -PR = "r2" +PR = "${INC_PR}.0" DEPENDS = "flex-native bison-native" -inherit autotools pkgconfig - -includedir = ${prefix}/include/libnl2 - -S = "${WORKDIR}/libnl-${PV}" SRC_URI = "\ http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ file://fix-pc-file.patch \ file://fix-pktloc-dep-race.patch \ " + SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c" diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl_git.bb index b667815924..a4a37a8b12 100644 --- a/recipes/libnl/libnl2_git.bb +++ b/recipes/libnl/libnl_git.bb @@ -1,24 +1,17 @@ -DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" -SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" -PV = "1.9+gitr${SRCPV}" +require libnl.inc + PE = "1" -PR = "r3" +PV = "1.9+gitr${SRCPV}" +PR = "${INC_PR}.0" DEPENDS = "flex-native bison-native" -inherit autotools - -includedir = ${prefix}/include/libnl2 - +S = "${WORKDIR}/git" +SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" SRC_URI = "\ git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \ file://fix-pc-file.patch \ - file://fix-pktloc-dep-race.patch \ " -S = "${WORKDIR}/git" PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli" FILES_${PN}-route = "${libdir}/libnl-route.so.*" diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc index 6c0ccbeae4..18af1bc805 100644 --- a/recipes/networkmanager/networkmanager-0.7.inc +++ b/recipes/networkmanager/networkmanager-0.7.inc @@ -2,7 +2,7 @@ DESCRIPTION = "NetworkManager" SECTION = "net/misc" LICENSE = "GPL" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp" +DEPENDS = "libnl1 dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp" RDEPENDS_${PN} = "wpa-supplicant dhcp-client \ ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ " diff --git a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch new file mode 100644 index 0000000000..a923da58cd --- /dev/null +++ b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch @@ -0,0 +1,51 @@ +From 9d6414375e2371086dcfadc1d117fbcfe43fb3fc Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 23 Mar 2011 17:27:54 +0100 +Subject: [PATCH] respect libnl flags also in backends/ip6-manager + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/backends/Makefile.am | 2 ++ + src/ip6-manager/Makefile.am | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am +index fbec9aa..c0780d0 100644 +--- a/src/backends/Makefile.am ++++ b/src/backends/Makefile.am +@@ -63,10 +63,12 @@ endif + + libnmbackend_la_LIBADD += \ + $(top_builddir)/src/logging/libnm-logging.la \ ++ $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + + libnmbackend_la_CPPFLAGS = \ ++ $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_DISABLE_DEPRECATED \ +diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am +index b56b197..b98d6de 100644 +--- a/src/ip6-manager/Makefile.am ++++ b/src/ip6-manager/Makefile.am +@@ -13,6 +13,7 @@ libip6_manager_la_SOURCES = \ + nm-ip6-manager.h + + libip6_manager_la_CPPFLAGS = \ ++ $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_DISABLE_DEPRECATED +@@ -20,6 +21,7 @@ libip6_manager_la_CPPFLAGS = \ + libip6_manager_la_LIBADD = \ + $(top_builddir)/marshallers/libmarshallers.la \ + $(top_builddir)/src/logging/libnm-logging.la \ ++ $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + +-- +1.7.4.1 + diff --git a/recipes/networkmanager/networkmanager_0.8.1.bb b/recipes/networkmanager/networkmanager_0.8.1.bb index 90b8946624..ca6572fcd1 100644 --- a/recipes/networkmanager/networkmanager_0.8.1.bb +++ b/recipes/networkmanager/networkmanager_0.8.1.bb @@ -1,6 +1,6 @@ require networkmanager-0.7.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -10,6 +10,7 @@ SRC_URI += " \ file://nm-system-settings.conf \ file://NetworkManager \ file://gtk-doc.make \ + file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \ " SRC_URI[md5sum] = "96e551149dda8f6e0a5621f77468ba79" diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb index bb746a1166..c6bfab2913 100644 --- a/recipes/networkmanager/networkmanager_git.bb +++ b/recipes/networkmanager/networkmanager_git.bb @@ -2,6 +2,7 @@ require networkmanager-0.7.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" +DEFAULT_PREFERENCE_shr = "1" SRCREV = "9b61ec7c58e8106c28d01b33ad0b263aefb1f347" PV = "0.8.2+git" @@ -18,6 +19,7 @@ SRC_URI += " \ file://nm-system-settings.conf \ file://NetworkManager \ file://gtk-doc.make \ + file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \ " EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \ diff --git a/recipes/ti/ti-wifi-utils_git.bb b/recipes/ti/ti-wifi-utils_git.bb index 5877cafdfc..7757f97f57 100644 --- a/recipes/ti/ti-wifi-utils_git.bb +++ b/recipes/ti/ti-wifi-utils_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The calibrator and other useful utilities for TI wireless solution based on wl12xx driver" LICENCE = "TI-BSD" -DEPENDS = "libnl2" +DEPENDS = "libnl" PV ="0.0" PR_append = "+gitr${SRCPV}" @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/gxk/ti-utils.git;protocol=git" S = "${WORKDIR}/git" export CROSS_COMPILE = "${TARGET_PREFIX}" -CFLAGS += "-I${STAGING_INCDIR}/libnl2/ -DCONFIG_LIBNL20" +CFLAGS += " -DCONFIG_LIBNL20" do_install() { install -d ${D}${bindir} diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc index 764903894d..0cf3b700fe 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc @@ -6,9 +6,9 @@ LICENSE = "GPLv2 | BSD" LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \ file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e" -DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" +DEPENDS = "gnutls dbus libnl openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig \ @@ -20,11 +20,6 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant" -# We stage libnl2 header files not directly as they clash with libnl files. Once -# we only use libnl2 and stage the headers at the normal place we can remove -# this. -CFLAGS += "-I${STAGING_INCDIR}/libnl2/" - PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" |