Commit c70662ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  setlocalversion: Ignote SCMs above the linux source tree
  makefile: not need to regenerate kernel.release file when make kernelrelease
  fixes for using make 3.82
  kconfig: fix segfault when detecting recursive dependency
  kconfig: fix savedefconfig with choice marked optional
parents ee005577 8558f59e

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1408,8 +1408,8 @@ checkstack: 
	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \

	$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)



kernelrelease: include/config/kernel.release

	@echo $(KERNELRELEASE)

kernelrelease:

	@echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"



kernelversion:

	@echo $(KERNELVERSION)

firmware/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin 
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)



# Directories which we _might_ need to create, so we have a rule for them.

firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all))))

firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))



quiet_cmd_mkdir = MKDIR   $(patsubst $(objtree)/%,%,$@)

      cmd_mkdir = mkdir -p $@

scripts/kconfig/confdata.c

+4 −2
Original line number Diff line number Diff line
@@ -497,7 +497,9 @@ int conf_write_defconfig(const char *filename) 
			/*

			 * If symbol is a choice value and equals to the

			 * default for a choice - skip.

			 * But only if value is bool and equal to "y" .

			 * But only if value is bool and equal to "y" and

			 * choice is not "optional".

			 * (If choice is "optional" then all values can be "n")

			 */

			if (sym_is_choice_value(sym)) {

				struct symbol *cs;
@@ -505,7 +507,7 @@ int conf_write_defconfig(const char *filename) 


				cs = prop_get_symbol(sym_get_choice_prop(sym));

				ds = sym_choice_default(cs);

				if (sym == ds) {

				if (!sym_is_optional(cs) && sym == ds) {

					if ((sym->type == S_BOOLEAN) &&

					    sym_get_tristate_value(sym) == yes)

						goto next_menu;

scripts/kconfig/symbol.c

+2 −0
Original line number Diff line number Diff line
@@ -937,6 +937,8 @@ static void sym_check_print_recursive(struct symbol *last_sym) 
		sym = stack->sym;

		next_sym = stack->next ? stack->next->sym : last_sym;

		prop = stack->prop;

		if (prop == NULL)

			prop = stack->sym->prop;



		/* for choice values find the menu entry (used below) */

		if (sym_is_choice(sym) || sym_is_choice_value(sym)) {

scripts/mkmakefile

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ all: 


Makefile:;



\$(all) %/: all

\$(all): all

	@:



%/: all

	@:

EOF

CRA Git | Maintained and supported by SUSTech CRA and CCSE