[gentoo-dev] commit 50078fbbb39667734 for linux-info.eclass

[gentoo-dev] commit 50078fbbb39667734 for linux-info.eclass

[Francesco Riosa]

hi all,

   like someone else I do build out of sources kernels, since commit
50078fbbb3966773401c1fc59838c1e5952c1318 it has been impossible to build
some modules from gentoo repo.

See bug https://bugs.gentoo.org/662772 reported by another user with the
same problem.

Please revert the commit, after that we should discuss here an
appropriate fix, with this statement I'm offering to test it for vanilla
kernel, out of source builds.

thank you,
Francesco Riosa

[gentoo-dev] Re: commit 50078fbbb39667734 for linux-info.eclass

[Francesco Riosa]

[-- Attachment #1: Type: text/plain, Size: 2534 bytes --]


Il 06/08/2018 17:13, Francesco Riosa ha scritto:
...
> Please revert the commit, after that we should discuss here an
> appropriate fix, with this statement I'm offering to test it for vanilla
> kernel, out of source builds.
tried to fix it and it seem to work, so I retract the revert request and
instead ask for review of this patch:

From de7bec54c51361ae2aecbfa06a9cf3300a338dca Mon Sep 17 00:00:00 2001
From: Francesco Riosa <vivo75@gmail.com>
Date: Mon, 6 Aug 2018 19:18:05 +0200
Subject: [PATCH] linux-info.eclass: CONFIG_LOCALVERSION for out of source
 builds

Closes: https://bugs.gentoo.org/662772
---
 eclass/linux-info.eclass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index b158e345d16..98ec0ac8dab 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -548,13 +548,22 @@ get_version() {
         return 1
     fi
 
+    [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
+    if [ -n "${KV_OUT_DIR}" ];
+    then
+        qeinfo "Found kernel object directory:"
+        qeinfo "    ${KV_OUT_DIR}"
+    fi
+    # and if we STILL have not got it, then we better just set it to KV_DIR
+    KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
+
     # Grab the kernel release from the output directory.
     # TODO: we MUST detect kernel.release being out of date, and
'return 1' from
     # this function.
-    if [ -s "${KV_DIR}"/include/config/kernel.release ]; then
-        KV_LOCAL=$(<"${KV_DIR}"/include/config/kernel.release)
-    elif [ -s "${KV_DIR}"/.kernelrelease ]; then
-        KV_LOCAL=$(<"${KV_DIR}"/.kernelrelease)
+    if [ -s "${KV_OUT_DIR}"/include/config/kernel.release ]; then
+        KV_LOCAL=$(<"${KV_OUT_DIR}"/include/config/kernel.release)
+    elif [ -s "${KV_OUT_DIR}"/.kernelrelease ]; then
+        KV_LOCAL=$(<"${KV_OUT_DIR}"/.kernelrelease)
     else
         KV_LOCAL=
     fi
@@ -586,15 +595,6 @@ get_version() {
         done
     fi
 
-    [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
-    if [ -n "${KV_OUT_DIR}" ];
-    then
-        qeinfo "Found kernel object directory:"
-        qeinfo "    ${KV_OUT_DIR}"
-    fi
-    # and if we STILL have not got it, then we better just set it to KV_DIR
-    KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
-
     # And we should set KV_FULL to the full expanded version
     KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}"
 
-- 
2.18.0



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-linux-info.eclass-CONFIG_LOCALVERSION-for-out-of-sou.patch --]
[-- Type: text/x-patch; name="0001-linux-info.eclass-CONFIG_LOCALVERSION-for-out-of-sou.patch", Size: 2043 bytes --]

From de7bec54c51361ae2aecbfa06a9cf3300a338dca Mon Sep 17 00:00:00 2001
From: Francesco Riosa <vivo75@gmail.com>
Date: Mon, 6 Aug 2018 19:18:05 +0200
Subject: [PATCH] linux-info.eclass: CONFIG_LOCALVERSION for out of source
 builds

Closes: https://bugs.gentoo.org/662772
---
 eclass/linux-info.eclass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index b158e345d16..98ec0ac8dab 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -548,13 +548,22 @@ get_version() {
 		return 1
 	fi
 
+	[ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
+	if [ -n "${KV_OUT_DIR}" ];
+	then
+		qeinfo "Found kernel object directory:"
+		qeinfo "    ${KV_OUT_DIR}"
+	fi
+	# and if we STILL have not got it, then we better just set it to KV_DIR
+	KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
+
 	# Grab the kernel release from the output directory.
 	# TODO: we MUST detect kernel.release being out of date, and 'return 1' from
 	# this function.
-	if [ -s "${KV_DIR}"/include/config/kernel.release ]; then
-		KV_LOCAL=$(<"${KV_DIR}"/include/config/kernel.release)
-	elif [ -s "${KV_DIR}"/.kernelrelease ]; then
-		KV_LOCAL=$(<"${KV_DIR}"/.kernelrelease)
+	if [ -s "${KV_OUT_DIR}"/include/config/kernel.release ]; then
+		KV_LOCAL=$(<"${KV_OUT_DIR}"/include/config/kernel.release)
+	elif [ -s "${KV_OUT_DIR}"/.kernelrelease ]; then
+		KV_LOCAL=$(<"${KV_OUT_DIR}"/.kernelrelease)
 	else
 		KV_LOCAL=
 	fi
@@ -586,15 +595,6 @@ get_version() {
 		done
 	fi
 
-	[ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
-	if [ -n "${KV_OUT_DIR}" ];
-	then
-		qeinfo "Found kernel object directory:"
-		qeinfo "    ${KV_OUT_DIR}"
-	fi
-	# and if we STILL have not got it, then we better just set it to KV_DIR
-	KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
-
 	# And we should set KV_FULL to the full expanded version
 	KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}"
 
-- 
2.18.0

[gentoo-dev] Re: commit 50078fbbb39667734 for linux-info.eclass

[Thomas Deutschmann]

[-- Attachment #1.1: Type: text/plain, Size: 249 bytes --]

Hi,

just an acknowledge for the moment that kernel project has seen the
request and is currently looking into this.

Thanks.


-- 
Regards,
Thomas Deutschmann / Gentoo Linux Developer
C4DD 695F A713 8F24 2AA1 5638 5849 7EE5 1D5D 74A5


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]