From: Gustavo Zacarias Date: Thu, 17 Jul 2014 19:55:08 +0000 (-0300) Subject: linux: fix fallout from c78d57637cd57a383e44713eb27e654b3071340e X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8f3073b18895bbf6938a5c310f6e6134f8bd6cb;p=buildroot.git linux: fix fallout from c78d57637cd57a383e44713eb27e654b3071340e The new variable LINUX_TARGET_NAME is unconditionally used but it may be unset leading to a default kernel build (which might not be uImage or other requested format). See http://lists.busybox.net/pipermail/buildroot/2014-July/102069.html Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- diff --git a/linux/linux.mk b/linux/linux.mk index 928d93dfcf..2a9bf3e55f 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -106,7 +106,9 @@ LINUX_IMAGE_NAME = vmlinux else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y) LINUX_IMAGE_NAME = vmlinuz endif +LINUX_TARGET_NAME = $(LINUX_IMAGE_NAME) endif + ifeq ($(LINUX_IMAGE_NAME),) LINUX_IMAGE_NAME = $(LINUX_TARGET_NAME) endif