Explorar o código

Revert "linux: only depend on host-lzop if needed"

This reverts commit ca80782f4571f004c2b8cf2d0e60e83343beff34. The
whole host-lzop optional dependency logic cannot work, since the
configuration file will only be known after the kernel sources are
extracted, if an internal kernel defconfig is used, which is quite
common.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni %!s(int64=11) %!d(string=hai) anos
pai
achega
0dc7901b00
Modificáronse 1 ficheiros con 2 adicións e 9 borrados
  1. 2 9
      linux/linux.mk

+ 2 - 9
linux/linux.mk

@@ -41,7 +41,7 @@ endif
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 
 
 LINUX_INSTALL_IMAGES = YES
 LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES  += host-kmod
+LINUX_DEPENDENCIES  += host-kmod host-lzop
 
 
 ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
 ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
 	LINUX_DEPENDENCIES += host-uboot-tools
 	LINUX_DEPENDENCIES += host-uboot-tools
@@ -163,14 +163,7 @@ LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
 ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
 KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
 KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
 else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
-KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE))
-endif
-
-ifeq ($(call KCONFIG_GET_OPT,CONFIG_KERNEL_LZO,$(KERNEL_SOURCE_CONFIG)),y)
-LINUX_DEPENDENCIES += host-lzop
-endif
-ifeq ($(call KCONFIG_GET_OPT,CONFIG_RD_LZO,$(KERNEL_SOURCE_CONFIG)),y)
-LINUX_DEPENDENCIES += host-lzop
+KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
 endif
 endif
 
 
 define LINUX_CONFIGURE_CMDS
 define LINUX_CONFIGURE_CMDS