aboutsummaryrefslogtreecommitdiff
path: root/linux/linux.mk
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-05-06 08:34:18 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-05-06 17:35:00 +0200
commit978a997c81f41702bc039f89a20129ef65060801 (patch)
tree1e6e41b37523e998f8470a532d8bdf4fa49c3923 /linux/linux.mk
parent10caac5be476d530be7977a618b801ee12ad1dd2 (diff)
downloadbuildroot-978a997c81f41702bc039f89a20129ef65060801.tar.gz
buildroot-978a997c81f41702bc039f89a20129ef65060801.tar.bz2
linux: ensure correct make targets are used for cuImage/simpleImage.<dtb>
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>
Diffstat (limited to 'linux/linux.mk')
-rw-r--r--linux/linux.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 9e646baffc..b6b91391b6 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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.$(LINUX_DTS_NAME)
+LINUX_IMAGE_NAME = cuImage.$(firstword $(LINUX_DTS_NAME))
else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y)
-LINUX_IMAGE_NAME = simpleImage.$(LINUX_DTS_NAME)
+LINUX_IMAGE_NAME = simpleImage.$(firstword $(LINUX_DTS_NAME))
else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y)
LINUX_IMAGE_NAME = Image
else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)