Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Trevor Woerner <twoerner@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/1] meta/classes/kernel.bbclass: revert 56fe5300ab5
Date: Tue, 21 Mar 2017 15:05:13 -0400	[thread overview]
Message-ID: <20170321190513.21469-2-twoerner@gmail.com> (raw)
In-Reply-To: <20170321190513.21469-1-twoerner@gmail.com>

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



  reply	other threads:[~2017-03-21 19:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-21 19:05 [PATCH 0/1] meta/classes/kernel.bbclass: revert 56fe5300ab5 Trevor Woerner
2017-03-21 19:05 ` Trevor Woerner [this message]
2017-03-22 17:00   ` [PATCH 1/1] " Trevor Woerner
2017-03-22 17:11     ` Burton, Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170321190513.21469-2-twoerner@gmail.com \
    --to=twoerner@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox