From 72f77f99efa80de354a591aad6b89cd3166d89e1 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 29 Jun 2014 14:09:53 +0000 Subject: [PATCH] rpmdist.mk: Disable cpfiles.dist, obsoleted by build-package.sh Signed-off-by: Jan Lindemann --- make/rpmdist.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index fdb791d9..31a067df 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -68,7 +68,7 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/upload-rules.mk -BUILD_PACKAGE_SH = /bin/bash -x $(MOD_SCRIPT_DIR)/build-package.sh \ +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) @@ -126,15 +126,15 @@ src-dir.dist: mkdir -p $(DIST_SRC_DIR) touch $@ -cpfiles.dist: src-dir.dist $(LOCAL_MKSPEC_SH) - rm -rf $(DIST_SRC_DIR)/* - $(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i) - sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \ - -R "$(RPM_REQUIRES_RUN)" \ - -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ - > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec - echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION - touch $@ +#cpfiles.dist: src-dir.dist $(LOCAL_MKSPEC_SH) +# rm -rf $(DIST_SRC_DIR)/* +# $(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i) +# sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \ +# -R "$(RPM_REQUIRES_RUN)" \ +# -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ +# > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec +# echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION +# touch $@ %.tar.gz: $(RPM_EXTRA_FILES) cpfiles.dist mkdir -p $(DIST_PCKG_DIR)