From d759137c46fb7a04c4db44123ba3050afd734eef Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 19 Nov 2017 00:23:55 -0800 Subject: [PATCH] Align script names with the ct-ng commands Signed-off-by: Alexey Neyman --- ct-ng.in | 2 +- samples/samples.mk | 10 +++++----- scripts/{showSamples.sh => show-config.sh} | 0 scripts/{showConfig.sh => show-tuple.sh} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename scripts/{showSamples.sh => show-config.sh} (100%) rename scripts/{showConfig.sh => show-tuple.sh} (100%) diff --git a/ct-ng.in b/ct-ng.in index 0fc5499e..a61637b9 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -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 862dbe4a..178e5378 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 similarity index 100% rename from scripts/showSamples.sh rename to scripts/show-config.sh diff --git a/scripts/showConfig.sh b/scripts/show-tuple.sh similarity index 100% rename from scripts/showConfig.sh rename to scripts/show-tuple.sh