Skip to contentSkip to conversation

libnl: rename libnl2 to libnl as used in openembedded-core

PATCH In review Martin Jansa 5 participants 31 messages Mar 18, 2011 – Mar 24, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/12 libnl: rename libnl2 to libnl as used in openembedded-core

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

---
 .../libnl/files/dont-link-libnl-from-sysroot.patch |   26 -------------------
 recipes/libnl/files/fix-includes.patch             |   13 ---------
 recipes/libnl/files/fix-pc-file.patch              |   11 --------
 recipes/libnl/files/local-includes.patch           |   12 ---------
 recipes/libnl/files/netlink-local-fix.patch        |   12 ---------
 recipes/libnl/files/respect-ldflags.patch          |   12 ---------
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 +++++++++++++++++++
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 +++++++++
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 +++++++++
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 +++++++++
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 +++++++++
 recipes/libnl/libnl/fix-pc-file.patch              |   11 ++++++++
 recipes/libnl/libnl/fix-pktloc-dep-race.patch      |   20 ++++++++++++++
 recipes/libnl/libnl2/fix-pc-file.patch             |   11 --------
 recipes/libnl/libnl2/fix-pktloc-dep-race.patch     |   20 --------------
 recipes/libnl/libnl2_2.0.bb                        |   27 --------------------
 recipes/libnl/libnl2_git.bb                        |   27 --------------------
 recipes/libnl/libnl_2.0.bb                         |   27 ++++++++++++++++++++
 recipes/libnl/libnl_git.bb                         |   27 ++++++++++++++++++++
 19 files changed, 160 insertions(+), 171 deletions(-)
 delete mode 100644 recipes/libnl/files/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/files/fix-includes.patch
 delete mode 100644 recipes/libnl/files/fix-pc-file.patch
 delete mode 100644 recipes/libnl/files/local-includes.patch
 delete mode 100644 recipes/libnl/files/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/files/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl/fix-pc-file.patch
 create mode 100644 recipes/libnl/libnl/fix-pktloc-dep-race.patch
 delete mode 100644 recipes/libnl/libnl2/fix-pc-file.patch
 delete mode 100644 recipes/libnl/libnl2/fix-pktloc-dep-race.patch
 delete mode 100644 recipes/libnl/libnl2_2.0.bb
 delete mode 100644 recipes/libnl/libnl2_git.bb
 create mode 100644 recipes/libnl/libnl_2.0.bb
 create mode 100644 recipes/libnl/libnl_git.bb
recipes/libnl/files/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/files/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/files/fix-pc-file.patch deleted +0 -11
deleted file mode 100644
index 77f3e88..0000000
@@ -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}
recipes/libnl/files/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/files/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/files/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl/fix-pc-file.patch new file +11 -0
new file mode 100644
index 0000000..17666fb
@@ -0,0 +1,11 @@
+Index: libnl-2.0/libnl-2.0.pc.in
+===================================================================
+--- libnl-2.0.orig/libnl-2.0.pc.in
++++ libnl-2.0/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}
recipes/libnl/libnl/fix-pktloc-dep-race.patch new file +20 -0
new file mode 100644
index 0000000..ee21744
@@ -0,0 +1,20 @@
+Index: libnl-2.0/lib/Makefile.am
+===================================================================
+--- libnl-2.0.orig/lib/Makefile.am
++++ libnl-2.0/lib/Makefile.am
+@@ -27,11 +27,15 @@ CLEANFILES = \
+ 	route/pktloc_grammar.c route/pktloc_grammar.h \
+ 	route/pktloc_syntax.c route/pktloc_syntax.h
+ 
++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_grammar.h: route/pktloc_grammar.c
+ route/pktloc_grammar.c: route/pktloc_grammar.l
+ 	$(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 $@ $^
+ 
recipes/libnl/libnl2/fix-pc-file.patch deleted +0 -11
deleted file mode 100644
index 17666fb..0000000
@@ -1,11 +0,0 @@
-Index: libnl-2.0/libnl-2.0.pc.in
-===================================================================
---- libnl-2.0.orig/libnl-2.0.pc.in
-+++ libnl-2.0/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}
recipes/libnl/libnl2/fix-pktloc-dep-race.patch deleted +0 -20
deleted file mode 100644
index ee21744..0000000
@@ -1,20 +0,0 @@
-Index: libnl-2.0/lib/Makefile.am
-===================================================================
---- libnl-2.0.orig/lib/Makefile.am
-+++ libnl-2.0/lib/Makefile.am
-@@ -27,11 +27,15 @@ CLEANFILES = \
- 	route/pktloc_grammar.c route/pktloc_grammar.h \
- 	route/pktloc_syntax.c route/pktloc_syntax.h
- 
-+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_grammar.h: route/pktloc_grammar.c
- route/pktloc_grammar.c: route/pktloc_grammar.l
- 	$(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 $@ $^
- 
recipes/libnl/libnl2_2.0.bb deleted +0 -27
deleted file mode 100644
index 7e9336e..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-PE = "1"
-PR = "r2"
-
-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"
-
-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.*"
recipes/libnl/libnl2_git.bb deleted +0 -27
deleted file mode 100644
index b667815..0000000
@@ -1,27 +0,0 @@
-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}"
-PE = "1"
-PR = "r3"
-
-DEPENDS = "flex-native bison-native"
-
-inherit autotools
-
-includedir = ${prefix}/include/libnl2
-
-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.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
-FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
-FILES_${PN}-cli   = "${libdir}/libnl-cli.so.*"
recipes/libnl/libnl_2.0.bb new file +27 -0
new file mode 100644
index 0000000..7e9336e
@@ -0,0 +1,27 @@
+DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+PE = "1"
+PR = "r2"
+
+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"
+
+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.*"
recipes/libnl/libnl_git.bb new file +27 -0
new file mode 100644
index 0000000..b667815
@@ -0,0 +1,27 @@
+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}"
+PE = "1"
+PR = "r3"
+
+DEPENDS = "flex-native bison-native"
+
+inherit autotools
+
+includedir = ${prefix}/include/libnl2
+
+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.*"
+FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
+FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
+FILES_${PN}-cli   = "${libdir}/libnl-cli.so.*"
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 2/12 libnl: don't use /usr/include/libnl2 anymore

---
 recipes/libnl/libnl_2.0.bb |    4 +---
 recipes/libnl/libnl_git.bb |    2 --
 2 files changed, 1 insertions(+), 5 deletions(-)
recipes/libnl/libnl_2.0.bb +1 -3
index 7e9336e..8b77d07 100644
@@ -9,14 +9,12 @@ 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"
 
recipes/libnl/libnl_git.bb +0 -2
index b667815..b3bb749 100644
@@ -11,8 +11,6 @@ DEPENDS = "flex-native bison-native"
 
 inherit autotools
 
-includedir = ${prefix}/include/libnl2
-
 SRC_URI = "\
   git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \
   file://fix-pc-file.patch \
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 3/12 libnl: add RREPLACES libnl2 for upgradable path

In reply to Martin Jansa
---
 recipes/libnl/libnl_2.0.bb |    7 +++++++
 recipes/libnl/libnl_git.bb |    7 +++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
