From bf298efc08fc1b4facd569c9d55f2ba838b82c03 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sun, 5 May 2019 20:18:49 -0700 Subject: 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 Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/pmtools/pmtools_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 8491fc904..9afcbbb7f 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() { -- cgit v1.2.3-54-g00ecf