diff --git a/srcpkgs/grub-utils b/srcpkgs/grub-utils deleted file mode 120000 index 2c8276e741a..00000000000 --- a/srcpkgs/grub-utils +++ /dev/null @@ -1 +0,0 @@ -grub \ No newline at end of file diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index eb69690769b..837d936db57 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.02~rc2 -revision=3 +revision=4 hostmakedepends="flex" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" @@ -14,10 +14,12 @@ homepage="http://www.gnu.org/software/grub/" distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz" checksum=053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 +replaces="grub-utils>=0" + only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes -subpackages="grub-utils grub-i386-efi" +subpackages="grub-i386-efi" case "$XBPS_TARGET_MACHINE" in x86_64*) subpackages+=" grub-x86_64-efi"; _GRUBX64=1;; esac @@ -127,16 +129,6 @@ do_install() { rm ${DESTDIR}/usr/bin/grub-sparc64-setup } -grub-utils_package() { - short_desc+=" - additional utilities" - depends="grub>=${version}" - pkg_install() { - vmove usr/bin/grub-menulst2cfg - vmove usr/bin/grub-fstest - vmove usr/bin/grub-mkfont - vmove usr/bin/grub-mount - } -} grub-x86_64-efi_package() { noarch=yes depends="grub>=$version dosfstools efibootmgr"