[oe-commits] [openembedded-core] 06/10: util-linux: fix multilib qa issue

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e13269837e32b3f3d424ac00a6f49e408d638c18
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Feb 27 04:50:32 2019 -0500

    util-linux: fix multilib qa issue
    
    Update RCONFLICTS and RREPLACES for util-linux to fix 'multilib' qa issue:
    
    | ERROR: lib32-util-linux-2.32.1-r0 do_package: QA Issue: lib32-util-linux
      package lib32-util-linux-blkid - suspicious values 'e2fsprogs-blkid' in
      RREPLACES [multilib]
    | ERROR: lib32-util-linux-2.32.1-r0 do_package: QA Issue: lib32-util-linux
      package lib32-util-linux-blkid - suspicious values 'e2fsprogs-blkid' in
      RCONFLICTS [multilib]
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/util-linux/util-linux.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e30e633..cce684f 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -133,8 +133,8 @@ FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \
                           ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*"
 
 # Util-linux' blkid replaces the e2fsprogs one
-RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid"
-RREPLACES_${PN}-blkid = "e2fsprogs-blkid"
+RCONFLICTS_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid"
+RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid"
 
 RRECOMMENDS_${PN}_class-native = ""
 RRECOMMENDS_${PN}_class-nativesdk = ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.