From 89c3886e5895ef67fb7a619df3af20627ea199d5 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Wed, 21 Feb 2024 17:00:43 +0100 Subject: [PATCH] Fixed apkbuilds & variable injection in build script --- .builds/build-all.yml | 2 +- main/blueprint/APKBUILD | 1 + main/little-town/APKBUILD | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.builds/build-all.yml b/.builds/build-all.yml index 1709146..a0cc65c 100644 --- a/.builds/build-all.yml +++ b/.builds/build-all.yml @@ -44,7 +44,7 @@ tasks: mkdir -p ~/packages sudo s3fs $s3_bucket ~/packages -o url=$s3_url -o use_path_request_style -o umask=0007,uid=$(id -u) -o allow_other # configure keypath - echo 'PACKAGER_PRIVKEY=$HOME/.abuild/$owner.rsa' >> $HOME/.abuild/abuild.conf + echo "PACKAGER_PRIVKEY=$HOME/.abuild/$owner.rsa" >> $HOME/.abuild/abuild.conf # start binfmt service for userspace emulation # required by abuild-rootbld sudo rc-service qemu-binfmt start diff --git a/main/blueprint/APKBUILD b/main/blueprint/APKBUILD index f40f297..b187fd2 100644 --- a/main/blueprint/APKBUILD +++ b/main/blueprint/APKBUILD @@ -10,6 +10,7 @@ license="GPL-3.0-or-later" makedepends="cargo" source="$pkgname-$_pkgrelease-$pkgver.tar.gz::https://codeberg.org/comcloudway/blueprint/archive/$_pkgrelease-$pkgver.tar.gz" builddir="$srcdir/$pkgname" +options="net" prepare() { default_prepare diff --git a/main/little-town/APKBUILD b/main/little-town/APKBUILD index 8019d10..79530af 100644 --- a/main/little-town/APKBUILD +++ b/main/little-town/APKBUILD @@ -10,7 +10,7 @@ license="AGPL-3.0" makedepends="cargo alsa-lib alsa-lib-dev protoc wget unzip ffmpeg bash" builddir="$srcdir/little_town" source=" - little-town-$pkgver-$_pkgver.tar.gz::https://codeberg.org/comcloudway/little_town/archive/v$_pkgver.tar.gz + little-town-$_pkgver.tar.gz::https://codeberg.org/comcloudway/little_town/archive/v$_pkgver.tar.gz fix-musl.patch LittleTown.desktop " @@ -46,7 +46,7 @@ package() { } sha512sums=" -ebf22abdac92291615e088b6cea88235e6446eaf268ed914078580398be3c432d279532b1df3b31088f4602a91369047633892f4dcd334ea576692bb512827a5 little-town-0.2.3-0.2.3-r4.tar.gz +aba2d5d73038d75ce28ff90edf329ec5f702172eac50e993e83f8a6e0c4a334feeb8cb3fcf7baeb5f16d0238b2ee9b8c2b9e075096a17fbb00dfbf35f3a9978b little-town-0.2.3-r4.tar.gz 8eaa642405335205e2758f99a35eaa94ca01ccf6ad4508119fbe14c934b51cd781f57bb39450898f39ca59f04f3e985413914ee21d011ec8ce622d6802eecbe1 fix-musl.patch 1c52648f2287f2b5a715ef90513d576ac75d9db0becc5a936e9e50083c5807b02fc982fa7f1027b7973e9744b605430f2e9baab4da7cad4bf4092799a29c8894 LittleTown.desktop " -- 2.38.5