diff options
| author | Phil Sutter <phil@nwl.cc> | 2009-08-02 14:31:31 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2009-08-02 15:46:20 +0200 |
| commit | a9d14d2f99c232b769c423ef40e903087a3f7877 (patch) | |
| tree | 837c8b67f1d99695ca1d79d11bb4106cb47e9794 | |
| parent | 6797b1d93206b3615a22fb003f7d656a041549b9 (diff) | |
hook in ADK version extraction, rename some stuff
| -rw-r--r-- | Config.in | 4 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | config/confdata.c | 4 | ||||
| -rw-r--r-- | config/mconf.c | 16 |
4 files changed, 17 insertions, 10 deletions
@@ -1,6 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +config ADKVERSION + string + option env="ADKVERSION" + mainmenu "OpenADK Configuration" config MODULES @@ -1,6 +1,9 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +ADKVERSION= 0.1.0 +export ADKVERSION + GMAKE?= $(PWD)/scripts/make GMAKE_FMK= ${GMAKE} -f $(PWD)/mk/build.mk GMAKE_INV= ${GMAKE_FMK} --no-print-directory diff --git a/config/confdata.c b/config/confdata.c index 7cc195cbd..e869f2d9a 100644 --- a/config/confdata.c +++ b/config/confdata.c @@ -434,7 +434,7 @@ int conf_write(const char *name) if (!out) return 1; - sym = sym_lookup("KERNELVERSION", 0); + sym = sym_lookup("ADKVERSION", 0); sym_calc_value(sym); time(&now); env = getenv("KCONFIG_NOTIMESTAMP"); @@ -689,7 +689,7 @@ int conf_write_autoconf(void) return 1; } - sym = sym_lookup("KERNELVERSION", 0); + sym = sym_lookup("ADKVERSION", 0); sym_calc_value(sym); time(&now); fprintf(out, "#\n" diff --git a/config/mconf.c b/config/mconf.c index 25b60bc11..9516a5715 100644 --- a/config/mconf.c +++ b/config/mconf.c @@ -364,10 +364,10 @@ static void set_config_filename(const char *config_filename) int size; struct symbol *sym; - sym = sym_lookup("KERNELVERSION", 0); + sym = sym_lookup("ADKVERSION", 0); sym_calc_value(sym); size = snprintf(menu_backtitle, sizeof(menu_backtitle), - _("%s - Linux Kernel v%s Configuration"), + _("%s - OpenADK v%s Configuration"), config_filename, sym_get_string_value(sym)); if (size >= sizeof(menu_backtitle)) menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; @@ -904,7 +904,7 @@ int main(int ac, char **av) if (conf_get_changed()) res = dialog_yesno(NULL, _("Do you wish to save your " - "new kernel configuration?\n" + "new OpenADK configuration?\n" "<ESC><ESC> to continue."), 6, 60); else @@ -916,20 +916,20 @@ int main(int ac, char **av) case 0: if (conf_write(filename)) { fprintf(stderr, _("\n\n" - "Error during writing of the kernel configuration.\n" - "Your kernel configuration changes were NOT saved." + "Error during writing of the OpenADK configuration.\n" + "Your OpenADK configuration changes were NOT saved." "\n\n")); return 1; } case -1: printf(_("\n\n" - "*** End of Linux kernel configuration.\n" - "*** Execute 'make' to build the kernel or try 'make help'." + "*** End of OpenADK configuration.\n" + "*** Execute 'make' to build the firmware or try 'make help'." "\n\n")); break; default: fprintf(stderr, _("\n\n" - "Your kernel configuration changes were NOT saved." + "Your OpenADK configuration changes were NOT saved." "\n\n")); } |