Skip to content
Permalink
Browse files

Makefile: only call "quilt pop" when a .pc/ folder exists

This prevents quilt to look in the parent directory when the .pc folder is
not there, as the feed was never patched before. This has caused unpatching
the OpenWrt-folder when being called on an unpatched feed.
  • Loading branch information...
SvenRoederer committed Jun 22, 2019
1 parent 3319bc5 commit 96038a0737d5a7d1ee3ab7d82ab486b3256e74c9
Showing with 2 additions and 0 deletions.
  1. +2 −0 Makefile
@@ -266,7 +266,9 @@ unpatch-feeds: $(OPENWRT_DIR)/feeds.conf $(UNPATCH_FEEDS_TARGET)

unpatch-feed-%: $(OPENWRT_DIR)/feeds/%
$(info this is $@)
ifneq ($(wildcard $(OPENWRT_DIR)/feeds/$*/.pc),)
cd $(OPENWRT_DIR)/feeds/$*; quilt pop -a -f || [ $$? = 2 ] && true
endif
#rm -rf $(OPENWRT_DIR)/feeds/$*/.pc


0 comments on commit 96038a0

Please sign in to comment.
You can’t perform that action at this time.