From 892b16a352cfeb53d54e315ec4872fe7a78c1fac Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 16 Sep 2007 16:10:37 +0000 Subject: revert CONFIG_* symbols set m enforcement introduced in [8591], it can't work when symbols from different kernel versions are mixed in KCONFIG SVN-Revision: 8798 --- include/kernel.mk | 3 +-- include/netfilter.mk | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/kernel.mk b/include/kernel.mk index 788e3f2378..7486057052 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -115,8 +115,7 @@ $(call KernelPackage/$(1)/description) endef endif - # check that all CONFIG_* symbols in $(KCONFIG) are set to 'm' - ifeq ($(filter-out m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$(if $($(c)),$($(c)),n))),) + ifneq ($(if $(KCONFIG),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),) ifneq ($(strip $(FILES)),) define Package/kmod-$(1)/install mkdir -p $$(1)/lib/modules/$(LINUX_VERSION) diff --git a/include/netfilter.mk b/include/netfilter.mk index 6f77f9670c..35efc039c4 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -16,9 +16,7 @@ endif define nf_add $(1)-$$($(2)) += $(3) - ifeq ($$($(2)),m) - KCONFIG_$(1) += $(2) - endif + KCONFIG_$(1) += $(2) endef IPT_CONNTRACK-m := -- cgit v1.2.3