aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-04 19:15:45 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-04 19:15:45 +0100
commit4ff3aa2288022b50b685bce4bb72132453bcf650 (patch)
treedafab534a1e56de920f6ed59ab4c8f04412f8e08 /linux
parent41711cfdeda6f5fd9b2531f538f3643854d7d3ea (diff)
downloadbuildroot-4ff3aa2288022b50b685bce4bb72132453bcf650.tar.gz
buildroot-4ff3aa2288022b50b685bce4bb72132453bcf650.tar.bz2
Revert "linux: fix the KCONFIG_GET_OPT calls to be inside a BR2_LINUX_KERNEL test"
This reverts commit 4ad1ea59a59f951fad072dcb19429e6f468abf05. 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.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 680279c9e6..91a5fb8d81 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -170,6 +170,7 @@ 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
@@ -177,7 +178,6 @@ 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