Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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>
Peter Korsgaard 7 years ago
parent
10caac5be4
commit
978a997c81
1 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 2
      linux/linux.mk

+ 2 - 2
linux/linux.mk
View File 

@@ -155,9 +155,9 @@ LINUX_IMAGE_NAME = zImage.epapr
 
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 
 LINUX_IMAGE_NAME = zImage
 
 LINUX_IMAGE_NAME = zImage
 
 else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y)
 
 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)
 
 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)
 
 else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y)
 
 LINUX_IMAGE_NAME = Image
 
 LINUX_IMAGE_NAME = Image
 
 else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)
 
 else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)