From c3a325b5c2d9315629d014e5ebba552fe045171c Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 6 May 2019 10:37:27 +0800 Subject: [PATCH] acpica: 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: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-extended/acpica/acpica_20180508.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/acpica/acpica_20180508.bb b/meta/recipes-extended/acpica/acpica_20180508.bb index b5c89fafc5..cd5f466262 100644 --- a/meta/recipes-extended/acpica/acpica_20180508.bb +++ b/meta/recipes-extended/acpica/acpica_20180508.bb @@ -29,7 +29,7 @@ S = "${WORKDIR}/acpica-unix2-${PV}" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "acpixtract" +ALTERNATIVE_${PN} = "acpixtract acpidump" EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" -- 2.40.1