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
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
From de7bec54c51361ae2aecbfa06a9cf3300a338dca Mon Sep 17 00:00:00 2001
From: Francesco Riosa
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
