janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 07:33:54 +01:00
Code Activity

rpmdist.mk: Fix architecture and source rpm generation

Browse source
This commit is contained in:
Jan Lindemann 2007-08-14 15:32:33 +00:00 • committed by Jan Lindemann
commit d702d91080
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/rpmdist.mk
View file

@ -18,6 +18,7 @@ FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RPM_PROJECT ?= $(PROJECT) RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(VERSION) RPM_VERSION ?= $(VERSION)
RPM_ARCH ?= i586
RPMBUILD ?= rpmbuild RPMBUILD ?= rpmbuild
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk
@ -27,8 +28,8 @@ DIST_SRC_DIR = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
DIST_PCKG_DIR = dist/pckg DIST_PCKG_DIR = dist/pckg
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
RPM_VERSION ?= $(VERSION) RPM_VERSION ?= $(VERSION)
@ -36,7 +37,7 @@ include $(MODDIR)/make/upload-defs.mk
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g') DIST_FILES = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
RPMS_DIR = /usr/src/packages/RPMS/i386 RPMS_DIR = /usr/src/packages/RPMS/$(RPM_ARCH)
SRPMS_DIR = /usr/src/packages/SRPMS SRPMS_DIR = /usr/src/packages/SRPMS
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
@ -95,7 +96,7 @@ cpfiles.dist:
-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
%.src.rpm: %.tar.gz %.src.rpm: %.tar.gz
rpm -ts $< $(RPMBUILD) -ts $<
cp $(SRPMS_DIR)/$(notdir $@) $@ cp $(SRPMS_DIR)/$(notdir $@) $@
$(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) $(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)