Changeset a1811b6

Timestamp:

Jul 25, 2010, 10:27:20 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

658135a

Parents:

29b19f9

git-author:

Joe Ciccone <jciccone@…> (07/25/10 10:24:51)

git-committer:

Joe Ciccone <jciccone@…> (07/25/10 10:27:20)

Message:

Update the grub patches.

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/grub-0.97-fixes-2.patch (moved) (moved from patches/grub-0.97-fixes-1.patch) (2 diffs)
• patches/grub-0.97-use_mmap-1.patch (deleted)
• patches/grub-0.97-use_mmap-2.patch (added)

BOOK/introduction/common/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>July 25, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated the grub patches.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

BOOK/patches.ent

@@ -217 +217 @@
 <!ENTITY grub-ext4-patch-size "9 KB">
 
-<!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-1.patch">
-<!ENTITY grub-fixes-patch-md5 "6f095b98bde1db8d5b1a7ceef96ca351">
-<!ENTITY grub-fixes-patch-size "129 KB">
-
-<!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-1.patch">
-<!ENTITY grub-use_mmap-patch-md5 "d4467ed0b13e87900ffb564879e1f2e4">
-<!ENTITY grub-use_mmap-patch-size "2 KB">
+<!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-2.patch">
+<!ENTITY grub-fixes-patch-md5 "3f7b50a6274063c1e8a8e57131045f5a">
+<!ENTITY grub-fixes-patch-size "132 KB">
+
+<!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-2.patch">
+<!ENTITY grub-use_mmap-patch-md5 "700257168164d6df67b5c73ba02cca75">
+<!ENTITY grub-use_mmap-patch-size "20 KB">
 
 <!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">

patches/grub-0.97-fixes-2.patch

@@ -850 +850 @@
 --- grub-0.97.orig/grub/asmstub.c       2005-02-16 12:45:14.000000000 -0800
 +++ grub-0.97/grub/asmstub.c    2006-07-04 00:01:50.000000000 -0700
-@@ -42,6 +42,12 @@
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+#include <sys/mman.h>
-+
-+#include <limits.h>
-+#ifndef PAGESIZE
-+#define PAGESIZE 4096
-+#endif
- 
- #ifdef __linux__
- # include <sys/ioctl.h>                /* ioctl */
 @@ -55,6 +61,10 @@
  # endif /* ! BLKFLSBUF */
@@ -874 +861 @@
     libc name clashes. */
  #define WITHOUT_LIBC_STUBS 1
-@@ -144,6 +154,22 @@
-   assert (grub_scratch_mem == 0);
-   scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
-   assert (scratch);
-+
-+  {
-+    char *p;
-+    int ret;
-+
-+    /* Align to a multiple of PAGESIZE, assumed to be a power of two. */
-+    p = (char *) (((long) scratch) & ~(PAGESIZE - 1));
-+
-+    /* The simulated stack needs to be executable, since GCC uses stack
-+     * trampolines to implement nested functions.
-+     */
-+    ret = mprotect (p, 0x100000 + EXTENDED_MEMSIZE + 15,
-+                   PROT_READ | PROT_WRITE | PROT_EXEC);
-+    assert (ret == 0);
-+  }
-+
-   grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
- 
-   /* FIXME: simulate the memory holes using mprot, if available. */
 @@ -777,7 +803,39 @@