* [Buildroot] [PATCH] linux: ensure correct make targets are used for cuImage/simpleImage.<dtb>
@ 2018-05-06 6:34 Peter Korsgaard
2018-05-06 15:35 ` Peter Korsgaard
2018-05-24 21:04 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-05-06 6:34 UTC (permalink / raw)
To: buildroot
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>
---
linux/linux.mk | 4 ++--
1 file 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)
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] linux: ensure correct make targets are used for cuImage/simpleImage.<dtb>
2018-05-06 6:34 [Buildroot] [PATCH] linux: ensure correct make targets are used for cuImage/simpleImage.<dtb> Peter Korsgaard
@ 2018-05-06 15:35 ` Peter Korsgaard
2018-05-24 21:04 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-05-06 15:35 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> 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>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] linux: ensure correct make targets are used for cuImage/simpleImage.<dtb>
2018-05-06 6:34 [Buildroot] [PATCH] linux: ensure correct make targets are used for cuImage/simpleImage.<dtb> Peter Korsgaard
2018-05-06 15:35 ` Peter Korsgaard
@ 2018-05-24 21:04 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-05-24 21:04 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> 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>
Committed to 2018.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-24 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-06 6:34 [Buildroot] [PATCH] linux: ensure correct make targets are used for cuImage/simpleImage.<dtb> Peter Korsgaard
2018-05-06 15:35 ` Peter Korsgaard
2018-05-24 21:04 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.