forge/qports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix qubes release
Some checks failed
/ lint (pull_request) Successful in 24s
Details
/ deploy-edge (pull_request) Failing after 1m38s
Details
/ build-edge (pull_request) Successful in 29s
Details

Browse source
This commit is contained in:
Antoine Martin 2024-08-16 00:19:05 -04:00
parent b76c48a97c
commit 9a01f02a08
Signed by: forge
GPG key ID: D62A472A4AA7D541
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.forgejo/patches/build.patch
View file

@ -1,7 +1,7 @@
diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh
old mode 100644 old mode 100644
new mode 100755 new mode 100755
index c3b8f7a..2d09c31 index c3b8f7a..d799817
--- a/usr/local/bin/build.sh.orig --- a/usr/local/bin/build.sh.orig
+++ b/usr/local/bin/build.sh +++ b/usr/local/bin/build.sh
@@ -7,13 +7,14 @@ @@ -7,13 +7,14 @@
@ -21,14 +21,13 @@ index c3b8f7a..2d09c31
: "${MAX_ARTIFACT_SIZE:=300000000}" #300M : "${MAX_ARTIFACT_SIZE:=300000000}" #300M
: "${CI_DEBUG_BUILD:=}" : "${CI_DEBUG_BUILD:=}"
@@ -67,13 +68,23 @@ report() { @@ -67,13 +68,24 @@ report() {
} }
get_release() { get_release() {
+ echo $(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() { +get_qubes_release() {
case $BASEBRANCH in case $BASEBRANCH in
@ -40,6 +39,8 @@ index c3b8f7a..2d09c31
esac esac
} }
+readonly REPOS="qubes-$(get_qubes_release)"
+
+# hack to support at-root packages +# hack to support at-root packages
+changed_repos() { +changed_repos() {
+ echo "." + echo "."
@ -48,7 +49,7 @@ index c3b8f7a..2d09c31
build_aport() { build_aport() {
local repo="$1" aport="$2" local repo="$1" aport="$2"
cd "$APORTSDIR/$repo/$aport" cd "$APORTSDIR/$repo/$aport"
@@ -101,11 +112,11 @@ set_repositories_for() { @@ -101,11 +113,11 @@ set_repositories_for() {
release=$(get_release) release=$(get_release)
for repo in $REPOS; do for repo in $REPOS; do
[ "$repo" = "non-free" ] && continue [ "$repo" = "non-free" ] && continue
@ -62,7 +63,7 @@ index c3b8f7a..2d09c31
doas apk update doas apk update
} }
@@ -118,7 +129,15 @@ apply_offset_limit() { @@ -118,7 +130,15 @@ apply_offset_limit() {
} }
setup_system() { setup_system() {