From 681dd53eae475229fab2fdbf9f0bbc1c4a726823 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 1 Feb 2008 13:10:09 +0000
Subject: [PATCH] linux-rpm-build.mk: Remove -release from kernel versions

Use sed scriptlets to remove -release from kernel versions in
KERNEL_PKG and for -v argument to mkspec-linux.sh, pretty hacky this
way
---
 make/linux-rpm-build.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk
index 44e467b1..d221e45b 100644
--- a/make/linux-rpm-build.mk
+++ b/make/linux-rpm-build.mk
@@ -11,7 +11,7 @@ BOOT_LABEL          ?= lx-$(KERNEL_VERSION)-$(RPM_RELEASE)
 KERNEL_PKG_SUFFIX   ?= .tar.gz
 CUSTOMER            ?= jannet
 KERNEL_DLOAD_DIR    ?= /home/samba/dat/exe/linux/os
-KERNEL_PKG          ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | sed 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(KERNEL_VERSION)$(KERNEL_PKG_SUFFIX)
+KERNEL_PKG          ?= $(KERNEL_DLOAD_DIR)/$(shell echo $(KERNEL_VERSION) | sed 's/\([0-9]\.[0-9]*\)\..*/\1/')/linux-$(shell echo $(KERNEL_VERSION) | sed 's/\(2\.6\.[0-9]+\)-..*/\1/')$(KERNEL_PKG_SUFFIX)
 UPLOAD_HOST         ?= ftp.jannet.de
 UPLOAD_PATH         ?= /home/ftp/dat/pub/packages/$(CUSTOMER)/$(KERNEL_BASE)
 UPLOAD_OWNER        ?= $(shell whoami)
@@ -97,7 +97,7 @@ all: rpm
 	touch $@
 
 $(TMP_INSTALL)/$(F_SPEC): linux-$(KERNEL_VERSION)/Makefile $(MKSPEC) Makefile
-	sh $(MKSPEC) -d $(TMP_INSTALL) -b $(KERNEL_BASE) -v $(KERNEL_VERSION) -r $(RPM_RELEASE) -a $(ARCH) -l $(BOOT_LABEL) > $@
+	sh $(MKSPEC) -d $(TMP_INSTALL) -b $(KERNEL_BASE) -v $(shell echo $(COMPLETE_VERSION) | sed 's/-[0-9][0-9]*.*//') -r $(RPM_RELEASE) -a $(ARCH) -l $(BOOT_LABEL) > $@
 
 $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): build.lxdone $(LOCAL_AFTER_KERNEL_BUILD)
 	@echo -n