[oe-commits] Martin Jansa : libnl: rename libnl2 to libnl as used in openembedded-core

[git version control]

Module: openembedded.git
Branch: master
Commit: 5ef679ab9130fdb1818d1827089c18b04ed5e7c6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5ef679ab9130fdb1818d1827089c18b04ed5e7c6

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar 18 14:12:14 2011 +0100

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 at dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/libnl/files/fix-pc-file.patch              |   11 -----------
 .../dont-link-libnl-from-sysroot.patch             |    0
 .../libnl/{files => libnl-1.1}/fix-includes.patch  |    0
 .../{files => libnl-1.1}/local-includes.patch      |    0
 .../{files => libnl-1.1}/netlink-local-fix.patch   |    0
 .../{files => libnl-1.1}/respect-ldflags.patch     |    0
 recipes/libnl/{libnl2 => libnl}/fix-pc-file.patch  |    0
 .../{libnl2 => libnl}/fix-pktloc-dep-race.patch    |    0
 recipes/libnl/{libnl2_2.0.bb => libnl_2.0.bb}      |    0
 recipes/libnl/{libnl2_git.bb => libnl_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
similarity index 100%
rename from recipes/libnl/files/dont-link-libnl-from-sysroot.patch
rename to 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
similarity index 100%
rename from recipes/libnl/files/fix-includes.patch
rename to 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
similarity index 100%
rename from recipes/libnl/files/local-includes.patch
rename to 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
similarity index 100%
rename from recipes/libnl/files/netlink-local-fix.patch
rename to 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
similarity index 100%
rename from recipes/libnl/files/respect-ldflags.patch
rename to 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
similarity index 100%
rename from recipes/libnl/libnl2/fix-pc-file.patch
rename to 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
similarity index 100%
rename from recipes/libnl/libnl2/fix-pktloc-dep-race.patch
rename to recipes/libnl/libnl/fix-pktloc-dep-race.patch
diff --git a/recipes/libnl/libnl2_2.0.bb b/recipes/libnl/libnl_2.0.bb
similarity index 100%
rename from recipes/libnl/libnl2_2.0.bb
rename to recipes/libnl/libnl_2.0.bb
diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl_git.bb
similarity index 100%
rename from recipes/libnl/libnl2_git.bb
rename to recipes/libnl/libnl_git.bb