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

Commit 28d747f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull more Kbuild updates from Masahiro Yamada:

 - add more Build-Depends to Debian source package

 - prefix header search paths with $(srctree)/

 - make modpost show verbose section mismatch warnings

 - avoid hard-coded CROSS_COMPILE for h8300

 - fix regression for Debian make-kpkg command

 - add semantic patch to detect missing put_device()

 - fix some warnings of 'make deb-pkg'

 - optimize NOSTDINC_FLAGS evaluation

 - add warnings about redundant generic-y

 - clean up Makefiles and scripts

* tag 'kbuild-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: remove stale lxdialog/.gitignore
  kbuild: force all architectures except um to include mandatory-y
  kbuild: warn redundant generic-y
  Revert "modsign: Abort modules_install when signing fails"
  kbuild: Make NOSTDINC_FLAGS a simply expanded variable
  kbuild: deb-pkg: avoid implicit effects
  coccinelle: semantic code search for missing put_device()
  kbuild: pkg: grep include/config/auto.conf instead of $KCONFIG_CONFIG
  kbuild: deb-pkg: introduce is_enabled and if_enabled_echo to builddeb
  kbuild: deb-pkg: add CONFIG_ prefix to kernel config options
  kbuild: add workaround for Debian make-kpkg
  kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG}
  unicore32: simplify linker script generation for decompressor
  h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux-
  kbuild: move archive command to scripts/Makefile.lib
  modpost: always show verbose warning for section mismatch
  ia64: prefix header search path with $(srctree)/
  libfdt: prefix header search paths with $(srctree)/
  deb-pkg: generate correct build dependencies
parents 80b98e92 c71bb9f8

Documentation/kbuild/makefiles.txt

+1 −1
Original line number Diff line number Diff line
@@ -1274,7 +1274,7 @@ See subsequent chapter for the syntax of the Kbuild file. 


--- 7.4 mandatory-y



	mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild.asm

	mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild

	to define the minimum set of ASM headers that all architectures must have.



	This works like optional generic-y. If a mandatory header is missing

Makefile

+15 −3
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ _all: 
# descending is started. They are now explicitly listed as the

# prepare rule.



# Ugly workaround for Debian make-kpkg:

# make-kpkg directly includes the top Makefile of Linux kernel. In such a case,

# skip sub-make to support debian_* targets in ruleset/kernel_version.mk, but

# displays warning to discourage such abusage.

ifneq ($(word 2, $(MAKEFILE_LIST)),)

$(warning Do not include top Makefile of Linux Kernel)

sub-make-done := 1

MAKEFLAGS += -rR

endif



ifneq ($(sub-make-done),1)



# Do not use make's built-in rules and variables
@@ -402,7 +412,7 @@ CHECK = sparse 


CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

NOSTDINC_FLAGS  =

NOSTDINC_FLAGS :=

CFLAGS_MODULE   =

AFLAGS_MODULE   =

LDFLAGS_MODULE  =
@@ -1088,9 +1098,11 @@ asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj 


PHONY += asm-generic uapi-asm-generic

asm-generic: uapi-asm-generic

	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm

	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm \

	generic=include/asm-generic

uapi-asm-generic:

	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm

	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm \

	generic=include/uapi/asm-generic



PHONY += prepare-objtool

prepare-objtool: $(objtool_target)

arch/alpha/include/uapi/asm/Kbuild

+0 −2
Original line number Diff line number Diff line 
include include/uapi/asm-generic/Kbuild.asm



generated-y += unistd_32.h

arch/arc/include/uapi/asm/Kbuild

+0 −2
Original line number Diff line number Diff line 
include include/uapi/asm-generic/Kbuild.asm



generic-y += kvm_para.h

generic-y += ucontext.h

arch/arm/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ generic-y += segment.h 
generic-y += serial.h

generic-y += simd.h

generic-y += sizes.h

generic-y += timex.h

generic-y += trace_clock.h



generated-y += mach-types.h