linux: fix breakage from d4b2b032a00c9922c9efa144b014dc086a7e48f1

PATCH New Gustavo Zacarias 2 participants 2 messages Dec 24, 2014 – Dec 26, 2014

Share & tools

Gustavo Zacarias

author

2014-12-24 13:54 UTC #0 lore raw

PATCH 1/1 linux: fix breakage from d4b2b032a00c9922c9efa144b014dc086a7e48f1

Unbreak qemu_xtensa_lx60_defconfig where LINUX_IMAGE_NAME != LINUX_TARGET_NAME.
It incorrectly overwrites LINUX_IMAGE_NAME even if it was set before, defeating the purpose of IMAGE being different than TARGET.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 linux/linux.mk | 2 ++
 1 file changed, 2 insertions(+)

linux/linux.mk +2 -0

index be66fb5..680521c 100644
@@ -82,7 +82,9 @@ KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
 LINUX_TARGET_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+ifeq ($(LINUX_IMAGE_NAME),)
 LINUX_IMAGE_NAME = $(LINUX_TARGET_NAME)
+endif
 else
 ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
 LINUX_IMAGE_NAME = uImage

Signature · 1 line

2.0.5

Thomas Petazzoni

Applied

2014-12-26 12:42 UTC #1 lore raw

PATCH 1/1 linux: fix breakage from d4b2b032a00c9922c9efa144b014dc086a7e48f1

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias

Unbreak qemu_xtensa_lx60_defconfig where LINUX_IMAGE_NAME != LINUX_TARGET_NAME.
It incorrectly overwrites LINUX_IMAGE_NAME even if it was set before, defeating the purpose of IMAGE being different than TARGET.
Signed-off-by Gustavo Zacarias <[email protected]>
---
 linux/linux.mk | 2 ++
 1 file changed, 2 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com