[oe-commits] [meta-openembedded] 07/28: pmtools: use update-alternatives for acpixtract

git at git.openembedded.org git at git.openembedded.org
Tue Sep 5 12:36:07 UTC 2017


This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 336297c94959ca54a296f8e1de287d98562fbb1e
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Fri Sep 1 15:43:29 2017 +0800

    pmtools: 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
    
    Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-devtools/pmtools/pmtools_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
index 94fc736..8491fc9 100644
--- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
+++ b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
@@ -15,6 +15,11 @@ COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 
 S = "${WORKDIR}/git"
 
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_${PN} = "acpixtract"
+
 do_configure[noexec] = "1"
 do_compile() {
     oe_runmake

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list