aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-04 19:16:41 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-04 19:16:41 +0100
commit0dc7901b00a581453896a65fb08ad8261c747521 (patch)
tree981f8409d79954680674c22882ba890e4f9b8d20 /linux
parent69628fc16f429d5eedc2b7dfe03fd328c7b282be (diff)
downloadbuildroot-0dc7901b00a581453896a65fb08ad8261c747521.tar.gz
buildroot-0dc7901b00a581453896a65fb08ad8261c747521.tar.bz2
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>
Diffstat (limited to 'linux')
-rw-r--r--linux/linux.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index cf728aad05..f948e6c552 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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