From e5e8fae892036360f399ed034463716f31bfd59f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 31 Oct 2010 17:35:10 +0100 Subject: Makefile: move version string from Config.in into Makefile This re-instates writing the version string in .config headers, and no longer provides it as a kconfig symbol in .config (it is now a variable in the Makefile, and in the environment). Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/config/confdata.c | 4 ++++ package/config/patches/01-kconfig-kernel-to-buildroot.patch | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/config/confdata.c b/package/config/confdata.c index ba1f8a7ed..5cfb6d23a 100644 --- a/package/config/confdata.c +++ b/package/config/confdata.c @@ -586,8 +586,10 @@ int conf_write(const char *name) fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" + "# Buildroot version: %s\n" "%s%s" "#\n"), + sym_get_string_value(sym), use_timestamp ? "# " : "", use_timestamp ? ctime(&now) : ""); @@ -831,8 +833,10 @@ int conf_write_autoconf(void) time(&now); fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" + "# Buildroot version: %s\n" "# %s" "#\n", + sym_get_string_value(sym), ctime(&now)); fprintf(tristate, "#\n" "# Automatically generated - do not edit\n" diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/package/config/patches/01-kconfig-kernel-to-buildroot.patch index f77a54ca9..9df22d491 100644 --- a/package/config/patches/01-kconfig-kernel-to-buildroot.patch +++ b/package/config/patches/01-kconfig-kernel-to-buildroot.patch @@ -69,18 +69,16 @@ Index: config/confdata.c sym_calc_value(sym); time(&now); env = getenv("KCONFIG_NOTIMESTAMP"); -@@ -588,10 +588,8 @@ +@@ -588,7 +588,7 @@ fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" - "# Linux kernel version: %s\n" ++ "# Buildroot version: %s\n" "%s%s" "#\n"), -- sym_get_string_value(sym), - use_timestamp ? "# " : "", - use_timestamp ? ctime(&now) : ""); - -@@ -802,25 +800,23 @@ + sym_get_string_value(sym), +@@ -802,25 +802,25 @@ return 1; } @@ -91,9 +89,11 @@ Index: config/confdata.c fprintf(out, "#\n" "# Automatically generated make config: don't edit\n" - "# Linux kernel version: %s\n" ++ "# Buildroot version: %s\n" "# %s" "#\n", - sym_get_string_value(sym), ctime(&now)); ++ sym_get_string_value(sym), + ctime(&now)); fprintf(tristate, "#\n" "# Automatically generated - do not edit\n" -- cgit v1.2.3