Fix paths to the repositories

Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>

compile_fw

@@ -156,7 +156,11 @@ configure() {
 	echo "CONFIG_DEVEL=y" >> .config
 	echo "CONFIG_CCACHE=y" >> .config
 	echo "CONFIG_DOWNLOAD_FOLDER=$DL_MIRROR" >> .config
-	echo "CONFIG_VERSION_REPO=\"https://repo.turris.cz/${TARGET_BOARD}\"" >> .config
+	if [ -n "${PUBLISH_BRANCH}" ]; then
+		echo "CONFIG_VERSION_REPO=\"https://repo.turris.cz/${TARGET_BOARD}-${PUBLISH_BRANCH}\"" >> .config
+	else
+		echo "CONFIG_VERSION_REPO=\"https://repo.turris.cz/${TARGET_BOARD}\"" >> .config
+	fi
 	echo "CONFIG_VERSION_NUMBER=\"$(_get_version)\"" >> .config
 	if [ "$EVERYTHING" = yes ]; then
 		echo "CONFIG_ALL_KMODS=y" >> .config

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

+From b21017f9cc5108d4b078335cae17c137cdec7baa 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
+
+We are using different paths in our repositories, so customizing build to
+reflect that.
+
+Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
+---
+ include/feeds.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/feeds.mk b/include/feeds.mk
+index b854383..cdd41b0 100644
+--- a/include/feeds.mk
++++ b/include/feeds.mk
+@@ -41,10 +41,10 @@ endef
+ # 1: destination file
+ define FeedSourcesAppend
+ ( \
+-  echo "src/gz %d_core %U/targets/%S/packages"; \
++  echo "src/gz %d_core %U/packages/core"; \
+   $(strip $(if $(CONFIG_PER_FEED_REPO), \
+ 	$(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(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)";)))) \
+ ) >> $(1)
+ endef
+-- 
+2.16.1
+