From 23b9c27d063b5fc2de4e373014b1f64c04651c2e Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 11 Jan 2005 15:56:15 +0000 Subject: [PATCH] linux-rpm.mk: Merged changes from V_1_1_7_1_JL --- make/linux-rpm.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 1368a74a..1934a2cc 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -23,7 +23,11 @@ TAG = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed ARCH = i386 ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) -KERNEL_RELEASE := $(shell make newrelease; exit 1) +KERNEL_RELEASE := $(shell echo '\# $$Id$(KERNEL_VERSION),v 0.1$$' \ + > RELEASE-$(KERNEL_VERSION); \ + cvs add RELEASE-$(KERNEL_VERSION); \ + cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION); \ + exit 1)) else 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),) @@ -79,10 +83,7 @@ $(KERNEL_PKG): config-$(KERNEL_VERSION): cp $(shell ls config-$(basename $(KERNEL_VERSION)).* | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)$$/\1.\2.0\3/' | sort -g | sed 's/\.0/./; $$ !d') $@ cvs add $@ - cvs commit - -toplevel-makefile: unpack.done - sed "s/^ *EXTRAVERSION *=/EXTRAVERSION = -$(KERNEL_RELEASE)/" linux-$(KERNEL_VERSION)/Makefile >$@ + cvs commit -m "initial checkin" linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile cp $< $@ @@ -92,7 +93,7 @@ unpack.done: $(KERNEL_PKG) tar -xzf $(KERNEL_PKG) touch $@ -%.lxdone: unpack.done config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD) linux-$(KERNEL_VERSION)/Makefile +%.lxdone: unpack.done config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD) $(BUILD) $(basename $@) touch $@ @@ -116,11 +117,11 @@ $(F_TGZ): Makefile build.lxdone $(F_BOOTFILES) $(TMP_INSTALL)/$(F_SPEC) ) %.src.rpm: %.tar.gz - rpm -ts $< + rpmbuild -ts $< cp /usr/src/packages/SRPMS/$@ . rpm.done: $(F_SPM) - rpm --rebuild $(F_SPM) + rpmbuild --rebuild $(F_SPM) touch $@ %.i386.rpm: rpm.done