Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (04d1f5e1a84d0d9647ee707511a3e5f2a2619147)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (04d1f5e1a84d0d9647ee707511a3e5f2a2619147)
  • Date: Tue, 10 Jan 2012 07:27:39 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/grub2/BUILD | 3 ++-
disk/grub2/DETAILS | 4 ++--
disk/grub2/HISTORY | 7 +++++++
disk/grub2/PRE_BUILD | 2 ++
disk/grub2/configs | 1 +
disk/grub2/volatiles | 1 +
6 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 04d1f5e1a84d0d9647ee707511a3e5f2a2619147
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

grub2: => 1.99

diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD
index 590633f..9381c04 100755
--- a/disk/grub2/BUILD
+++ b/disk/grub2/BUILD
@@ -1,3 +1,4 @@
OPTS="${OPTS} ${GRUB2_OPTS} -disable-werror" &&
-make_single &&
+CFLAGS=${CFLAGS/-m64/} &&
+echo $CFLAGS &&
default_build
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index a29e9bc..83c13e8 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -11,10 +11,10 @@
# SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
# SOURCE_IGNORE=volatile
#else
- VERSION=1.98
+ VERSION=1.99
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
- SOURCE_URL[0]=http://alpha.gnu.org/gnu/grub/$SOURCE
+ SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/grub-${VERSION}
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 2bbdb30..0720a0e 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,10 @@
+2012-01-08 Treeve Jelbert ,treeve AT sourcemage.org.
+ * DETAILS: version 1.99
+ use GNU_URL
+ * BUILD: remove make_single
+ strip -m64 from CFLAGS
+ * config, volatiles: add /etc/grub.d
+
2011-09-20 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: remove obsolete emu and pe2elf options from GRUB_OPTS
(fixes bug #212)

diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 0938ade..457375e 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -2,4 +2,6 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
+else
+ rm -rf autom4te.cache
fi
diff --git a/disk/grub2/configs b/disk/grub2/configs
index 7af7e16..559e48c 100755
--- a/disk/grub2/configs
+++ b/disk/grub2/configs
@@ -1,2 +1,3 @@
^/boot/grub/grub.cfg$
^/etc/default/grub$
+^/etc/grub.d/*
diff --git a/disk/grub2/volatiles b/disk/grub2/volatiles
index 7af7e16..559e48c 100755
--- a/disk/grub2/volatiles
+++ b/disk/grub2/volatiles
@@ -1,2 +1,3 @@
^/boot/grub/grub.cfg$
^/etc/default/grub$
+^/etc/grub.d/*



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (04d1f5e1a84d0d9647ee707511a3e5f2a2619147), Treeve Jelbert, 01/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page