New commits:
commit aee72879429d71e53ac5fbced31d1c3ce5be618b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: Missing newline in HISTORY
commit db2679ab86dfc7803e3a2b03bb8af4614868088a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
grub2: Moved mkfont query to depends
Optionally depends on freetype2 for grub-mkfont
checking for freetype-config... no
./configure: line 8721: freetype-config: command not found
./configure: line 8722: freetype-config: command not found
configure: error: grub-mkfont was explicitly requested but can't be
compiled
commit b9f1a2ab600d63150b9c0d0996c2238a2fb3f465
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xen-tools: xproto and xorg-libs are not required at compile-time
dev86 is requires (and bin86, the other LD86, is not sufficient)
diff --git a/disk/grub2/CONFIGURE b/disk/grub2/CONFIGURE
index 103a2e6..3a4c810 100755
--- a/disk/grub2/CONFIGURE
+++ b/disk/grub2/CONFIGURE
@@ -1,3 +1,8 @@
+#
+# mkfont moved to an optional dependency
+#
+list_remove GRUB2_OPTS '--enable-grub-mkfont' &&
+
config_query_option GRUB2_OPTS 'build and install the grub-emu debugging
utility?' n \
'--enable-grub-emu' \
'--disable-grub-emu' &&
@@ -10,9 +15,6 @@ config_query_option GRUB2_OPTS 'build and install the
grub-fstest debugging util
config_query_option GRUB2_OPTS 'build and install the grub-pe2elf conversion
utility?' y \
'--enable-grub-pe2elf' \
'--disable-grub-pe2elf' &&
-config_query_option GRUB2_OPTS 'build and install the grub-mkfont utility?'
y \
- '--enable-grub-mkfont' \
- '--disable-grub-mkfont' &&
config_query_option GRUB2_OPTS 'build and install the efiemu runtimes?' y \
'--enable-efiemu' \
'--disable-efiemu'
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 86d9985..d48d40c 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -2,8 +2,14 @@ depends automake &&
depends gnupg &&
depends smgl-fhs &&
depends lzo &&
+
if [[ "${GRUB2_SVN}" = 'y' ]]; then
depends autoconf &&
depends subversion &&
depends ruby
-fi
+fi &&
+
+optional_depends freetype2 \
+ '--enable-grub-mkfont' \
+ '--disable-grub-mkfont' \
+ 'for grub-mkfont utility'
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index d6c6546..eb25306 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -3,6 +3,8 @@
* PREPARE: SVN no longer required for x86_64, no longer default
* grub-default: Add GRUB_DEFAULT, GRUB_TIMEOUT, and
GRUB_HIDDEN_TIMEOUT
Add GRUB_GFXMODE, but it doesn't seem to change the menu generation
+ * CONFIGURE: Moved mkfont query to depends
+ * Optionally depends on freetype2 for grub-mkfont