aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDermot Bradley <dermot_bradley@yahoo.com>2022-06-20 18:04:06 +0100
committeralice <alice@ayaya.dev>2022-06-22 17:48:47 +0000
commit4d1fa69ac0443a7d3ecf5312845b76535e0342b3 (patch)
treef3785e1ab79a503b2979e1a921836fcf49c54fa7
parent4b6007f3f4517ed388600a69b1aa3be7b8e992ee (diff)
downloadaports-4d1fa69ac0443a7d3ecf5312845b76535e0342b3.tar.gz
aports-4d1fa69ac0443a7d3ecf5312845b76535e0342b3.tar.bz2
aports-4d1fa69ac0443a7d3ecf5312845b76535e0342b3.tar.xz
main/util-linux: split mount and umount into subpackages
Busybox mount does not support some functionality such as bind mounts so split mount and umount into subpackages so that other packages that only require mount and/or umount do not need to install util-linux-misc. Add util-linux-misc.post-upgrade script to warn of the move.
-rw-r--r--main/util-linux/APKBUILD5
-rw-r--r--main/util-linux/util-linux-misc.post-upgrade14
2 files changed, 18 insertions, 1 deletions
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index f3be8bf4aa..4c1c73d67f 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-linux
pkgver=2.38
-pkgrel=1
+pkgrel=2
pkgdesc="Random collection of Linux utilities"
url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all"
@@ -42,9 +42,11 @@ subpackages="
losetup:_mv_bin
lsblk:_mv_bin
mcookie:_mv_bin
+ mount:_mv_bin
partx:_mv_bin
setpriv:_mv_bin
sfdisk:_mv_bin
+ umount:_mv_bin
uuidgen:_mv_bin
wipefs:_mv_bin
"
@@ -253,6 +255,7 @@ _login_doc() {
misc() {
pkgdesc="Misc binaries for $pkgname"
depends=
+ install="$pkgname-misc.post-upgrade"
install_if="$pkgname=$pkgver-r$pkgrel"
local dir; for dir in usr/bin usr/sbin bin sbin; do
diff --git a/main/util-linux/util-linux-misc.post-upgrade b/main/util-linux/util-linux-misc.post-upgrade
new file mode 100644
index 0000000000..aa911c41e0
--- /dev/null
+++ b/main/util-linux/util-linux-misc.post-upgrade
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '2.38-r2')" = '<' ]; then
+ cat >&2 <<-EOF
+ *
+ * The mount and umount programs have been moved from util-linux-misc to
+ * individual subpackages. If you use them, run: "apk add mount umount".
+ *
+ EOF
+fi
+
+exit 0