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

conf/jcs, make, scripts: Rename jw-build's get_os.sh to get-os.sh

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-06-12 09:35:57 +00:00
commit 3961d47f07
7 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/jcs/jcs.conf
View file

@ -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_owner=root
jcs_group=root jcs_group=root
jcs_log_dir=$jcs_dir/log jcs_log_dir=$jcs_dir/log

2
make/defs.mk
View file

@ -39,7 +39,7 @@ ifeq ($(PROJECT),)
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//'))) PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
endif endif
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh) OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get-os.sh)
CREATE_DEVEL ?= true CREATE_DEVEL ?= true
#COMPILER_SUITE ?= clang #COMPILER_SUITE ?= clang

2
make/smart-selection.mk
View file

@ -1,5 +1,5 @@
# === variable definitions # === 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 GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh
UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh

0
scripts/get_os.sh → scripts/get-os.sh Normal file → Executable file
View file

2
scripts/jcs
View file

@ -2037,7 +2037,7 @@ JNT_JCSDIR=/tmp
--<<<-- jcs.conf.oldstyle -- --<<<-- jcs.conf.oldstyle --
-->>>-- jcs.conf -- -->>>-- 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_owner=root
jcs_group=root jcs_group=root
jcs_log_dir=$jcs_dir/log jcs_log_dir=$jcs_dir/log

2
scripts/pkg.sh
View file

@ -36,7 +36,7 @@ fatal()
os() os()
{ {
/bin/bash $MOD_SCRIPT_DIR/get_os.sh /bin/bash $MOD_SCRIPT_DIR/get-os.sh
} }
scm_commit() scm_commit()

2
scripts/projects.py
View file

@ -45,7 +45,7 @@ def remove_duplicates(seq):
def get_os(args = ""): def get_os(args = ""):
for d in [ projs_root + '/jw-build/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
if args: if args: