Browse Source

linux: fix the KCONFIG_GET_OPT calls to be inside a BR2_LINUX_KERNEL test

The KCONFIG_GET_OPT calls added by
ca80782f4571f004c2b8cf2d0e60e83343beff34 ('linux: only depend on
host-lzop if needed') are made even if the kernel package is not
selected. This hangs the linux.mk parsing as they try to read from a
file that doesn't exist.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 11 năm trước cách đây
mục cha
commit
4ad1ea59a5
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      linux/linux.mk

+ 1 - 1
linux/linux.mk

@@ -170,7 +170,6 @@ ifeq ($(BR2_LINUX_KERNEL),y)
 ifeq ($(wildcard $(KERNEL_SOURCE_CONFIG)),)
 ifeq ($(wildcard $(KERNEL_SOURCE_CONFIG)),)
 $(error Configuration file '$(KERNEL_SOURCE_CONFIG)' not found.)
 $(error Configuration file '$(KERNEL_SOURCE_CONFIG)' not found.)
 endif
 endif
-endif
 
 
 ifeq ($(call KCONFIG_GET_OPT,CONFIG_KERNEL_LZO,$(KERNEL_SOURCE_CONFIG)),y)
 ifeq ($(call KCONFIG_GET_OPT,CONFIG_KERNEL_LZO,$(KERNEL_SOURCE_CONFIG)),y)
 LINUX_DEPENDENCIES += host-lzop
 LINUX_DEPENDENCIES += host-lzop
@@ -178,6 +177,7 @@ endif
 ifeq ($(call KCONFIG_GET_OPT,CONFIG_RD_LZO,$(KERNEL_SOURCE_CONFIG)),y)
 ifeq ($(call KCONFIG_GET_OPT,CONFIG_RD_LZO,$(KERNEL_SOURCE_CONFIG)),y)
 LINUX_DEPENDENCIES += host-lzop
 LINUX_DEPENDENCIES += host-lzop
 endif
 endif
+endif
 
 
 define LINUX_CONFIGURE_CMDS
 define LINUX_CONFIGURE_CMDS
 	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig