diff options
| author | Allen Wild <allenwild93@gmail.com> | 2018-05-06 19:00:02 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-15 10:56:49 +0100 |
| commit | 3f5af5e1ecdb59c8301882568232dd98a14cc6b5 (patch) | |
| tree | f4e4469c3d8b002d4c60544238370b12164973d0 | |
| parent | 97293e7cdef37765f129b0e482ffd5af42f0d160 (diff) | |
| download | poky-3f5af5e1ecdb59c8301882568232dd98a14cc6b5.tar.gz | |
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 <allenwild93@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/xz/xz_5.2.3.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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" | |||
| 31 | 31 | ||
| 32 | FILES_liblzma = "${libdir}/liblzma*${SOLIBS}" | 32 | FILES_liblzma = "${libdir}/liblzma*${SOLIBS}" |
| 33 | 33 | ||
| 34 | inherit update-alternatives | ||
| 35 | ALTERNATIVE_PRIORITY = "100" | ||
| 36 | ALTERNATIVE_${PN} = "xz xzcat unxz \ | ||
| 37 | lzma lzcat unlzma" | ||
| 38 | |||
| 34 | BBCLASSEXTEND = "native nativesdk" | 39 | BBCLASSEXTEND = "native nativesdk" |
| 35 | 40 | ||
| 36 | export CONFIG_SHELL="/bin/sh" | 41 | export CONFIG_SHELL="/bin/sh" |