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

devutil/jcs and make: Add an EXTRAVERSION string to uname -r

Browse source
This commit is contained in:
Jan Lindemann 2004-08-18 18:09:20 +00:00 • committed by Jan Lindemann
commit 5a4a2367c8
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -146,3 +146,4 @@ o merged changes from V_1_1_5_2_FIXES and corrected YStopWatchThreadList
related issues related issues
o devutil/jcs and make: added support for specifying a bootlabel in kernel o devutil/jcs and make: added support for specifying a bootlabel in kernel
rpm build process; added asm to asm-$ARCH link in kernel include rpm build process; added asm to asm-$ARCH link in kernel include
o devutil/jcs and make: now adding an EXTRAVERSION string to `uname -r`

20
make/linux-rpm.mk
View file

@ -25,7 +25,12 @@ ARCH = i386
ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
KERNEL_RELEASE := $(shell make newrelease; exit 1) KERNEL_RELEASE := $(shell make newrelease; 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_NUM := $(strip $(shell grep Id: RELEASE-$(KERNEL_VERSION) | sed "s/.*RELEASE-$(KERNEL_VERSION),v[ ]*[0-9]*\.\([0-9]*\)[^0-9]*.*/\1/"))
ifeq ($(UNAME_SUFFIX),)
KERNEL_RELEASE = $(KERNEL_RELEASE_NUM)
else
KERNEL_RELEASE = $(UNAME_SUFFIX)$(KERNEL_RELEASE_NUM)
endif
endif endif
BASE = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) BASE = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)
@ -72,19 +77,25 @@ config-$(KERNEL_VERSION):
cvs add $@ cvs add $@
cvs commit cvs commit
toplevel-makefile: unpack.done
sed "s/^ *EXTRAVERSION *=/EXTRAVERSION = -$(KERNEL_RELEASE)/" linux-$(KERNEL_VERSION)/Makefile >$@
linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile
cp $< $@
unpack.done: $(KERNEL_PKG) unpack.done: $(KERNEL_PKG)
rm -rf linux-$(KERNEL_VERSION) rm -rf linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)
tar -xzf $(KERNEL_PKG) tar -xzf $(KERNEL_PKG)
touch $@ touch $@
%.lxdone: unpack.done config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD) %.lxdone: unpack.done linux-$(KERNEL_VERSION)/Makefile config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD)
$(BUILD) $(basename $@) $(BUILD) $(basename $@)
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) -a $(ARCH) -l $(BOOT_LABEL) > $@ $(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)-$(KERNEL_RELEASE): build.lxdone $(LOCAL_AFTER_KERNEL_BUILD)
@echo -n @echo -n
.PRECIOUS: $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION) .PRECIOUS: $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)
@ -194,6 +205,7 @@ 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_*
rm toplevel-makefile
newrelease: newrelease:
echo '# $$Id$$' > RELEASE-$(KERNEL_VERSION); \ echo '# $$Id$$' > RELEASE-$(KERNEL_VERSION); \