main/grub: build grub-mount, move utilities to subpackages

grub-mkfont requires freetype, grub-mount requires fuse. both are non-essential. lzma could also be split, but grub-{install,mk{image,standalone,rescue}} require it, and usually people want at least one of those.

main/grub/APKBUILD

@@ -2,14 +2,14 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=grub
 pkgver=2.04
-pkgrel=1
+pkgrel=2
 pkgdesc="Bootloader with support for Linux, Multiboot and more"
 url="https://www.gnu.org/software/grub/"
 arch="all !s390x"
 license="GPL-3.0-or-later"
 depends="mkinitfs"
 triggers="grub.trigger=/boot"
-makedepends="bison flex linux-headers xz-dev lvm2-dev
+makedepends="bison flex linux-headers xz-dev lvm2-dev fuse-dev
 	automake autoconf libtool python3 freetype-dev unifont gettext-dev"
 install="$pkgname.post-upgrade"
 # strip handled by grub Makefiles, abuild strip breaks xen pv-grub
@@ -17,6 +17,8 @@ options="!check !strip"  # Cannot test boot loader.
 subpackages="
 	$pkgname-dev
 	$pkgname-doc
+	$pkgname-mkfont
+	$pkgname-mount
 	$pkgname-bash-completion:bashcomp:noarch
 	"
 
@@ -207,6 +209,20 @@ emu() {
 	mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/
 }
 
+mkfont() {
+	pkgdesc="$pkgdesc (mkfont utility)"
+	depends="$pkgname"
+	mkdir -p $subpkgdir/usr/bin
+	mv $pkgdir/usr/bin/grub-mkfont $subpkgdir/usr/bin/
+}
+
+mount() {
+	pkgdesc="$pkgdesc (mount utility)"
+	depends="$pkgname"
+	mkdir -p $subpkgdir/usr/bin
+	mv $pkgdir/usr/bin/grub-mount $subpkgdir/usr/bin/
+}
+
 bashcomp() {
 	depends=""
 	pkgdesc="Bash completions for $pkgname"