summaryrefslogtreecommitdiff
path: root/system/abuild
diff options
context:
space:
mode:
Diffstat (limited to 'system/abuild')
-rw-r--r--system/abuild/APKBUILD26
-rw-r--r--system/abuild/noarch.patch115
2 files changed, 126 insertions, 15 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index 30428a27c..e92435f73 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,11 +1,13 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abuild
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.5
+pkgrel=0
pkgdesc="Script to build APK packages"
-url="https://code.foxkit.us/adelie/abuild"
+url="https://git.adelielinux.org/adelie/abuild"
arch="all"
+options="suid !check"
license="GPL-2.0-only"
+pkggroups="abuild"
depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
attr libarchive-tools pkgconf patch lzip"
if [ "$CBUILD" = "$CHOST" ]; then
@@ -14,14 +16,12 @@ fi
makedepends_build="pkgconfig"
makedepends_host="openssl-dev zlib-dev"
makedepends="$makedepends_host $makedepends_build"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc"
-options="suid !check"
-pkggroups="abuild"
-source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz
keyhole.patch
+ noarch.patch
"
-builddir="$srcdir/$pkgname-$pkgver+adelie"
# secfixes:
# 3.3.1-r1:
@@ -29,19 +29,14 @@ builddir="$srcdir/$pkgname-$pkgver+adelie"
prepare() {
default_prepare
-
- cd "$builddir"
sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
}
build() {
- cd "$builddir"
make VERSION="$pkgver-r$pkgrel"
}
package() {
- cd "$builddir"
-
make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
@@ -59,5 +54,6 @@ _rootbld() {
mkdir -p "$subpkgdir"
}
-sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz
-757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch"
+sha512sums="50e6ad1dfb033688a4a06bbb313db6bb90c0a2e7c47dbab30c1cd7f30520b782fdfd113babed8796104c415f096071a49feb8ab9e71286889d0ac79bb4acc039 abuild-3.5.tar.xz
+757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch
+06542b3baca0a52d0a74c32683738ebe4bfc5c7c3fef867b3cbed5767cd4c5e1517a2174934320bd4184894f3462538a77ae2f4641dff8530c29a6fa0e8184a0 noarch.patch"
diff --git a/system/abuild/noarch.patch b/system/abuild/noarch.patch
new file mode 100644
index 000000000..d6e59d4db
--- /dev/null
+++ b/system/abuild/noarch.patch
@@ -0,0 +1,115 @@
+diff --git a/abuild.in b/abuild.in
+index b0c0f9c..a6a0fe1 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -518,7 +518,7 @@ cleanpkg() {
+ rm -f "$REPODEST/$repo/src/$pkgname-$pkgver-r$pkgrel.src.tar.gz"
+ for i in $allpackages; do
+ subpkg_set "$i"
+- [ "$subpkgarch" = "noarch" ] && subpkgarch="$CARCH"
++ list_has noarch "$subpkgarch" && subpkgarch="$CARCH"
+ rm -f "$REPODEST/$repo/$subpkgarch/$subpkgname-$pkgver-r$pkgrel.apk"
+ done
+ subpkg_unset
+@@ -943,7 +943,7 @@ prepare_metafiles() {
+
+ if [ "$arch" != "$apkbuild_arch" ]; then
+ local msg="Split function set arch=\"$arch\" for $name, use subpackages=pkg:split:arch format instead"
+- [ "$arch" != "noarch" ] && die "$msg"
++ ! list_has noarch "$arch" && die "$msg"
+ warning "$msg"
+ subpkgarch="$arch"
+ fi
+@@ -1039,7 +1039,7 @@ prepare_metafiles() {
+ prepare_trace_rpaths() {
+ local dir="${subpkgdir:-$pkgdir}"
+ local etype= soname= file= sover=
+- [ "${subpkgarch:-$pkgarch}" = "noarch" ] && return 0
++ list_has noarch "${subpkgarch:-$pkgarch}" && return 0
+ options_has "!tracedeps" && return 0
+ # lets tell all the places we should look for .so files - all rpaths
+ scanelf --quiet --recursive --rpath "$dir" \
+@@ -1137,10 +1137,10 @@ is_openrc_pkg() {
+ archcheck() {
+ options_has "!archcheck" && return 0
+ if dir_has_arch_binaries "${subpkgdir:-$pkgdir}"; then
+- [ "${subpkgarch:-$pkgarch}" != "noarch" ] && return 0
++ ! list_has noarch "${subpkgarch:-$pkgarch}" && return 0
+ error "Arch specific binaries found so arch must not be set to \"noarch\""
+ return 1
+- elif [ "${subpkgarch:-$pkgarch}" != "noarch" ] && ! is_dev_pkg; then
++ elif ! list_has noarch "${subpkgarch:-$pkgarch}" && ! is_dev_pkg; then
+ # we dont want -dev package go to noarch
+ warning "No arch specific binaries found so arch should probably be set to \"noarch\""
+ fi
+@@ -1339,7 +1339,7 @@ scan_shared_objects() {
+ local name="$1" controldir="$2" datadir="$3"
+ local opt= i=
+
+- if [ "${subpkgarch:-$pkgarch}" = "noarch" ]; then
++ if list_has noarch "${subpkgarch:-$pkgarch}"; then
+ return 0
+ fi
+
+@@ -1542,7 +1542,7 @@ create_apks() {
+ abuild-sign -q control.tar.gz || exit 1
+
+ msg "Create $apk"
+- [ "$subpkgarch" = "noarch" ] && subpkgarch="$CARCH"
++ list_has noarch "$subpkgarch" && subpkgarch="$CARCH"
+ mkdir -p "$REPODEST"/$repo/$subpkgarch
+ cat control.tar.gz data.tar.gz > "$REPODEST"/$repo/$subpkgarch/$apk
+ )
+@@ -1590,7 +1590,7 @@ update_abuildrepo_index() {
+ # thinks they are for $CARCH and apk-tools will fetch them from
+ # correct URL path. Remainder of the script uses ${subpkgarch/noarch/$CARCH}
+ # when expanding to the target repository path.
+- [ "$subpkgarch" = "noarch" ] && subpkgarch="$CARCH"
++ list_has noarch "$subpkgarch" && subpkgarch="$CARCH"
+ list_has "$subpkgarch" "$allarch" || allarch="$allarch $subpkgarch"
+ done
+ subpkg_unset
+@@ -1936,7 +1936,7 @@ apk_up2date() {
+ local i s
+ for i in $allpackages; do
+ subpkg_set "$i"
+- [ "$subpkgarch" = "noarch" ] && subpkgarch="$CARCH"
++ list_has noarch "$subpkgarch" && subpkgarch="$CARCH"
+ if [ ! -f "$REPODEST/$repo/$subpkgarch/$subpkgname-$pkgver-r$pkgrel.apk" ]; then
+ subpkg_unset
+ return 1
+@@ -1952,7 +1952,7 @@ apk_up2date() {
+ else
+ s="$startdir/${i##*/}"
+ fi
+- [ "$pkgarch" = "noarch" ] && pkgarch="$CARCH"
++ list_has noarch "$pkgarch" && pkgarch="$CARCH"
+ if [ "$s" -nt "$REPODEST/$repo/$pkgarch/$pkgname-$pkgver-r$pkgrel.apk" ]; then
+ return 1
+ fi
+@@ -1966,7 +1966,7 @@ abuildindex_up2date() {
+
+ for i in $allpackages; do
+ subpkg_set "$i"
+- [ "$subpkgarch" = "noarch" ] && subpkgarch="$CARCH"
++ list_has noarch "$subpkgarch" && subpkgarch="$CARCH"
+ local dir="$REPODEST"/$repo/$subpkgarch
+ local idx="$dir"/APKINDEX.tar.gz
+ local file="$dir"/$subpkgname-$pkgver-r$pkgrel.apk
+@@ -2335,7 +2335,7 @@ rootbld() {
+
+ stripbin() {
+ local bin
+- if options_has "!strip" || [ "${subpkgarch:-$pkgarch}" = "noarch" ]; then
++ if options_has "!strip" || list_has noarch "${subpkgarch:-$pkgarch}"; then
+ return 0
+ fi
+ cd "${subpkgdir:-$pkgdir}" || return 1
+@@ -2679,7 +2679,7 @@ fi
+ fi
+
+ # add dbg subpackage if its enabled globally
+-if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$pkgarch" != "noarch" ]; then
++if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && ! list_has noarch "$pkgarch"; then
+ subpackages="$pkgname-dbg $subpackages"
+ fi