Commit 154dd78d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'kbuild', 'packaging' and 'misc' of... 

Merge branches 'kbuild', 'packaging' and 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  genksyms: Use same type in loop comparison
  kbuild: silence generated makefile message
  kernel: prevent unnecessary rebuilding due to config_data.gz
  headers_install: fix __packed in exported kernel headers
  dtc: regen parser
  dtc: migrate parser to implicit rules
  kconfig: regen parser
  kconfig: migrate parser to implicit rules
  kconfig/zconf.l: do not ask to generate backup
  kconfig: kill no longer needed reference to YYDEBUG
  kconfig: constify `kconf_id_lookup'
  genksym: regen parser
  genksyms: migrate parser to implicit rules
  genksyms: drop -Wno-uninitialized from HOSTCFLAGS_parse.tab.o
  genksyms: pass hash and lookup functions name and target language though the input file
  kbuild: simplify the %_shipped rule
  kbuild: add implicit rules for parser generation
  kbuild: add `baseprereq'
  kbuild: Fix reference to vermagic.h

* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  package: Makefile: fix perf target bug

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  gitignore: ignore debian build directory
parents 14067ff5 1ae14703 3bdccc88 b7568286

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ modules.builtin 
/Module.markers

/Module.symvers



#

# Debian directory (make deb-pkg)

#

/debian/



#

# git files that we don't want to ignore even it they are dot-files

#

kernel/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -125,11 +125,10 @@ targets += config_data.gz 
$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE

	$(call if_changed,gzip)



quiet_cmd_ikconfiggz = IKCFG   $@

      cmd_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@

      filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;")

targets += config_data.h

$(obj)/config_data.h: $(obj)/config_data.gz FORCE

	$(call if_changed,ikconfiggz)

	$(call filechk,ikconfiggz)



$(obj)/time.o: $(obj)/timeconst.h

scripts/Kbuild.include

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ depfile = $(subst $(comma),_,$(dot-target).d) 
# filename of target with directory and extension stripped

basetarget = $(basename $(notdir $@))



###

# filename of first prerequisite with directory and extension stripped

baseprereq = $(basename $(notdir $<))



###

# Escape single quote for use in echo statements

escsq = $(subst $(squote),'\$(squote)',$1)

scripts/Makefile.lib

+39 −1
Original line number Diff line number Diff line
@@ -160,13 +160,51 @@ ld_flags = $(LDFLAGS) $(ldflags-y) 
modname-multi = $(sort $(foreach m,$(multi-used),\

		$(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))



ifdef REGENERATE_PARSERS



# GPERF

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

quiet_cmd_gperf = GPERF $@

      cmd_gperf = gperf -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<



$(src)/%.hash.c_shipped: $(src)/%.gperf

	$(call cmd,gperf)



# LEX

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

LEX_PREFIX = $(if $(LEX_PREFIX_${baseprereq}),$(LEX_PREFIX_${baseprereq}),yy)



quiet_cmd_flex = LEX     $@

      cmd_flex = flex -o$@ -L -P $(LEX_PREFIX) $<



$(src)/%.lex.c_shipped: $(src)/%.l

	$(call cmd,flex)



# YACC

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

YACC_PREFIX = $(if $(YACC_PREFIX_${baseprereq}),$(YACC_PREFIX_${baseprereq}),yy)



quiet_cmd_bison = YACC    $@

      cmd_bison = bison -o$@ -t -l -p $(YACC_PREFIX) $<



$(src)/%.tab.c_shipped: $(src)/%.y

	$(call cmd,bison)



quiet_cmd_bison_h = YACC    $@

      cmd_bison_h = bison -o/dev/null --defines=$@ -t -l -p $(YACC_PREFIX) $<



$(src)/%.tab.h_shipped: $(src)/%.y

	$(call cmd,bison_h)



endif



# Shipped files

# ===========================================================================



quiet_cmd_shipped = SHIPPED $@

cmd_shipped = cat $< > $@



$(obj)/%:: $(src)/%_shipped

$(obj)/%: $(src)/%_shipped

	$(call cmd,shipped)



# Commands useful for building a boot image

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


# Step 3 is used to place certain information in the module's ELF

# section, including information such as:

#   Version magic (see include/vermagic.h for full details)

#   Version magic (see include/linux/vermagic.h for full details)

#     - Kernel release

#     - SMP is CONFIG_SMP

#     - PREEMPT is CONFIG_PREEMPT

CRA Git | Maintained and supported by SUSTech CRA and CCSE