aboutsummaryrefslogtreecommitdiffstats
path: root/main/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'main/util-linux')
-rw-r--r--main/util-linux/APKBUILD68
1 files changed, 56 insertions, 12 deletions
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index d0d18884d5..993444ae13 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-linux
-pkgver=2.36.2
+pkgver=2.37.1
case $pkgver in
*.*.*) _v=${pkgver%.*};;
@@ -15,31 +15,49 @@ url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all"
license="GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND
LGPL-2.1-or-later AND BSD-3-Clause AND BSD-4-Clause-UC AND Public-Domain"
-depends="blkid setpriv findmnt mcookie hexdump lsblk sfdisk cfdisk partx"
-makedepends_build="autoconf automake libtool"
-makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev"
+makedepends_build="
+ asciidoctor
+ autoconf
+ automake
+ libtool
+ "
+makedepends_host="
+ libcap-ng-dev
+ linux-headers
+ ncurses-dev
+ zlib-dev
+ "
options="suid"
source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz
ttydefaults.h
rfkill.confd
rfkill.initd
"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch $pkgname-openrc
+subpackages="
+ $pkgname-bash-completion:bashcomp:noarch
+ $pkgname-dev
+ $pkgname-doc
+ $pkgname-openrc
+
libblkid:_mv_lib
libfdisk:_mv_lib
libmount:_mv_lib
libsmartcols:_mv_lib
libuuid:_mv_lib
- lsblk:_mv_bin
blkid:_mv_bin
cfdisk:_mv_bin
findmnt:_mv_bin
+ flock:_mv_bin
hexdump:_mv_bin
+ logger:_mv_bin
+ lsblk:_mv_bin
mcookie:_mv_bin
partx:_mv_bin
setpriv:_mv_bin
sfdisk:_mv_bin
+ uuidgen:_mv_bin
+ wipefs:_mv_bin
"
if [ -z "$BOOTSTRAP" ]; then
makedepends_host="$makedepends_host linux-pam-dev python3-dev libeconf-dev"
@@ -48,6 +66,7 @@ if [ -z "$BOOTSTRAP" ]; then
else
_bootstrap_config="--without-python --without-econf"
fi
+subpackages="$subpackages $pkgname-misc"
makedepends="$makedepends_build $makedepends_host"
prepare() {
@@ -91,12 +110,22 @@ _mv_bin() {
local _bin=$subpkgname
pkgdesc="$_bin from util-linux"
depends=
+ install_if="$pkgname=$pkgver-r$pkgrel"
case "$_bin" in
blkid) pkgdesc="Block device identification tool from util-linux";;
- sfdisk) pkgdesc="Partition table manipulator from util-linux";;
cfdisk) pkgdesc="Curses based partition table manipulator from util-linux";;
- setpriv) pkgdesc="Run a program with different Linux privilege settings";;
+ findfmt) pkgdesc="findfmt from util-linux";;
+ flock) pkgdesc="File locker from util-linux";;
+ hexdump) pkgdesc="hexdump from util-linux";;
+ logger) pkgdesc="Logger from util-linux";;
+ lsblk) pkgdesc="Block device list tool from util-linux";;
+ mcookie) pkgdesc="mcookie tool from util-linux";;
+ partx) pkgdesc="partx tool from util-linux";;
runuser) pkgdesc="Run a program with substitute user and group ID";;
+ setpriv) pkgdesc="Run a program with different Linux privilege settings";;
+ sfdisk) pkgdesc="Partition table manipulator from util-linux";;
+ uuidgen) pkgdesc="UUID generator from util-linux";;
+ wipefs) pkgdesc="wipefs from util-linux";;
*);;
esac
local _path; for _path in usr/bin usr/sbin bin sbin; do
@@ -113,14 +142,26 @@ _mv_lib() {
local _lib="$subpkgname"
depends=
case "$_lib" in
- libuuid) pkgdesc="DCE compatible Universally Unique Identifier library";;
libblkid) pkgdesc="Block device identification library from util-linux";;
+ libfdisk) pkgdesc="Partitioning library for fdisk-like programs";;
libmount) pkgdesc="Block device identification library from util-linux";;
libsmartcols) pkgdesc="Formatting library for ls-like programs.";;
- libfdisk) pkgdesc="Partitioning library for fdisk-like programs";;
+ libuuid) pkgdesc="DCE compatible Universally Unique Identifier library";;
esac
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/$_lib.so.* "$subpkgdir"/lib/
+ rmdir --ignore-fail-on-non-empty "$pkgdir"/lib
+}
+
+misc() {
+ pkgdesc="Misc binaries for $pkgname"
+ depends=
+ install_if="$pkgname=$pkgver-r$pkgrel"
+ local _path; for _path in usr/bin usr/sbin bin sbin; do
+ if [ -e "$pkgdir"/$_path ]; then
+ amove "$_path"
+ fi
+ done
}
dev() {
@@ -143,9 +184,12 @@ _py3() {
depends=
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+ rmdir --ignore-fail-on-non-empty "$pkgdir"/usr/lib
}
-sha512sums="6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b util-linux-2.36.2.tar.xz
+sha512sums="
+ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555 util-linux-2.37.1.tar.xz
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h
401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97 rfkill.confd
-c4e7ba6d257496c99934add2ca532db16fb070ea2367554587c9fb4e24ab1d80b8ba3fd0fd4fdd5ef1374c3ec6414007369b292ee334ef23171d0232ef709db2 rfkill.initd"
+c4e7ba6d257496c99934add2ca532db16fb070ea2367554587c9fb4e24ab1d80b8ba3fd0fd4fdd5ef1374c3ec6414007369b292ee334ef23171d0232ef709db2 rfkill.initd
+"