summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorponce <matteo.bernardini@gmail.com>2012-06-30 11:16:49 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-08-21 08:55:30 -0500
commit7283ec7d0bd7336f56260ba5e0d7d408d37b5f67 (patch)
tree1f82e4342c270e407de5a09e5eedb2864a3c9538
parent0cfa1744b880b158c07dbc767514311ea2633c88 (diff)
downloadslackbuilds-7283ec7d0bd7336f56260ba5e0d7d408d37b5f67.tar.gz
system/grub2: Updated for version 2.00.
This commit also adds a patch for initrd.gz autodetection and basic instructions to the README. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--system/grub2/README19
-rw-r--r--system/grub2/grub2.SlackBuild5
-rw-r--r--system/grub2/grub2.info6
-rw-r--r--system/grub2/initrd_naming.patch13
4 files changed, 29 insertions, 14 deletions
diff --git a/system/grub2/README b/system/grub2/README
index 0da909c050..f6c5bc832c 100644
--- a/system/grub2/README
+++ b/system/grub2/README
@@ -1,13 +1,12 @@
-GRUB2 (the GRand Unified Bootloader)
+GRUB2 (the GRand Unified Bootloader) is a multiboot boot loader.
-GNU GRUB is a multiboot boot loader.
+If you want to set the size of gfxterm font, then specify
+FONT_SIZE=size in the build options. The default size is 19.
-If you want to set the size of gfxterm font,
-then specify FONT_SIZE=size in the build options.
-The default size is 19.
-
-If you want to install grub2 on GPT,
-you need to put a BIOS boot partition on GPT.
-
-This requires os-prober, gnu-unifont, and help2man.
+If you want to install grub2 on GPT, you need to put a BIOS boot
+partition on GPT. To install it in the MBR replacing lilo, generate
+a config file in /boot/grub and launch grub-install, e.g.
+mkdir /boot/grub
+grub-mkconfig -o /boot/grub/grub.cfg
+grub-install /dev/sda
diff --git a/system/grub2/grub2.SlackBuild b/system/grub2/grub2.SlackBuild
index 44e43ac002..13819cac23 100644
--- a/system/grub2/grub2.SlackBuild
+++ b/system/grub2/grub2.SlackBuild
@@ -5,7 +5,7 @@
# Written by crocket (crockabiscuit@gmail.com)
PRGNAM=grub2
-VERSION=${VERSION:-1.99}
+VERSION=${VERSION:-2.00}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -57,6 +57,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# We use initrd.gz here, so look for it too
+patch -p1 < $CWD/initrd_naming.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/grub2/grub2.info b/system/grub2/grub2.info
index d7bcb2db47..2df533dded 100644
--- a/system/grub2/grub2.info
+++ b/system/grub2/grub2.info
@@ -1,8 +1,8 @@
PRGNAM="grub2"
-VERSION="1.99"
+VERSION="2.00"
HOMEPAGE="http://www.gnu.org/software/grub/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz"
-MD5SUM="27e360b951f006c464299d06bbd63442"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/grub/grub-2.00.tar.xz"
+MD5SUM="a1043102fbc7bcedbf53e7ee3d17ab91"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gnu-unifont help2man os-prober"
diff --git a/system/grub2/initrd_naming.patch b/system/grub2/initrd_naming.patch
new file mode 100644
index 0000000000..6b62778b07
--- /dev/null
+++ b/system/grub2/initrd_naming.patch
@@ -0,0 +1,13 @@
+diff -Naur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
+--- grub-2.00.orig/util/grub.d/10_linux.in 2012-04-18 23:24:38.000000000 +0200
++++ grub-2.00/util/grub.d/10_linux.in 2012-06-30 07:53:03.765625589 +0200
+@@ -198,7 +198,8 @@
+ "initramfs-genkernel-${version}" \
+ "initramfs-genkernel-${alt_version}" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
++ "initrd.gz"; do
+ if test -e "${dirname}/${i}" ; then
+ initrd="$i"
+ break