From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52122158094 for ; Sun, 25 Sep 2022 18:26:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 543D82BC0CE; Sun, 25 Sep 2022 18:23:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CC462BC0CB for ; Sun, 25 Sep 2022 18:23:35 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 11/15] sys-kernel/gentoo-kernel-bin: Use unpacker.eclass for .gpkg.tar Date: Sun, 25 Sep 2022 20:23:13 +0200 Message-Id: <20220925182317.1559529-12-mgorny@gentoo.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220925182317.1559529-1-mgorny@gentoo.org> References: <20220925182317.1559529-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: ae4c9e56-c7b9-41bb-8bf4-733f6214af8d X-Archives-Hash: f60a1e461873852fa74667095becf5c6 Signed-off-by: Michał Górny --- .../gentoo-kernel-bin-5.19.11.ebuild | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild index 966fadbe839a..0ba336c5c1aa 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit kernel-install toolchain-funcs +inherit kernel-install toolchain-funcs unpacker MY_P=linux-${PV%.*} GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) @@ -55,11 +55,6 @@ QA_PREBUILT='*' KV_LOCALVERSION='-gentoo-dist' KPV=${PV}${KV_LOCALVERSION} -src_unpack() { - default - unpack "${BINPKG}"/image.tar.xz -} - src_prepare() { local PATCHES=( # meh, genpatches have no directory @@ -102,22 +97,22 @@ src_configure() { ) mkdir modprep || die - cp "image/usr/src/linux-${KPV}/.config" modprep/ || die + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare } src_test() { kernel-install_test "${KPV}" \ - "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ - "image/lib/modules/${KPV}" + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" } src_install() { - mv image/{lib,usr} "${ED}"/ || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot if [[ -d boot/dtbs ]]; then - mv image/boot "${ED}"/ || die + mv "${BINPKG}"/image/boot "${ED}"/ || die fi # strip out-of-source build stuffs from modprep -- 2.37.3