[oe-commits] [openembedded-core] 07/46: xz: use update-alternatives

[git at git.openembedded.org]

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

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit e48cd8423562d4b03bdf55ba04873b7582f12452
Author: Allen Wild <allenwild93 at gmail.com>
AuthorDate: Sun May 6 19:00:02 2018 -0400

    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.
    
    Signed-off-by: Allen Wild <allenwild93 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-extended/xz/xz_5.2.3.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-extended/xz/xz_5.2.3.bb b/meta/recipes-extended/xz/xz_5.2.3.bb
index c0f8b82..6516892 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"

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