diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-16 16:10:37 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-16 16:10:37 +0000 |
| commit | d1020e0c943dbf817cdf133553a122df4d96e15b (patch) | |
| tree | 5ff4eb4324992722dcc68ec438f99e8694cbc583 | |
| parent | 16885019df804baacf75300ba8fc21f8fb40bf88 (diff) | |
revert CONFIG_* symbols set m enforcement introduced in [8591], it can't work when symbols from different kernel versions are mixed in KCONFIG
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8798 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel.mk | 3 | ||||
| -rw-r--r-- | include/netfilter.mk | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 788e3f237..748605705 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 6f77f9670..35efc039c 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 := |