Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (aee72879429d71e53ac5fbced31d1c3ce5be618b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (aee72879429d71e53ac5fbced31d1c3ce5be618b)
  • Date: Sun, 15 Nov 2009 15:41:09 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/grub2/CONFIGURE | 8 +++++---
disk/grub2/DEPENDS | 8 +++++++-
disk/grub2/HISTORY | 3 +++
utils/xen-tools/DEPENDS | 9 +--------
utils/xen-tools/HISTORY | 4 ++++
5 files changed, 20 insertions(+), 12 deletions(-)

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

2009-08-09 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,, DETAILS, FINAL, INSTALL, PREPARE, PRE_BUILD, PROVIDES,
@@ -12,3 +14,4 @@

2009-08-15 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, CONFIGURE: added
+
diff --git a/utils/xen-tools/DEPENDS b/utils/xen-tools/DEPENDS
index 54b46b9..95bba31 100755
--- a/utils/xen-tools/DEPENDS
+++ b/utils/xen-tools/DEPENDS
@@ -2,11 +2,4 @@ depends bridge-utils &&
depends python &&
depends python-pam &&
depends iproute2 &&
-optional_depends dev86 '' '' 'for building firmware' &&
-# this would be really nice if it were fixed
-if spell_installed xproto
-then
- depends xproto
-else
- depends xorg-libs
-fi
+depends dev86
diff --git a/utils/xen-tools/HISTORY b/utils/xen-tools/HISTORY
index f99774a..c75b8fc 100644
--- a/utils/xen-tools/HISTORY
+++ b/utils/xen-tools/HISTORY
@@ -1,3 +1,7 @@
+2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: xproto and xorg-libs are not required at compile-time
+ dev86 is requires (and bin86, the other LD86, is not sufficient)
+
2009-09-12 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.1




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (aee72879429d71e53ac5fbced31d1c3ce5be618b), Eric Sandall, 11/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page