summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-03 22:55:49 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-03 22:55:49 +0100
commit4ad1ea59a59f951fad072dcb19429e6f468abf05 (patch)
tree66e441e2fe294aed65fc95fc5cac58f61da1d971 /linux
parent92777aa29737349ef9a3033318dd59628fe30d38 (diff)
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>
Diffstat (limited to 'linux')
-rw-r--r--linux/linux.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 91a5fb8d8..680279c9e 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -170,7 +170,6 @@ ifeq ($(BR2_LINUX_KERNEL),y)
ifeq ($(wildcard $(KERNEL_SOURCE_CONFIG)),)
$(error Configuration file '$(KERNEL_SOURCE_CONFIG)' not found.)
endif
-endif
ifeq ($(call KCONFIG_GET_OPT,CONFIG_KERNEL_LZO,$(KERNEL_SOURCE_CONFIG)),y)
LINUX_DEPENDENCIES += host-lzop
@@ -178,6 +177,7 @@ endif
ifeq ($(call KCONFIG_GET_OPT,CONFIG_RD_LZO,$(KERNEL_SOURCE_CONFIG)),y)
LINUX_DEPENDENCIES += host-lzop
endif
+endif
define LINUX_CONFIGURE_CMDS
$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig