Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
  kconfig: fix mconf segmentation fault
  kbuild: enable use of code from a different dir
  kconfig: error out if recursive dependencies are found
  kbuild: scripts/basic/fixdep segfault on pathological string-o-death
  kconfig: correct minor typo in Kconfig warning message.
  kconfig: fix path to modules.txt in Kconfig help
  usr/Kconfig: fix typo
  kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
  kbuild: be more explicit on missing .config file
  kbuild: clarify the creation of the LOCALVERSION_AUTO string.
  kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
  kconfig: refer to qt3 if we cannot find qt libraries
  kbuild: handle compressed cpio initramfs-es
  kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
  kbuild: remove stale comment in modpost.c
  kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
  kbuild: fix make mrproper for Documentation/DocBook/man
  kbuild: remove kconfig binaries during make mrproper
  kconfig/menuconfig: do not hardcode '.config'
  kbuild: override build timestamp & version
  ...
parents 6de410c2 11de39e2

Documentation/DocBook/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ psdocs: $(PS) 
PDF := $(patsubst %.xml, %.pdf, $(BOOKS))

pdfdocs: $(PDF)



HTML := $(patsubst %.xml, %.html, $(BOOKS))

HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))

htmldocs: $(HTML)



MAN := $(patsubst %.xml, %.9, $(BOOKS))
@@ -152,6 +152,7 @@ quiet_cmd_db2man = MAN $@ 
	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(Q)mkdir -p $(obj)/man

	$(call cmd,db2man)

	@touch $@
@@ -212,11 +213,7 @@ clean-files := $(DOCBOOKS) \ 
	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \

	$(C-procfs-example)



clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS))



#man put files in man subdir - traverse down

subdir- := man/



clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man



# Declare the contents of the .PHONY variable as phony.  We keep that

# information in a variable se we can use it in if_changed and friends.

Documentation/DocBook/man/Makefile

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# Rules are put in Documentation/DocBook



clean-files := *.9.gz *.sgml manpage.links manpage.refs

Documentation/kbuild/modules.txt

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ following files: 
		--> filename: Makefile

		KERNELDIR := /lib/modules/`uname -r`/build

		all::

			$(MAKE) -C $KERNELDIR M=`pwd` $@

			$(MAKE) -C $(KERNELDIR) M=`pwd` $@



		# Module specific targets

		genbin:

Kbuild

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Kbuild for top-level directory of the kernel

# This file takes care of the following:

# 1) Generate asm-offsets.h

# 2) Check for missing system calls



#####

# 1) Generate asm-offsets.h
@@ -46,3 +47,13 @@ $(obj)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild 
	$(Q)mkdir -p $(dir $@)

	$(call cmd,offsets)



#####

# 2) Check for missing system calls

#



quiet_cmd_syscalls = CALL    $<

      cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags)



PHONY += missing-syscalls

missing-syscalls: scripts/checksyscalls.sh FORCE

	$(call cmd,syscalls)

Makefile

+9 −6
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ libs-y := $(libs-y1) $(libs-y2) 
# ---------------------------------------------------------------------------

# vmlinux is built from the objects selected by $(vmlinux-init) and

# $(vmlinux-main). Most are built-in.o files from top-level directories

# in the kernel tree, others are specified in arch/$(ARCH)Makefile.

# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.

# Ordering when linking is important, and $(vmlinux-init) must be first.

#

# vmlinux
@@ -603,6 +603,7 @@ vmlinux-init := $(head-y) $(init-y) 
vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y)

vmlinux-all  := $(vmlinux-init) $(vmlinux-main)

vmlinux-lds  := arch/$(ARCH)/kernel/vmlinux.lds

export KBUILD_VMLINUX_OBJS := $(vmlinux-all)



# Rule to link vmlinux - also used during CONFIG_KALLSYMS

# May be overridden by arch/$(ARCH)/Makefile
@@ -855,6 +856,7 @@ archprepare: prepare1 scripts_basic 


prepare0: archprepare FORCE

	$(Q)$(MAKE) $(build)=.

	$(Q)$(MAKE) $(build)=. missing-syscalls



# All the preparing..

prepare: prepare0
@@ -1277,10 +1279,7 @@ endif 
ALLSOURCE_ARCHS := $(ARCH)



define find-sources

        ( find $(__srctree) $(RCS_FIND_IGNORE) \

	       \( -name include -o -name arch \) -prune -o \

	       -name $1 -print; \

	  for ARCH in $(ALLSOURCE_ARCHS) ; do \

        ( for ARCH in $(ALLSOURCE_ARCHS) ; do \

	       find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \

	            -name $1 -print; \

	  done ; \
@@ -1294,7 +1293,11 @@ define find-sources 
	            -name $1 -print; \

	  done ; \

	  find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \

	       -name $1 -print )

	       -name $1 -print; \

	  find $(__srctree) $(RCS_FIND_IGNORE) \

	       \( -name include -o -name arch \) -prune -o \

	       -name $1 -print; \

	  )

endef



define all-sources