From 74b6c0d61aadcbe22d42ac5f4e83af2948dbf006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 24 Apr 2019 22:26:12 +0200
Subject: [PATCH] compile_pkgs: fix repo_checkout
---
compile_pkgs | 2 +-
helpers/generate_common.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compile_pkgs b/compile_pkgs
index a4e3aa0de..c1d746cdd 100755
--- a/compile_pkgs
+++ b/compile_pkgs
@@ -282,7 +282,7 @@ checkout() {
available_commands+=( ["repo_checkout"]="Start everything from scratch relative to repository on repo.turris.cz - all changes deleted and copy of OpenWRT gets checked out with same hashes as repo.turris.cz" )
repo_checkout() {
_report "Starting out $TARGET_BOARD-$PUBLISH_BRANCH!"
- curl "https://repo.turris.cz/$PUBLISH_BRANCH/packages/$TARGET_BOARD/git-hash" | tail -n +2 | grep -v '^$' | sed 's/^ \* //;s/: /:/' > repo-git-hashes
+ curl "https://repo.turris.cz/$PUBLISH_BRANCH/$TARGET_BOARD/packages/git-hash" | tail -n +2 | grep -v '^$' | sed 's/^ \* //;s/: /:/' > repo-git-hashes
_checkout_init
git fetch
git checkout -f "$(awk -F : '/^openwrt:/{print $2}' repo-git-hashes)"
diff --git a/helpers/generate_common.sh b/helpers/generate_common.sh
index 01576d5f8..b16b7333a 100644
--- a/helpers/generate_common.sh
+++ b/helpers/generate_common.sh
@@ -74,7 +74,7 @@ get_usign() {
updater_ng_repodetect() {
local REPO="$1"
local BOARD="${2:-mox}"
- local VERSION="$(curl "https://repo.turris.cz/$REPO/packages/$BOARD/turrispackages/Packages" | \
+ local VERSION="$(curl "https://repo.turris.cz/$REPO/$BOARD/packages/turrispackages/Packages" | \
awk '/^Package: updater-ng$/,/^$/ { if ($1 == "Version:") { gsub("-.*$","",$2); print $2 } }')"
if [ -z "$VERSION" ]; then
echo "Detection of updater-ng version from repository failed. Using $UPDATER_VERSION instead."
--
GitLab