xdarklight's patch

From cce3a13a1f74e6dfbd8823bad01ad62b2bb288c8 Mon Sep 17 00:00:00 2001From: xdarklight <darklight.xdarklight@googlemail.com>Date: Fri, 20 Aug 2010 20:26:57 +0200Subject: [PATCH] Add an option which lets the user choose if a plus is automatically appended to the kernel version of an unclean repository state.--- init/Kconfig            |   10 ++++++++++ scripts/setlocalversion |    2 +- 2 files changed, 11 insertions(+), 1 deletions(-)diff --git a/init/Kconfig b/init/Kconfigindex fb41987..f160c85 100644--- a/init/Kconfig+++ b/init/Kconfig@@ -260,6 +260,16 @@ config LOCALVERSION_AUTO  	  which is done within the script "scripts/setlocalversion".) +config LOCALVERSION_AUTO_PLUS+	bool "Automatically append a plus sign at the end of the version string"+	default y+	depends on !LOCALVERSION_AUTO+	help+	  This will automatically add a plus sign ("+") at the end of the version+	  if the repository is not in a clean (tagged) state.++	  If unsure, say Y+ config HAVE_KERNEL_GZIP 	bool diff --git a/scripts/setlocalversion b/scripts/setlocalversionindex 64a9cb5..0bf15a9 100755--- a/scripts/setlocalversion+++ b/scripts/setlocalversion@@ -159,7 +159,7 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then 	# full scm version string 	res="$res$(scm_version)"-else+elif test "$CONFIG_LOCALVERSION_AUTO_PLUS" = "y"; then 	# apped a plus sign if the repository is not in a clean tagged 	# state and  LOCALVERSION= is not specified 	if test "${LOCALVERSION+set}" != "set"; then-- 1.7.2.1