diff options
author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2010-08-31 23:32:16 +0000 |
---|---|---|
committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2010-08-31 23:32:16 +0000 |
commit | 6f8df4bf431eb3e7a10d5a4f00a46db4e9a88460 (patch) | |
tree | bb6a667125ee24b133600faa73488cffe4860d8d | |
parent | f13cd5e3da2de672bf51f32ad0c68d7c086bf460 (diff) |
Update to linux-2.6.35.4
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9367 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r-- | chapter01/changelog.xml | 10 | ||||
-rw-r--r-- | chapter03/patches.xml | 4 | ||||
-rw-r--r-- | chapter08/kernel.xml | 4 | ||||
-rw-r--r-- | general.ent | 4 | ||||
-rw-r--r-- | packages.ent | 8 | ||||
-rw-r--r-- | patches.ent | 3 |
6 files changed, 20 insertions, 13 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 639527253..ad874af14 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <listitem> + <para>2010-08-31</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to linux-2.6.35.4. Fixes + <ulink url="&lfs-ticket-root;2743">#2743</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2010-08-17</para> <itemizedlist> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index b3f174f02..f0a58c325 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -130,7 +130,7 @@ <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para> </listitem> </varlistentry> - +<!-- <varlistentry> <term>Linux Memory Model Locking Patch - <token>&linux-mm_locking-patch-size;</token>:</term> <listitem> @@ -138,7 +138,7 @@ <para>MD5 sum: <literal>&linux-mm_locking-patch-md5;</literal></para> </listitem> </varlistentry> - +--> <varlistentry> <term>Man-DB Upstream Fix Assertion Patch - <token>&man-db-upstream_fixes-patch-size;</token>:</term> <listitem> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index ccba83381..d56cac861 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -45,10 +45,6 @@ in the kernel source tree for alternative methods to the way this book configures the kernel.</para> - <para>Fix a bug in the memory model code that can cause boot failures:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&linux-mm_locking-patch;</userinput></screen> - <para>Prepare for compilation by running the following command:</para> <screen><userinput remap="pre">make mrproper</userinput></screen> diff --git a/general.ent b/general.ent index 8cfe89faf..4e3fed40d 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20100817"> -<!ENTITY releasedate "August 17, 2010"> +<!ENTITY version "SVN-20100831"> +<!ENTITY releasedate "August 31, 2010"> <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "6.7"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 79b875155..82648b7f9 100644 --- a/packages.ent +++ b/packages.ent @@ -307,19 +307,19 @@ <!ENTITY linux-major-version "2.6"> <!ENTITY linux-minor-version "35"> -<!ENTITY linux-patch-version "2"> +<!ENTITY linux-patch-version "4"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!ENTITY linux-size "67,636 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2"> -<!ENTITY linux-md5 "0da1c090199663c180d8a60bf49de36e"> +<!ENTITY linux-md5 "0bb2cd59c13d7412f813c8fbc0769eec"> <!ENTITY linux-home "http://www.kernel.org/"> <!ENTITY linux-ch8-du "450 - 500 MB"> <!ENTITY linux-ch8-sbu "1.5 - 5.0 SBU"> -<!ENTITY linux-headers-ch5-du "431 MB"> +<!ENTITY linux-headers-ch5-du "466 MB"> <!ENTITY linux-headers-ch5-sbu "0.1 SBU"> -<!ENTITY linux-headers-ch6-du "431 MB"> +<!ENTITY linux-headers-ch6-du "466 MB"> <!ENTITY linux-headers-ch6-sbu "0.1 SBU"> <!ENTITY m4-version "1.4.14"> diff --git a/patches.ent b/patches.ent index ec0268ade..be23ad56e 100644 --- a/patches.ent +++ b/patches.ent @@ -71,9 +71,10 @@ <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895"> <!ENTITY kbd-backspace-patch-size "12 KB"> +<!-- <!ENTITY linux-mm_locking-patch "linux-&linux-version;-mm_locking-1.patch"> <!ENTITY linux-mm_locking-patch-md5 "f139404228d3cc92bcf41d5f146e1a1b"> -<!ENTITY linux-mm_locking-patch-size "1.4 KB"> +<!ENTITY linux-mm_locking-patch-size "1.4 KB">--> <!ENTITY man-db-upstream_fixes-patch "man-db-&man-db-version;-fix_man_assertion-1.patch"> <!ENTITY man-db-upstream_fixes-patch-md5 "a2d7e211160564c13296476cb5f05574"> |