Commit 0dc7901b authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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



This reverts commit ca80782f. 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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 69628fc1

linux/linux.mk

+2 −9
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ endif 
LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))



LINUX_INSTALL_IMAGES = YES

LINUX_DEPENDENCIES  += host-kmod

LINUX_DEPENDENCIES  += host-kmod host-lzop



ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)

	LINUX_DEPENDENCIES += host-uboot-tools
@@ -163,14 +163,7 @@ LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES 
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)

KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig

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



define LINUX_CONFIGURE_CMDS