From cd671eae4159cb8b75518d158a98229e6ae4b312 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 27 Feb 2019 04:50:32 -0500 Subject: 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] (From OE-Core rev: 069808976de91050e16d01c82a7491d2cabfce1a) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/util-linux') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e30e6331fd..cce684f280 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 = "" -- cgit v1.2.3-54-g00ecf