From 3f5af5e1ecdb59c8301882568232dd98a14cc6b5 Mon Sep 17 00:00:00 2001 From: Allen Wild Date: Sun, 6 May 2018 19:00:02 -0400 Subject: xz: use update-alternatives Installing xz and busybox together may cause conflicts for xz, xzcat, unxz, and their lzma variants. In the default configuration, xzcat is silently replaced with a symlink to busybox. If busybox is compiled with CONFIG_XZ=y, its postinst fails during do_rootfs. Using update-alternatives to xz handles these conflicts properly. (From OE-Core rev: e48cd8423562d4b03bdf55ba04873b7582f12452) Signed-off-by: Allen Wild Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/xz/xz_5.2.3.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/recipes-extended/xz') diff --git a/meta/recipes-extended/xz/xz_5.2.3.bb b/meta/recipes-extended/xz/xz_5.2.3.bb index c0f8b82f64..65168920d1 100644 --- a/meta/recipes-extended/xz/xz_5.2.3.bb +++ b/meta/recipes-extended/xz/xz_5.2.3.bb @@ -31,6 +31,11 @@ PACKAGES =+ "liblzma" FILES_liblzma = "${libdir}/liblzma*${SOLIBS}" +inherit update-alternatives +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "xz xzcat unxz \ + lzma lzcat unlzma" + BBCLASSEXTEND = "native nativesdk" export CONFIG_SHELL="/bin/sh" -- cgit v1.2.3-54-g00ecf