[ar71xx] add experimental support for 2.6.30

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 7f5308f..dd8fcd6 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -49,7 +49,7 @@ prepare-tmpinfo: FORCE
        ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
        touch $(TOPDIR)/tmp/.build
 
        ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
        touch $(TOPDIR)/tmp/.build
 

-.config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)
+.config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)

        @+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                $(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
        @+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                $(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \


@@ -82,10 +82,19 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
        fi
        $< Config.in
 
        fi
        $< Config.in
 

-kernel_oldconfig: .config FORCE
+prepare_kernel_conf: .config FORCE
+
+ifeq ($(wildcard staging_dir/host/bin/sed),)
+  prepare_kernel_conf:
+       @+$(SUBMAKE) -r tools/sed/install
+else
+  prepare_kernel_conf: ;
+endif
+
+kernel_oldconfig: prepare_kernel_conf

        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig
 
        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig
 

-kernel_menuconfig: .config FORCE
+kernel_menuconfig: prepare_kernel_conf

        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 tmp/.prereq-build: include/prereq-build.mk
        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 tmp/.prereq-build: include/prereq-build.mk


@@ -106,7 +115,7 @@ download: .config FORCE
 clean dirclean: .config
        @+$(SUBMAKE) -r $@ 
 
 clean dirclean: .config
        @+$(SUBMAKE) -r $@ 
 

-prereq:: .config
+prereq:: prepare-tmpinfo .config

        @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK)
        @+$(NO_TRACE_MAKE) -r -s $@
 
        @+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK)
        @+$(NO_TRACE_MAKE) -r -s $@