Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
sh: Use full path in KBUILD_IMAGE definition
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
  • Loading branch information
Michal Marek authored and masahir0y committed Mar 20, 2017
1 parent 5e40f0f commit e62c527
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arch/sh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))

Expand All @@ -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)/$@
Expand Down

0 comments on commit e62c527

Please sign in to comment.