commit: 80c1e09ee4df09982c37229471864e3953e8b56d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Dec 23 14:32:29 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 13:15:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c1e09e
sys-kernel/vanilla-kernel: Use verify-sig_uncompress_verify_unpack Closes: https://github.com/gentoo/gentoo/pull/39828 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild | 6 ++---- sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild | 6 ++---- sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild | 6 ++---- sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild | 6 ++---- sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild | 6 ++---- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild index 69d61ddb8e86..4c395b41090d 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild @@ -59,10 +59,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc src_unpack() { if use verify-sig; then - einfo "Unpacking linux-${PV}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ - < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -xf -)) - assert "Unpack failed" + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" else default diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild index 4e0df368e38b..f922ce9dc716 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild @@ -59,10 +59,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc src_unpack() { if use verify-sig; then - einfo "Unpacking linux-${PV}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ - < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -xf -)) - assert "Unpack failed" + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" else default diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild index 4e0df368e38b..f922ce9dc716 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild @@ -59,10 +59,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc src_unpack() { if use verify-sig; then - einfo "Unpacking linux-${PV}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ - < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -xf -)) - assert "Unpack failed" + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" else default diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild index cfb537c1b75d..237bf2d71e7c 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild @@ -60,10 +60,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc src_unpack() { if use verify-sig; then - einfo "Unpacking linux-${PV}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ - < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -xf -)) - assert "Unpack failed" + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" else default diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild index 756c85b771ec..f4370e66a954 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild @@ -60,10 +60,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc src_unpack() { if use verify-sig; then - einfo "Unpacking linux-${PV}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ - < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -xf -)) - assert "Unpack failed" + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" else default
