Commit 152e6744 authored by Michal Marek's avatar Michal Marek Committed by Masahiro Yamada
Browse files

arm: Use full path in KBUILD_IMAGE definition 



The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which
expect it to point to the image file in the build directory. The
builddeb script has a workaround for architectures which only provide
the basename, but let's provide a clean interface for packaging tools.

Cc: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 06995804

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