* [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work
@ 2011-11-21 19:53 Andreas Müller
2011-11-21 19:53 ` [meta-oe][V2 1/4] iw: update to 3.2 Andreas Müller
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Andreas Müller @ 2011-11-21 19:53 UTC (permalink / raw)
To: openembedded-devel
V1 -> V2: networkmanager bump PR
Note: It might be required to rebuild wpa-supplicant coming from oe-core.
Andreas Müller (4):
iw: update to 3.2
libnl: add 3.23
networkmanager: bump PR to force rebuild with libnl 3.23
libnl1: remove
.../iw/iw/kill-git-version-check.patch | 26 -------
.../iw/{iw_0.9.20.bb => iw_3.2.bb} | 15 +---
.../networkmanager/networkmanager_0.9.2.0.bb | 2 +-
.../libnl/libnl1-1.1/build.only.static.lib.patch | 79 --------------------
.../libnl1-1.1/dont-link-libnl-from-sysroot.patch | 26 -------
.../libnl/libnl1-1.1/fix-includes.patch | 13 ---
.../libnl/libnl1-1.1/fix-ucred-declaration.patch | 23 ------
.../libnl/libnl1-1.1/local-includes.patch | 12 ---
.../libnl/libnl1-1.1/netlink-local-fix.patch | 12 ---
.../libnl/libnl1-1.1/respect-ldflags.patch | 12 ---
meta-oe/recipes-support/libnl/libnl1_1.1.bb | 30 --------
meta-oe/recipes-support/libnl/libnl_3.2.3.bb | 46 +++++++++++
12 files changed, 51 insertions(+), 245 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch
rename meta-oe/recipes-connectivity/iw/{iw_0.9.20.bb => iw_3.2.bb} (51%)
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/build.only.static.lib.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/fix-includes.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/fix-ucred-declaration.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/local-includes.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/netlink-local-fix.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/respect-ldflags.patch
delete mode 100644 meta-oe/recipes-support/libnl/libnl1_1.1.bb
create mode 100644 meta-oe/recipes-support/libnl/libnl_3.2.3.bb
--
1.7.4.4
^ permalink raw reply [flat|nested] 10+ messages in thread* [meta-oe][V2 1/4] iw: update to 3.2 2011-11-21 19:53 [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Andreas Müller @ 2011-11-21 19:53 ` Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 2/4] libnl: add 3.23 Andreas Müller ` (3 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Andreas Müller @ 2011-11-21 19:53 UTC (permalink / raw) To: openembedded-devel to prepare support for libnl-3 we need to update iw. Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> --- .../iw/iw/kill-git-version-check.patch | 26 -------------------- .../iw/{iw_0.9.20.bb => iw_3.2.bb} | 15 +++-------- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch rename meta-oe/recipes-connectivity/iw/{iw_0.9.20.bb => iw_3.2.bb} (51%) diff --git a/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch b/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch deleted file mode 100644 index 93aad02..0000000 --- a/meta-oe/recipes-connectivity/iw/iw/kill-git-version-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: iw-0.9.18/version.sh -=================================================================== ---- iw-0.9.18.orig/version.sh 2010-09-14 13:50:27.000000000 +0400 -+++ iw-0.9.18/version.sh 2010-09-14 13:50:40.000000000 +0400 -@@ -5,20 +5,6 @@ - - echo '#include "iw.h"' > "$OUT" - --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -- git update-index --refresh --unmerged > /dev/null -- descr=$(git describe) -- -- # on git builds check that the version number above -- # is correct... -- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 -- -- v="${descr#v}" -- if git diff-index --name-only HEAD | read dummy ; then -- v="$v"-dirty -- fi --else -- v="$VERSION" --fi -+v="$VERSION" - - echo "const char iw_version[] = \"$v\";" >> "$OUT" diff --git a/meta-oe/recipes-connectivity/iw/iw_0.9.20.bb b/meta-oe/recipes-connectivity/iw/iw_3.2.bb similarity index 51% rename from meta-oe/recipes-connectivity/iw/iw_0.9.20.bb rename to meta-oe/recipes-connectivity/iw/iw_3.2.bb index 0b66e8d..ba7afdd 100644 --- a/meta-oe/recipes-connectivity/iw/iw_0.9.20.bb +++ b/meta-oe/recipes-connectivity/iw/iw_3.2.bb @@ -6,19 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774" DEPENDS = "libnl pkgconfig" -SRC_URI = " \ - http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ - file://kill-git-version-check.patch \ - " +SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2" -SRC_URI[md5sum] = "1055799b544b3e08169d155bb6c21bb0" -SRC_URI[sha256sum] = "2d665fbfbe4fd6a40159fb821518fc5337da37448416405b936a393a14cbc7d3" +SRC_URI[md5sum] = "80615c972a287dcd50890735469b0d1c" +SRC_URI[sha256sum] = "370edabe6f73cc55be77a7502a3a25d23ec2aea900ae4ca3cec19d55bf8bdb12" -CFLAGS += "-DCONFIG_LIBNL20" - -do_compile() { - oe_runmake -} +CFLAGS += "-DCONFIG_LIBNL30" do_install() { oe_runmake DESTDIR=${D} install -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-oe][V2 2/4] libnl: add 3.23 2011-11-21 19:53 [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 1/4] iw: update to 3.2 Andreas Müller @ 2011-11-21 19:53 ` Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 3/4] networkmanager: bump PR to force rebuild with libnl 3.23 Andreas Müller ` (2 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Andreas Müller @ 2011-11-21 19:53 UTC (permalink / raw) To: openembedded-devel * fixes networkmanager default route issue * to make wpa-supplicant build, links to include files and shared libs were added since wpa-supplicant expects old libnl-2 locations. Should libnl-3 move to oe-core, this woraround should be fixed at wpa-supplicant. * the command line interface (cli) applications were added at libnl-cli packet. This seems correct because EXTRA_OECONF += "--disable-cli" creates empty package libnl-cli without affecting other packages. * build tested from scratch & run tested on overo with iw 3.2 / wpa-supplicant 0.7.3 / networkmanager 0.9.2. Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> --- meta-oe/recipes-support/libnl/libnl_3.2.3.bb | 46 ++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/libnl/libnl_3.2.3.bb diff --git a/meta-oe/recipes-support/libnl/libnl_3.2.3.bb b/meta-oe/recipes-support/libnl/libnl_3.2.3.bb new file mode 100644 index 0000000..190ea4c --- /dev/null +++ b/meta-oe/recipes-support/libnl/libnl_3.2.3.bb @@ -0,0 +1,46 @@ +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" + +SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz" + +SRC_URI[md5sum] = "dbbb44801e833cf9ca4fdc943f2a58ee" +SRC_URI[sha256sum] = "69f4a360350ea61f2c988f947c251995c04093c74743eae9eeffba85846ef007" + +inherit autotools pkgconfig + +do_install_append() { + # make wpa-supplicant happy + # TODO: when moving to oe-core fix at wpa-supplicant + # (e.g src/drivers/drivers.mak) + cd ${D}${includedir} + ln -sf libnl3/netlink netlink + cd ${D}${libdir} + ln -sf libnl-3.so.200 libnl.so + ln -sf libnl-3.so.200 libnl.so.3 + ln -sf libnl-genl-3.so.200 libnl-genl.so + ln -sf libnl-genl-3.so.200 libnl-genl.so.3 +} + +FILES_${PN} = "${libdir}/libnl-3.so.* \ + ${libdir}/libnl.so.* \ + ${sysconfdir}" +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.*" + -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-oe][V2 3/4] networkmanager: bump PR to force rebuild with libnl 3.23 2011-11-21 19:53 [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 1/4] iw: update to 3.2 Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 2/4] libnl: add 3.23 Andreas Müller @ 2011-11-21 19:53 ` Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 4/4] libnl1: remove Andreas Müller 2011-11-21 22:11 ` [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Koen Kooi 4 siblings, 0 replies; 10+ messages in thread From: Andreas Müller @ 2011-11-21 19:53 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> --- .../networkmanager/networkmanager_0.9.2.0.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb index 6d5a7ac..1dcc3cf 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb @@ -4,7 +4,7 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" -PR = "r1" +PR = "r2" DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp" inherit gnome gettext -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-oe][V2 4/4] libnl1: remove 2011-11-21 19:53 [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Andreas Müller ` (2 preceding siblings ...) 2011-11-21 19:53 ` [meta-oe][V2 3/4] networkmanager: bump PR to force rebuild with libnl 3.23 Andreas Müller @ 2011-11-21 19:53 ` Andreas Müller 2011-11-21 22:11 ` [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Koen Kooi 4 siblings, 0 replies; 10+ messages in thread From: Andreas Müller @ 2011-11-21 19:53 UTC (permalink / raw) To: openembedded-devel networkmanager 0.9.0 was the last to depend on linbl1. So since update of networkmanager 0.9.0 -> 0.9.2 linnl1 is obsolete. Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> --- .../libnl/libnl1-1.1/build.only.static.lib.patch | 79 -------------------- .../libnl1-1.1/dont-link-libnl-from-sysroot.patch | 26 ------- .../libnl/libnl1-1.1/fix-includes.patch | 13 --- .../libnl/libnl1-1.1/fix-ucred-declaration.patch | 23 ------ .../libnl/libnl1-1.1/local-includes.patch | 12 --- .../libnl/libnl1-1.1/netlink-local-fix.patch | 12 --- .../libnl/libnl1-1.1/respect-ldflags.patch | 12 --- meta-oe/recipes-support/libnl/libnl1_1.1.bb | 30 -------- 8 files changed, 0 insertions(+), 207 deletions(-) delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/build.only.static.lib.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/fix-includes.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/fix-ucred-declaration.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/local-includes.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/netlink-local-fix.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1-1.1/respect-ldflags.patch delete mode 100644 meta-oe/recipes-support/libnl/libnl1_1.1.bb diff --git a/meta-oe/recipes-support/libnl/libnl1-1.1/build.only.static.lib.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/build.only.static.lib.patch deleted file mode 100644 index 770a392..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/build.only.static.lib.patch +++ /dev/null @@ -1,79 +0,0 @@ -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/meta-oe/recipes-support/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch deleted file mode 100644 index beb6361..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libnl-1.1/src/Makefile -=================================================================== ---- libnl-1.1.orig/src/Makefile 2008-01-14 07:48:45.000000000 -0800 -+++ libnl-1.1/src/Makefile 2010-09-22 14:58:46.820826001 -0700 -@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] - include ../Makefile.opts - endif - --LDFLAGS += -L../lib -lnl utils.o -+LDFLAGS += ../lib/libnl.so utils.o - CIN := $(wildcard nl-*.c) $(wildcard genl-*.c) $(wildcard nf-*.c) - TOOLS := $(CIN:%.c=%) - -Index: libnl-1.1/tests/Makefile -=================================================================== ---- libnl-1.1.orig/tests/Makefile 2008-01-14 07:48:45.000000000 -0800 -+++ libnl-1.1/tests/Makefile 2010-09-22 14:58:46.820826001 -0700 -@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] - include ../Makefile.opts - endif - --LDFLAGS += -L../lib -lnl ../src/utils.o -+LDFLAGS += ../lib/libnl.so ../src/utils.o - CIN := $(wildcard test-*.c) - TOOLS := $(CIN:%.c=%) - diff --git a/meta-oe/recipes-support/libnl/libnl1-1.1/fix-includes.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/fix-includes.patch deleted file mode 100644 index b172fd2..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/fix-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN libnl-1.1/lib/route/link/vlan.c libnl-1.1-new/lib/route/link/vlan.c ---- libnl-1.1/lib/route/link/vlan.c 2008-01-14 18:48:45.000000000 +0300 -+++ libnl-1.1-new/lib/route/link/vlan.c 2009-01-30 10:55:09.000000000 +0300 -@@ -26,7 +26,9 @@ - #include <netlink/route/link/info-api.h> - #include <netlink/route/link/vlan.h> - -+#ifndef VLAN_FLAG_REORDER_HDR - #include <linux/if_vlan.h> -+#endif - - /** @cond SKIP */ - #define VLAN_HAS_ID (1<<0) diff --git a/meta-oe/recipes-support/libnl/libnl1-1.1/fix-ucred-declaration.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/fix-ucred-declaration.patch deleted file mode 100644 index e31b18e..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/fix-ucred-declaration.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -pruN libnl-1.1.orig/include/netlink/handlers.h libnl-1.1/include/netlink/handlers.h ---- libnl-1.1.orig/include/netlink/handlers.h 2008-01-14 18:48:45.000000000 +0300 -+++ libnl-1.1/include/netlink/handlers.h 2011-04-12 19:23:16.603292527 +0400 -@@ -120,6 +120,7 @@ extern struct nl_cb * nl_cb_alloc(enum n - extern struct nl_cb * nl_cb_clone(struct nl_cb *); - extern struct nl_cb * nl_cb_get(struct nl_cb *); - extern void nl_cb_put(struct nl_cb *); -+struct ucred; - - extern int nl_cb_set(struct nl_cb *, enum nl_cb_type, enum nl_cb_kind, - nl_recvmsg_msg_cb_t, void *); -diff -pruN libnl-1.1.orig/include/netlink/netlink.h libnl-1.1/include/netlink/netlink.h ---- libnl-1.1.orig/include/netlink/netlink.h 2008-01-14 18:48:45.000000000 +0300 -+++ libnl-1.1/include/netlink/netlink.h 2011-04-12 19:23:51.370292658 +0400 -@@ -50,6 +50,8 @@ extern int nl_send_auto_complete(struc - extern int nl_send_simple(struct nl_handle *, int, int, - void *, size_t); - -+struct ucred; -+ - /* Receive */ - extern int nl_recv(struct nl_handle *, - struct sockaddr_nl *, unsigned char **, diff --git a/meta-oe/recipes-support/libnl/libnl1-1.1/local-includes.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/local-includes.patch deleted file mode 100644 index 85659db..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/local-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libnl-1.1.orig/Makefile.opts.in libnl-1.1/Makefile.opts.in ---- libnl-1.1.orig/Makefile.opts.in 2008-01-14 15:48:45.000000000 +0000 -+++ libnl-1.1/Makefile.opts.in 2009-04-06 10:20:40.000000000 +0000 -@@ -10,7 +10,7 @@ - # - - CC := @CC@ --CFLAGS := @CFLAGS@ -+CFLAGS := -I./include -I. -I../include @CFLAGS@ - LDFLAGS := @LDFLAGS@ - CPPFLAGS := @CPPFLAGS@ - PACKAGE_NAME := @PACKAGE_NAME@ diff --git a/meta-oe/recipes-support/libnl/libnl1-1.1/netlink-local-fix.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/netlink-local-fix.patch deleted file mode 100644 index 51c6736..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/netlink-local-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libnl-1.1/include/netlink-local.h -=================================================================== ---- libnl-1.1.orig/include/netlink-local.h 2009-06-18 15:28:32.614209645 +0400 -+++ libnl-1.1/include/netlink-local.h 2009-06-18 15:28:44.094190518 +0400 -@@ -26,6 +26,7 @@ - #include <sys/socket.h> - #include <inttypes.h> - #include <assert.h> -+#include <limits.h> - - #include <arpa/inet.h> - #include <netdb.h> diff --git a/meta-oe/recipes-support/libnl/libnl1-1.1/respect-ldflags.patch b/meta-oe/recipes-support/libnl/libnl1-1.1/respect-ldflags.patch deleted file mode 100644 index ba97dc6..0000000 --- a/meta-oe/recipes-support/libnl/libnl1-1.1/respect-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libnl-1.1.orig/lib/Makefile libnl-1.1/lib/Makefile ---- libnl-1.1.orig/lib/Makefile 2008-01-14 15:48:45.000000000 +0000 -+++ libnl-1.1/lib/Makefile 2009-04-06 10:16:21.000000000 +0000 -@@ -48,7 +48,7 @@ - - $(OUT_SLIB): ../Makefile.opts $(OBJ) - @echo " LD $(OUT_SLIB)"; \ -- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc - @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ - rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) - @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ diff --git a/meta-oe/recipes-support/libnl/libnl1_1.1.bb b/meta-oe/recipes-support/libnl/libnl1_1.1.bb deleted file mode 100644 index 72f5995..0000000 --- a/meta-oe/recipes-support/libnl/libnl1_1.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" -SECTION = "libs/network" - -inherit autotools pkgconfig - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" - -PR = "r6" - -# move it to extra subdirectory -includedir = "${prefix}/include/libnl1" - -CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' - -SRC_URI = "\ - http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ - file://local-includes.patch \ - file://fix-includes.patch \ - file://respect-ldflags.patch \ - file://netlink-local-fix.patch \ - file://dont-link-libnl-from-sysroot.patch \ - file://build.only.static.lib.patch \ - file://fix-ucred-declaration.patch \ -" -S = "${WORKDIR}/libnl-${PV}" - -SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1" -SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3" -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work 2011-11-21 19:53 [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Andreas Müller ` (3 preceding siblings ...) 2011-11-21 19:53 ` [meta-oe][V2 4/4] libnl1: remove Andreas Müller @ 2011-11-21 22:11 ` Koen Kooi 2011-11-21 23:49 ` Andreas Müller 4 siblings, 1 reply; 10+ messages in thread From: Koen Kooi @ 2011-11-21 22:11 UTC (permalink / raw) To: openembedded-devel -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 21-11-11 20:53, Andreas Müller schreef: > V1 -> V2: networkmanager bump PR > > Note: It might be required to rebuild wpa-supplicant coming from > oe-core. I'll apply this set tomorrow if there are no comments, but could you also push libnl3 into oe-core and then bump PR for wpa-supplicant? If not, could you add a wpa-supplicant bbappend that simply does PR_INC = 1 (or PRINC, I forget) ? regards, Koen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAk7KzIgACgkQMkyGM64RGpHnHACffdU98Hr58FMbhlExV7qH3QVd jCAAoLCk4++ZcR/spyp7aSzY1rWSWf6k =grcU -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work 2011-11-21 22:11 ` [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Koen Kooi @ 2011-11-21 23:49 ` Andreas Müller 2011-11-22 0:44 ` Andreas Müller 0 siblings, 1 reply; 10+ messages in thread From: Andreas Müller @ 2011-11-21 23:49 UTC (permalink / raw) To: openembedded-devel On Monday, November 21, 2011 11:11:22 PM Koen Kooi wrote: > Op 21-11-11 20:53, Andreas Müller schreef: > > V1 -> V2: networkmanager bump PR > > > > Note: It might be required to rebuild wpa-supplicant coming from > > oe-core. > > I'll apply this set tomorrow if there are no comments, but could you also > push libnl3 into oe-core and then bump PR for wpa-supplicant? If not, could > you add a wpa-supplicant bbappend that simply does PR_INC = 1 (or PRINC, I > forget) ? > how about: 1st step: I'll send V3 in a few minutes with wpa-supplicant PR bump. 2nd step: * libnl-3 -> oe-core and remove workarounds for wpa-supplicant (symlink include/lib) * modify wpa-supplicant so that it works with libnl-3 without workarounds & PR bump +2 * iw -> oe-core? Since I am under pressure in my first life, 2nd step may take a few days. What do you think? Andreas ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work 2011-11-21 23:49 ` Andreas Müller @ 2011-11-22 0:44 ` Andreas Müller 2011-11-22 7:57 ` Koen Kooi 0 siblings, 1 reply; 10+ messages in thread From: Andreas Müller @ 2011-11-22 0:44 UTC (permalink / raw) To: openembedded-devel On Tuesday, November 22, 2011 12:49:20 AM Andreas Müller wrote: > On Monday, November 21, 2011 11:11:22 PM Koen Kooi wrote: > > Op 21-11-11 20:53, Andreas Müller schreef: > > > V1 -> V2: networkmanager bump PR > > > > > > Note: It might be required to rebuild wpa-supplicant coming from > > > oe-core. > > > > I'll apply this set tomorrow if there are no comments, but could you also > > push libnl3 into oe-core and then bump PR for wpa-supplicant? If not, > > could you add a wpa-supplicant bbappend that simply does PR_INC = 1 (or > > PRINC, I forget) ? > > how about: > > 1st step: > I'll send V3 in a few minutes with wpa-supplicant PR bump. > > 2nd step: > * libnl-3 -> oe-core and remove workarounds for wpa-supplicant (symlink > include/lib) > * modify wpa-supplicant so that it works with libnl-3 without workarounds & > PR bump +2 > * iw -> oe-core? > > Since I am under pressure in my first life, 2nd step may take a few days. > > What do you think? > Sorry for spamming but: how about 2nd step only? Andreas ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work 2011-11-22 0:44 ` Andreas Müller @ 2011-11-22 7:57 ` Koen Kooi 2011-11-23 7:47 ` Andreas Müller 0 siblings, 1 reply; 10+ messages in thread From: Koen Kooi @ 2011-11-22 7:57 UTC (permalink / raw) To: openembedded-devel -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 22-11-11 01:44, Andreas Müller schreef: > On Tuesday, November 22, 2011 12:49:20 AM Andreas Müller wrote: >> On Monday, November 21, 2011 11:11:22 PM Koen Kooi wrote: >>> Op 21-11-11 20:53, Andreas Müller schreef: >>>> V1 -> V2: networkmanager bump PR >>>> >>>> Note: It might be required to rebuild wpa-supplicant coming from >>>> oe-core. >>> >>> I'll apply this set tomorrow if there are no comments, but could you >>> also push libnl3 into oe-core and then bump PR for wpa-supplicant? If >>> not, could you add a wpa-supplicant bbappend that simply does PR_INC >>> = 1 (or PRINC, I forget) ? >> >> how about: >> >> 1st step: I'll send V3 in a few minutes with wpa-supplicant PR bump. >> >> 2nd step: * libnl-3 -> oe-core and remove workarounds for >> wpa-supplicant (symlink include/lib) * modify wpa-supplicant so that it >> works with libnl-3 without workarounds & PR bump +2 * iw -> oe-core? >> >> Since I am under pressure in my first life, 2nd step may take a few >> days. >> >> What do you think? >> > Sorry for spamming but: how about 2nd step only? I'm fine with either, but since you sent a v3 already, do you want me to apply it? regards, Koen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAk7LVfUACgkQMkyGM64RGpGZHgCeN4ob+HRSlwPRzJEKodaTMBDB hoAAn01kwtNCtxiurR1C2XsFo4Ded+ot =Y+pG -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work 2011-11-22 7:57 ` Koen Kooi @ 2011-11-23 7:47 ` Andreas Müller 0 siblings, 0 replies; 10+ messages in thread From: Andreas Müller @ 2011-11-23 7:47 UTC (permalink / raw) To: openembedded-devel On Tuesday, November 22, 2011 08:57:43 AM Koen Kooi wrote: > Op 22-11-11 01:44, Andreas Müller schreef: > > On Tuesday, November 22, 2011 12:49:20 AM Andreas Müller wrote: > >> On Monday, November 21, 2011 11:11:22 PM Koen Kooi wrote: > >>> Op 21-11-11 20:53, Andreas Müller schreef: > >>>> V1 -> V2: networkmanager bump PR > >>>> > >>>> Note: It might be required to rebuild wpa-supplicant coming from > >>>> oe-core. > >>> > >>> I'll apply this set tomorrow if there are no comments, but could you > >>> also push libnl3 into oe-core and then bump PR for wpa-supplicant? If > >>> not, could you add a wpa-supplicant bbappend that simply does PR_INC > >>> = 1 (or PRINC, I forget) ? > >> > >> how about: > >> > >> 1st step: I'll send V3 in a few minutes with wpa-supplicant PR bump. > >> > >> 2nd step: * libnl-3 -> oe-core and remove workarounds for > >> wpa-supplicant (symlink include/lib) * modify wpa-supplicant so that it > >> works with libnl-3 without workarounds & PR bump +2 * iw -> oe-core? > >> > >> Since I am under pressure in my first life, 2nd step may take a few > >> days. > >> > >> What do you think? > > > > Sorry for spamming but: how about 2nd step only? > > I'm fine with either, but since you sent a v3 already, do you want me to > apply it? > It seems no pressure on networkmanager issue, so I would prefer the cleaner oe- core solution and ignore these patches. Andreas ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-11-23 7:53 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-21 19:53 [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 1/4] iw: update to 3.2 Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 2/4] libnl: add 3.23 Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 3/4] networkmanager: bump PR to force rebuild with libnl 3.23 Andreas Müller 2011-11-21 19:53 ` [meta-oe][V2 4/4] libnl1: remove Andreas Müller 2011-11-21 22:11 ` [meta-oe][V2 0/4] libnl and iw updates to make networkmanager work Koen Kooi 2011-11-21 23:49 ` Andreas Müller 2011-11-22 0:44 ` Andreas Müller 2011-11-22 7:57 ` Koen Kooi 2011-11-23 7:47 ` Andreas Müller
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.