| Message ID | 20180506063418.6326-1-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Commit | 978a997c81f41702bc039f89a20129ef65060801 |
| Headers | show |
| Series | linux: ensure correct make targets are used for cuImage/simpleImage.<dtb> | expand |
>>>>> "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.
>>>>> "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.
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)
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(-)