fix repo
This commit is contained in:
parent
6e9075a50a
commit
887094380b
1 changed files with 10 additions and 9 deletions
|
@ -1,10 +1,10 @@
|
|||
diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index c3b8f7a..dc5d72b
|
||||
index c3b8f7a..2d09c31
|
||||
--- a/usr/local/bin/build.sh.orig
|
||||
+++ b/usr/local/bin/build.sh
|
||||
@@ -7,13 +7,15 @@
|
||||
@@ -7,13 +7,14 @@
|
||||
set -eu -o pipefail
|
||||
|
||||
readonly APORTSDIR=$CI_PROJECT_DIR
|
||||
|
@ -13,7 +13,6 @@ index c3b8f7a..dc5d72b
|
|||
readonly ARCH=$(apk --print-arch)
|
||||
# gitlab variables
|
||||
readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
|
||||
+readonly REPOS="qubes-$BASEBRANCH"
|
||||
|
||||
: "${REPODEST:=$HOME/packages}"
|
||||
-: "${MIRROR:=https://dl-cdn.alpinelinux.org/alpine}"
|
||||
|
@ -22,13 +21,15 @@ index c3b8f7a..dc5d72b
|
|||
: "${MAX_ARTIFACT_SIZE:=300000000}" #300M
|
||||
: "${CI_DEBUG_BUILD:=}"
|
||||
|
||||
@@ -67,13 +69,21 @@ report() {
|
||||
@@ -67,13 +68,23 @@ report() {
|
||||
}
|
||||
|
||||
get_release() {
|
||||
+ grep PRETTY_NAME /etc/os-release | awk '{print $3}' | tr -d '"'
|
||||
+ echo $(grep PRETTY_NAME /etc/os-release | awk '{print $3}' | tr -d '"')
|
||||
+}
|
||||
+
|
||||
+readonly REPOS="qubes-$(get_release)"
|
||||
+
|
||||
+get_qubes_release() {
|
||||
case $BASEBRANCH in
|
||||
- *-stable) echo v"${BASEBRANCH%-*}";;
|
||||
|
@ -40,14 +41,14 @@ index c3b8f7a..dc5d72b
|
|||
}
|
||||
|
||||
+# hack to support at-root packages
|
||||
+changed_repos() {
|
||||
+changed_repos()
|
||||
+ echo "."
|
||||
+}
|
||||
+{
|
||||
+
|
||||
build_aport() {
|
||||
local repo="$1" aport="$2"
|
||||
cd "$APORTSDIR/$repo/$aport"
|
||||
@@ -101,11 +111,11 @@ set_repositories_for() {
|
||||
@@ -101,11 +112,11 @@ set_repositories_for() {
|
||||
release=$(get_release)
|
||||
for repo in $REPOS; do
|
||||
[ "$repo" = "non-free" ] && continue
|
||||
|
@ -61,7 +62,7 @@ index c3b8f7a..dc5d72b
|
|||
doas apk update
|
||||
}
|
||||
|
||||
@@ -118,7 +128,15 @@ apply_offset_limit() {
|
||||
@@ -118,7 +129,15 @@ apply_offset_limit() {
|
||||
}
|
||||
|
||||
setup_system() {
|
||||
|
|
Loading…
Reference in a new issue