summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2017-09-01 15:42:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-02 00:52:10 +0100
commit881dad10ebbca131aebdbb5028307a1b1baf37cb (patch)
tree77f2f8330aa52d4fc798769e248d1cefa9d4bd5c
parentdcebade36d4cd19189ff419d4c1d54752f8d39cb (diff)
downloadpoky-881dad10ebbca131aebdbb5028307a1b1baf37cb.tar.gz
acpica: use update-alternatives for acpixtract
acpixtract is both provided by acpica and pmtools, so use update-alternatives to fix conflicts: | file /usr/bin/acpixtract conflicts between attempted installs of pmtools-20130209+git0+3ebe0e54c5-r0.i586 and acpica-20170303-r0.i586 (From OE-Core rev: 250085877f9191eb304bd9ff8327cd260a31e74b) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/acpica/acpica_20170303.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20170303.bb b/meta/recipes-extended/acpica/acpica_20170303.bb
index 12dfc6da3f..e712ca008d 100644
--- a/meta/recipes-extended/acpica/acpica_20170303.bb
+++ b/meta/recipes-extended/acpica/acpica_20170303.bb
@@ -27,6 +27,11 @@ UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
27 27
28S = "${WORKDIR}/acpica-unix2-${PV}" 28S = "${WORKDIR}/acpica-unix2-${PV}"
29 29
30inherit update-alternatives
31
32ALTERNATIVE_PRIORITY = "100"
33ALTERNATIVE_${PN} = "acpixtract"
34
30EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" 35EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'"
31 36
32do_install() { 37do_install() {