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