diff options
| -rw-r--r-- | system/abuild/APKBUILD | 4 | ||||
| -rw-r--r-- | system/abuild/apkpath.patch | 25 |
2 files changed, 28 insertions, 1 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 5f780a690..257a11ad0 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild pkgver=3.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/abuild" arch="all" @@ -19,6 +19,7 @@ makedepends="$makedepends_host $makedepends_build" subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz + apkpath.patch keyhole.patch " @@ -54,4 +55,5 @@ _rootbld() { } sha512sums="6446171cc68d8341b5267816e7a05e0dc7b8a4e89c8c8410ae61e9501b163cc32db888476b14f032c16ef15bdd4dd4844e087394c2d061db8281f7bdfb34d450 abuild-3.4.1.tar.xz +bc373c93344d498a48675256bb26cf9bebac74f54d8e53a09c0975e3047c481ee35c6b88e5de392efd2d0ce2a8de23ebbf0822e1a093ee01ea99349f238c62f7 apkpath.patch 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch" diff --git a/system/abuild/apkpath.patch b/system/abuild/apkpath.patch new file mode 100644 index 000000000..4390fe0b0 --- /dev/null +++ b/system/abuild/apkpath.patch @@ -0,0 +1,25 @@ +From d9811dee71cfafde1fe6d596a2b9922b60dd0c4f Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Fri, 21 Feb 2020 19:28:36 -0600 +Subject: [PATCH] abuild: Solve, once and for all, 'apk: not found' + +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index 1b8898b..2212789 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -23,7 +23,7 @@ fi + # defaults + : ${FAKEROOT:="fakeroot"} + : ${SUDO_APK:="abuild-apk"} +-: ${APK:="apk"} ++: ${APK:="/sbin/apk"} + : ${ADDUSER:="abuild-adduser"} + : ${ADDGROUP:="abuild-addgroup"} + +-- +2.25.0 + |