Skip to content
Permalink
Browse files

AMkefile: fixes for patch-openwrt / patch-feeds

  • Loading branch information...
SvenRoederer committed Jun 23, 2019
1 parent 575d7c4 commit d8b2c9900a2e7d17ea5031f5c6d3b2987dd61bb3
Showing with 12 additions and 12 deletions.
  1. +12 −12 Makefile
@@ -75,8 +75,8 @@ $(OPENWRT_DIR)/patches: | .stamp-openwrt-updated
ln -s $(FW_DIR)/patches/openwrt $@

# patches require updated openwrt working copy
$(OPENWRT_DIR)/feeds/luci/patches: | .stamp-feeds-updated
ln -s $(FW_DIR)/patches/packages/luci $@
$(OPENWRT_DIR)/feeds/%/patches: | .stamp-feeds-updated
ln -s $(FW_DIR)/patches/packages/$* $@

# feeds
$(OPENWRT_DIR)/feeds.conf: .stamp-openwrt-updated feeds.conf
@@ -92,7 +92,7 @@ feeds-update: stamp-clean-feeds-updated .stamp-feeds-updated

# prepare patch
pre-patch: stamp-clean-pre-patch .stamp-pre-patch
.stamp-pre-patch: .stamp-feeds-updated $(wildcard $(FW_DIR)/patches/*) | $(OPENWRT_DIR)/patches $(OPENWRT_DIR)/feeds/luci/patches
.stamp-pre-patch: .stamp-feeds-updated $(wildcard $(FW_DIR)/patches/*) | $(OPENWRT_DIR)/patches $(wildcard $(OPENWRT_DIR)/feeds/*/patches)
touch $@

# patch openwrt working copy
@@ -107,6 +107,15 @@ patch-openwrt: .stamp-pre-patch
$(UMASK); cd $(OPENWRT_DIR); ./scripts/feeds install -a
touch $@

patch-feeds: $(OPENWRT_DIR)/feeds.conf $(PATCH_FEEDS_TARGET)
$(info patching all feeds: $(FEEDS))
touch .stamp-patch-feeds

patch-feed-%: $(wildcard patches/packages/%/*) .stamp-feeds-updated patch-openwrt $(OPENWRT_DIR)/feeds/%/patches
$(info this is $@)
cd $(OPENWRT_DIR)/feeds/$*; quilt push -a
$(OPENWRT_DIR)/feeds/$*/.pc

.stamp-build_rev: .FORCE
ifneq (,$(wildcard .stamp-build_rev))
ifneq ($(shell cat .stamp-build_rev),$(FW_REVISION))
@@ -272,15 +281,6 @@ unpatch-feed-%: $(OPENWRT_DIR)/feeds/%
(cd $(OPENWRT_DIR)/feeds/$*; quilt pop -a -f || [ $$? = 2 ] && true)
#rm -rf $(OPENWRT_DIR)/feeds/$*/.pc

patch-feeds: $(OPENWRT_DIR)/feeds.conf $(PATCH_FEEDS_TARGET)
$(info patching all feeds: $(FEEDS))
touch .stamp-patch-feeds

patch-feed-%: $(wildcard patches/packages/%/*) .stamp-feeds-updated patch-openwrt
$(info this is $@)
cd $(OPENWRT_DIR)/feeds/$*; quilt push -a
$(OPENWRT_DIR)/feeds/$*/.pc


clean: stamp-clean .stamp-openwrt-cleaned

0 comments on commit d8b2c99

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