diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-04 23:15:17 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-04 23:15:17 +0000 |
| commit | 187ca0602dd34161650ce10f051de47df3d9290e (patch) | |
| tree | 932dbe0689fcbbc41bc99355a3da4c61e421c000 | |
| parent | 3070019b68ff1b0e935e738df270c673b9d3d515 (diff) | |
make package prereq checks behave more like build prereq checks (first check all, then fail if necessary), also make them less verbose
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12106 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -56,8 +56,19 @@ dirclean: clean rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) rm -rf $(TMP_DIR) +tmp/.prereq_packages: .config + unset ERROR; \ + for package in $(sort $(prereq-y) $(prereq-m)); do \ + $(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \ + done; \ + if [ -n "$$ERROR" ]; then \ + echo "Package prerequisite check failed."; \ + false; \ + fi + touch $@ + # check prerequisites before starting to build -prereq: $(package/stamp-prereq) $(target/stamp-prereq) ; +prereq: $(target/stamp-prereq) tmp/.prereq_packages prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE |