[PATCH 0/1] meta/classes/kernel.bbclass: revert 56fe5300ab5

[PATCH 0/1] meta/classes/kernel.bbclass: revert 56fe5300ab5

[Trevor Woerner]

Changes from v1:
 - fixed kernel config option to which this patch refers from
   CONFIG_LOCALVERSION to CONFIG_LOCALVERSION_AUTO

Trevor Woerner (1):
  meta/classes/kernel.bbclass: revert 56fe5300ab5

 meta/classes/kernel.bbclass | 6 ------
 1 file changed, 6 deletions(-)

-- 
2.12.0.rc1.48.g076c053

[PATCH 1/1] meta/classes/kernel.bbclass: revert 56fe5300ab5

[Trevor Woerner]

This commit effectively reverts 56fe5300ab5 (except doing a revert at this
point is not clean).

The Linux kernel contains a configuration option called
CONFIG_LOCALVERSION_AUTO which, if enabled, will change the boot
log and "uname -a" from, for example, "4.10.2-yocto-standard" to
"4.10.2-yocto-standard-00368-g827a1164b155".

According to the log message for 56fe5300ab5, the Linux kernel's
scripts/setlocalversion script was leaving or appending a '+' to the end of
directory names (e.g. /lib/modules/2.6.37+). This conversation can be seen at:

	http://lists.openembedded.org/pipermail/openembedded-core/2011-December/053263.html

The solution was to touch an empty .scmversion file, which causes the kernel's
CONFIG_LOCALVERSION_AUTO logic to be entirely circumvented. This seems like
a very big hammer to use in order to fix a trailing '+'. If users were
enabling this kernel option, it wasn't having any effect. Also, by default,
CONFIG_LOCALVERSION_AUTO is disabled in linux-yocto kernels.

Commit 56fe5300ab5 was many years ago, and my current testing with
CONFIG_LOCALVERSION_AUTO enabled and 56fe5300ab5 reverted doesn't appear to
cause trailing '+' characters to be appended to filenames in /lib/modules
anymore. It appears as though the problem has been fixed somewhere else along
the way. In which case, enable this functionality so setting this kernel
option gives users the expected result.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta/classes/kernel.bbclass | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 1e0646a437..c44978808b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -451,12 +451,6 @@ check_oldest_kernel[vardepsexclude] += "OLDEST_KERNEL KERNEL_VERSION"
 do_configure[prefuncs] += "check_oldest_kernel"
 
 kernel_do_configure() {
-	# fixes extra + in /lib/modules/2.6.37+
-	# $ scripts/setlocalversion . => +
-	# $ make kernelversion => 2.6.37
-	# $ make kernelrelease => 2.6.37+
-	touch ${B}/.scmversion ${S}/.scmversion
-
 	if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then
 		mv "${S}/.config" "${B}/.config"
 	fi
-- 
2.12.0.rc1.48.g076c053

Re: [PATCH 1/1] meta/classes/kernel.bbclass: revert 56fe5300ab5

[Trevor Woerner]

Please don't add this patch, I've found a test case where I see the
"+" being added.
(Is there a stronger way of doing this via patchwork?)

On Tue, Mar 21, 2017 at 3:05 PM, Trevor Woerner <twoerner@gmail.com> wrote:
> This commit effectively reverts 56fe5300ab5 (except doing a revert at this
> point is not clean).
>
> The Linux kernel contains a configuration option called
> CONFIG_LOCALVERSION_AUTO which, if enabled, will change the boot
> log and "uname -a" from, for example, "4.10.2-yocto-standard" to
> "4.10.2-yocto-standard-00368-g827a1164b155".
>
> According to the log message for 56fe5300ab5, the Linux kernel's
> scripts/setlocalversion script was leaving or appending a '+' to the end of
> directory names (e.g. /lib/modules/2.6.37+). This conversation can be seen at:
>
>         http://lists.openembedded.org/pipermail/openembedded-core/2011-December/053263.html
>
> The solution was to touch an empty .scmversion file, which causes the kernel's
> CONFIG_LOCALVERSION_AUTO logic to be entirely circumvented. This seems like
> a very big hammer to use in order to fix a trailing '+'. If users were
> enabling this kernel option, it wasn't having any effect. Also, by default,
> CONFIG_LOCALVERSION_AUTO is disabled in linux-yocto kernels.
>
> Commit 56fe5300ab5 was many years ago, and my current testing with
> CONFIG_LOCALVERSION_AUTO enabled and 56fe5300ab5 reverted doesn't appear to
> cause trailing '+' characters to be appended to filenames in /lib/modules
> anymore. It appears as though the problem has been fixed somewhere else along
> the way. In which case, enable this functionality so setting this kernel
> option gives users the expected result.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  meta/classes/kernel.bbclass | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 1e0646a437..c44978808b 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -451,12 +451,6 @@ check_oldest_kernel[vardepsexclude] += "OLDEST_KERNEL KERNEL_VERSION"
>  do_configure[prefuncs] += "check_oldest_kernel"
>
>  kernel_do_configure() {
> -       # fixes extra + in /lib/modules/2.6.37+
> -       # $ scripts/setlocalversion . => +
> -       # $ make kernelversion => 2.6.37
> -       # $ make kernelrelease => 2.6.37+
> -       touch ${B}/.scmversion ${S}/.scmversion
> -
>         if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then
>                 mv "${S}/.config" "${B}/.config"
>         fi
> --
> 2.12.0.rc1.48.g076c053
>

Re: [PATCH 1/1] meta/classes/kernel.bbclass: revert 56fe5300ab5

[Burton, Ross]

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

On 22 March 2017 at 17:00, Trevor Woerner <twoerner@gmail.com> wrote:

> Please don't add this patch, I've found a test case where I see the
> "+" being added.
> (Is there a stronger way of doing this via patchwork?)
>

As the submitter you should be able to retract a patch in patchwork, but
this message is good enough!

Ross

[-- Attachment #2: Type: text/html, Size: 761 bytes --]