summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-06 10:37:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 12:15:17 +0100
commit0f2270cd40971da1f0b66478ed54511e0ed4e0ae (patch)
treeeafaade9cb723aa99fc0e0125187b66071606026 /meta
parentc008c8dc7ad83de10063ce246ac0229180a9dbeb (diff)
downloadpoky-0f2270cd40971da1f0b66478ed54511e0ed4e0ae.tar.gz
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 ... (From OE-Core rev: 6af441a50922943176bf4df32f3541c34a7b0bb2) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/acpica/acpica_20190405.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20190405.bb b/meta/recipes-extended/acpica/acpica_20190405.bb
index 0cd88d4e30..25ad7ce31c 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}"
26inherit update-alternatives 26inherit update-alternatives
27 27
28ALTERNATIVE_PRIORITY = "100" 28ALTERNATIVE_PRIORITY = "100"
29ALTERNATIVE_${PN} = "acpixtract" 29ALTERNATIVE_${PN} = "acpixtract acpidump"
30 30
31EXTRA_OEMAKE = "CC='${CC}' \ 31EXTRA_OEMAKE = "CC='${CC}' \
32 OPT_CFLAGS=-Wall \ 32 OPT_CFLAGS=-Wall \