mirror of https://github.com/hak5/openwrt-owl.git
make package prereq checks behave more like build prereq checks (first check all, then fail if necessary), also make them less verbose
SVN-Revision: 12106owl
parent
72396bd614
commit
1b838dbd95
13
Makefile
13
Makefile
|
@ -56,8 +56,19 @@ dirclean: clean
|
||||||
rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)
|
rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)
|
||||||
rm -rf $(TMP_DIR)
|
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
|
# 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)
|
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
|
world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE
|
||||||
|
|
Loading…
Reference in New Issue