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.mk: Fix some ARCH issues

Browse source
This commit is contained in:
Jan Lindemann 2005-01-31 14:03:17 +00:00 • committed by Jan Lindemann
commit 63dc510260
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/linux-rpm.mk
View file

@ -20,7 +20,7 @@ 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
ARCH = $(shell rpmbuild --showrc | sed '/build arch / !d; s/.*build arch *://; s/ //g')
ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
KERNEL_RELEASE := $(shell make newrelease; exit 1)
@ -45,8 +45,8 @@ KERNEL_TGZ = $(notdir $(KERNEL_PKG))
F_SPEC = $(BASE).spec
F_TGZ = $(BASE).tar.gz
F_SPM = $(BASE).src.rpm
F_RPM_RUN = $(BASE_RUN).i386.rpm
F_RPM_DEVEL = $(BASE_DEVEL).i386.rpm
F_RPM_RUN = $(BASE_RUN).$(ARCH).rpm
F_RPM_DEVEL = $(BASE_DEVEL).$(ARCH).rpm
F_RPMS = $(F_RPM_RUN) $(F_RPM_DEVEL)
F_BOOTFILES = $(addsuffix -$(KERNEL_VERSION)-$(KERNEL_RELEASE),$(addprefix $(TMP_INSTALL)/boot/,vmlinuz config System.map))
F_CURRENT = $(addprefix CURRENT_, SRC RPM_SRC RPM_RUN_I386 RPM_DEVEL_I386)
@ -123,8 +123,8 @@ rpm.done: $(F_SPM)
rpmbuild --rebuild $(F_SPM)
touch $@
%.i386.rpm: rpm.done
cp /usr/src/packages/RPMS/i386/$@ .
%.$(ARCH).rpm: rpm.done
cp /usr/src/packages/RPMS/$(ARCH)/$@ .
CURRENT_RPM_RUN_I386: $(F_RPM_RUN)
echo $(UPLOAD_PATH)/rpm/run/$(F_RPM_RUN) > $@