Author: robert
Date: 2007-03-24 16:11:29 -0600 (Sat, 24 Mar 2007)
New Revision: 982

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter04/packages.xml
   trunk/BOOK/chapter04/patches.xml
   trunk/BOOK/chapter05/linux-headers.xml
   trunk/BOOK/chapter06/linux-headers.xml
   trunk/BOOK/chapter07/kernel.xml
   trunk/BOOK/general.ent
   trunk/BOOK/packages.ent
   trunk/BOOK/patches.ent
Log:
Bump to linux-2.6.20.4

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml  2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/chapter01/changelog.xml  2007-03-24 22:11:29 UTC (rev 982)
@@ -65,8 +65,7 @@
 <listitem><para>lfs-bootscripts-3.2.1</para></listitem>
 <listitem><para>libpng-1.2.8</para></listitem>
 <listitem><para>libtool-1.5.22</para></listitem>
-<listitem><para>linux-2.6.17.11</para></listitem>
-<listitem><para>linux-headers-2.6.17.11-08232006</para></listitem>
+<listitem><para>linux-2.6.20.4</para></listitem>
 <listitem><para>m4-1.4.8</para></listitem>
 <listitem><para>make-3.81</para></listitem>
 <listitem><para>man-1.6b</para></listitem>
@@ -112,6 +111,8 @@
 </listitem>
 -->
 
+<listitem><para>March 24rth, 2007 [Robert]: Bump to 
linux-2.6.20.4.</para></listitem>
+
 <listitem><para>March 23rd, 2007 [Robert]: Fix chap5 embryo to symlink the
 binutils dirs.</para></listitem>
 

Modified: trunk/BOOK/chapter04/packages.xml
===================================================================
--- trunk/BOOK/chapter04/packages.xml   2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/chapter04/packages.xml   2007-03-24 22:11:29 UTC (rev 982)
@@ -179,7 +179,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC core (&gcc-version;) - 16,688 KB:</term>
+      <term>GCC core (&gcc-version;) - 17,093 KB:</term>
       <listitem>
         <para>Home page: <ulink url="http://gcc.gnu.org/"/></para>
         <para>Download: <ulink
@@ -199,7 +199,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>GCC testsuite (&gcc-version;) - 3,432 KB:</term>
+      <term>GCC testsuite (&gcc-version;) - 3,523 KB:</term>
       <listitem>
         <para>Home page: <ulink url="http://gcc.gnu.org/"/></para>
         <para>Download: <ulink
@@ -357,7 +357,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-version;) - 40,924 KB:</term>
+      <term>Linux (&linux-version;) - 42,401 KB:</term>
       <listitem>
         <para>Home page: <ulink url="http://www.kernel.org/"/></para>
         <para>Download: <ulink

Modified: trunk/BOOK/chapter04/patches.xml
===================================================================
--- trunk/BOOK/chapter04/patches.xml    2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/chapter04/patches.xml    2007-03-24 22:11:29 UTC (rev 982)
@@ -213,7 +213,7 @@
     <varlistentry>
       <term>GR Security Patch - &grsecurity-patch-size;:</term>
       <listitem>
-        <para>Download: <ulink 
url="http://www.grsecurity.net/&grsecurity-patch;"/></para>
+        <para>Download: <ulink 
url="http://www.grsecurity.net/~spender/&grsecurity-patch;"/></para>
         <para>MD5 sum: <literal>&grsecurity-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -243,22 +243,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux Unifdef Patch - &linux-unifdef-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink 
url="&patches-root;&linux-unifdef-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-unifdef-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux Unistd x86 PIC Patch - 
&linux-unistd_x86_PIC-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink 
url="&patches-root;&linux-unistd_x86_PIC-patch;"/></para>
-        <para>MD5 sum: 
<literal>&linux-unistd_x86_PIC-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Mktemp Tempfile Patch - &mktemp-add_tempfile-patch-size;:</term>
       <listitem>
         <para>Download: <ulink 
url="&patches-root;&mktemp-add_tempfile-patch;"/></para>

Modified: trunk/BOOK/chapter05/linux-headers.xml
===================================================================
--- trunk/BOOK/chapter05/linux-headers.xml      2007-03-24 05:32:40 UTC (rev 
981)
+++ trunk/BOOK/chapter05/linux-headers.xml      2007-03-24 22:11:29 UTC (rev 
982)
@@ -38,28 +38,16 @@
     <title>Installation of Linux-Headers</title>
 
     <para>The Linux kernel needs to expose an Application Programming Interface
-    (API) for the system's C library (Glibc in LFS) to utilize.  This is done
+    (API) for the system's C library to utilize.  This is done
     by way of sanitizing various C header files that are shipped in the Linux
     kernel source tarball.</para>
 
-    <para>Apply the following patch to provide <command>unifdef</command>, 
which
-    the installation of the kernel headers requires:</para>
-
-<screen><userinput>patch -Np1 -i ../&linux-unifdef-patch;</userinput></screen>
-
-    <para>This patch adds PIC assembly code to asm-i386/unistd.h. This patch 
was
-    reported at <ulink 
url="http://bugzilla.kernel.org/show_bug.cgi?id=7302"/>:</para>
-
-<screen><userinput>patch -Np1 -i 
../&linux-unistd_x86_PIC-patch;</userinput></screen>
-
     <para>Install the header files:</para>
 
-<screen><userinput>mkdir /tools/tmp
-make mrproper
+<screen><userinput>make mrproper
+make headers_install
 make headers_check
