libnl: upgrade to 3.2.9 and fix upgrade path

* COPYING change is only formal from
  http://git.infradead.org/users/tgr/libnl.git/commitdiff/c857625be074a7b9ef6adbcdde986a0b23aae901

(From meta-openembedded rev: b34296ae22cda74490d094658183782b3c20b302)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-support/libnl/libnl_3.2.3.bb b/meta-openembedded/meta-oe/recipes-support/libnl/libnl_3.2.9.bb
similarity index 74%
rename from meta-openembedded/meta-oe/recipes-support/libnl/libnl_3.2.3.bb
rename to meta-openembedded/meta-oe/recipes-support/libnl/libnl_3.2.9.bb
index 38d34bf..11b901c 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-support/libnl/libnl_3.2.3.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libnl/libnl_3.2.9.bb
@@ -5,14 +5,14 @@ SECTION = "libs/network"
 PE = "1"
 
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 DEPENDS = "flex-native bison-native"
 
 SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "dbbb44801e833cf9ca4fdc943f2a58ee"
-SRC_URI[sha256sum] = "69f4a360350ea61f2c988f947c251995c04093c74743eae9eeffba85846ef007"
+SRC_URI[md5sum] = "c13adec0239b266207fff07d79e5ce9e"
+SRC_URI[sha256sum] = "9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63"
 
 inherit autotools pkgconfig
 
@@ -32,6 +32,8 @@ do_install_append() {
 FILES_${PN} = "${libdir}/libnl-3.so.* \
                ${libdir}/libnl.so.* \
                ${sysconfdir}"
+RREPLACES_${PN} = "libnl2"
+RCONFLICTS_${PN} = "libnl2"
 FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
 FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
                     ${libdir}/libnl/cli/*/*.la"
@@ -44,5 +46,7 @@ FILES_${PN}-cli   = "${libdir}/libnl-cli-3.so.* \
 FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
 FILES_${PN}-nf    = "${libdir}/libnl-nf-3.so.*"
 FILES_${PN}-genl  = "${libdir}/libnl-genl-3.so.* \
-                     ${libdir}/libnl-genl.so.*"
-
+                     ${libdir}/libnl-genl.so.* \
+                     ${sbindir}/genl-ctrl-list"
+RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
+RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"