]> code.ossystems Code Review - openembedded-core.git/commitdiff
acpica: use update-alternatives for acpixtract
authorJackie Huang <jackie.huang@windriver.com>
Fri, 1 Sep 2017 07:42:31 +0000 (15:42 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 1 Sep 2017 22:59:54 +0000 (23:59 +0100)
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/acpica/acpica_20170303.bb

index 12dfc6da3f918b6b418275e30630da86d0288418..e712ca008d32873186fad0195f069b1582c8b10a 100644 (file)
@@ -27,6 +27,11 @@ UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
 
 S = "${WORKDIR}/acpica-unix2-${PV}"
 
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "acpixtract"
+
 EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'"
 
 do_install() {