From e4ea74dadc92644b251bf775f549e6ca55249ec8 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 8 Apr 2017 13:40:04 +0000
Subject: [PATCH] make, scripts: Add more scripts from ytools/devutil/scripts

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/isolinux.mk        | 2 +-
 make/rpmdist.mk         | 2 +-
 make/upload-defs-rpm.mk | 2 +-
 scripts/pkg.sh          | 4 ++--
 scripts/projects.py     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/make/isolinux.mk b/make/isolinux.mk
index d2fd2d8b..76b8e45d 100644
--- a/make/isolinux.mk
+++ b/make/isolinux.mk
@@ -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)
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index e40484e9..fa7909ec 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -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)
diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk
index eb8a5871..366aec0c 100644
--- a/make/upload-defs-rpm.mk
+++ b/make/upload-defs-rpm.mk
@@ -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
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 6182fba7..b1e5cece 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -426,7 +426,7 @@ build_pkg()
 		case $pkgfmt in
 		rpm)
 			# 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;;
 		debian|deb)
 			deffmt=debian;;
@@ -436,7 +436,7 @@ build_pkg()
 
 		# --- generate spec file
 		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 ] && \
 			fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"."
diff --git a/scripts/projects.py b/scripts/projects.py
index e63016d4..dfd6a05b 100644
--- a/scripts/projects.py
+++ b/scripts/projects.py
@@ -42,7 +42,7 @@ def remove_duplicates(seq):
     return [x for x in seq if not (x in seen or seen_add(x))]
 
 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'
         if isfile(script):
             cmd = '/bin/bash ' + script