Commit e5e8fae8 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 2d239bbe

Config.in

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG 


config BR2_VERSION

	string

	default "2010.11-git"

	option env="BR2_VERSION"



source "target/Config.in.arch"

source "target/device/Config.in"

Makefile

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
# You shouldn't need to mess with anything beyond this point...

#--------------------------------------------------------------



# Set and export the version string

export BR2_VERSION:=2010.11-git



# This top-level Makefile can *not* be executed in parallel

.NOTPARALLEL:
@@ -631,9 +634,8 @@ help: 
	@echo 'See docs/README and docs/buildroot.html for further details'

	@echo



release:

	OUT=buildroot-$$(grep -A2 BR2_VERSION $(CONFIG_CONFIG_IN)|grep default|cut -f2 -d\"); \

	git archive --format=tar --prefix=$$OUT/ master|gzip -9 >$$OUT.tar.gz

release: OUT=buildroot-$(BR2_VERSION)

	git archive --format=tar --prefix=$(OUT)/ master|gzip -9 >$(OUT).tar.gz



.PHONY: $(noconfig_targets)

package/config/confdata.c

+4 −0
Original line number Diff line number Diff line
@@ -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"

package/config/patches/01-kconfig-kernel-to-buildroot.patch

+6 −6
Original line number Diff line number Diff line
@@ -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"