]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
acpica: use update-alternatives for acpidump
authorHongxu Jia <hongxu.jia@windriver.com>
Mon, 6 May 2019 02:37:27 +0000 (10:37 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 May 2019 11:15:17 +0000 (12:15 +0100)
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
...

(From OE-Core rev: 6af441a50922943176bf4df32f3541c34a7b0bb2)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/acpica/acpica_20190405.bb

index 0cd88d4e301819639a10989937c5dfa1fbdd0a80..25ad7ce31c95fbb8e1ef560ce1763685c3dd1ced 100644 (file)
@@ -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 \