From 4e25c951c7f7dc0374aa3c4d7560915afa9ed8b4 Mon Sep 17 00:00:00 2001 From: triaxx Date: Sun, 16 Sep 2018 13:18:54 +0000 Subject: grub2: add support for grub-mount Also add some cosmetics. --- sysutils/grub2/PLIST | 4 +++- sysutils/grub2/options.mk | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'sysutils') diff --git a/sysutils/grub2/PLIST b/sysutils/grub2/PLIST index 198ca2b103a..6b272b209c9 100644 --- a/sysutils/grub2/PLIST +++ b/sysutils/grub2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2018/05/23 07:56:53 triaxx Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/09/16 13:18:54 triaxx Exp $ bin/grub-editenv bin/grub-file bin/grub-fstest @@ -13,6 +13,7 @@ bin/grub-mkpasswd-pbkdf2 bin/grub-mkrelpath bin/grub-mkrescue bin/grub-mkstandalone +${PLIST.fuse}bin/grub-mount bin/grub-render-label bin/grub-script-check bin/grub-syslinux2cfg @@ -587,6 +588,7 @@ man/man1/grub-mkpasswd-pbkdf2.1 man/man1/grub-mkrelpath.1 man/man1/grub-mkrescue.1 man/man1/grub-mkstandalone.1 +${PLIST.fuse}man/man1/grub-mount.1 man/man1/grub-render-label.1 man/man1/grub-script-check.1 man/man1/grub-syslinux2cfg.1 diff --git a/sysutils/grub2/options.mk b/sysutils/grub2/options.mk index 5761841de90..633ea64c032 100644 --- a/sysutils/grub2/options.mk +++ b/sysutils/grub2/options.mk @@ -1,19 +1,20 @@ -# $NetBSD: options.mk,v 1.2 2014/09/05 12:14:24 gsutre Exp $ +# $NetBSD: options.mk,v 1.3 2018/09/16 13:18:54 triaxx Exp $ # # # Description of options (taken from configure --help): # debug include memory manager debugging # freetype build and install the `grub-mkfont' utility +# fuse build and install the `grub-mount' utility # PKG_OPTIONS_VAR= PKG_OPTIONS.grub2 -PKG_SUPPORTED_OPTIONS= debug freetype +PKG_SUPPORTED_OPTIONS= debug freetype fuse PKG_SUGGESTED_OPTIONS= freetype .include "../../mk/bsd.options.mk" -PLIST_VARS+= freetype +PLIST_VARS+= freetype fuse UNIFONT= unifont-5.1.20080820.pcf SITES.${UNIFONT}.gz= http://unifoundry.com/ @@ -21,12 +22,18 @@ SITES.${UNIFONT}.gz= http://unifoundry.com/ post-extract: do-move-unifont .PHONY: do-move-unifont +### +### debug support +### .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-mm-debug .else CONFIGURE_ARGS+= --disable-mm-debug .endif +### +### FreeType support +### .if !empty(PKG_OPTIONS:Mfreetype) CONFIGURE_ARGS+= --enable-grub-mkfont PLIST.freetype= yes @@ -39,3 +46,14 @@ do-move-unifont: CONFIGURE_ARGS+= --disable-grub-mkfont do-move-unifont: .endif + +### +### FUSE support +### +.if !empty(PKG_OPTIONS:Mfuse) +CONFIGURE_ARGS+= --enable-grub-mount +PLIST.fuse= yes +.include "../../filesystems/fuse/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-grub-mount +.endif -- cgit v1.2.3