From: <alan.tull@freescale.com>
To: <mmarek@suse.cz>
Cc: <linux-kbuild@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Alan Tull <alan.tull@freescale.com>
Subject: [PATCH] Fix LOCALVERSION append plus logic
Date: Thu, 7 Oct 2010 15:18:52 -0500 [thread overview]
Message-ID: <1286482732-12087-1-git-send-email-alan.tull@freescale.com> (raw)
From: Alan Tull <alan.tull@freescale.com>
This change fixes the logic to do what the comment says
when CONFIG_LOCALVERSION_AUTO and CONFIG_LOCALVERSION are
both not set.
Also fix a spelling error in the comment.
If the kernel tree is in git, here's the config
permutations (with CONFIG_LOCALVERSION_AUTO turned off)
and the image name resulting:
CONFIG_LOCALVERSION=""
results:
patched : Linux-2.6.35.3+
unpatched : Linux-2.6.35.3
CONFIG_LOCALVERSION="-something"
results:
patched : Linux-2.6.35.3-something
unpatched : Linux-2.6.35.3-something+
Signed-off-by: Alan Tull <alan.tull@freescale.com>
---
scripts/setlocalversion | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 64a9cb5..4488a33 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -160,9 +160,9 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
# full scm version string
res="$res$(scm_version)"
else
- # apped a plus sign if the repository is not in a clean tagged
+ # append a plus sign if the repository is not in a clean tagged
# state and LOCALVERSION= is not specified
- if test "${LOCALVERSION+set}" != "set"; then
+ if test "$CONFIG_LOCALVERSION" = ""; then
scm=$(scm_version --short)
res="$res${scm:++}"
fi
--
1.6.0.4
next reply other threads:[~2010-10-07 20:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 20:18 alan.tull [this message]
2010-10-08 14:04 ` Michal Marek
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=1286482732-12087-1-git-send-email-alan.tull@freescale.com \
--to=alan.tull@freescale.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
/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
all inboxes | Powered by JetHome®