aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-03-18 14:12:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-03-24 11:18:16 +0100
commit5ef679ab9130fdb1818d1827089c18b04ed5e7c6 (patch)
tree15a56ad04c44ed2aa7cee09bf41b930aa2839217
parentfb0a796b1fc6612168a187a2883fc7b5cd9d1240 (diff)
downloadopenembedded-5ef679ab9130fdb1818d1827089c18b04ed5e7c6.zip
openembedded-5ef679ab9130fdb1818d1827089c18b04ed5e7c6.tar.gz
openembedded-5ef679ab9130fdb1818d1827089c18b04ed5e7c6.tar.bz2
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 Acked-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/libnl/files/fix-pc-file.patch11
-rw-r--r--recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch (renamed from recipes/libnl/files/dont-link-libnl-from-sysroot.patch)0
-rw-r--r--recipes/libnl/libnl-1.1/fix-includes.patch (renamed from recipes/libnl/files/fix-includes.patch)0
-rw-r--r--recipes/libnl/libnl-1.1/local-includes.patch (renamed from recipes/libnl/files/local-includes.patch)0
-rw-r--r--recipes/libnl/libnl-1.1/netlink-local-fix.patch (renamed from recipes/libnl/files/netlink-local-fix.patch)0
-rw-r--r--recipes/libnl/libnl-1.1/respect-ldflags.patch (renamed from recipes/libnl/files/respect-ldflags.patch)0
-rw-r--r--recipes/libnl/libnl/fix-pc-file.patch (renamed from recipes/libnl/libnl2/fix-pc-file.patch)0
-rw-r--r--recipes/libnl/libnl/fix-pktloc-dep-race.patch (renamed from recipes/libnl/libnl2/fix-pktloc-dep-race.patch)0
-rw-r--r--recipes/libnl/libnl_2.0.bb (renamed from recipes/libnl/libnl2_2.0.bb)0
-rw-r--r--recipes/libnl/libnl_git.bb (renamed from recipes/libnl/libnl2_git.bb)0
10 files changed, 0 insertions, 11 deletions
diff --git a/recipes/libnl/files/fix-pc-file.patch b/recipes/libnl/files/fix-pc-file.patch
deleted file mode 100644
index 77f3e88..0000000
--- a/recipes/libnl/files/fix-pc-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: git/libnl-2.0.pc.in
-===================================================================
---- git.orig/libnl-2.0.pc.in
-+++ git/libnl-2.0.pc.in
-@@ -6,5 +6,5 @@
- Name: libnl
- Description: Convenience library for netlink sockets
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lnl
-+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route
- Cflags: -I${includedir}
diff --git a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
index beb6361..beb6361 100644
--- a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch
+++ b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch
diff --git a/recipes/libnl/files/fix-includes.patch b/recipes/libnl/libnl-1.1/fix-includes.patch
index b172fd2..b172fd2 100644
--- a/recipes/libnl/files/fix-includes.patch
+++ b/recipes/libnl/libnl-1.1/fix-includes.patch
diff --git a/recipes/libnl/files/local-includes.patch b/recipes/libnl/libnl-1.1/local-includes.patch
index 85659db..85659db 100644
--- a/recipes/libnl/files/local-includes.patch
+++ b/recipes/libnl/libnl-1.1/local-includes.patch
diff --git a/recipes/libnl/files/netlink-local-fix.patch b/recipes/libnl/libnl-1.1/netlink-local-fix.patch
index 51c6736..51c6736 100644
--- a/recipes/libnl/files/netlink-local-fix.patch
+++ b/recipes/libnl/libnl-1.1/netlink-local-fix.patch
diff --git a/recipes/libnl/files/respect-ldflags.patch b/recipes/libnl/libnl-1.1/respect-ldflags.patch
index ba97dc6..ba97dc6 100644
--- a/recipes/libnl/files/respect-ldflags.patch
+++ b/recipes/libnl/libnl-1.1/respect-ldflags.patch
diff --git a/recipes/libnl/libnl2/fix-pc-file.patch b/recipes/libnl/libnl/fix-pc-file.patch
index 17666fb..17666fb 100644
--- a/recipes/libnl/libnl2/fix-pc-file.patch
+++ b/recipes/libnl/libnl/fix-pc-file.patch
diff --git a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch b/recipes/libnl/libnl/fix-pktloc-dep-race.patch
index ee21744..ee21744 100644
--- a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch
+++ b/recipes/libnl/libnl/fix-pktloc-dep-race.patch
diff --git a/recipes/libnl/libnl2_2.0.bb b/recipes/libnl/libnl_2.0.bb
index 7e9336e..7e9336e 100644
--- a/recipes/libnl/libnl2_2.0.bb
+++ b/recipes/libnl/libnl_2.0.bb
diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl_git.bb
index b667815..b667815 100644
--- a/recipes/libnl/libnl2_git.bb
+++ b/recipes/libnl/libnl_git.bb