From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 6 May 2019 02:37:27 +0000 (+0800)
Subject: acpica: use update-alternatives for acpidump
X-Git-Tag: yocto-4.0~10134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6af441a50922943176bf4df32f3541c34a7b0bb2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

acpica: use update-alternatives for acpidump

acpidump is both provided by acpica and pmtools, so use
update-alternatives to fix conflicts:
...
|Error: Transaction check error:
|  file /usr/bin/acpidump conflicts between attempted installs of
pmtools-20130209+git0+3ebe0e54c5-r0.i586 and acpica-20190405-r0.i586
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/acpica/acpica_20190405.bb b/meta/recipes-extended/acpica/acpica_20190405.bb
index 0cd88d4e301..25ad7ce31c9 100644
--- a/meta/recipes-extended/acpica/acpica_20190405.bb
+++ b/meta/recipes-extended/acpica/acpica_20190405.bb
@@ -26,7 +26,7 @@ S = "${WORKDIR}/acpica-unix2-${PV}"
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "acpixtract"
+ALTERNATIVE_${PN} = "acpixtract acpidump"
 
 EXTRA_OEMAKE = "CC='${CC}' \
                 OPT_CFLAGS=-Wall \