janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

linux-rpm-build.mk: Remove -release from kernel versions

Browse source 
Use sed scriptlets to remove -release from kernel versions in
KERNEL_PKG and for -v argument to mkspec-linux.sh, pretty hacky this
way
This commit is contained in:
Jan Lindemann 2008-02-01 13:10:09 +00:00 • committed by Jan Lindemann
commit 681dd53eae
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/linux-rpm-build.mk
View file

@ -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