diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2020-12-09 08:42:54 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-02-02 07:06:32 (GMT) |
| commit | 8fbf528681d1fa64a5d6fa6286fbf6f256c10a80 (patch) | |
| tree | ad7533ca766f9b8b97183b9ff3097878ced02265 /config | |
| parent | bbc4db133746d49893c3c9b70ef710747df27441 (diff) | |
config: Update environment variable usage
Upstream changes in the way kconfig handles environment variables means
we need to update our usage of them.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.in | 2 | ||||
| -rw-r--r-- | config/global.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.in b/config/config.in index f941301..cc349aa 100644 --- a/config/config.in +++ b/config/config.in @@ -1,4 +1,4 @@ -mainmenu "crosstool-NG $CT_VERSION Configuration" +mainmenu "crosstool-NG $(CT_VERSION) Configuration" source "config/configure.in" source "config/global.in" source "config/target.in" diff --git a/config/global.in b/config/global.in index 94d2191..d2a5c5e 100644 --- a/config/global.in +++ b/config/global.in @@ -2,7 +2,7 @@ config VERSION string - option env="CT_VERSION" + default "$(CT_VERSION)" # Config version checking framework. If CONFIG_VERSION is unset in the current .config # or defconfig, it is loaded as 0 (possibly triggering a user prompt during 'ct-ng oldconfig'). @@ -16,13 +16,13 @@ config VERSION # i.e. 'ct-ng saveconfig' or 'ct-ng savedefconfig'. config VCHECK string - option env="CT_VCHECK" + default "$(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" + default "$(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. |