janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

linux-rpm: Add target newrelease and option -l bootlabel

Browse source 
- Add target newrelease
  - Add support for the new options -l bootlabel and -a arch of mkspec-linux.sh
This commit is contained in:
Jan Lindemann 2004-08-18 12:42:05 +00:00 • committed by Jan Lindemann
commit 66fcab4b89
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
make/linux-rpm.mk
View file

@ -20,13 +20,10 @@ WD := $(shell pwd)
KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1) KERNEL_SRC_DIR = $(shell tar -tzf $(KERNEL_DIR)/$(KERNEL_PKG) | head -1)
TMP_INSTALL = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) TMP_INSTALL = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)
TAG = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed 's/\./_/g') TAG = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed 's/\./_/g')
ARCH = i386
ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
KERNEL_RELEASE := $(shell echo '\# \$$""Id:"$$"' \ KERNEL_RELEASE := $(shell make newrelease; exit 1)
> RELEASE-$(KERNEL_VERSION); \
cvs add RELEASE-$(KERNEL_VERSION); \
cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION); \
exit 1))
else else
KERNEL_RELEASE := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | sed "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/")) KERNEL_RELEASE := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | sed "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/"))
endif 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) # note that order matters for F_ULDONE and F_RPMS (remote directory attributes)
KERNEL_INSTALL_PREFIX= $(shell pwd)/$(TMP_INSTALL) KERNEL_INSTALL_PREFIX= $(shell pwd)/$(TMP_INSTALL)
BUILD = build_linux.sh \ BUILD = build_linux.sh \
-c config-$(KERNEL_VERSION) \ -c config-$(KERNEL_VERSION) \
-t $(HOST) \ -t $(HOST) \
-b $(WD) \ -b $(WD) \
@ -85,7 +82,7 @@ unpack.done: $(KERNEL_PKG)
touch $@ touch $@
$(TMP_INSTALL)/$(F_SPEC): $(MKSPEC) Makefile $(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) $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION): build.lxdone $(LOCAL_AFTER_KERNEL_BUILD)
@echo -n @echo -n
@ -197,3 +194,9 @@ dist: clean
clean: clean:
rm -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.rpm *.tar.gz *.tar $(SCOPE_DRIVER_BASE) 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_* 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)