Signed-off-by: Michał Górny <mgo...@gentoo.org> --- .../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