From 66fcab4b8930b34309ab12f78329c0d5882ef062 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 18 Aug 2004 12:42:05 +0000 Subject: [PATCH] linux-rpm: Add target newrelease and option -l bootlabel - Add target newrelease - Add support for the new options -l bootlabel and -a arch of mkspec-linux.sh --- make/linux-rpm.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 41577bd7..334132d9 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -20,13 +20,10 @@ WD := $(shell pwd) KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1) TMP_INSTALL = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) TAG = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed 's/\./_/g') +ARCH = i386 ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) -KERNEL_RELEASE := $(shell echo '\# \$$""Id:"$$"' \ - > RELEASE-$(KERNEL_VERSION); \ - cvs add RELEASE-$(KERNEL_VERSION); \ - cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION); \ - exit 1)) +KERNEL_RELEASE := $(shell make newrelease; exit 1) else KERNEL_RELEASE := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | sed "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/")) endif @@ -48,7 +45,7 @@ F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) current) # note that order matters for F_ULDONE and F_RPMS (remote directory attributes) KERNEL_INSTALL_PREFIX= $(shell pwd)/$(TMP_INSTALL) -BUILD = build_linux.sh \ +BUILD = build_linux.sh \ -c config-$(KERNEL_VERSION) \ -t $(HOST) \ -b $(WD) \ @@ -85,7 +82,7 @@ unpack.done: $(KERNEL_PKG) touch $@ $(TMP_INSTALL)/$(F_SPEC): $(MKSPEC) Makefile - $(MKSPEC) -d $(TMP_INSTALL) -b $(KERNEL_BASE) -v $(KERNEL_VERSION) -r $(KERNEL_RELEASE) > $@ + $(MKSPEC) -d $(TMP_INSTALL) -b $(KERNEL_BASE) -v $(KERNEL_VERSION) -r $(KERNEL_RELEASE) -a $(ARCH) -l $(BOOT_LABEL) > $@ $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION): build.lxdone $(LOCAL_AFTER_KERNEL_BUILD) @echo -n @@ -197,3 +194,9 @@ dist: clean clean: rm -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.rpm *.tar.gz *.tar $(SCOPE_DRIVER_BASE) rm -rf linux linux-$(KERNEL_VERSION) $(TMP_INSTALL) CURRENT_* + +newrelease: + echo '# $$Id$$' > RELEASE-$(KERNEL_VERSION); \ + cvs add RELEASE-$(KERNEL_VERSION); \ + cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION) +