aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-05 20:18:49 -0700
committerArmin Kuster <akuster808@gmail.com>2019-05-23 07:03:43 -0700
commitbf298efc08fc1b4facd569c9d55f2ba838b82c03 (patch)
tree19a3e5933439b53fec849dcfeda036237366fcd1
parent2b57e9fc4060e8e133ea9c6fd6aa56b7fb0dc078 (diff)
downloadmeta-openembedded-contrib-bf298efc08fc1b4facd569c9d55f2ba838b82c03.tar.gz
pmtools: 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: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/pmtools/pmtools_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
index 8491fc904d..9afcbbb7f5 100644
--- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
+++ b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_${PN} = "acpixtract"
+ALTERNATIVE_${PN} = "acpixtract acpidump"
do_configure[noexec] = "1"
do_compile() {