Skip to Content.
Sympa Menu

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

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 (d9827e06a5b14d430182755124b3e27d579bf120)
  • Date: Thu, 12 Jan 2012 04:49:06 -0600

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

disk/grub2/BUILD | 1 +
disk/grub2/DEPENDS | 5 +++++
disk/grub2/HISTORY | 6 ++++++
disk/grub2/grub-default | 4 ++--
4 files changed, 14 insertions(+), 2 deletions(-)

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

grub2 - force minimise size of kernel.img

diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD
index e9092c9..564f1c6 100755
--- a/disk/grub2/BUILD
+++ b/disk/grub2/BUILD
@@ -1,4 +1,5 @@
OPTS="${OPTS} ${GRUB2_OPTS} -disable-werror" &&
CFLAGS=${CFLAGS/-m64/} &&
+CFLAGS=${CFLAGS/-O?/-Os} &&
disable_pic force &&
default_build
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 3891283..d21f5d9 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -10,6 +10,11 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
depends RUBY
fi &&

+optional_depends lvm \
+ '--enable-device-mapper' \
+ '--disable-device-mapper' \
+ 'device Mapper/ RAID support' &&
+
optional_depends freetype2 \
'--enable-grub-mkfont' \
'--disable-grub-mkfont' \
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 45ae6ce..8e6c388 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,9 @@
+2012-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: explicity disable device mapper/ LVM support
+ * BUILD: force -Os
+ without this, the kernel image is too big to install on one of my
machines
+ * grub-default: update to latest syntax
+
2012-01-11 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: force disable_pic for all architectures

diff --git a/disk/grub2/grub-default b/disk/grub2/grub-default
index 3683aaa..a1631d0 100644
--- a/disk/grub2/grub-default
+++ b/disk/grub2/grub-default
@@ -7,8 +7,8 @@ GRUB_HIDDEN_TIMEOUT=0
# Graphics mode
GRUB_GFXMODE=640x480
# Add recovery items (single mode)
-GRUB_DISABLE_LINUX_RECOVERY=
+GRUB_DISABLE_RECOVERY=
# Booting using UUID's appears broken
-GRUB_DISABLE_LINUX_UUID=true
+GRUB_DISABLE_UUID=true
# We rule ;)
GRUB_DISTRIBUTOR="SourceMage"



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

Archive powered by MHonArc 2.6.24.

Top of Page