From e6c00c1ad78daed7e79122ff2e1e9cddfa9b860b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Thu, 28 May 2015 02:45:19 +0200 Subject: [PATCH] build: ensure prereq has been run at the beginning of prepare-tmpinfo --- Makefile | 11 ++++++----- include/toplevel.mk | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a4fe82b8d..4420b3872 100644 --- a/Makefile +++ b/Makefile @@ -179,11 +179,8 @@ include $(INCLUDE_DIR)/target.mk prereq: FORCE +$(NO_TRACE_MAKE) prereq -gluon-tools: FORCE - +$(GLUONMAKE_EARLY) tools/sed/install - +$(GLUONMAKE_EARLY) package/lua/host/install - prepare-tmpinfo: FORCE + @+$(MAKE) -r -s staging_dir/host/.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" @@ -204,8 +201,12 @@ feeds: FORCE . $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do ln -s ../../../packages/$$feed $(TOPDIR)/package/feeds/module_$$feed; done +$(GLUONMAKE_EARLY) prepare-tmpinfo +gluon-tools: FORCE + +$(GLUONMAKE_EARLY) tools/sed/install + +$(GLUONMAKE_EARLY) package/lua/host/install + 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 74a95997a..72522da57 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 -- GitLab