From 9a01f02a088ee43df7452b217636287c6f9102f1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 16 Aug 2024 00:19:05 -0400 Subject: [PATCH] fix qubes release --- .forgejo/patches/build.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.forgejo/patches/build.patch b/.forgejo/patches/build.patch index 211e877..463ddf4 100644 --- a/.forgejo/patches/build.patch +++ b/.forgejo/patches/build.patch @@ -1,7 +1,7 @@ diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh old mode 100644 new mode 100755 -index c3b8f7a..2d09c31 +index c3b8f7a..d799817 --- a/usr/local/bin/build.sh.orig +++ b/usr/local/bin/build.sh @@ -7,13 +7,14 @@ @@ -21,14 +21,13 @@ index c3b8f7a..2d09c31 : "${MAX_ARTIFACT_SIZE:=300000000}" #300M : "${CI_DEBUG_BUILD:=}" -@@ -67,13 +68,23 @@ report() { +@@ -67,13 +68,24 @@ report() { } get_release() { + echo $(grep PRETTY_NAME /etc/os-release | awk '{print $3}' | tr -d '"') +} + -+readonly REPOS="qubes-$(get_release)" + +get_qubes_release() { case $BASEBRANCH in @@ -40,6 +39,8 @@ index c3b8f7a..2d09c31 esac } ++readonly REPOS="qubes-$(get_qubes_release)" ++ +# hack to support at-root packages +changed_repos() { + echo "." @@ -48,7 +49,7 @@ index c3b8f7a..2d09c31 build_aport() { local repo="$1" aport="$2" cd "$APORTSDIR/$repo/$aport" -@@ -101,11 +112,11 @@ set_repositories_for() { +@@ -101,11 +113,11 @@ set_repositories_for() { release=$(get_release) for repo in $REPOS; do [ "$repo" = "non-free" ] && continue @@ -62,7 +63,7 @@ index c3b8f7a..2d09c31 doas apk update } -@@ -118,7 +129,15 @@ apply_offset_limit() { +@@ -118,7 +130,15 @@ apply_offset_limit() { } setup_system() {