diff --git a/Makefile b/Makefile index 7f5fd437e34452878a534ab37d220900e954126d..8e5cc9a9d2ef26f8cc04ae13cd04b4903c1d9281 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,7 @@ gluon-tools: FORCE +$(GLUONMAKE_EARLY) package/lua/host/install prepare-tmpinfo: FORCE + @+$(MAKE) -r -s tmp/.prereq-build OPENWRT_BUILD= QUIET=0 mkdir -p tmp/info $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_EXTRA="" $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1" @@ -205,7 +206,7 @@ feeds: FORCE +$(GLUONMAKE_EARLY) prepare-tmpinfo config: FORCE - +$(NO_TRACE_MAKE) scripts/config/conf OPENWRT_BUILD=0 + +$(NO_TRACE_MAKE) scripts/config/conf OPENWRT_BUILD= QUIET=0 +$(GLUONMAKE) prepare-tmpinfo ( \ cat $(GLUONDIR)/include/config $(GLUONDIR)/targets/$(GLUON_TARGET)/config; \ diff --git a/include/toplevel.mk b/include/toplevel.mk index 74a95997a744d5bb736cb0dce32034d7b20ee754..72522da57f04f085efae7d1917e9c7c6d671995e 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -48,10 +48,6 @@ else export HOSTCC_WRAPPER:=$(HOSTCC) endif -ifeq ($(FORCE),) - .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build -endif - SCAN_COOKIE?=$(shell echo $$$$) export SCAN_COOKIE