mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-12 23:46:59 +02:00
eclass/unpacker: Sync with Gentoo
It's from Gentoo commit bc6173b5fdeb051759254745f80ef539849a6cd0.
This commit is contained in:
parent
91cb4540cf
commit
6716e8969e
@ -4,7 +4,7 @@
|
|||||||
# @ECLASS: unpacker.eclass
|
# @ECLASS: unpacker.eclass
|
||||||
# @MAINTAINER:
|
# @MAINTAINER:
|
||||||
# base-system@gentoo.org
|
# base-system@gentoo.org
|
||||||
# @SUPPORTED_EAPIS: 6 7 8
|
# @SUPPORTED_EAPIS: 7 8
|
||||||
# @BLURB: helpers for extraneous file formats and consistent behavior across EAPIs
|
# @BLURB: helpers for extraneous file formats and consistent behavior across EAPIs
|
||||||
# @DESCRIPTION:
|
# @DESCRIPTION:
|
||||||
# Some extraneous file formats are not part of PMS, or are only in certain
|
# Some extraneous file formats are not part of PMS, or are only in certain
|
||||||
@ -16,7 +16,7 @@
|
|||||||
# - support partial unpacks?
|
# - support partial unpacks?
|
||||||
|
|
||||||
case ${EAPI} in
|
case ${EAPI} in
|
||||||
6|7|8) ;;
|
7|8) ;;
|
||||||
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -430,10 +430,7 @@ _unpacker_get_decompressor() {
|
|||||||
echo "xz -T$(makeopts_jobs) -dc" ;;
|
echo "xz -T$(makeopts_jobs) -dc" ;;
|
||||||
*.lz)
|
*.lz)
|
||||||
find_lz_unpacker() {
|
find_lz_unpacker() {
|
||||||
local has_version_arg="-b"
|
if has_version -b ">=app-arch/xz-utils-5.4.0" ; then
|
||||||
|
|
||||||
[[ ${EAPI} == 6 ]] && has_version_arg="--host-root"
|
|
||||||
if has_version "${has_version_arg}" ">=app-arch/xz-utils-5.4.0" ; then
|
|
||||||
echo xz
|
echo xz
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@ -537,7 +534,7 @@ _unpacker() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# 7z, rar and lha/lzh are handled by package manager in EAPI < 8
|
# 7z, rar and lha/lzh are handled by package manager in EAPI < 8
|
||||||
if [[ ${EAPI} != [67] ]]; then
|
if [[ ${EAPI} != 7 ]]; then
|
||||||
case ${m} in
|
case ${m} in
|
||||||
*.7z)
|
*.7z)
|
||||||
arch="unpack_7z" ;;
|
arch="unpack_7z" ;;
|
||||||
|
Loading…
Reference in New Issue
Block a user