Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c83cc036e8c28eec957f991c1dcf8f9027267fe6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c83cc036e8c28eec957f991c1dcf8f9027267fe6)
  • Date: Tue, 9 Mar 2010 00:37:22 -0600

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

disk/grub2/CONFIGURE | 9 +++------
disk/grub2/DEPENDS | 6 +++++-
disk/grub2/DETAILS | 30 +++++++++++++++---------------
disk/grub2/HISTORY | 10 ++++++++++
disk/grub2/PREPARE | 10 +++++-----
gnu.gpg |binary
6 files changed, 38 insertions(+), 27 deletions(-)

New commits:
commit 1ef82595ba2c50b969cc9b2b77e0968b72c56c8d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

grub2: => 1.98 , Commented out SVN options, as bazaar is now used and is
not yet supported by summon

commit 15edce38e265a2cbd421f7b7c029ba68146e5717
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

gnu.gpg: added key E82E4209 Vladimir 'phcoder' Serbinenko
<phcoder AT gmail.com> for grub2 spell

diff --git a/disk/grub2/CONFIGURE b/disk/grub2/CONFIGURE
index 3a4c810..f565465 100755
--- a/disk/grub2/CONFIGURE
+++ b/disk/grub2/CONFIGURE
@@ -3,18 +3,15 @@
#
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' &&
+config_query_option GRUB2_OPTS 'include memory manger debugging?' n \
+ '--enable-mm-debug' \
+ '--disable-mm-debug' &&
config_query_option GRUB2_OPTS 'build and install the grub-emu-usb debugging
utility?' n \
'--enable-grub-emu-usb' \
'--disable-grub-emu-usb' &&
config_query_option GRUB2_OPTS 'build and install the grub-fstest debugging
utility?' n \
'--enable-grub-fstest' \
'--disable-grub-fstest' &&
-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 efiemu runtimes?' y \
'--enable-efiemu' \
'--disable-efiemu'
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 21058de..715fc91 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -12,4 +12,8 @@ fi &&
optional_depends freetype2 \
'--enable-grub-mkfont' \
'--disable-grub-mkfont' \
- 'for grub-mkfont utility'
+ 'for grub-mkfont utility' &&
+optional_depends sdl \
+ '--enable-grub-emu-sdl' \
+ '--disable-grub-emu-sdl' \
+ 'To build and install the grub-emu debugging utility with
SDL support'
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 27577af..c0dd143 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -1,25 +1,25 @@
SPELL=grub2
-if [[ "${GRUB2_SVN}" = 'y' ]]; then
-if [[ "${GRUB2_SVN_AUTOUPDATE}" = 'y' ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
- SOURCE_IGNORE=volatile
-else
- VERSION=1.97.1
+#if [[ "${GRUB2_SVN}" = 'y' ]]; then
+#if [[ "${GRUB2_SVN_AUTOUPDATE}" = 'y' ]]; then
+# VERSION=$(date +%Y%m%d)
+#else
+# VERSION=svn
+#fi
+# SOURCE=$SPELL-svn.tar.bz2
+# FORCE_DOWNLOAD=on
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+# SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
+# SOURCE_IGNORE=volatile
+#else
+ VERSION=1.98
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
SOURCE_URL[0]=ftp://alpha.gnu.org/gnu/grub/$SOURCE
- SOURCE2_URL[2]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/grub-${VERSION}
SOURCE_GPG=gnu.gpg:${SOURCE2}:UPSTREAM_KEY
-fi
+#fi
WEB_SITE=http://www.gnu.org/software/grub/
ENTERED=20090808
LICENSE[0]=GPL
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index b9099e6..7a2df12 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,13 @@
+2010-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 1.98
+ Commented out SCM version, as bazaar is now used and is not yet
supported by summon
+ * CONFIGURE: removed "--enable-grub-pe2elf" option, no longer in
configure
+ changed blabla
+ removed "--enable-grub-emu", no longer seems to be used
+ added "--enable-mm-debug" to include memory manager debugging
+ * PREPARE: Commented out SVN query
+ * DEPENDS: addded optional dependency on SDL for grub-emu debugging
with sdl support
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider

diff --git a/disk/grub2/PREPARE b/disk/grub2/PREPARE
index e36fea1..1440197 100755
--- a/disk/grub2/PREPARE
+++ b/disk/grub2/PREPARE
@@ -1,5 +1,5 @@
-config_query GRUB2_SVN "Build SCM version?" n &&
-if [ "$GRUB2_SVN" == "y" ]; then
- config_query GRUB2_SVN_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+#config_query GRUB2_SVN "Build SCM version?" n &&
+#if [ "$GRUB2_SVN" == "y" ]; then
+# config_query GRUB2_SVN_AUTOUPDATE \
+# "Automatically update on every system update?" n
+#fi
diff --git a/gnu.gpg b/gnu.gpg
index 5301866..2da49f3 100644
Binary files a/gnu.gpg and b/gnu.gpg differ




Archive powered by MHonArc 2.6.24.

Top of Page