build: move patch process after feeds update and clean up warning

This commit is contained in:
Joe Ayers 2018-08-08 09:45:45 -07:00 committed by Joe AE6XE
parent 08a234e8c4
commit eb05530582
1 changed files with 2 additions and 1 deletions

View File

@ -75,6 +75,7 @@ feeds-update: stamp-clean-feeds-updated .stamp-feeds-updated
.stamp-feeds-updated: $(OPENWRT_DIR)/feeds.conf .stamp-feeds-updated: $(OPENWRT_DIR)/feeds.conf
cd $(OPENWRT_DIR); ./scripts/feeds uninstall -a cd $(OPENWRT_DIR); ./scripts/feeds uninstall -a
cd $(OPENWRT_DIR); ./scripts/feeds update -a cd $(OPENWRT_DIR); ./scripts/feeds update -a
cd $(OPENWRT_DIR); ./scripts/feeds install libidn2
cd $(OPENWRT_DIR); ./scripts/feeds install liblzma cd $(OPENWRT_DIR); ./scripts/feeds install liblzma
cd $(OPENWRT_DIR); ./scripts/feeds install libssh2 cd $(OPENWRT_DIR); ./scripts/feeds install libssh2
cd $(OPENWRT_DIR); ./scripts/feeds install libidn cd $(OPENWRT_DIR); ./scripts/feeds install libidn
@ -105,7 +106,7 @@ pre-patch: stamp-clean-pre-patch .stamp-pre-patch
# patch openwrt working copy # patch openwrt working copy
patch: stamp-clean-patched .stamp-patched patch: stamp-clean-patched .stamp-patched
.stamp-patched: .stamp-pre-patch .stamp-unpatched .stamp-patched: .stamp-pre-patch .stamp-unpatched .stamp-feeds-updated
cd $(OPENWRT_DIR); quilt push -a || [ $$? = 2 ] && true cd $(OPENWRT_DIR); quilt push -a || [ $$? = 2 ] && true
rm -rf $(OPENWRT_DIR)/tmp rm -rf $(OPENWRT_DIR)/tmp
touch $@ touch $@