summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2022-01-19 14:37:50 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2022-04-24 20:51:30 -0500
commitd28f635b3ae22c73e7caa5c1998da66e8a634c02 (patch)
tree1bbef06de9e685d8f07f2ba0120e4b83dbde1bba
parentaed535c7d67ceac277822f247523432559e638f0 (diff)
downloadpackages-d28f635b3ae22c73e7caa5c1998da66e8a634c02.tar.gz
packages-d28f635b3ae22c73e7caa5c1998da66e8a634c02.tar.bz2
packages-d28f635b3ae22c73e7caa5c1998da66e8a634c02.tar.xz
packages-d28f635b3ae22c73e7caa5c1998da66e8a634c02.zip
system/abuild: Add patch for zero-size files
-rw-r--r--system/abuild/APKBUILD4
-rw-r--r--system/abuild/inode.patch30
2 files changed, 33 insertions, 1 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index f3c5bef69..d5c3a55fd 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abuild
pkgver=3.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build APK packages"
url="https://git.adelielinux.org/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
+ inode.patch
keyhole.patch
"
@@ -54,4 +55,5 @@ _rootbld() {
}
sha512sums="9bdeb31f54879878697b4a5436ec2bc7764e1b9840798e913ba3dd47c344437e362a3067b89440ca8a7940af1efcaa83a24e7c1077187f924bf73fb058f97fbf abuild-3.4.2.tar.xz
+53b0f2c15da767fbdde5a28b6f428943907e8752490ffae580e4a4198fea76fd71fc253a526c81bbbf17311ce3c72a563649a416ea0fda219a35cee50fcd46d1 inode.patch
757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch"
diff --git a/system/abuild/inode.patch b/system/abuild/inode.patch
new file mode 100644
index 000000000..a3a7cef09
--- /dev/null
+++ b/system/abuild/inode.patch
@@ -0,0 +1,30 @@
+From 9969ec002c408b616714a99a6317c7f996965dd4 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 19 Jan 2022 02:35:19 -0600
+Subject: [PATCH] abuild: Correctly package files that fit in inode
+
+On filesystems such as XFS, abuild will skip small files and symlinks
+because the file fits in an inode and shows a size of 0.
+
+Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
+Acked-by: Zach van Rijn <me@zv.io>
+---
+ abuild.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index 6bb087a..3e83563 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -927,7 +927,7 @@ prepare_metafiles() {
+ sync;;
+ esac
+
+- local size="$(du -sk | awk '{print $1 * 1024}')"
++ local size="$(du -sk --apparent-size | awk '{print $1 * 1024}')"
+
+ if [ "$arch" != "$apkbuild_arch" ]; then
+ local msg="Split function set arch=\"$arch\" for $name, use subpackages=pkg:split:arch format instead"
+--
+2.32.0 (Apple Git-132)
+