metadata: fix handling of multiple build dependencies with different conditions

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index fa0bc25..cb50dfa 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -7,7 +7,6 @@
 #
 
 RELEASE:=Kamikaze
 #
 
 RELEASE:=Kamikaze

-SHELL:=/usr/bin/env bash

 PREP_MK= OPENWRT_BUILD= QUIET=0
 
 include $(TOPDIR)/include/verbose.mk
 PREP_MK= OPENWRT_BUILD= QUIET=0
 
 include $(TOPDIR)/include/verbose.mk


@@ -42,6 +41,8 @@ endif
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 

+SUBMAKE:=umask 022; $(SUBMAKE)
+

 prepare-mk: FORCE ;
 
 prepare-tmpinfo: FORCE
 prepare-mk: FORCE ;
 
 prepare-tmpinfo: FORCE


@@ -103,6 +104,9 @@ kernel_oldconfig: prepare_kernel_conf
 kernel_menuconfig: prepare_kernel_conf
        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 
 kernel_menuconfig: prepare_kernel_conf
        $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
 

+kernel_nconfig: prepare_kernel_conf
+       $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux nconfig
+

 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp
        rm -f tmp/.host.mk
 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp
        rm -f tmp/.host.mk


@@ -112,6 +116,9 @@ tmp/.prereq-build: include/prereq-build.mk
        }
        touch $@
 
        }
        touch $@
 

+printdb: FORCE
+       @$(_SINGLE)$(NO_TRACE_MAKE) -p $@ V=99 DUMP_TARGET_DB=1 2>&1
+

 download: .config FORCE
        @+$(SUBMAKE) tools/download
        @+$(SUBMAKE) toolchain/download
 download: .config FORCE
        @+$(SUBMAKE) tools/download
        @+$(SUBMAKE) toolchain/download