recipes/libnl/libnl_2.0.bb +7 -0
index 8b77d07..6614478 100644
@@ -23,3 +23,10 @@ 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.*"
+
+# for upgradable path from libnl2_2.0 to libnl_2.0
+RREPLACES_${PN} = "${PN}2"
+RREPLACES_${PN}-route = "${PN}2-route"
+RREPLACES_${PN}-nf = "${PN}2-nf"
+RREPLACES_${PN}-genl = "${PN}2-genl"
+RREPLACES_${PN}-cli = "${PN}2-cli"
recipes/libnl/libnl_git.bb +7 -0
index b3bb749..b844bdd 100644
@@ -23,3 +23,10 @@ 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.*"
+
+# for upgradable path from libnl2_2.0 to libnl_2.0
+RREPLACES_${PN} = "${PN}2"
+RREPLACES_${PN}-route = "${PN}2-route"
+RREPLACES_${PN}-nf = "${PN}2-nf"
+RREPLACES_${PN}-genl = "${PN}2-genl"
+RREPLACES_${PN}-cli = "${PN}2-cli"
Signature · 1 line
1.7.4.1
#3 lore raw

Re: [PATCH 03/12] libnl: add RREPLACES libnl2 for upgradable path

Quoted 5 lines · Martin Jansa
---
 recipes/libnl/libnl_2.0.bb |    7 +++++++
 recipes/libnl/libnl_git.bb |    7 +++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

This one is probably not needed (don't have libnl1 installed here to test)

I've PATCHv2 with this:

+# for upgradable path from libnl_1.0 to libnl_2.0
+# old libnl2_2.0 already had same names so RREPLACES isn't needed +# libnl2_2.0/libnl_2.0 with debian naming produces ie libnl-route2 +RREPLACES_${PN} = "libnl1"
+RREPLACES_${PN}-route = "libnl1"
+RREPLACES_${PN}-nf = "libnl1"
+RREPLACES_${PN}-genl = "libnl1"
+RREPLACES_${PN}-cli = "libnl1"

but still it looks like only libnl2-dev and libnl-dev have conflicting files, so maybe RCONFLICTS will be better to let user to remove old libnl1 before upgrade to libnl2?

Quoted 33 lines
recipes/libnl/libnl_2.0.bb +7 -0
index 8b77d07..6614478 100644
@@ -23,3 +23,10 @@ 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.*"
+
+# for upgradable path from libnl2_2.0 to libnl_2.0
+RREPLACES_${PN} = "${PN}2"
+RREPLACES_${PN}-route = "${PN}2-route"
+RREPLACES_${PN}-nf = "${PN}2-nf"
+RREPLACES_${PN}-genl = "${PN}2-genl"
+RREPLACES_${PN}-cli = "${PN}2-cli"
recipes/libnl/libnl_git.bb +7 -0
index b3bb749..b844bdd 100644
@@ -23,3 +23,10 @@ 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.*"
+
+# for upgradable path from libnl2_2.0 to libnl_2.0
+RREPLACES_${PN} = "${PN}2"
+RREPLACES_${PN}-route = "${PN}2-route"
+RREPLACES_${PN}-nf = "${PN}2-nf"
+RREPLACES_${PN}-genl = "${PN}2-genl"
+RREPLACES_${PN}-cli = "${PN}2-cli"
Signature · 1 line
1.7.4.1
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw

Re: [PATCH 03/12] libnl: add RREPLACES libnl2 for upgradable path

In reply to Martin Jansa

recipes/libnl/libnl_2.0.bb FILES_${PN}-route = "${libdir}/libnl-route.so.*" · line 29

Quoted 3 lines · Martin Jansa
recipes/libnl/libnl_2.0.bb +3 -0
+# for upgradable path from libnl2_2.0 to libnl_2.0
+RREPLACES_${PN} = "${PN}2"
+RREPLACES_${PN}-route = "${PN}2-route"

Don't you also want RPROVIDES, RCONFLICTS?

p.

#5 lore raw

Re: [PATCH 03/12] libnl: add RREPLACES libnl2 for upgradable path

Quoted 6 lines · Phil Blundell

recipes/libnl/libnl_2.0.bb FILES_${PN}-route = "${libdir}/libnl-route.so.*" · line 29

Quoted 3 lines · Martin Jansa
recipes/libnl/libnl_2.0.bb +3 -0
+# for upgradable path from libnl2_2.0 to libnl_2.0
+RREPLACES_${PN} = "${PN}2"
+RREPLACES_${PN}-route = "${PN}2-route"

Don't you also want RPROVIDES, RCONFLICTS?

Actually, I can probably drop this patch completely. At least for people using debian naming. (someone not using debian naming can test and send patch if needed).

see:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-March/031155.html

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw

PATCH 4/12 libnl_git: remove fix-pktloc-dep-race.patch from this version

In reply to Martin Jansa

* it does not apply because there isn't pktloc in this SRCREV yet, commented out in upstream src/lib/Makefile.am

---
 recipes/libnl/libnl_git.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
recipes/libnl/libnl_git.bb +0 -1
index b844bdd..e645892 100644
@@ -14,7 +14,6 @@ inherit autotools
 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"
 
Signature · 1 line
1.7.4.1
#7 lore raw

Re: [PATCH 04/12] libnl_git: remove fix-pktloc-dep-race.patch from this version

Hello.

Quoted 2 lines · Martin Jansa

* it does not apply because there isn't pktloc in this SRCREV yet, commented out in upstream src/lib/Makefile.am

Hmm, does this mean we are behind the latest release with our _git recipe?

regards
Stefan Schmidt

#8 lore raw

Re: [PATCH 04/12] libnl_git: remove fix-pktloc-dep-race.patch from this version

Quoted 8 lines · Stefan Schmidt

Hello.

Quoted 2 lines · Martin Jansa

* it does not apply because there isn't pktloc in this SRCREV yet, commented out in upstream src/lib/Makefile.am

Hmm, does this mean we are behind the latest release with our _git recipe?

Yes, it's older than libnl_2.0.0 as PV says
PV = "1.9+gitr${SRCPV}"

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#9 lore raw

PATCH 5/12 libnl: add libnl.inc and use INC_PR

In reply to Martin Jansa
---
 recipes/libnl/libnl.inc    |    9 +++++++++
 recipes/libnl/libnl_1.1.bb |   10 ++--------
 recipes/libnl/libnl_2.0.bb |    9 ++-------
 recipes/libnl/libnl_git.bb |   16 ++++++----------
 4 files changed, 19 insertions(+), 25 deletions(-)
 create mode 100644 recipes/libnl/libnl.inc
recipes/libnl/libnl.inc new file +9 -0
new file mode 100644
index 0000000..6f502b1
@@ -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
+
recipes/libnl/libnl_1.1.bb +2 -8
index f1b2a9d..d9f250e 100644
@@ -1,11 +1,6 @@
-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"
-
-inherit autotools pkgconfig
+PR = "${INC_PR}.0"
 
 CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
 
@@ -18,6 +13,5 @@ SRC_URI = "\
   file://dont-link-libnl-from-sysroot.patch \
 "
 
-
 SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
 SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
recipes/libnl/libnl_2.0.bb +2 -7
index 6614478..3038487 100644
@@ -1,14 +1,9 @@
-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
-
 SRC_URI = "\
   http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \
   file://fix-pc-file.patch \
recipes/libnl/libnl_git.bb +6 -10
index e645892..8ce4a6e 100644
@@ -1,21 +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
-
+S = "${WORKDIR}/git"
+SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d"
 SRC_URI = "\
   git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \
   file://fix-pc-file.patch \
 "
-S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
 FILES_${PN}-route = "${libdir}/libnl-route.so.*"
Signature · 1 line
1.7.4.1
#10 lore raw

PATCH 6/12 SHR: drop blacklist entries for libnl, now when libnl2 is used by default

In reply to Martin Jansa
---
 conf/distro/shr.conf |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
conf/distro/shr.conf +0 -2
index e8fd844..be5904e 100644
@@ -59,7 +59,6 @@ ANGSTROM_BLACKLIST_pn-xserver-kdrive-1300 = "xorg-server is preferred"
 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"
@@ -85,7 +84,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
Signature · 1 line
1.7.4.1
#11 lore raw

PATCH 7/12 libfsobasics: depend only on libnl(-2.0) not libnl2(-2.0)

In reply to Martin Jansa
---
 recipes/freesmartphone/libfsobasics_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/freesmartphone/libfsobasics_git.bb +2 -2
index c99bd8e..1d751ca 100644
@@ -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"
Signature · 1 line
1.7.4.1
#12 lore raw

PATCH 8/12 hostap-daemon: depend only on libnl(-2.0) not libnl2(-2.0)

In reply to Martin Jansa
---
 recipes/hostap/hostap-daemon_0.7.3.bb |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
recipes/hostap/hostap-daemon_0.7.3.bb +2 -3
index 2dfec35..10b1389 100644
@@ -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() {
Signature · 1 line
1.7.4.1
#13 lore raw

PATCH 9/12 iw: depend only on libnl(-2.0) not libnl2(-2.0)

In reply to Martin Jansa
---
 recipes/iw/iw_0.9.20.bb |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
recipes/iw/iw_0.9.20.bb +3 -6
index 0b6a768..7048091 100644
@@ -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
Signature · 1 line
1.7.4.1
#14 lore raw

PATCH 10/12 ti-wifi-utils: depend only on libnl(-2.0) not libnl2(-2.0)

In reply to Martin Jansa
---
 recipes/ti/ti-wifi-utils_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/ti/ti-wifi-utils_git.bb +2 -2
index e6795a8..92edb7f 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "The calibrator and other useful utilities for TI wireless solution based on wl12xx driver"
 LICENSE = "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}
Signature · 1 line
1.7.4.1
#15 lore raw

PATCH 11/12 wpa-supplicant-0.7: depend only on libnl(-2.0) not libnl2(-2.0)

In reply to Martin Jansa
---
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
recipes/wpa-supplicant/wpa-supplicant-0.7.inc +2 -7
index 7649038..0cf3b70 100644
@@ -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"
Signature · 1 line
1.7.4.1
#16 lore raw

PATCH 12/12 connman: depend only on libnl(-2.0) not libnl2(-2.0)

In reply to Martin Jansa
---
 recipes/connman/connman.inc     |    2 +-
 recipes/connman/connman_0.46.bb |    2 +-
 recipes/connman/connman_0.51.bb |    2 +-
 recipes/connman/connman_0.65.bb |    2 +-
 recipes/connman/connman_0.68.bb |    2 +-
 recipes/connman/connman_git.bb  |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
recipes/connman/connman.inc +1 -1
index e25d64a..7306b1b 100644
@@ -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 \
recipes/connman/connman_0.46.bb +1 -1
index a7bf286..1f1df9c 100644
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
recipes/connman/connman_0.51.bb +1 -1
index f1c5003..036a710 100644
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
recipes/connman/connman_0.65.bb +1 -1
index 78e4287..880d775 100644
@@ -1,7 +1,7 @@
 require connman.inc
 # connman requires libXtables now
 DEPENDS += "iptables"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
recipes/connman/connman_0.68.bb +1 -1
index ead215d..093a5a5 100644
@@ -1,7 +1,7 @@
 require connman.inc
 # connman requires libXtables now
 DEPENDS += "iptables"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
recipes/connman/connman_git.bb +1 -1
index 39ffac6..283eb6b 100644
@@ -27,7 +27,7 @@ require connman.inc
 SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" 
 
 PV = "0.42+git"
-PR = "r2"
+PR = "r3"
 PR_append = ".gitr${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
Signature · 1 line
1.7.4.1
#17 lore raw
In reply to Martin Jansa

Hello.

Quoted 3 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

For distros that want to support network-manager that still means that both versions are being build and may clash as we have seen before.

Just a remark. Personally I would like to go this route and maybe get rid of libnl1 at all.

regards
Stefan Schmidt

#18 lore raw
Quoted 9 lines · Stefan Schmidt

Hello.

Quoted 3 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

For distros that want to support network-manager that still means that both versions are being build and may clash as we have seen before.

How do you build 2 versions of same package? Whole point of this patch series is to force distromaintainers to use only libnl_2.0.0 or libnl_1.1.0 based on PREFERRED_VERSION_libnl and this way keep them away from shooting own foot by accident.

Quoted 2 lines

Just a remark. Personally I would like to go this route and maybe get rid of libnl1 at all.

Yes this is step in direction to get rid of libnl1 :). I'm using libnl_2.0.0 from oe-core in meta-shr, so this change is making diff between recipes in oe.dev and meta-shr smaller.

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#19 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Martin Jansa
Quoted 7 lines · Stefan Schmidt

Hello.

Quoted 3 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

Quoted 7 lines
Quoted 2 lines

For distros that want to support network-manager that still means that both versions are being build and may clash as we have seen before.

How do you build 2 versions of same package? Whole point of this patch series is to force distromaintainers to use only libnl_2.0.0 or libnl_1.1.0 based on PREFERRED_VERSION_libnl and this way keep them away from shooting own foot by accident.

I don't think that's an acceptable solution just yet since angstrom needs both iw and nm. I think the best way forward is:

1) configure libnl1 to only build a .a
2) rename that .a to libnl-old.a before installing it
3) patch nm to use -l:libnl-old.a

