summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-09-01 22:09:14 -0700
committerRobert Yang <liezhi.yang@windriver.com>2016-09-02 02:47:52 -0700
commitacede875239e23cdc4d5ba41bdfbf46b027ce733 (patch)
tree0cd72855f1e42217723314c40ceab59f8d9d3e78
parent3481121c21ea07ff83d3b05439f5442cd921e244 (diff)
downloadopenembedded-core-contrib-rbt/libnl.tar.gz
openembedded-core-contrib-rbt/libnl.tar.bz2
openembedded-core-contrib-rbt/libnl.zip
libnl: fix RREPLACES and RCONFLICTS for libnl-genlrbt/libnl
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. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-support/libnl/libnl_3.2.28.bb4
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 7ddbd40416..26982f3efb 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"