app-emulation/grub-xen-host: add support for sys-boot/grub[-multislot]

Package-Manager: portage-2.3.0_p16

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
index 292c3380101d3841eda57226d146c0ba961b4422..6ada0a84dc4246e43b8c1c9e05663da24e3b68b4 100644 (file)
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -60,12 +60,22 @@ src_compile() {
 
        tar cf memdisk.tar grub.cfg || die "failed to tar"
 
-       grub2-mkimage -O x86_64-xen \
-               -c grub-bootstrap.cfg \
-               -m memdisk.tar \
-               -o grub-x86_64-xen.bin \
-               /usr/lib/grub/x86_64-xen/*.mod \
-               || die "failed to grub-mkimage"
+       local grub_mkimage=grub-mkimage
+       if type grub2-mkimage &> /dev/null; then
+               grub_mkimage=grub2-mkimage
+       fi
+
+       local args=(
+               "${grub_mkimage}"
+               -O x86_64-xen
+               -c grub-bootstrap.cfg
+               -m memdisk.tar
+               -o grub-x86_64-xen.bin
+               /usr/lib/grub/x86_64-xen/*.mod
+       )
+
+       echo "${args[@]}"
+       "${args[@]}" || die "failed to grub-mkimage"
 }
 
 src_install() {