From adc16046f769fdf27db9b533260609fe675d8c6b Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 27 Jan 2019 19:04:15 -0800 Subject: 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 --- config/global.in | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'config/global.in') diff --git a/config/global.in b/config/global.in index a19667b7..f5df002d 100644 --- a/config/global.in +++ b/config/global.in @@ -18,15 +18,24 @@ config VCHECK string option env="CT_VCHECK" +# Kconfig's idiosynchrasy: it does not output the config settings declared with 'option env' +# to the generated .config file. Must use one extra level of indirection. +config CONFIG_VERSION_ENV + string + option env="CT_CONFIG_VERSION_CURRENT" + +# Up-to-date version of the configuration file. If saving a defconfig, choose a default that +# is guaranteed not to match - so that kconfig saves the value to .config. config CONFIG_VERSION_CURRENT string - default -1 if VCHECK = "save" - default 1 + default CONFIG_VERSION_ENV +# Version used by the config being loaded (e.g. as part of 'oldconfig' or recalling +# a defconfig. Make it changeable while loading/saving to force writing it to defconfig. config CONFIG_VERSION string prompt "** make it changeable **" if VCHECK = "load" || VCHECK = "save" - default 0 if VCHECK = "load" || VCHECK = "save" + default "0" if VCHECK = "load" || VCHECK = "save" default CONFIG_VERSION_CURRENT if VCHECK = "warning" -- cgit v1.2.3