janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

rpmdist.mk: Disable cpfiles.dist, obsoleted by build-package.sh

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-29 14:09:53 +00:00
commit 72f77f99ef
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
make/rpmdist.mk
View file

@ -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)