Changeset a1811b6


Ignore:
Timestamp:
Jul 25, 2010, 10:27:20 AM (13 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/2010 10:24:51 AM)
git-committer:
Joe Ciccone <jciccone@…> (07/25/2010 10:27:20 AM)
Message:

Update the grub patches.

Files:
1 added
1 deleted
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    r29b19f9 ra1811b6  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>July 25, 2010</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Updated the grub patches.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
    3847
    3948    <listitem>
  • BOOK/patches.ent

    r29b19f9 ra1811b6  
    217217<!ENTITY grub-ext4-patch-size "9 KB">
    218218
    219 <!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-1.patch">
    220 <!ENTITY grub-fixes-patch-md5 "6f095b98bde1db8d5b1a7ceef96ca351">
    221 <!ENTITY grub-fixes-patch-size "129 KB">
    222 
    223 <!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-1.patch">
    224 <!ENTITY grub-use_mmap-patch-md5 "d4467ed0b13e87900ffb564879e1f2e4">
    225 <!ENTITY grub-use_mmap-patch-size "2 KB">
     219<!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-2.patch">
     220<!ENTITY grub-fixes-patch-md5 "3f7b50a6274063c1e8a8e57131045f5a">
     221<!ENTITY grub-fixes-patch-size "132 KB">
     222
     223<!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-2.patch">
     224<!ENTITY grub-use_mmap-patch-md5 "700257168164d6df67b5c73ba02cca75">
     225<!ENTITY grub-use_mmap-patch-size "20 KB">
    226226
    227227<!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">
  • patches/grub-0.97-fixes-2.patch

    r29b19f9 ra1811b6  
    850850--- grub-0.97.orig/grub/asmstub.c       2005-02-16 12:45:14.000000000 -0800
    851851+++ grub-0.97/grub/asmstub.c    2006-07-04 00:01:50.000000000 -0700
    852 @@ -42,6 +42,12 @@
    853  #include <sys/time.h>
    854  #include <termios.h>
    855  #include <signal.h>
    856 +#include <sys/mman.h>
    857 +
    858 +#include <limits.h>
    859 +#ifndef PAGESIZE
    860 +#define PAGESIZE 4096
    861 +#endif
    862  
    863  #ifdef __linux__
    864  # include <sys/ioctl.h>                /* ioctl */
    865852@@ -55,6 +61,10 @@
    866853 # endif /* ! BLKFLSBUF */
     
    874861    libc name clashes. */
    875862 #define WITHOUT_LIBC_STUBS 1
    876 @@ -144,6 +154,22 @@
    877    assert (grub_scratch_mem == 0);
    878    scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
    879    assert (scratch);
    880 +
    881 +  {
    882 +    char *p;
    883 +    int ret;
    884 +
    885 +    /* Align to a multiple of PAGESIZE, assumed to be a power of two. */
    886 +    p = (char *) (((long) scratch) & ~(PAGESIZE - 1));
    887 +
    888 +    /* The simulated stack needs to be executable, since GCC uses stack
    889 +     * trampolines to implement nested functions.
    890 +     */
    891 +    ret = mprotect (p, 0x100000 + EXTENDED_MEMSIZE + 15,
    892 +                   PROT_READ | PROT_WRITE | PROT_EXEC);
    893 +    assert (ret == 0);
    894 +  }
    895 +
    896    grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
    897  
    898    /* FIXME: simulate the memory holes using mprot, if available. */
    899863@@ -777,7 +803,39 @@
    900864 
Note: See TracChangeset for help on using the changeset viewer.