From 8c3b0cfad144953afcddec57be9529e7ccc54aa3 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 25 May 2015 14:39:07 +0000 Subject: [PATCH] rpmdist.mk: Add hooks for building .deb packages Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index e45eb677..96b4761c 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -4,6 +4,7 @@ CREATE_DEVEL = false endif endif +PKG_FORMAT ?= rpm RPM_ARCH ?= $(ARCH) CREATE_DEVEL ?= true UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh @@ -71,7 +72,7 @@ include $(MODDIR)/make/upload-rules.mk BUILD_PACKAGE_SH = /bin/bash $(MOD_SCRIPT_DIR)/build-package.sh \ -N $(RPM_PROJECT) \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ - -m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) + -m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) # -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently @@ -80,7 +81,7 @@ install: clean: rpm-clean distclean: rpm-clean -tgz: $(PCKG_TAR) +tgz: $(DIST_PCKG_DIR)/$(PCKG_TAR) ftag: ftag.dist rpm-upload-stable: rpm-upload-STABLE.dist