1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
2 |
--- |
3 |
.../gentoo-kernel-bin-5.19.11.ebuild | 17 ++++++----------- |
4 |
1 file changed, 6 insertions(+), 11 deletions(-) |
5 |
|
6 |
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 |
7 |
index 966fadbe839a..0ba336c5c1aa 100644 |
8 |
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild |
9 |
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild |
10 |
@@ -3,7 +3,7 @@ |
11 |
|
12 |
EAPI=8 |
13 |
|
14 |
-inherit kernel-install toolchain-funcs |
15 |
+inherit kernel-install toolchain-funcs unpacker |
16 |
|
17 |
MY_P=linux-${PV%.*} |
18 |
GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) |
19 |
@@ -55,11 +55,6 @@ QA_PREBUILT='*' |
20 |
KV_LOCALVERSION='-gentoo-dist' |
21 |
KPV=${PV}${KV_LOCALVERSION} |
22 |
|
23 |
-src_unpack() { |
24 |
- default |
25 |
- unpack "${BINPKG}"/image.tar.xz |
26 |
-} |
27 |
- |
28 |
src_prepare() { |
29 |
local PATCHES=( |
30 |
# meh, genpatches have no directory |
31 |
@@ -102,22 +97,22 @@ src_configure() { |
32 |
) |
33 |
|
34 |
mkdir modprep || die |
35 |
- cp "image/usr/src/linux-${KPV}/.config" modprep/ || die |
36 |
+ cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die |
37 |
emake -C "${MY_P}" "${makeargs[@]}" modules_prepare |
38 |
} |
39 |
|
40 |
src_test() { |
41 |
kernel-install_test "${KPV}" \ |
42 |
- "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ |
43 |
- "image/lib/modules/${KPV}" |
44 |
+ "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ |
45 |
+ "${BINPKG}/image/lib/modules/${KPV}" |
46 |
} |
47 |
|
48 |
src_install() { |
49 |
- mv image/{lib,usr} "${ED}"/ || die |
50 |
+ mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die |
51 |
|
52 |
# FIXME: requires proper mount-boot |
53 |
if [[ -d boot/dtbs ]]; then |
54 |
- mv image/boot "${ED}"/ || die |
55 |
+ mv "${BINPKG}"/image/boot "${ED}"/ || die |
56 |
fi |
57 |
|
58 |
# strip out-of-source build stuffs from modprep |
59 |
-- |
60 |
2.37.3 |