or

1) configure libnl1 to only build a .a
2) move that .a to ${libdir}/libnl1/
3) patch nm to use -L${STAGING_LIBDIR}/libnl1 -l:libnl.a

A lot like
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=71e69ad8b551aa06f63160232d1bd87b8d801a1d
but a bit cleaner.

Quoted 6 lines
Quoted 2 lines

Just a remark. Personally I would like to go this route and maybe get rid of libnl1 at all.

Yes this is step in direction to get rid of libnl1 :). I'm using libnl_2.0.0 from oe-core in meta-shr, so this change is making diff between recipes in oe.dev and meta-shr smaller.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNidyDMkyGM64RGpERAtrBAJ9j+q1b4dFMXW7C0T9g55y22GO/PACfeH1O 3NU5PzIAzmtbZy5rdk7ojhs=
=Vgfx
-----END PGP SIGNATURE-----

#20 lore raw
Quoted 27 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Martin Jansa
Quoted 7 lines · Stefan Schmidt

Hello.

Quoted 3 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

Quoted 7 lines
Quoted 2 lines

For distros that want to support network-manager that still means that both versions are being build and may clash as we have seen before.

How do you build 2 versions of same package? Whole point of this patch series is to force distromaintainers to use only libnl_2.0.0 or libnl_1.1.0 based on PREFERRED_VERSION_libnl and this way keep them away from shooting own foot by accident.

I don't think that's an acceptable solution just yet since angstrom needs both iw and nm. I think the best way forward is:

1) configure libnl1 to only build a .a
2) rename that .a to libnl-old.a before installing it
3) patch nm to use -l:libnl-old.a

Quoted 5 lines

or

