kbuild: create .kernelrelease at *config step (2244cbd8) · Commits · 戴 / test

Makefile

+10 −9

Original line number	Diff line number	Diff line
		@@ -338,8 +338,9 @@ AFLAGS := -D__ASSEMBLY__

		# Read KERNELRELEASE from .kernelrelease (if it exists)
		KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
		KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

		export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE \
		export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
		ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
		CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
		HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
		@@ -434,6 +435,7 @@ export KBUILD_DEFCONFIG
		config %config: scripts_basic outputmakefile FORCE
		$(Q)mkdir -p include/linux
		$(Q)$(MAKE) $(build)=scripts/kconfig $@
		$(Q)$(MAKE) .kernelrelease

		else
		# ===========================================================================
		@@ -784,12 +786,10 @@ endif
		localver-full = $(localver)$(localver-auto)

		# Store (new) KERNELRELASE string in .kernelrelease
		kernelrelease = \
		$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(localver-full)
		kernelrelease = $(KERNELVERSION)$(localver-full)
		.kernelrelease: FORCE
		$(Q)rm -f .kernelrelease
		$(Q)echo $(kernelrelease) > .kernelrelease
		$(Q)echo " Building kernel $(kernelrelease)"
		$(Q)rm -f $@
		$(Q)echo $(kernelrelease) > $@


		# Things we need to do before we recursively start building the kernel
		@@ -899,7 +899,7 @@ define filechk_version.h
		)
		endef

		include/linux/version.h: $(srctree)/Makefile FORCE
		include/linux/version.h: $(srctree)/Makefile .config FORCE
		$(call filechk,version.h)

		# ---------------------------------------------------------------------------
		@@ -1302,9 +1302,10 @@ checkstack:
		$(PERL) $(src)/scripts/checkstack.pl $(ARCH)

		kernelrelease:
		@echo $(KERNELRELEASE)
		$(if $(wildcard .kernelrelease), $(Q)echo $(KERNELRELEASE), \
		$(error kernelrelease not valid - run 'make *config' to update it))
		kernelversion:
		@echo $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
		@echo $(KERNELVERSION)

		# FIXME Should go into a make.lib or something
		# ===========================================================================

scripts/kconfig/confdata.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ int conf_write(const char *name)
		if (!out_h)
		return 1;
		}
		sym = sym_lookup("KERNELRELEASE", 0);
		sym = sym_lookup("KERNELVERSION", 0);
		sym_calc_value(sym);
		time(&now);
		env = getenv("KCONFIG_NOTIMESTAMP");

scripts/kconfig/gconf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ void init_main_window(const gchar * glade_file)
		NULL);

		sprintf(title, _("Linux Kernel v%s Configuration"),
		getenv("KERNELRELEASE"));
		getenv("KERNELVERSION"));
		gtk_window_set_title(GTK_WINDOW(main_wnd), title);

		gtk_widget_show(main_wnd);

scripts/kconfig/mconf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1051,7 +1051,7 @@ int main(int ac, char **av)
		conf_parse(av[1]);
		conf_read(NULL);

		sym = sym_lookup("KERNELRELEASE", 0);
		sym = sym_lookup("KERNELVERSION", 0);
		sym_calc_value(sym);
		sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),
		sym_get_string_value(sym));

scripts/kconfig/symbol.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,10 +61,10 @@ void sym_init(void)
		if (p)
		sym_add_default(sym, p);

		sym = sym_lookup("KERNELRELEASE", 0);
		sym = sym_lookup("KERNELVERSION", 0);
		sym->type = S_STRING;
		sym->flags \|= SYMBOL_AUTO;
		p = getenv("KERNELRELEASE");
		p = getenv("KERNELVERSION");
		if (p)
		sym_add_default(sym, p);

Admin message