From: Paul Spooren Date: Sun, 13 Oct 2019 19:53:40 +0000 (-1000) Subject: build: add buildinfo as single Makefile target X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6fe6853d7e707d018fdaf1a8557d94217775d50c;p=openwrt%2Fstaging%2Fadrian.git build: add buildinfo as single Makefile target The prepare target was added some 11 years ago to build tools and toolchain and was recently extended to create buildinfo files for reproducibility, meaning {feeds,version,config}.buildinfo. As the buildbot workflow is more complex than the single prepare (kmod feed insertion), prepare is only used to create those buildinfo files. Running prepare however runs `target/compile` as well, taking time even everything is already compiled. Splitting this allows the buildbot to run only the `buildinfo` target while others can still use the convenience feature `prepare`. Signed-off-by: Paul Spooren (cherry picked from commit 6caf437652d858e5795ee16bdaf9f0436d2488f9) --- diff --git a/Makefile b/Makefile index 65ee10a84b..181c33b180 100644 --- a/Makefile +++ b/Makefile @@ -100,9 +100,12 @@ diffconfig: FORCE mkdir -p $(BIN_DIR) $(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.buildinfo -prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile) +buildinfo: FORCE $(_SINGLE)$(SUBMAKE) -r diffconfig buildversion feedsversion +prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile) + $(_SINGLE)$(SUBMAKE) -r buildinfo + world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE $(_SINGLE)$(SUBMAKE) -r package/index $(_SINGLE)$(SUBMAKE) -r checksum