1) configure libnl1 to only build a .a
2) move that .a to ${libdir}/libnl1/
3) patch nm to use -L${STAGING_LIBDIR}/libnl1 -l:libnl.a

OK, so we'll make special case from libnl1 instead of libnl2 (to be in line with oe-core).

I have it ready, will send patch for libnl1 and networkmanager_git.

Please test, I'm not using nm on target so only build tested it.

Cheers

Quoted 27 lines

A lot like
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=71e69ad8b551aa06f63160232d1bd87b8d801a1d
but a bit cleaner.

Quoted 6 lines
Quoted 2 lines

Just a remark. Personally I would like to go this route and maybe get rid of libnl1 at all.

Yes this is step in direction to get rid of libnl1 :). I'm using libnl_2.0.0 from oe-core in meta-shr, so this change is making diff between recipes in oe.dev and meta-shr smaller.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNidyDMkyGM64RGpERAtrBAJ9j+q1b4dFMXW7C0T9g55y22GO/PACfeH1O 3NU5PzIAzmtbZy5rdk7ojhs=
=Vgfx
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#21 lore raw

PATCH 1/2 libnl-1.1: rename to libnl1 and build only static lib

* static lib is enough to build nm and shouldn't conflict with libnl2
* this makes special case from libnl1 instead libnl2

---
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 -------
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 ---
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 ---
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 ---
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 ---
 .../libnl/libnl1-1.1/build.only.static.lib.patch   |   79 ++++++++++++++++++++
 .../libnl1-1.1/dont-link-libnl-from-sysroot.patch  |   26 +++++++
 recipes/libnl/libnl1-1.1/fix-includes.patch        |   13 +++
 recipes/libnl/libnl1-1.1/local-includes.patch      |   12 +++
 recipes/libnl/libnl1-1.1/netlink-local-fix.patch   |   12 +++
 recipes/libnl/libnl1-1.1/respect-ldflags.patch     |   12 +++
 recipes/libnl/libnl1_1.1.bb                        |   22 ++++++
 recipes/libnl/libnl_1.1.bb                         |   17 ----
 13 files changed, 176 insertions(+), 92 deletions(-)
 delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch
 create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1_1.1.bb
 delete mode 100644 recipes/libnl/libnl_1.1.bb
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/libnl-1.1/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/libnl-1.1/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/libnl-1.1/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file +79 -0

79 lines not on this page · raw message

recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl1-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl1-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl1-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl1-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl1_1.1.bb new file +22 -0
new file mode 100644
index 0000000..3569867
@@ -0,0 +1,22 @@
+require libnl.inc
+
+PR = "${INC_PR}.0"
+
+# 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 \
+"
+S = "${WORKDIR}/libnl-${PV}"
+
+SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
+SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
recipes/libnl/libnl_1.1.bb deleted +0 -17
deleted file mode 100644
index d9f250e..0000000
@@ -1,17 +0,0 @@
-require libnl.inc
-
-PR = "${INC_PR}.0"
-
-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 \
-"
-
-SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
-SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
Signature · 1 line
1.7.4.1
#22 lore raw

PATCH 2/2 networkmanager_git: fix build with static libnl1

* backend/ip6-manager didn't respect LIBNL_CFLAGS so using /usr/include/netlink headers from libnl-2
* older versions of networkmanager should be fixed or removed
* only build tested, please test runtime..

---
 recipes/networkmanager/networkmanager-0.7.inc      |    2 +-
 ...-libnl-flags-also-in-backends-ip6-manager.patch |   51 ++++++++++++++++++++
 recipes/networkmanager/networkmanager_git.bb       |    2 +
 3 files changed, 54 insertions(+), 1 deletions(-)
 create mode 100644 recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
recipes/networkmanager/networkmanager-0.7.inc +1 -1
index 6c0ccbe..18af1bc 100644
@@ -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)} \
            "
recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch new file +51 -0

51 lines not on this page · raw message

recipes/networkmanager/networkmanager_git.bb +2 -0
index bb746a1..c6bfab2 100644
@@ -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 \
Signature · 1 line
1.7.4.1
#23 lore raw

Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib

In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Can you regenerate this on top of .dev? I couldn't get it to apply, even after renaming files -> libnl-1.1

Quoted 369 lines · Martin Jansa

* static lib is enough to build nm and shouldn't conflict with libnl2
* this makes special case from libnl1 instead libnl2

---
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 -------
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 ---
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 ---
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 ---
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 ---
 .../libnl/libnl1-1.1/build.only.static.lib.patch   |   79 ++++++++++++++++++++
 .../libnl1-1.1/dont-link-libnl-from-sysroot.patch  |   26 +++++++
 recipes/libnl/libnl1-1.1/fix-includes.patch        |   13 +++
 recipes/libnl/libnl1-1.1/local-includes.patch      |   12 +++
 recipes/libnl/libnl1-1.1/netlink-local-fix.patch   |   12 +++
 recipes/libnl/libnl1-1.1/respect-ldflags.patch     |   12 +++
 recipes/libnl/libnl1_1.1.bb                        |   22 ++++++
 recipes/libnl/libnl_1.1.bb                         |   17 ----
 13 files changed, 176 insertions(+), 92 deletions(-)
 delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch
 create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1_1.1.bb
 delete mode 100644 recipes/libnl/libnl_1.1.bb
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/libnl-1.1/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/libnl-1.1/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/libnl-1.1/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file +79 -0
new file mode 100644
index 0000000..770a392
@@ -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
recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl1-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl1-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl1-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl1-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl1_1.1.bb new file +22 -0
new file mode 100644
index 0000000..3569867
@@ -0,0 +1,22 @@
+require libnl.inc
+
+PR = "${INC_PR}.0"
+
+# 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 \
+"
+S = "${WORKDIR}/libnl-${PV}"
+
+SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
+SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
recipes/libnl/libnl_1.1.bb deleted +0 -7
deleted file mode 100644
index d9f250e..0000000
@@ -1,17 +0,0 @@
-require libnl.inc
-
-PR = "${INC_PR}.0"
-
-CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
-
-SRC_URI = "\

recipes/libnl/libnl_1.1.bb line 17

Quoted 10 lines
recipes/libnl/libnl_1.1.bb deleted +0 -10
-  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 \
-"
-
-SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
-SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNik6yMkyGM64RGpERAmGaAJ4hgELxVhOiPwxLdFdvQ8NLxocuCACeIuyH XZWggTYtFEhserJNsOLOhqU=
=7A9C
-----END PGP SIGNATURE-----

#24 lore raw

Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib

Quoted 5 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Can you regenerate this on top of .dev? I couldn't get it to apply, even after renaming files -> libnl-1.1

Did you try to apply it on top of that 12patch series?

Or you can apply top 14 from
http://gitorious.org/~jama/angstrom/jama-shr-experimental/

Cheers,

Quoted 394 lines · Martin Jansa
Quoted 369 lines

* static lib is enough to build nm and shouldn't conflict with libnl2
* this makes special case from libnl1 instead libnl2

