aboutsummaryrefslogtreecommitdiffstats
path: root/main/btrfs-progs
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2017-08-03 12:58:04 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2017-08-03 13:09:06 +0200
commit91e569b6073676ebf5bd18271c53d38dd3b5343f (patch)
treec925a83b2774583c665ae96f7985810da6d87e22 /main/btrfs-progs
parent829a46e579053774659b381f0a04cfda2bb6da72 (diff)
downloadaports-91e569b6073676ebf5bd18271c53d38dd3b5343f.tar.bz2
aports-91e569b6073676ebf5bd18271c53d38dd3b5343f.tar.xz
main/btrfs-progs: modernize APKBUILD
Diffstat (limited to 'main/btrfs-progs')
-rw-r--r--main/btrfs-progs/APKBUILD14
1 files changed, 6 insertions, 8 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 47b5e22d1a..cf29b16981 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -20,7 +20,7 @@ source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v
builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
- default_prepare || return 1
+ default_prepare
cd "$builddir"
./autogen.sh
@@ -35,19 +35,17 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- --disable-backtrace \
- || return 1
- make || return 1
+ --disable-backtrace
+ make
}
package() {
cd "$builddir"
-
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" install
mkdir "$pkgdir"/sbin
local i; for i in btrfs btrfsck fsck.btrfs mkfs.btrfs; do
- mv "$pkgdir"/usr/bin/$i "$pkgdir"/sbin/ || return 1
+ mv "$pkgdir"/usr/bin/$i "$pkgdir"/sbin/
done
mv "$pkgdir"/usr/bin "$pkgdir"/usr/sbin
}
@@ -65,7 +63,7 @@ extra() {
pkgdesc="BTRFS filesystem extra utilities"
mkdir -p "$subpkgdir"
- mv "$pkgdir"/usr "$subpkgdir"/ || return 1
+ mv "$pkgdir"/usr "$subpkgdir"/
rmdir "$subpkgdir"/usr/lib
}