From: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxx> compat already deals with defining CONFIG_COMPAT_KERNEL_* variables for us for both makefiles and C / header files. The C / header file usage was fixed in the last commit, this removes internal usage we had for the Makefiles in preference over the same mechanism. Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxx> --- Makefile | 8 +++++++- config.mk | 18 ------------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index b5423ee..5393b40 100644 --- a/Makefile +++ b/Makefile @@ -76,9 +76,14 @@ export CREL_PRE:=.compat_autoconf_ export CREL_CHECK:=$(CREL_PRE)$(CREL) include $(PWD)/$(COMPAT_CONFIG_CW) + +# Recursion lets us ensure we get this file included. +# Trick is to run make -C $(PWD) modules later. -include $(PWD)/$(COMPAT_CONFIG) -all: modules +all: $(CREL_CHECK) + +$COMPAT_CONFIG: ; modules: $(CREL_CHECK) @./scripts/check_config.sh @@ -100,6 +105,7 @@ $(CREL_CHECK): @./scripts/check_config.sh @touch $@ @md5sum $(COMPAT_CONFIG_CW) > $(CONFIG_CHECK) + make -C $(PWD) modules btinstall: btuninstall bt-install-modules diff --git a/config.mk b/config.mk index 4b47321..4bbbd88 100644 --- a/config.mk +++ b/config.mk @@ -16,29 +16,11 @@ endif ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) -COMPAT_LATEST_VERSION = 3 - KERNEL_VERSION := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p') ifneq ($(KERNEL_VERSION),2) -KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^3\.\([0-9]\+\).*/\1/p') else -COMPAT_26LATEST_VERSION = 39 KERNEL_26SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') -COMPAT_26VERSIONS := $(shell I=$(COMPAT_26LATEST_VERSION); while [ "$$I" -gt $(KERNEL_26SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) -$(foreach ver,$(COMPAT_26VERSIONS),$(eval CONFIG_COMPAT_KERNEL_2_6_$(ver)=y)) -KERNEL_SUBLEVEL := -1 -endif - -COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) -$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3_$(ver)=y)) - -RHEL_MAJOR := $(shell grep ^RHEL_MAJOR $(KLIB_BUILD)/Makefile | sed -n 's/.*= *\(.*\)/\1/p') - -ifneq ($(RHEL_MAJOR),) -RHEL_MINOR := $(shell grep ^RHEL_MINOR $(KLIB_BUILD)/Makefile | sed -n 's/.*= *\(.*\)/\1/p') -COMPAT_RHEL_VERSIONS := $(shell I=$(RHEL_MINOR); while [ "$$I" -ge 0 ]; do echo $$I; I=$$(($$I - 1)); done) -$(foreach ver,$(COMPAT_RHEL_VERSIONS),$(eval CONFIG_COMPAT_RHEL_$(RHEL_MAJOR)_$(ver)=y)) endif ifdef CONFIG_COMPAT_KERNEL_2_6_24 -- 1.7.4.15.g7811d -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