---
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 -------
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 ---
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 ---
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 ---
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 ---
 .../libnl/libnl1-1.1/build.only.static.lib.patch   |   79 ++++++++++++++++++++
 .../libnl1-1.1/dont-link-libnl-from-sysroot.patch  |   26 +++++++
 recipes/libnl/libnl1-1.1/fix-includes.patch        |   13 +++
 recipes/libnl/libnl1-1.1/local-includes.patch      |   12 +++
 recipes/libnl/libnl1-1.1/netlink-local-fix.patch   |   12 +++
 recipes/libnl/libnl1-1.1/respect-ldflags.patch     |   12 +++
 recipes/libnl/libnl1_1.1.bb                        |   22 ++++++
 recipes/libnl/libnl_1.1.bb                         |   17 ----
 13 files changed, 176 insertions(+), 92 deletions(-)
 delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch
 create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1_1.1.bb
 delete mode 100644 recipes/libnl/libnl_1.1.bb
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/libnl-1.1/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/libnl-1.1/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/libnl-1.1/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file +79 -0
new file mode 100644
index 0000000..770a392
@@ -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
recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl1-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl1-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl1-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl1-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl1_1.1.bb new file +22 -0
new file mode 100644
index 0000000..3569867
@@ -0,0 +1,22 @@
+require libnl.inc
+
+PR = "${INC_PR}.0"
+
+# 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 \
+"
+S = "${WORKDIR}/libnl-${PV}"
+
+SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
+SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
recipes/libnl/libnl_1.1.bb deleted +0 -7
deleted file mode 100644
index d9f250e..0000000
@@ -1,17 +0,0 @@
-require libnl.inc
-
-PR = "${INC_PR}.0"
-
-CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
-
-SRC_URI = "\

recipes/libnl/libnl_1.1.bb line 17

Quoted 10 lines
recipes/libnl/libnl_1.1.bb deleted +0 -10
-  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 \
-"
-
-SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
-SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNik6yMkyGM64RGpERAmGaAJ4hgELxVhOiPwxLdFdvQ8NLxocuCACeIuyH XZWggTYtFEhserJNsOLOhqU=
=7A9C
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#25 lore raw

Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Martin Jansa

On Wed, Mar 23, 2011 at 08:49:06PM +0100, Koen Kooi wrote:
Can you regenerate this on top of .dev? I couldn't get it to apply, even after renaming files -> libnl-1.1

Quoted 4 lines

Did you try to apply it on top of that 12patch series?

Or you can apply top 14 from
http://gitorious.org/~jama/angstrom/jama-shr-experimental/

I applied the top 14, clean libnl* and nm, built libnl1 and libnl and I get:

ps/libip6_manager_la-nm-ip6-manager.Tpo -c nm-ip6-manager.c -fPIC -DPIC
- -o .libs/libip6_manager_la-nm-ip6-manager.o
| nm-ip6-manager.c: In function 'process_addr':
| nm-ip6-manager.c:488:46: error: too few arguments to function
'nl_cache_include'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:64:14:
note: declared here
| nm-ip6-manager.c: In function 'process_route':
| nm-ip6-manager.c:528:47: error: too few arguments to function
'nl_cache_include'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:64:14:
note: declared here
| nm-ip6-manager.c: In function 'nm_ip6_manager_get_ip6_config':
| nm-ip6-manager.c:944:2: warning: passing argument 1 of
'nl_cache_refill' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:56:14:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:945:2: warning: passing argument 1 of
'nl_cache_refill' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:56:14:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:960:13: warning: assignment makes pointer from
integer without a cast
| nm-ip6-manager.c:985:3: error: too few arguments to function
'rtnl_route_get_metric'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:83:12:
note: declared here
| nm-ip6-manager.c: In function 'nm_ip6_manager_init':
| nm-ip6-manager.c:1073:2: warning: passing argument 1 of
'rtnl_addr_alloc_cache' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/addr.h:31:12:
note: expected 'struct nl_sock *' but argument is ofERROR: Function
'do_compile' failed (see /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/temp/log.do_compile.20022 for further information)
| type 'struct nl_handle *'
| nm-ip6-manager.c:1073:2: error: too few arguments to function
'rtnl_addr_alloc_cache'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/addr.h:31:12:
note: declared here
| nm-ip6-manager.c:1074:2: warning: passing argument 1 of
'rtnl_route_alloc_cache' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:48:12:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:1074:2: error: too few arguments to function
'rtnl_route_alloc_cache'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:48:12:
note: declared here
| make[4]: *** [libip6_manager_la-nm-ip6-manager.lo] Error 1
| make[4]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src/ip6-manager' | make[3]: *** [all-recursive] Error 1
| make[3]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src' | make[2]: *** [all] Error 2
| make[2]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src' | make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1'

| make: *** [all] Error 2
| + die 'oe_runmake failed'
| + oefatal 'oe_runmake failed'
| + echo FATAL: 'oe_runmake failed'
| FATAL: oe_runmake failed
| + exit 1

So there still is a header clash by the looks of it. Did I miss a patch?

regards,

Koen

Quoted 378 lines
Quoted 2 lines

Cheers,

Quoted 374 lines · Martin Jansa
Quoted 374 lines
Quoted 374 lines

* static lib is enough to build nm and shouldn't conflict with libnl2
* this makes special case from libnl1 instead libnl2

---
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 -------
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 ---
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 ---
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 ---
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 ---
 .../libnl/libnl1-1.1/build.only.static.lib.patch   |   79 ++++++++++++++++++++
 .../libnl1-1.1/dont-link-libnl-from-sysroot.patch  |   26 +++++++
 recipes/libnl/libnl1-1.1/fix-includes.patch        |   13 +++
 recipes/libnl/libnl1-1.1/local-includes.patch      |   12 +++
 recipes/libnl/libnl1-1.1/netlink-local-fix.patch   |   12 +++
 recipes/libnl/libnl1-1.1/respect-ldflags.patch     |   12 +++
 recipes/libnl/libnl1_1.1.bb                        |   22 ++++++
 recipes/libnl/libnl_1.1.bb                         |   17 ----
 13 files changed, 176 insertions(+), 92 deletions(-)
 delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch
 create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1_1.1.bb
 delete mode 100644 recipes/libnl/libnl_1.1.bb
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/libnl-1.1/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/libnl-1.1/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/libnl-1.1/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file +79 -0
new file mode 100644
index 0000000..770a392
@@ -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
recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl1-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl1-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl1-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl1-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl1_1.1.bb new file +22 -0
new file mode 100644
index 0000000..3569867
@@ -0,0 +1,22 @@
+require libnl.inc
+
+PR = "${INC_PR}.0"
+
+# 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 \
+"
+S = "${WORKDIR}/libnl-${PV}"
+
+SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
+SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
recipes/libnl/libnl_1.1.bb deleted +0 -12
deleted file mode 100644
index d9f250e..0000000
@@ -1,17 +0,0 @@
-require libnl.inc
-
-PR = "${INC_PR}.0"
-
-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 \
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines

recipes/libnl/libnl_1.1.bb line 17

Quoted 5 lines
recipes/libnl/libnl_1.1.bb deleted +0 -5
-  file://dont-link-libnl-from-sysroot.patch \
-"
-
-SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
-SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNiwbBMkyGM64RGpERAmdbAJ9hrrjAfdIkvPUEjpSNnyYwF2uaAQCfX+sc 8n5+gtoCJVtfWvIeeDRyc5k=
=o9Ih
-----END PGP SIGNATURE-----

#26 lore raw

Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib

Quoted 87 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Martin Jansa

On Wed, Mar 23, 2011 at 08:49:06PM +0100, Koen Kooi wrote:
Can you regenerate this on top of .dev? I couldn't get it to apply, even after renaming files -> libnl-1.1

Quoted 4 lines