-make INSTALL_HDR_PATH=/tools/tmp headers_install
-cp -R /tools/tmp/include/* /tools/include
-rm -r /tools/tmp</userinput></screen>
+cp -av usr/include/* /tools/include</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/chapter06/linux-headers.xml
===================================================================
--- trunk/BOOK/chapter06/linux-headers.xml      2007-03-24 05:32:40 UTC (rev 
981)
+++ trunk/BOOK/chapter06/linux-headers.xml      2007-03-24 22:11:29 UTC (rev 
982)
@@ -35,34 +35,22 @@
     <title>Installation of Linux-Headers</title>
 
     <para>The Linux kernel needs to expose an Application Programming Interface
-    (API) for the system's C library (Glibc in LFS) to utilize.  This is done
+    (API) for the system's C library to utilize.  This is done
     by way of sanitizing various C header files that are shipped in the Linux
     kernel source tarball.</para>
 
-    <para>Apply the following patch to provide <command>unifdef</command>, 
which
-    the installation of the kernel headers requires:</para>
+    <para>Apply a sed subsitution to suppress the installation of header
+    files in /usr/include/scsi. The versions provided by Glibc will be
+    used instead:</para>
 
-<screen><userinput>patch -Np1 -i ../&linux-unifdef-patch;</userinput></screen>
+<screen><userinput>sed '/scsi/d' -i.orig include/Kbuild</userinput></screen>
 
-    <para>This patch replaces non-PIC code with PIC code:</para>
-
-<screen><userinput>patch -Np1 -i 
../&linux-unistd_x86_PIC-patch;</userinput></screen>
-
     <para>Install the header files:</para>
 
 <screen><userinput>make mrproper
 make headers_check
 make INSTALL_HDR_PATH=/usr headers_install</userinput></screen>
 
-    <para>Ensure that all the headers are owned by root:</para>
-
-<screen><userinput>chown -vR root:root 
/usr/include/{asm,linux}</userinput></screen>
-
-    <para>Make sure the users can read the headers:</para>
-
-<screen><userinput>find /usr/include/{asm,linux} -type d -exec chmod -v 755 {} 
\;
-find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} 
\;</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-linux-headers" role="content">

Modified: trunk/BOOK/chapter07/kernel.xml
===================================================================
--- trunk/BOOK/chapter07/kernel.xml     2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/chapter07/kernel.xml     2007-03-24 22:11:29 UTC (rev 982)
@@ -61,7 +61,7 @@
 <para>Then change to the Linux source directory and apply the patches:</para>
 
 <screen><userinput>cd /usr/src/linux-&linux-version;
-zcat ../&grsecurity-patch; | patch -Np1</userinput></screen>
+patch -Np1 ../&grsecurity-patch;</userinput></screen>
 
 <tip><para>Look at <command>info libc</command>, node <quote>System
 Configuration</quote>, <quote>General Limits</quote>. There are

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/general.ent      2007-03-24 22:11:29 UTC (rev 982)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20070323">
-<!ENTITY releasedate "March 23rd, 2007">
+<!ENTITY version "SVN-20070324">
+<!ENTITY releasedate "March 24rth, 2007">
 <!ENTITY milestone "1.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/";>

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent     2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/packages.ent     2007-03-24 22:11:29 UTC (rev 982)
@@ -98,8 +98,8 @@
 <!ENTITY libtool-md5 "8e0ac9797b62ba4dcc8a2fb7936412b0">
 
 <!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-version "2.6.18">
-<!ENTITY linux-md5 "296a6d150d260144639c3664d127d174">
+<!ENTITY linux-version "2.6.20.4">
+<!ENTITY linux-md5 "ad6df0431ce9eb91dd558538e71239de">
 
 <!ENTITY m4-version "1.4.8">
 <!ENTITY m4-md5 "6bbf917e5d8fab20b38d43868c3944d3">

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent      2007-03-24 05:32:40 UTC (rev 981)
+++ trunk/BOOK/patches.ent      2007-03-24 22:11:29 UTC (rev 982)
@@ -98,9 +98,9 @@
 <!ENTITY glibc-strlcpy_strlcat-patch-md5 "d67b7df35e0b5861a592cf10625d5aa4">
 <!ENTITY glibc-strlcpy_strlcat-patch-size "12 KB">
 
-<!ENTITY grsecurity-patch "grsecurity-2.1.9-2.6.18-200610021833.patch.gz">
-<!ENTITY grsecurity-patch-md5 "df7aaaa329b360de5d7fa7ca0e6f9ced">
-<!ENTITY grsecurity-patch-size "188 KB">
+<!ENTITY grsecurity-patch "grsecurity-2.1.10-2.6.20.3-200703231034.patch">
+<!ENTITY grsecurity-patch-md5 "a6748751f19c591dc342d4609718e18e">
+<!ENTITY grsecurity-patch-size "997 KB">
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "692c88bb76906d99cc20446fadfb6499">
@@ -114,14 +114,6 @@
 <!ENTITY less-signal_fix-patch-md5 "ef8f5750b1ef047e6a06cd4ea23068b0">
 <!ENTITY less-signal_fix-patch-size "4 KB">
 
-<!ENTITY linux-unifdef-patch "linux-&linux-version;-unifdef-1.patch">
-<!ENTITY linux-unifdef-patch-md5 "7d6a92f0d10492e06a3275627377df86">
-<!ENTITY linux-unifdef-patch-size "36 KB">
-
-<!ENTITY linux-unistd_x86_PIC-patch 
"linux-&linux-version;-unistd_x86_PIC-1.patch">
-<!ENTITY linux-unistd_x86_PIC-patch-md5 "7f984329318744cf55f8626736238ffc">
-<!ENTITY linux-unistd_x86_PIC-patch-size "8 KB">
-
 <!ENTITY mktemp-add_tempfile-patch 
"mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-add_tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-add_tempfile-patch-size "3.5 KB">

-- 
http://linuxfromscratch.org/mailman/listinfo/hlfs-book
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to