]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
linux: ensure correct make targets are used for cuImage/simpleImage.<dtb>
authorPeter Korsgaard <peter@korsgaard.com>
Sun, 6 May 2018 06:34:18 +0000 (08:34 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Thu, 24 May 2018 20:52:51 +0000 (22:52 +0200)
Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/66561794

LINUX_DTS_NAME may end up with a leading space because of the += logic, and
may contain multiple dts files - Neither of which works when we construct
the {cu,simple}Image.$(LINUX_DTS_NAME) make target name.

Fix it by using the first word in the variable.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 978a997c81f41702bc039f89a20129ef65060801)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
linux/linux.mk

index 8d14f41c6bb151b6754df80c19bfe73470418592..0c78d824e1d9e4e75ebaed2c94b0f14a1ad1e60b 100644 (file)
@@ -155,9 +155,9 @@ LINUX_IMAGE_NAME = zImage.epapr
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 LINUX_IMAGE_NAME = zImage
 else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y)
-LINUX_IMAGE_NAME = cuImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = cuImage.$(firstword $(KERNEL_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y)
-LINUX_IMAGE_NAME = simpleImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = simpleImage.$(firstword $(KERNEL_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y)
 LINUX_IMAGE_NAME = Image
 else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)