Did you try to apply it on top of that 12patch series?

Or you can apply top 14 from
http://gitorious.org/~jama/angstrom/jama-shr-experimental/

I applied the top 14, clean libnl* and nm, built libnl1 and libnl and I get:

ps/libip6_manager_la-nm-ip6-manager.Tpo -c nm-ip6-manager.c -fPIC -DPIC
- -o .libs/libip6_manager_la-nm-ip6-manager.o
| nm-ip6-manager.c: In function 'process_addr':
| nm-ip6-manager.c:488:46: error: too few arguments to function
'nl_cache_include'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:64:14:
note: declared here
| nm-ip6-manager.c: In function 'process_route':
| nm-ip6-manager.c:528:47: error: too few arguments to function
'nl_cache_include'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:64:14:
note: declared here
| nm-ip6-manager.c: In function 'nm_ip6_manager_get_ip6_config':
| nm-ip6-manager.c:944:2: warning: passing argument 1 of
'nl_cache_refill' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:56:14:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:945:2: warning: passing argument 1 of
'nl_cache_refill' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:56:14:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:960:13: warning: assignment makes pointer from
integer without a cast
| nm-ip6-manager.c:985:3: error: too few arguments to function
'rtnl_route_get_metric'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:83:12:
note: declared here
| nm-ip6-manager.c: In function 'nm_ip6_manager_init':
| nm-ip6-manager.c:1073:2: warning: passing argument 1 of
'rtnl_addr_alloc_cache' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/addr.h:31:12:
note: expected 'struct nl_sock *' but argument is ofERROR: Function
'do_compile' failed (see /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/temp/log.do_compile.20022 for further information)
| type 'struct nl_handle *'
| nm-ip6-manager.c:1073:2: error: too few arguments to function
'rtnl_addr_alloc_cache'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/addr.h:31:12:
note: declared here
| nm-ip6-manager.c:1074:2: warning: passing argument 1 of
'rtnl_route_alloc_cache' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:48:12:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:1074:2: error: too few arguments to function
'rtnl_route_alloc_cache'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:48:12:
note: declared here
| make[4]: *** [libip6_manager_la-nm-ip6-manager.lo] Error 1
| make[4]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src/ip6-manager' | make[3]: *** [all-recursive] Error 1
| make[3]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src' | make[2]: *** [all] Error 2
| make[2]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src' | make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1'

Quoted 8 lines
| make: *** [all] Error 2
| + die 'oe_runmake failed'
| + oefatal 'oe_runmake failed'
| + echo FATAL: 'oe_runmake failed'
| FATAL: oe_runmake failed
| + exit 1

So there still is a header clash by the looks of it. Did I miss a patch?

I've fixed nm only in
recipes/networkmanager/networkmanager_git.bb
where was
DEFAULT_PREFERENCE_angstrom = "1"
and highest PV

this looks like recipes/networkmanager/networkmanager_0.8.1.bb
and exactly same errors like I had with git version (backend subdir will be next to fail)

you can add/adapt recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch if you need 0.8.1 too

Cheers,

Quoted 406 lines
Quoted 375 lines · Martin Jansa
Quoted 374 lines
Quoted 374 lines
Quoted 374 lines

* static lib is enough to build nm and shouldn't conflict with libnl2
* this makes special case from libnl1 instead libnl2

---
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 -------
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 ---
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 ---
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 ---
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 ---
 .../libnl/libnl1-1.1/build.only.static.lib.patch   |   79 ++++++++++++++++++++
 .../libnl1-1.1/dont-link-libnl-from-sysroot.patch  |   26 +++++++
 recipes/libnl/libnl1-1.1/fix-includes.patch        |   13 +++
 recipes/libnl/libnl1-1.1/local-includes.patch      |   12 +++
 recipes/libnl/libnl1-1.1/netlink-local-fix.patch   |   12 +++
 recipes/libnl/libnl1-1.1/respect-ldflags.patch     |   12 +++
 recipes/libnl/libnl1_1.1.bb                        |   22 ++++++
 recipes/libnl/libnl_1.1.bb                         |   17 ----
 13 files changed, 176 insertions(+), 92 deletions(-)
 delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch
 create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl1_1.1.bb
 delete mode 100644 recipes/libnl/libnl_1.1.bb
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/libnl-1.1/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/libnl-1.1/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/libnl-1.1/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file +79 -0
new file mode 100644
index 0000000..770a392
@@ -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
recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl1-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl1-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl1-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl1-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl1_1.1.bb new file +22 -0
new file mode 100644
index 0000000..3569867
@@ -0,0 +1,22 @@
+require libnl.inc
+
+PR = "${INC_PR}.0"
+
+# 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 \
+"
+S = "${WORKDIR}/libnl-${PV}"
+
+SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
+SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
recipes/libnl/libnl_1.1.bb deleted +0 -12
deleted file mode 100644
index d9f250e..0000000
@@ -1,17 +0,0 @@
-require libnl.inc
-
-PR = "${INC_PR}.0"
-
-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 \
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines

recipes/libnl/libnl_1.1.bb line 17

Quoted 5 lines
recipes/libnl/libnl_1.1.bb deleted +0 -5
-  file://dont-link-libnl-from-sysroot.patch \
-"
-
-SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
-SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNiwbBMkyGM64RGpERAmdbAJ9hrrjAfdIkvPUEjpSNnyYwF2uaAQCfX+sc 8n5+gtoCJVtfWvIeeDRyc5k=
=o9Ih
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Acked-by
#27 lore raw

Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 85 lines · Martin Jansa

On Thu, Mar 24, 2011 at 09:54:25AM +0100, Koen Kooi wrote:

Quoted 8 lines · Martin Jansa
Quoted 8 lines
Quoted 8 lines · Koen Kooi

Can you regenerate this on top of .dev? I couldn't get it to apply, even after renaming files -> libnl-1.1

Quoted 4 lines

Did you try to apply it on top of that 12patch series?

Or you can apply top 14 from
http://gitorious.org/~jama/angstrom/jama-shr-experimental/

I applied the top 14, clean libnl* and nm, built libnl1 and libnl and I get:

ps/libip6_manager_la-nm-ip6-manager.Tpo -c nm-ip6-manager.c -fPIC -DPIC
-o .libs/libip6_manager_la-nm-ip6-manager.o
| nm-ip6-manager.c: In function 'process_addr':
| nm-ip6-manager.c:488:46: error: too few arguments to function
'nl_cache_include'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:64:14:
note: declared here
| nm-ip6-manager.c: In function 'process_route':
| nm-ip6-manager.c:528:47: error: too few arguments to function
'nl_cache_include'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:64:14:
note: declared here
| nm-ip6-manager.c: In function 'nm_ip6_manager_get_ip6_config':
| nm-ip6-manager.c:944:2: warning: passing argument 1 of
'nl_cache_refill' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:56:14:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:945:2: warning: passing argument 1 of
'nl_cache_refill' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/cache.h:56:14:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:960:13: warning: assignment makes pointer from
integer without a cast
| nm-ip6-manager.c:985:3: error: too few arguments to function
'rtnl_route_get_metric'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:83:12:
note: declared here
| nm-ip6-manager.c: In function 'nm_ip6_manager_init':
| nm-ip6-manager.c:1073:2: warning: passing argument 1 of
'rtnl_addr_alloc_cache' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/addr.h:31:12:
note: expected 'struct nl_sock *' but argument is ofERROR: Function
'do_compile' failed (see /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/temp/log.do_compile.20022 for further information)
| type 'struct nl_handle *'
| nm-ip6-manager.c:1073:2: error: too few arguments to function
'rtnl_addr_alloc_cache'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/addr.h:31:12:
note: declared here
| nm-ip6-manager.c:1074:2: warning: passing argument 1 of
'rtnl_route_alloc_cache' from incompatible pointer type
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:48:12:
note: expected 'struct nl_sock *' but argument is of type 'struct
nl_handle *'
| nm-ip6-manager.c:1074:2: error: too few arguments to function
'rtnl_route_alloc_cache'
| /OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/netlink/route/route.h:48:12:
note: declared here
| make[4]: *** [libip6_manager_la-nm-ip6-manager.lo] Error 1
| make[4]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src/ip6-manager' | make[3]: *** [all-recursive] Error 1
| make[3]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src' | make[2]: *** [all] Error 2
| make[2]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1/src' | make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/OE/angstrom-setup-scripts/build/tmp-angstrom_2008_1/work/armv7a-angstrom-linux-gnueabi/networkmanager-0.8.1-r2/NetworkManager-0.8.1'

