sys-apps/util-linux: optimize src_unpack

See 7e4aeaf563 and 5cc8ea5265.

Note that as mgorny points out at https://github.com/gentoo/gentoo/pull/37220#discussion_r1646906325,
we still unpack twice, so we should look at that next.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-06-20 08:25:07 +01:00
parent 093b4815b1
commit c8e331071d
2 changed files with 6 additions and 22 deletions

View File

@@ -116,18 +116,10 @@ src_unpack() {
fi
if use verify-sig ; then
mkdir "${T}"/verify-sig || die
pushd "${T}"/verify-sig &>/dev/null || die
# Upstream sign the decompressed .tar
# Let's do it separately in ${T} then cleanup to avoid external
# effects on normal unpack.
cp "${DISTDIR}"/${MY_P}.tar.xz . || die
xz -d ${MY_P}.tar.xz || die
verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
popd &>/dev/null || die
rm -r "${T}"/verify-sig || die
verify-sig_verify_detached \
<(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
"${DISTDIR}"/${MY_P}.tar.sign
fi
default

View File

@@ -116,18 +116,10 @@ src_unpack() {
fi
if use verify-sig ; then
mkdir "${T}"/verify-sig || die
pushd "${T}"/verify-sig &>/dev/null || die
# Upstream sign the decompressed .tar
# Let's do it separately in ${T} then cleanup to avoid external
# effects on normal unpack.
cp "${DISTDIR}"/${MY_P}.tar.xz . || die
xz -d ${MY_P}.tar.xz || die
verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
popd &>/dev/null || die
rm -r "${T}"/verify-sig || die
verify-sig_verify_detached \
<(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
"${DISTDIR}"/${MY_P}.tar.sign
fi
default