From ca80782f4571f004c2b8cf2d0e60e83343beff34 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 8 Feb 2014 17:26:05 +0100 Subject: [PATCH] linux: only depend on host-lzop if needed There is no reason to always depend on host-lzop, even when the kernel compression is not LZO. Since LZO is not the default compression option in the kernel (and there is not sign that will change in the foreseeable future), it will always appear in a config file, whether it is a complete config file or it is only a defconfig. So, only depend on host-lzop if the LZO compression is enabled in the kernel config file (either the defconfig or the custom config file). This includes: - kernel compression itself - initrd compression - initramfs compression Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index f948e6c55..cf728aad0 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 host-lzop +LINUX_DEPENDENCIES += host-kmod ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y) LINUX_DEPENDENCIES += host-uboot-tools @@ -163,7 +163,14 @@ 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 = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) +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 endif define LINUX_CONFIGURE_CMDS