Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1527959

[PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition

From Michal Marek <mmarek@suse.com>
Newsgroups linux.kernel
Subject [PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition
Date 2016-11-22 22:40 +0100
Message-ID <sGqXg-4ft-29@gated-at.bofh.it> (permalink)
References <sGqXf-4ft-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Michal Marek <mmarek@suse.com>
---
 arch/sh/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 336f33a419d9..280bbff12102 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -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)/$@
-- 
2.10.0

Back to linux.kernel | Previous | NextPrevious in thread | Find similar | Unroll thread


Thread

[PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
  [PATCH 5/6] unicore32: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
  [PATCH 2/6] arm: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
  [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
  [PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100

csiph-web