From eb05530582ab25fdd6942fe561f4b73180dc8c2a Mon Sep 17 00:00:00 2001 From: Joe Ayers Date: Wed, 8 Aug 2018 09:45:45 -0700 Subject: [PATCH] build: move patch process after feeds update and clean up warning --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6c410c0c..b10b321e 100644 --- a/Makefile +++ b/Makefile @@ -75,6 +75,7 @@ feeds-update: stamp-clean-feeds-updated .stamp-feeds-updated .stamp-feeds-updated: $(OPENWRT_DIR)/feeds.conf cd $(OPENWRT_DIR); ./scripts/feeds uninstall -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 libssh2 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: 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 rm -rf $(OPENWRT_DIR)/tmp touch $@