diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-02-09 23:55:16 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2019-02-09 23:55:16 (GMT) |
| commit | 74a53fdf3eb383f09bdbf0d4adf8d2e26f838bd1 (patch) | |
| tree | 59f7c27a3d83f8ede979e58407c0a40c2d75b10b /samples/samples.mk | |
| parent | 09cb590847e5e26e5bb029c1a2693cfa7a1e99b6 (diff) | |
Use enhanced framework for 'ct-ng update-samples'
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'samples/samples.mk')
| -rw-r--r-- | samples/samples.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/samples/samples.mk b/samples/samples.mk index 3c4d4c3..48bbbb9 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -43,7 +43,6 @@ help-env:: PHONY += show-config show-config: .config @cp .config .config.sample - @$(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh -v current @rm -f .config.sample @@ -54,7 +53,6 @@ $(patsubst %,show-%,$(CT_SAMPLES)): show-%: CT_VCHECK=load \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - @$(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config.sample @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh -v $* @rm -f .config.sample @@ -69,6 +67,7 @@ list-samples: list-samples-pre $(patsubst %,list-%,$(CT_SAMPLES)) @echo ' G (Global) : sample was installed with crosstool-NG' @echo ' X (EXPERIMENTAL): sample may use EXPERIMENTAL features' @echo ' B (BROKEN) : sample is currently broken' + @echo ' O (OBSOLETE) : sample needs to be upgraded' PHONY += list-samples-pre list-samples-pre: FORCE @@ -80,7 +79,6 @@ $(patsubst %,list-%,$(CT_SAMPLES)): list-%: CT_VCHECK=load \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - @$(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config.sample @$(bash) $(CT_LIB_DIR)/scripts/show-config.sh $* @rm -f .config.sample @@ -90,17 +88,21 @@ list-samples-short: FORCE printf "%s\n" "$${s}"; \ done -# Check one sample +# Check one sample. Note that we are not loading but rather copying the defconfig; +# loading it while it contains some removed options would reset them to currently +# supported default values. PHONY += $(patsubst %,check-%,$(CT_SAMPLES)) $(patsubst %,check-%,$(CT_SAMPLES)): check-%: @set -e; export KCONFIG_CONFIG=$$(pwd)/.config.sample; \ CT_NG_SAMPLE=$(call sample_dir,$*)/crosstool.config; \ - CT_VCHECK=load $(CONF) -s --defconfig=$${CT_NG_SAMPLE} $(KCONFIG_TOP) &>/dev/null; \ - CT_UPGRADECONFIG=yes $(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config.sample; \ - CT_VCHECK=save $(CONF) -s --savedefconfig=$$(pwd)/.defconfig $(KCONFIG_TOP) &>/dev/null; \ - old_sha1=$$( sha1sum "$${CT_NG_SAMPLE}" |cut -d ' ' -f 1 ); \ - new_sha1=$$( sha1sum .defconfig |cut -d ' ' -f 1 ); \ - if [ $${old_sha1} != $${new_sha1} ]; then \ + cp $${CT_NG_SAMPLE} .config.sample; \ + CT_UPGRADECONFIG=yes \ + $(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config.sample &>/dev/null; \ + CT_VCHECK=load $(CONF) -s --olddefconfig \ + $(KCONFIG_TOP) &>/dev/null; \ + CT_VCHECK=save $(CONF) -s --savedefconfig=$$(pwd)/.defconfig \ + $(KCONFIG_TOP) &>/dev/null; \ + if ! cmp -s "$${CT_NG_SAMPLE}" .defconfig; then \ if [ $(CT_UPDATE_SAMPLES) = yes ]; then \ echo "Updating $*"; \ mv .defconfig "$${CT_NG_SAMPLE}"; \ |