Rebase feeds url patch

patches/openwrt/branding/0001-feeds-Support-our-repo-paths.patch

-From b21017f9cc5108d4b078335cae17c137cdec7baa Mon Sep 17 00:00:00 2001
+From cd6cad0d566857343241c4cf5fdfa0935d46371a Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <Michal@Hrusecky.net>
 Date: Fri, 16 Feb 2018 11:11:45 +0100
 Subject: [PATCH] feeds: Support our repo paths
@@ -8,27 +8,28 @@ reflect that.
 
 Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
 ---
- include/feeds.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ include/feeds.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/include/feeds.mk b/include/feeds.mk
-index b854383..cdd41b0 100644
+index 3e0801e..4422169 100644
 --- a/include/feeds.mk
 +++ b/include/feeds.mk
-@@ -41,10 +41,10 @@ endef
+@@ -33,11 +33,11 @@ endef
  # 1: destination file
  define FeedSourcesAppend
  ( \
--  echo "src/gz %d_core %U/targets/%S/packages"; \
-+  echo "src/gz %d_core %U/packages/core"; \
+-  echo 'src/gz %d_core %U/targets/%S/packages'; \
+-  echo 'src/gz %d_base %U/packages/%A/base'; \
++  echo 'src/gz %d_core %U/packages/core'; \
++  echo 'src/gz %d_base %U/packages/base'; \
    $(strip $(if $(CONFIG_PER_FEED_REPO), \
--	$(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(feed)";) \
-+	$(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/$(feed)";) \
- 	$(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
--		$(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \
-+		$(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/$(feed)";)))) \
+ 	$(foreach feed,$(FEEDS_AVAILABLE), \
+ 		$(if $(CONFIG_FEED_$(feed)), \
+-			echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/packages/%A/$(feed)';)))) \
++			echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/packages/$(feed)';)))) \
  ) >> $(1)
  endef
 -- 
-2.16.1
+2.18.0