diff --git a/conf/jcs/jcs.conf b/conf/jcs/jcs.conf index ef2e5c15..bfffbff0 100644 --- a/conf/jcs/jcs.conf +++ b/conf/jcs/jcs.conf @@ -1,4 +1,4 @@ -jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/jw-build/bin/get_os.sh` +jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/jw-build/bin/get-os.sh` jcs_owner=root jcs_group=root jcs_log_dir=$jcs_dir/log diff --git a/make/defs.mk b/make/defs.mk index 60ff1eff..7e145eef 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -39,7 +39,7 @@ ifeq ($(PROJECT),) PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//'))) endif -OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh) +OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get-os.sh) CREATE_DEVEL ?= true #COMPILER_SUITE ?= clang diff --git a/make/smart-selection.mk b/make/smart-selection.mk index 8fbdd210..688ee09d 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -1,5 +1,5 @@ # === variable definitions -GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get_os.sh +GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get-os.sh GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh diff --git a/scripts/get_os.sh b/scripts/get-os.sh old mode 100644 new mode 100755 similarity index 100% rename from scripts/get_os.sh rename to scripts/get-os.sh diff --git a/scripts/jcs b/scripts/jcs index 729ebe68..252ce09b 100644 --- a/scripts/jcs +++ b/scripts/jcs @@ -2037,7 +2037,7 @@ JNT_JCSDIR=/tmp --<<<-- jcs.conf.oldstyle -- -->>>-- jcs.conf -- -jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/jw-build/bin/get_os.sh` +jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/jw-build/bin/get-os.sh` jcs_owner=root jcs_group=root jcs_log_dir=$jcs_dir/log diff --git a/scripts/pkg.sh b/scripts/pkg.sh index df9098c7..6ebf0c25 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -36,7 +36,7 @@ fatal() os() { - /bin/bash $MOD_SCRIPT_DIR/get_os.sh + /bin/bash $MOD_SCRIPT_DIR/get-os.sh } scm_commit() diff --git a/scripts/projects.py b/scripts/projects.py index 2bbe1327..3b506488 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -45,7 +45,7 @@ def remove_duplicates(seq): def get_os(args = ""): 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): cmd = '/bin/bash ' + script if args: