From 808d0805073776a9be2433dd9fd82472b334c31c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 11 Jan 2005 16:08:36 +0000 Subject: [PATCH] linux-rpm.mk: Support architectures other than i386 Build for architecture $(ARCH) (from rpmbuild --showrc) instead of i386 only. --- make/linux-rpm.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 1934a2cc..494822e4 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -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 2>&1 | sed '/build arch / !d; s/build arch *://; s/ *//g') ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) KERNEL_RELEASE := $(shell echo '\# $$Id$(KERNEL_VERSION),v 0.1$$' \ @@ -49,8 +49,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) @@ -62,7 +62,7 @@ BUILD = build_linux.sh \ -c config-$(KERNEL_VERSION) \ -t $(HOST) \ -b $(WD) \ - -a i386 \ + -a $(ARCH) \ -s $(KERNEL_SRC_DIR) \ -i $(TMP_INSTALL) MKSPEC := $(shell which mkspec-linux.sh) @@ -124,8 +124,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) > $@