Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756154AbcKVVfm (ORCPT ); Tue, 22 Nov 2016 16:35:42 -0500 Received: from mx2.suse.de ([195.135.220.15]:44154 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbcKVVfj (ORCPT ); Tue, 22 Nov 2016 16:35:39 -0500 From: Michal Marek To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/6] arm: Use full path in KBUILD_IMAGE definition Date: Tue, 22 Nov 2016 22:34:30 +0100 Message-Id: <20161122213434.14788-2-mmarek@suse.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161122213434.14788-1-mmarek@suse.com> References: <20161122213434.14788-1-mmarek@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1312 Lines: 43 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 Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Michal Marek --- arch/arm/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6be9ee148b78..f3fa2cafca15 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -296,10 +296,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 @@ -307,9 +308,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 archprepare: $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h -- 2.10.0