janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 21:37:39 +01:00
Code Activity

fix: Tried to call pkg.sh without /bin/bash led to permission denied

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-21 12:22:28 +00:00
commit 9d7059b64d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/defs.mk
View file

@ -672,7 +672,8 @@ GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
RM = rm RM = rm
AR = ar AR = ar
LOG_INSTALL_SH = $(MOD_SCRIPT_DIR)/pkg.sh log-install PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH = $(PKG_SH_EXE) log-install
ifeq ($(LOG_THREAD_NAMES), true) ifeq ($(LOG_THREAD_NAMES), true)
BUILD_CFLAGS += -DSLOG_THREAD_NAMES BUILD_CFLAGS += -DSLOG_THREAD_NAMES

4
make/rpmdist.mk
View file

@ -17,7 +17,7 @@ FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX) LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
LAST_RPM_VERSION ?= $(shell sh $(MOD_SCRIPT_DIR)/pkg.sh version \ LAST_RPM_VERSION ?= $(shell $(PKG_SH_EXE) version \
-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//') -p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
@ -78,7 +78,7 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR
include $(MODDIR)/make/tag-rules.mk include $(MODDIR)/make/tag-rules.mk
include $(MODDIR)/make/upload-rules.mk include $(MODDIR)/make/upload-rules.mk
PKG_SH = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh \ PKG_SH = $(PKG_SH_EXE) \
-N $(RPM_PROJECT) \ -N $(RPM_PROJECT) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(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) -m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT)