Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 3/3] kernel-build.eclass: Respect KV_FULL
Date: Sun, 16 Oct 2022 04:50:14
Message-Id: 20221016044919.61743-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/3] dist-kernel-utils.eclass: Add a PV → KV conversion function by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/kernel-build.eclass | 6 +++---
4 1 file changed, 3 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
7 index 1fa25cbc9574..858a6dbd3cda 100644
8 --- a/eclass/kernel-build.eclass
9 +++ b/eclass/kernel-build.eclass
10 @@ -150,7 +150,7 @@ kernel-build_src_test() {
11 emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
12 INSTALL_MOD_PATH="${T}" "${targets[@]}"
13
14 - local ver="${PV}${KV_LOCALVERSION}"
15 + local ver="${KV_FULL}${KV_LOCALVERSION}"
16 kernel-install_test "${ver}" \
17 "${WORKDIR}/build/$(dist-kernel_get_image_path)" \
18 "${T}/lib/modules/${ver}"
19 @@ -159,7 +159,7 @@ kernel-build_src_test() {
20 # @FUNCTION: kernel-build_src_install
21 # @DESCRIPTION:
22 # Install the built kernel along with subset of sources
23 -# into /usr/src/linux-${PV}. Install the modules. Save the config.
24 +# into /usr/src/linux-${KV_FULL}. Install the modules. Save the config.
25 kernel-build_src_install() {
26 debug-print-function ${FUNCNAME} "${@}"
27
28 @@ -177,7 +177,7 @@ kernel-build_src_install() {
29 # note: we're using mv rather than doins to save space and time
30 # install main and arch-specific headers first, and scripts
31 local kern_arch=$(tc-arch-kernel)
32 - local ver="${PV}${KV_LOCALVERSION}"
33 + local ver="${KV_FULL}${KV_LOCALVERSION}"
34 dodir "/usr/src/linux-${ver}/arch/${kern_arch}"
35 mv include scripts "${ED}/usr/src/linux-${ver}/" || die
36 mv "arch/${kern_arch}/include" \
37 --
38 2.38.0