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) mv $(SYSLINUX_BASE) $(UNPACK_DIR)
touch $@ touch $@
GENERATE = sh $(MOD_SCRIPT_DIR)/generate_boot_medium.sh GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh
BOOT_CONF = boot.conf BOOT_CONF = boot.conf
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES) $(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) ifneq ($(BUILD_PROJECT_PACKAGE),false)
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.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_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami) FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= $(shell id -g) FTP_RUN_GROUP ?= $(shell id -g)

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

@ -4,7 +4,7 @@
# MOD_SCRIPT_DIR # MOD_SCRIPT_DIR
#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh #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_FILE_MODE ?= 640
#FTP_DIR_MODE ?= 750 #FTP_DIR_MODE ?= 750

4
scripts/pkg.sh
View file

@ -426,7 +426,7 @@ build_pkg()
case $pkgfmt in case $pkgfmt in
rpm) rpm)
# historical mess: # historical mess:
# pkg.sh -> mkspec_wrapper.sh -> create-mkspec.sh -> mkspec.sh -> spec -> rpmbuild spec > /var/tmp/xy.sh -> pkg.sh milk-install-log # pkg.sh -> mkspec-wrapper.sh -> create-mkspec.sh -> mkspec.sh -> spec -> rpmbuild spec > /var/tmp/xy.sh -> pkg.sh milk-install-log
deffmt=spec;; deffmt=spec;;
debian|deb) debian|deb)
deffmt=debian;; deffmt=debian;;
@ -436,7 +436,7 @@ build_pkg()
# --- generate spec file # --- generate spec file
local mkdef_sh=$TOPDIR/make/mk$deffmt.sh local mkdef_sh=$TOPDIR/make/mk$deffmt.sh
local mkdef_wrapper_sh=$MOD_SCRIPT_DIR/mkspec_wrapper.sh local mkdef_wrapper_sh=$MOD_SCRIPT_DIR/mkspec-wrapper.sh
[ ! -r $mkdef_wrapper_sh ] && \ [ ! -r $mkdef_wrapper_sh ] && \
fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"." fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"."

2
scripts/projects.py
View file

@ -42,7 +42,7 @@ def remove_duplicates(seq):
return [x for x in seq if not (x in seen or seen_add(x))] return [x for x in seq if not (x in seen or seen_add(x))]
def get_os(args = ""): def get_os(args = ""):
for d in [ projs_root + '/jw-build/devutil/scripts', '/opt/jw-build/bin' ]: for d in [ projs_root + '/jw-build/scripts', '/opt/jw-build/bin' ]:
script = d + '/get_os.sh' script = d + '/get_os.sh'
if isfile(script): if isfile(script):
cmd = '/bin/bash ' + script cmd = '/bin/bash ' + script