Quoted 23 lines
| make: *** [all] Error 2
| + die 'oe_runmake failed'
| + oefatal 'oe_runmake failed'
| + echo FATAL: 'oe_runmake failed'
| FATAL: oe_runmake failed
| + exit 1

So there still is a header clash by the looks of it. Did I miss a patch?

Quoted 14 lines

I've fixed nm only in
recipes/networkmanager/networkmanager_git.bb
where was
DEFAULT_PREFERENCE_angstrom = "1"
and highest PV

this looks like recipes/networkmanager/networkmanager_0.8.1.bb
and exactly same errors like I had with git version (backend subdir will be next to fail)

you can add/adapt recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch if you need 0.8.1 too

That worked!

I will adapt it since I'd like this to go into 2011.03-maintenance as well.

Patch is here:
http://dominion.thruhere.net/koen/angstrom/0001-networkmanager-0.8.1-fix-build-against-libl-using-th.patch

For the whole series:

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNixLGMkyGM64RGpERAihzAJ9RVZzfyPnOYyEGM0K5AcmIsXz/BQCaA39i MoqqmxpHxqlyUNj8pQCocBk=
=leDh
-----END PGP SIGNATURE-----

#28 lore raw
In reply to Koen Kooi
Quoted 20 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Martin Jansa
Quoted 7 lines · Stefan Schmidt

Hello.

Quoted 3 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

Quoted 7 lines
Quoted 2 lines

For distros that want to support network-manager that still means that both versions are being build and may clash as we have seen before.

How do you build 2 versions of same package? Whole point of this patch series is to force distromaintainers to use only libnl_2.0.0 or libnl_1.1.0 based on PREFERRED_VERSION_libnl and this way keep them away from shooting own foot by accident.

Quoted 6 lines

I don't think that's an acceptable solution just yet since angstrom needs both iw and nm. I think the best way forward is:

1) configure libnl1 to only build a .a
2) rename that .a to libnl-old.a before installing it
3) patch nm to use -l:libnl-old.a

if its only one package that needs libnl1 supposedly then I would suggest to add this to said package's build system if possible but if there are more than one packages that we care, that need it then having a static archive would be ok approach.

Quoted 34 lines

or

1) configure libnl1 to only build a .a
2) move that .a to ${libdir}/libnl1/
3) patch nm to use -L${STAGING_LIBDIR}/libnl1 -l:libnl.a

A lot like
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=71e69ad8b551aa06f63160232d1bd87b8d801a1d
but a bit cleaner.

Quoted 6 lines
Quoted 2 lines

Just a remark. Personally I would like to go this route and maybe get rid of libnl1 at all.

Yes this is step in direction to get rid of libnl1 :). I'm using libnl_2.0.0 from oe-core in meta-shr, so this change is making diff between recipes in oe.dev and meta-shr smaller.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNidyDMkyGM64RGpERAtrBAJ9j+q1b4dFMXW7C0T9g55y22GO/PACfeH1O 3NU5PzIAzmtbZy5rdk7ojhs=
=Vgfx
-----END PGP SIGNATURE-----

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line
-Khem
#29 lore raw
In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

I added this into my maintenance staging branch:
http://dominion.thruhere.net/git/cgit.cgi/openembedded/log/?h=2011.03-maintenance

If testing shows no regressions I'm going to do a pull request for it next week.

Quoted 476 lines
---
 .../libnl/files/dont-link-libnl-from-sysroot.patch |   26 -------------------
 recipes/libnl/files/fix-includes.patch             |   13 ---------
 recipes/libnl/files/fix-pc-file.patch              |   11 --------
 recipes/libnl/files/local-includes.patch           |   12 ---------
 recipes/libnl/files/netlink-local-fix.patch        |   12 ---------
 recipes/libnl/files/respect-ldflags.patch          |   12 ---------
 .../libnl-1.1/dont-link-libnl-from-sysroot.patch   |   26 +++++++++++++++++++
 recipes/libnl/libnl-1.1/fix-includes.patch         |   13 +++++++++
 recipes/libnl/libnl-1.1/local-includes.patch       |   12 +++++++++
 recipes/libnl/libnl-1.1/netlink-local-fix.patch    |   12 +++++++++
 recipes/libnl/libnl-1.1/respect-ldflags.patch      |   12 +++++++++
 recipes/libnl/libnl/fix-pc-file.patch              |   11 ++++++++
 recipes/libnl/libnl/fix-pktloc-dep-race.patch      |   20 ++++++++++++++
 recipes/libnl/libnl2/fix-pc-file.patch             |   11 --------
 recipes/libnl/libnl2/fix-pktloc-dep-race.patch     |   20 --------------
 recipes/libnl/libnl2_2.0.bb                        |   27 --------------------
 recipes/libnl/libnl2_git.bb                        |   27 --------------------
 recipes/libnl/libnl_2.0.bb                         |   27 ++++++++++++++++++++
 recipes/libnl/libnl_git.bb                         |   27 ++++++++++++++++++++
 19 files changed, 160 insertions(+), 171 deletions(-)
 delete mode 100644 recipes/libnl/files/dont-link-libnl-from-sysroot.patch
 delete mode 100644 recipes/libnl/files/fix-includes.patch
 delete mode 100644 recipes/libnl/files/fix-pc-file.patch
 delete mode 100644 recipes/libnl/files/local-includes.patch
 delete mode 100644 recipes/libnl/files/netlink-local-fix.patch
 delete mode 100644 recipes/libnl/files/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
 create mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch
 create mode 100644 recipes/libnl/libnl-1.1/local-includes.patch
 create mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch
 create mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch
 create mode 100644 recipes/libnl/libnl/fix-pc-file.patch
 create mode 100644 recipes/libnl/libnl/fix-pktloc-dep-race.patch
 delete mode 100644 recipes/libnl/libnl2/fix-pc-file.patch
 delete mode 100644 recipes/libnl/libnl2/fix-pktloc-dep-race.patch
 delete mode 100644 recipes/libnl/libnl2_2.0.bb
 delete mode 100644 recipes/libnl/libnl2_git.bb
 create mode 100644 recipes/libnl/libnl_2.0.bb
 create mode 100644 recipes/libnl/libnl_git.bb
