aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/util-linux/APKBUILD14
1 files changed, 7 insertions, 7 deletions
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index 5866f1f869d..57b7dab942a 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -9,7 +9,7 @@ case $pkgver in
*.*) _v=$pkgver;;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Random collection of Linux utilities"
url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all"
@@ -18,22 +18,21 @@ depends="findmnt"
makedepends_build="autoconf automake libtool"
makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev"
options="suid"
-source="https://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.tar.xz
+source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz
ttydefaults.h
"
subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
libuuid libblkid libmount libsmartcols libfdisk sfdisk cfdisk
findmnt:_findmnt mcookie blkid setpriv"
if [ -z "$BOOTSTRAP" ]; then
- makedepends_host="$makedepends_host ncurses-dev python2-dev"
- subpackages="$subpackages py-libmount:_py"
+ makedepends_host="$makedepends_host python3-dev"
+ subpackages="$subpackages py3-libmount:_py3"
else
_bootstrap_config="--without-python"
fi
makedepends="$makedepends_build $makedepends_host"
replaces="e2fsprogs util-linux-ng"
-builddir="$srcdir/$pkgname-$pkgver"
prepare() {
default_prepare
@@ -61,6 +60,7 @@ build() {
--disable-last \
--disable-sulogin \
--disable-su \
+ --with-python=3 \
$_bootstrap_config
make
}
@@ -164,8 +164,8 @@ _findmnt() {
mv "$pkgdir"/bin/findmnt "$subpkgdir"/bin
}
-_py() {
- pkgdesc="python bindings to libmount"
+_py3() {
+ pkgdesc="python3 bindings to libmount"
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}