diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-11-19 08:23:55 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-11-20 05:50:28 (GMT) |
| commit | d759137c46fb7a04c4db44123ba3050afd734eef (patch) | |
| tree | 82126494b2d3ae995728114dae262add31ed493b | |
| parent | 5495a3497b54aa56e821c8aa44233345c0bd86b9 (diff) | |
Align script names with the ct-ng commands
Signed-off-by: Alexey Neyman <stilor@att.net>
| -rw-r--r-- | ct-ng.in | 2 | ||||
| -rw-r--r-- | samples/samples.mk | 10 | ||||
| -rw-r--r-- | scripts/show-config.sh (renamed from scripts/showSamples.sh) | 0 | ||||
| -rw-r--r-- | scripts/show-tuple.sh (renamed from scripts/showConfig.sh) | 0 |
4 files changed, 6 insertions, 6 deletions
@@ -132,7 +132,7 @@ help-env:: @false show-tuple: .config - $(SILENT)$(bash) $(CT_LIB_DIR)/scripts/showConfig.sh '$${CT_TARGET}' + $(SILENT)$(bash) $(CT_LIB_DIR)/scripts/show-tuple.sh '$${CT_TARGET}' # Actual build source: .config diff --git a/samples/samples.mk b/samples/samples.mk index 862dbe4..178e537 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -42,7 +42,7 @@ help-env:: PHONY += show-config show-config: .config @cp .config .config.sample - @$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -v current + @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh -v current @rm -f .config.sample # Prints the details of a sample @@ -51,7 +51,7 @@ $(patsubst %,show-%,$(CT_SAMPLES)): show-%: @KCONFIG_CONFIG=$$(pwd)/.config.sample \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - @$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -v $* + @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh -v $* @rm -f .config.sample # Prints the details of all samples @@ -75,7 +75,7 @@ $(patsubst %,list-%,$(CT_SAMPLES)): list-%: @KCONFIG_CONFIG=$$(pwd)/.config.sample \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - @$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh $* + @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh $* @rm -f .config.sample PHONY += list-samples-short @@ -190,9 +190,9 @@ define build_sample mkdir -p .build-all/$$status/$(1); \ bzip2 < build.log > .build-all/$$status/$(1)/build.log.bz2; \ if [ "$$status" = PASS ]; then \ - blddir=`$(bash) $(CT_LIB_DIR)/scripts/showConfig.sh '$${CT_BUILD_TOP_DIR}'`; \ + blddir=`$(bash) $(CT_LIB_DIR)/scripts/show-tuple.sh '$${CT_BUILD_TOP_DIR}'`; \ [ -z "$(CT_PRESERVE_PASSED_BUILDS)" ] && rm -rf $${blddir}; \ - $(bash) $(CT_LIB_DIR)/scripts/showConfig.sh '$${CT_PREFIX_DIR}' > .build-all/PASS/$(1)/prefix; \ + $(bash) $(CT_LIB_DIR)/scripts/show-tuple.sh '$${CT_PREFIX_DIR}' > .build-all/PASS/$(1)/prefix; \ fi; \ : endef diff --git a/scripts/showSamples.sh b/scripts/show-config.sh index ea50102..ea50102 100644 --- a/scripts/showSamples.sh +++ b/scripts/show-config.sh diff --git a/scripts/showConfig.sh b/scripts/show-tuple.sh index 9031b3c..9031b3c 100644 --- a/scripts/showConfig.sh +++ b/scripts/show-tuple.sh |