Commit 23ea3f62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-misc-v4.12' of... 

Merge tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull misc Kbuild updates from Masahiro Yamada:

 - clean up builddeb script

 - use full path for KBUILD_IMAGE to fix rpm-pkg build

 - fix objdiff tool to ignore debug info

* tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  builddeb: fix typo
  builddeb: Update a few outdated and hardcoded strings
  deb-pkg: Remove the KBUILD_IMAGE workaround
  unicore32: Use full path in KBUILD_IMAGE definition
  sh: Use full path in KBUILD_IMAGE definition
  arc: Use full path in KBUILD_IMAGE definition
  arm: Use full path in KBUILD_IMAGE definition
  arm64: Use full path in KBUILD_IMAGE definition
  scripts: objdiff: Ignore debug info when comparing
parents 593043d3 9eb3c958

arch/arc/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ libs-y += arch/arc/lib/ $(LIBGCC) 
boot		:= arch/arc/boot



#default target for make without any arguments.

KBUILD_IMAGE	:= bootpImage

KBUILD_IMAGE	:= $(boot)/bootpImage



all:	$(KBUILD_IMAGE)

all:	bootpImage

bootpImage: vmlinux



boot_targets += uImage uImage.bin uImage.gz

arch/arm/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -297,10 +297,11 @@ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ 
libs-y				:= arch/arm/lib/ $(libs-y)



# Default target when executing plain make

boot := arch/arm/boot

ifeq ($(CONFIG_XIP_KERNEL),y)

KBUILD_IMAGE := xipImage

KBUILD_IMAGE := $(boot)/xipImage

else

KBUILD_IMAGE := zImage

KBUILD_IMAGE := $(boot)/zImage

endif



# Build the DT binary blobs if we have OF configured
@@ -308,9 +309,8 @@ ifeq ($(CONFIG_USE_OF),y) 
KBUILD_DTBS := dtbs

endif



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)

all:	$(notdir $(KBUILD_IMAGE)) $(KBUILD_DTBS)



boot := arch/arm/boot



archheaders:

	$(Q)$(MAKE) $(build)=arch/arm/tools uapi

arch/arm64/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ libs-y := arch/arm64/lib/ $(libs-y) 
core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a



# Default target when executing plain make

KBUILD_IMAGE	:= Image.gz

boot		:= arch/arm64/boot

KBUILD_IMAGE	:= $(boot)/Image.gz

KBUILD_DTBS	:= dtbs



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)

all:	Image.gz $(KBUILD_DTBS)



boot := arch/arm64/boot



Image: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

arch/sh/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE) := vmlinux 
defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux



# Set some sensible Kbuild defaults

KBUILD_IMAGE		:= $(defaultimage-y)

boot := arch/sh/boot

KBUILD_IMAGE		:= $(boot)/$(defaultimage-y)



#

# Choosing incompatible machines durings configuration will result in
@@ -186,8 +187,6 @@ cpuincdir-y += cpu-common # Must be last 
drivers-y			+= arch/sh/drivers/

drivers-$(CONFIG_OPROFILE)	+= arch/sh/oprofile/



boot := arch/sh/boot



cflags-y	+= $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \

		   $(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
@@ -211,7 +210,7 @@ BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.xz uImage.lzo \ 
	       romImage

PHONY += $(BOOT_TARGETS)



all: $(KBUILD_IMAGE)

all: $(notdir $(KBUILD_IMAGE))



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

arch/unicore32/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ boot := arch/unicore32/boot 


# Default defconfig and target when executing plain make

KBUILD_DEFCONFIG	:= $(ARCH)_defconfig

KBUILD_IMAGE		:= zImage

KBUILD_IMAGE		:= $(boot)/zImage



all:	$(KBUILD_IMAGE)

all:	zImage



zImage Image uImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@