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

make, scripts: Add more scripts from ytools/devutil/scripts

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-08 13:40:04 +00:00
commit e4ea74dadc
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/isolinux.mk
View file

@ -55,7 +55,7 @@ unpack.done: $(URL_FILE) dload.done
mv $(SYSLINUX_BASE) $(UNPACK_DIR)
touch $@
GENERATE = sh $(MOD_SCRIPT_DIR)/generate_boot_medium.sh
GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh
BOOT_CONF = boot.conf
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)

2
make/rpmdist.mk
View file

@ -3,7 +3,7 @@ RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
ifneq ($(BUILD_PROJECT_PACKAGE),false)
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(LOCAL_MKSPEC_SH)
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
FTP_SRC_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= $(shell id -g)

2
make/upload-defs-rpm.mk
View file

@ -4,7 +4,7 @@
# MOD_SCRIPT_DIR
#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh
#FTP_FILE_MODE ?= 640
#FTP_DIR_MODE ?= 750