summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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-20 14:38:16 +0100
commit7a960890992f1c26750d709be90ddd9c09627fa2 (patch)
treeeaec78fd35609bd760ff9eaca68936f9dfaca3ba /meta/recipes-extended
parentb2b48f0253dd5b1a1d1ffd0071b6528c0d90a049 (diff)
downloadpoky-7a960890992f1c26750d709be90ddd9c09627fa2.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: c3a325b5c2d9315629d014e5ebba552fe045171c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/acpica/acpica_20180508.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20180508.bb b/meta/recipes-extended/acpica/acpica_20180508.bb
index b5c89fafc5..cd5f466262 100644
--- a/meta/recipes-extended/acpica/acpica_20180508.bb
+++ b/meta/recipes-extended/acpica/acpica_20180508.bb
@@ -29,7 +29,7 @@ S = "${WORKDIR}/acpica-unix2-${PV}"
29inherit update-alternatives 29inherit update-alternatives
30 30
31ALTERNATIVE_PRIORITY = "100" 31ALTERNATIVE_PRIORITY = "100"
32ALTERNATIVE_${PN} = "acpixtract" 32ALTERNATIVE_${PN} = "acpixtract acpidump"
33 33
34EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" 34EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'"
35 35