diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-01-28 03:04:15 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2019-01-28 06:55:26 (GMT) |
| commit | adc16046f769fdf27db9b533260609fe675d8c6b (patch) | |
| tree | 5b9b1727f256c7c07d7c517daf769b002f4a6bc8 /samples/samples.mk | |
| parent | 20c6accc65b9dafbb3e764b36e162c919b3b728c (diff) | |
Add upgrade logic to version-check.sh
Slightly rework config version detector to catch the case where neither
CONFIG_VERSION/CONFIG_VERSION_CURRENT is defined in the config file.
Add olddefconfig and use it after the upgrade.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'samples/samples.mk')
| -rw-r--r-- | samples/samples.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/samples/samples.mk b/samples/samples.mk index 6305800..3c4d4c3 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -21,7 +21,6 @@ CT_UPDATE_SAMPLES := no help-config:: @echo ' show-config - Show a brief overview of current configuration' @echo ' saveconfig - Save current config as a preconfigured target' - @echo ' upgradeconfig - Upgrade config file to current crosstool-NG' help-samples:: @echo ' list-samples - Prints the list of all samples (for scripting)' @@ -94,7 +93,7 @@ list-samples-short: FORCE # Check one sample PHONY += $(patsubst %,check-%,$(CT_SAMPLES)) $(patsubst %,check-%,$(CT_SAMPLES)): check-%: - @eset -e; xport KCONFIG_CONFIG=$$(pwd)/.config.sample; \ + @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; \ @@ -129,9 +128,6 @@ samples: saveconfig: .config samples $(SILENT)CT_VCHECK=save CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh -upgradeconfig: .config - $(SILENT)CT_UPGRADECONFIG=yes $(bash) $(CT_LIB_DIR)/scripts/version-check.sh .config - # The 'sample_dir' function prints the directory in which the sample is, # searching first in local samples, then in global samples define sample_dir |