From 3573120b9e92d610483d49946cc6bdd8cf9dd2f5 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sun, 9 Sep 2007 16:28:58 +0000
Subject: [PATCH] linux-rpm.mk: Revert to CVS revision 1.37

Go back to revision 1.37 of linux-rpm.mk, undoing Benno's changes in
the last two revisions, since they made kernels with Torvalds-defined
EXTRAVERSIONs stop working
---
 make/linux-rpm.mk | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index e94a57c5..f967efe0 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -67,16 +67,24 @@ config-$(KERNEL_VERSION):
 	cvs commit $@
 
 toplevel-makefile: unpack.done patches.done
-	awk -F = -v release=$(RPM_RELEASE) '{                                   \
-		if ($$0 ~ /EXTRAVERSION[ 	]*=/) {                         \
-			if (release ~ "^ *$$") {                                \
-				printf "EXTRAVERSION =\n"                       \
-			} else {                                                \
-				printf "EXTRAVERSION = -%s\n",release           \
-			}                                                       \
-		} else {                                                        \
-			print $$0                                               \
-		}                                                               \
+	awk -v release=$(RPM_RELEASE) '{   \
+		if ($$0 ~ /EXTRAVERSION *= *-/) {                             \
+			oldextra=$$3;                                         \
+			gsub(/-/,_,oldextra);                                 \
+			printf "EXTRAVERSION = -%s_%s\n", release, oldextra   \
+		} else if ($$0 ~ /EXTRAVERSION *= *\./) {                     \
+			oldextra=$$3;                                         \
+			gsub(/-/,_,oldextra);                                 \
+			printf "EXTRAVERSION = %s-%s\n",oldextra, release     \
+		} else if ($$0 ~ /EXTRAVERSION *= *$$/) {                     \
+			if (release ~ "^ *$$") {                              \
+				printf "EXTRAVERSION =\n"                     \
+			} else {                                              \
+				printf "EXTRAVERSION = -%s\n",release         \
+			}                                                     \
+		} else {                                                      \
+			print $$0                                             \
+		}                                                             \
 	}' linux-$(KERNEL_VERSION)/Makefile >$@
 
 linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile
@@ -156,5 +164,5 @@ thisclean:
 export \
 	TOPDIR MODDIR KERNEL_VERSION RPM_RELEASE HOST KERNEL_PKG_SUFFIX CUSTOMER \
 	KERNEL_BASE_DIR KERNEL_PKG KERNEL_BASE UPLOAD_HOST UPLOAD_PATH \
-	UPLOAD_OWNER BOOT_LABEL PATCHES KERNEL_MAJOR KERNEL_MINOR \
+	UPLOAD_OWNER BOOT_LABEL BOOT_LABEL PATCHES KERNEL_MAJOR KERNEL_MINOR \
 	KERNEL_RELEASE WD