recipes/libnl/files/dont-link-libnl-from-sysroot.patch deleted +0 -26
deleted file mode 100644
index beb6361..0000000
@@ -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=%)
- 
recipes/libnl/files/fix-includes.patch deleted +0 -13
deleted file mode 100644
index b172fd2..0000000
@@ -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)
recipes/libnl/files/fix-pc-file.patch deleted +0 -11
deleted file mode 100644
index 77f3e88..0000000
@@ -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}
recipes/libnl/files/local-includes.patch deleted +0 -12
deleted file mode 100644
index 85659db..0000000
@@ -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@
recipes/libnl/files/netlink-local-fix.patch deleted +0 -12
deleted file mode 100644
index 51c6736..0000000
@@ -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>
recipes/libnl/files/respect-ldflags.patch deleted +0 -12
deleted file mode 100644
index ba97dc6..0000000
@@ -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)"; \
recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+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=%)
+ 
recipes/libnl/libnl-1.1/fix-includes.patch new file +13 -0
new file mode 100644
index 0000000..b172fd2
@@ -0,0 +1,13 @@
+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)
recipes/libnl/libnl-1.1/local-includes.patch new file +12 -0
new file mode 100644
index 0000000..85659db
@@ -0,0 +1,12 @@
+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@
recipes/libnl/libnl-1.1/netlink-local-fix.patch new file +12 -0
new file mode 100644
index 0000000..51c6736
@@ -0,0 +1,12 @@
+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>
recipes/libnl/libnl-1.1/respect-ldflags.patch new file +12 -0
new file mode 100644
index 0000000..ba97dc6
@@ -0,0 +1,12 @@
+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)"; \
recipes/libnl/libnl/fix-pc-file.patch new file +11 -0
new file mode 100644
index 0000000..17666fb
@@ -0,0 +1,11 @@
+Index: libnl-2.0/libnl-2.0.pc.in
+===================================================================
+--- libnl-2.0.orig/libnl-2.0.pc.in
++++ libnl-2.0/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}
recipes/libnl/libnl/fix-pktloc-dep-race.patch new file +20 -0
new file mode 100644
index 0000000..ee21744
@@ -0,0 +1,20 @@
+Index: libnl-2.0/lib/Makefile.am
+===================================================================
+--- libnl-2.0.orig/lib/Makefile.am
++++ libnl-2.0/lib/Makefile.am
+@@ -27,11 +27,15 @@ CLEANFILES = \
+ 	route/pktloc_grammar.c route/pktloc_grammar.h \
+ 	route/pktloc_syntax.c route/pktloc_syntax.h
+ 
++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_grammar.h: route/pktloc_grammar.c
+ route/pktloc_grammar.c: route/pktloc_grammar.l
+ 	$(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 $@ $^
+ 
recipes/libnl/libnl2/fix-pc-file.patch deleted +0 -11
deleted file mode 100644
index 17666fb..0000000
@@ -1,11 +0,0 @@
-Index: libnl-2.0/libnl-2.0.pc.in
-===================================================================
---- libnl-2.0.orig/libnl-2.0.pc.in
-+++ libnl-2.0/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}
recipes/libnl/libnl2/fix-pktloc-dep-race.patch deleted +0 -20
deleted file mode 100644
index ee21744..0000000
@@ -1,20 +0,0 @@
-Index: libnl-2.0/lib/Makefile.am
-===================================================================
---- libnl-2.0.orig/lib/Makefile.am
-+++ libnl-2.0/lib/Makefile.am
-@@ -27,11 +27,15 @@ CLEANFILES = \
- 	route/pktloc_grammar.c route/pktloc_grammar.h \
- 	route/pktloc_syntax.c route/pktloc_syntax.h
- 
-+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_grammar.h: route/pktloc_grammar.c
- route/pktloc_grammar.c: route/pktloc_grammar.l
- 	$(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 $@ $^
- 
recipes/libnl/libnl2_2.0.bb deleted +0 -27
deleted file mode 100644
index 7e9336e..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-PE = "1"
-PR = "r2"
-
-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"
-
-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.*"
recipes/libnl/libnl2_git.bb deleted +0 -27
deleted file mode 100644
index b667815..0000000
@@ -1,27 +0,0 @@
-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}"
-PE = "1"
-PR = "r3"
-
-DEPENDS = "flex-native bison-native"
-
-inherit autotools
-
-includedir = ${prefix}/include/libnl2
-
-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.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
-FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
-FILES_${PN}-cli   = "${libdir}/libnl-cli.so.*"
recipes/libnl/libnl_2.0.bb new file +27 -0
new file mode 100644
index 0000000..7e9336e
@@ -0,0 +1,27 @@
+DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+PE = "1"
+PR = "r2"
+
+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"
+
+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.*"
recipes/libnl/libnl_git.bb new file +17 -0
new file mode 100644
index 0000000..b667815
@@ -0,0 +1,27 @@
+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}"
+PE = "1"
+PR = "r3"
+
+DEPENDS = "flex-native bison-native"
+
+inherit autotools
+
+includedir = ${prefix}/include/libnl2
+
+SRC_URI = "\
+  git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \

recipes/libnl/libnl_git.bb line 27

Quoted 10 lines
recipes/libnl/libnl_git.bb new file +10 -0
+  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.*"
+FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
+FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
+FILES_${PN}-cli   = "${libdir}/libnl-cli.so.*"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNiySLMkyGM64RGpERAlBLAJ99rLnVNbEI5Nr2Mik/tu/0Ofj24ACfeeJq h8vHXjulSP/1A8KCvyHTGwA=
=hU1j
-----END PGP SIGNATURE-----

#30 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Koen Kooi
Quoted 3 lines · Martin Jansa

* libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION

Quoted 7 lines
Quoted 1 line

I added this into my maintenance staging branch:
http://dominion.thruhere.net/git/cgit.cgi/openembedded/log/?h=2011.03-maintenance

If testing shows no regressions I'm going to do a pull request for it next week.

FWIW from
http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/diff/beagleboard/GNOME-image/depends.dot?id=97bcd1b4d01073a30a54a1387a89a54fc9fa3fe3:

(quoted diff) +0 -0

b/beagleboard/GNOME-image/depends.dot
index f7b7cb3..ee4b521 100644
- --- a/beagleboard/GNOME-image/depends.dot +++ b/beagleboard/GNOME-image/depends.dot
@@ -5924,8 +5924,6 @@ libnet_dbus_perl -> libdbus_1_3;
libnet_dbus_perl -> libc6;
libnl_genl2 -> libnl2;
libnl_genl2 -> libc6;
- -libnl1 -> libc6;
- -libnl1 -> libgcc1;
libnl2 -> libc6;
libnl2 -> libgcc1;
libnm_util1 -> libdbus_glib_1_2;
@@ -7166,7 +7164,7 @@ networkmanager -> libgio_2_0_0;
networkmanager -> libgmodule_2_0_0; networkmanager -> policykit;
networkmanager -> eggdbus;
- -networkmanager -> libnl1;
+networkmanager -> libgcc1;
networkmanager -> iptables [style=dotted]; networkmanager_locale_de -> libnm_util1; networkmanager_locale_de -> virtual_locale_de;

Seems to be working as expected!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNizMIMkyGM64RGpERAsjkAKCk1B/gFOSkDBwDgXCmRWxmIIws0QCgtneF DFp11bVF08UQKUrP+2/dgYQ=
=FWub
-----END PGP SIGNATURE-----