From: Michal Marek <mmarek@suse.com>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
linux-sh@vger.kernel.org
Subject: [PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition
Date: Tue, 22 Nov 2016 22:34:32 +0100 [thread overview]
Message-ID: <20161122213434.14788-4-mmarek@suse.com> (raw)
In-Reply-To: <20161122213434.14788-1-mmarek@suse.com>
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
next prev parent reply other threads:[~2016-11-22 21:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 21:34 [PATCH 1/6] arm64: " Michal Marek
2016-11-22 21:34 ` [PATCH 2/6] arm: " Michal Marek
2017-03-20 13:53 ` Masahiro Yamada
2016-11-22 21:34 ` [PATCH 3/6] arc: " Michal Marek
2016-11-23 19:40 ` Alexey Brodkin
2016-11-25 14:21 ` Michal Marek
2017-03-20 13:54 ` Masahiro Yamada
2016-11-22 21:34 ` Michal Marek [this message]
2017-03-20 13:54 ` [PATCH 4/6] sh: " Masahiro Yamada
2016-11-22 21:34 ` [PATCH 5/6] unicore32: " Michal Marek
2017-03-20 13:55 ` Masahiro Yamada
2016-11-22 21:34 ` [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround Michal Marek
2016-11-25 12:12 ` Riku Voipio
2016-11-25 14:22 ` Michal Marek
2017-03-20 13:56 ` Masahiro Yamada
2017-03-10 17:58 ` [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition Will Deacon
2017-03-10 21:20 ` Michal Marek
2017-03-18 13:14 ` Masahiro Yamada
2017-03-20 12:13 ` Will Deacon
2017-03-20 13:52 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161122213434.14788-4-mmarek@suse.com \
--to=mmarek@suse.com \
--cc=dalias@libc.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome