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

build-package.sh: Rename to pkg.sh

Browse source 
Rename build-package.sh to pkg.sh, prepare it for handling more
generic tasks.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-05-31 11:52:08 +00:00
commit 25e4c197d3
2 changed files with 637 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/rpmdist.mk
View file

@ -84,7 +84,7 @@ ifeq ($(CREATE_DEVEL),true)
BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
endif
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
# to be replaced by build-package.sh
# to be replaced by pkg.sh
RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = __NEXT_VERSION__
unexport RPM_VERSION VERSION DIST_SRC_DIR
@ -92,7 +92,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 $(MOD_SCRIPT_DIR)/build-package.sh \
PKG_SH = /bin/bash $(MOD_SCRIPT_DIR)/pkg.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) -F $(PKG_FORMAT)
@ -139,7 +139,7 @@ clean.rpm:
#endif
pkg-build.dist:
$(BUILD_PACKAGE_SH) build
$(PKG_SH) build
touch $@
pkg-update-local-repo:
@ -320,7 +320,7 @@ pkg-release: pkg-release-reinstall
# pkg-release-update: pkg-release pkg-update
pkg-release-reinstall: update
$(BUILD_PACKAGE_SH) release
$(PKG_SH) release
ifneq ($(TARGET_HOST),)
pkg-remote-install: