[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2155/8267] libnl: fix RREPLACES and RCONFLICTS for libnl-genl

[Emmanuele Bassi <ebassi src gnome org>]

commit ff0ebe98a12cfaa1b4265633a2b8d6adfa539188
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Sep 1 22:09:14 2016 -0700

    libnl: fix RREPLACES and RCONFLICTS for libnl-genl
    
    The libnl-genl.rpm provides libnl-genl-3-200 after the following 2 fixes:
    libnl: update to v3.2.28
    libnl: fix packaging mistakes
    
    $ rpm -qp --provides tmp/deploy/rpm/core2_64/libnl-genl-3-200-3.2.28-r0.4.core2_64.rpm
    elf(buildid) = 4e753b2361ba0b02f162244a87cc0680796e46cc
    libnl-genl = 3.2.28
    libnl-genl-3.so.200()(64bit)
    libnl-genl-3.so.200(libnl_3)(64bit)
    libnl-genl2
    libnl-genl-3-200 = 1:3.2.28-r0.4
    
    Note, the libnl-genl2 is introduced by REPLACES_${PN}-genl = "libnl-genl2".
    
    So that we don't need set libnl-genl-3-200 in the RREPLACES and
    RCONFLICTS, otherwise it would cause do_rootfs errors when install both
    libnl-genl.rpm and lib32-libnl-genl.rpm:
    
    Computing transaction...error: Can't install libnl-genl-3-200-1:3.2.28-r0.0@core2_64: conflicted package 
libnl-genl-3-200-1:3.2.28-r0.0@lib32_x86 is locked
    
    We didn't meet this error before was because there was no libnl-genl.rpm,
    but libnl-3-genl.rpm, and it doesn't provide libnl-genl-3-200 by default.
    
    Remove libnl-genl-3-200 from RREPLACES and RCONFLICTS will fix the problem.
    
    (From OE-Core rev: a2e9e0bb7a4901f819332df30ec265616e422826)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-support/libnl/libnl_3.2.28.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-support/libnl/libnl_3.2.28.bb b/meta/recipes-support/libnl/libnl_3.2.28.bb
index 7ddbd40..26982f3 100644
--- a/meta/recipes-support/libnl/libnl_3.2.28.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.28.bb
@@ -44,5 +44,5 @@ FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*"
 FILES_${PN}-nf    = "${libdir}/libnl-nf-3.so.*"
 FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
 FILES_${PN}-xfrm  = "${libdir}/libnl-xfrm-3.so.*"
-RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
-RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
+RREPLACES_${PN}-genl = "libnl-genl2"
+RCONFLICTS_${PN}-genl = "libnl-genl2"