Skip to content
Snippets Groups Projects
Verified Commit d4eff89d authored by Karel Koci's avatar Karel Koci :metal:
Browse files

Update path to distribution repository

parent 1c174e77
No related merge requests found
......@@ -251,7 +251,7 @@ configure() {
echo "CONFIG_CCACHE=y"
[ -n "$DL_MIRROR" ] && echo "CONFIG_DOWNLOAD_FOLDER=$DL_MIRROR"
echo "CONFIG_VERSION_DIST=\"TurrisOS\""
echo "CONFIG_VERSION_REPO=\"https://repo.turris.cz/${PUBLISH_BRANCH}\""
echo "CONFIG_VERSION_REPO=\"https://repo.turris.cz/$PUBLISH_BRANCH/packages/$TARGET_BOARD\""
echo "CONFIG_VERSION_NUMBER=\"$(_get_version)\""
echo "CONFIG_ALL_KMODS=$everything"
echo "CONFIG_ALL=$everything"
......
From 09704f4b45e5e336f0ce2bcbf4a3e740db5a1dc0 Mon Sep 17 00:00:00 2001
From b2319ee76dea352fef081ae028e5edb899b96994 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We are using different paths in our repositories, so customizing build to
reflect that.
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
---
include/feeds.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/feeds.mk b/include/feeds.mk
index d20cdfe..a908c95 100644
index d20cdfe069..dcfebd8b30 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -33,11 +33,11 @@ endef
......@@ -20,16 +24,16 @@ index d20cdfe..a908c95 100644
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/core'; \
$(strip $(if $(CONFIG_PER_FEED_REPO), \
- echo 'src/gz %d_base %U/packages/%A/base'; \
+ echo 'src/gz %d_base %U/packages/base'; \
+ echo 'src/gz %d_base %U/base'; \
$(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)';)))) \
+ echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/$(feed)';)))) \
) >> $(1)
endef
--
2.18.0
2.19.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment