Inicio Explorar Axuda
Iniciar sesión
PUBLIC_REPOS
/
buildroot
réplica de git://git.buildroot.net/buildroot
2
1
Fork 0
Ficheiros
Explorar o código

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 <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Gustavo Zacarias %!s(int64=10) %!d(string=hai) anos
pai
31347e9401
achega
49b147ccbb
Modificáronse 1 ficheiros con 2 adicións e 0 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 2 0
      linux/linux.mk

+ 2 - 0
linux/linux.mk
Ver ficheiro 

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