Author: jhuntwork
Date: 2008-01-30 12:10:15 -0700 (Wed, 30 Jan 2008)
New Revision: 8468
Modified:
branches/jh/BOOK/Makefile
branches/jh/BOOK/chapter01/changelog.xml
branches/jh/BOOK/chapter01/whatsnew.xml
branches/jh/BOOK/chapter06/linux-headers.xml
branches/jh/BOOK/chapter06/util-linux-ng.xml
branches/jh/BOOK/general.ent
branches/jh/BOOK/packages.ent
Log:
Merged r8463, r8464, r8465, r8466, r8467 from trunk to jh branch
Modified: branches/jh/BOOK/Makefile
===================================================================
--- branches/jh/BOOK/Makefile 2008-01-29 19:54:40 UTC (rev 8467)
+++ branches/jh/BOOK/Makefile 2008-01-30 19:10:15 UTC (rev 8468)
@@ -34,7 +34,7 @@
$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
tidy -config tidy.conf $$filename; \
true; \
- sh obfuscate.sh $$filename; \
+ /bin/bash obfuscate.sh $$filename; \
sed -i -e "[EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]"
$$filename; \
done;
Modified: branches/jh/BOOK/chapter01/changelog.xml
===================================================================
--- branches/jh/BOOK/chapter01/changelog.xml 2008-01-29 19:54:40 UTC (rev
8467)
+++ branches/jh/BOOK/chapter01/changelog.xml 2008-01-30 19:10:15 UTC (rev
8468)
@@ -37,6 +37,24 @@
-->
<listitem>
+ <para>2008-01-29</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgraded to Linux-2.6.24. Fixes
+ <ulink url="&lfs-ticket-root;2137">#2137</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgraded to Findutils-4.2.32. Fixes
+ <ulink url="&lfs-ticket-root;2136">#2136</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgraded to Automake-1.10.1. Fixes
+ <ulink url="&lfs-ticket-root;2132">#2132</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2008-01-22</para>
<itemizedlist>
<listitem>
Modified: branches/jh/BOOK/chapter01/whatsnew.xml
===================================================================
--- branches/jh/BOOK/chapter01/whatsnew.xml 2008-01-29 19:54:40 UTC (rev
8467)
+++ branches/jh/BOOK/chapter01/whatsnew.xml 2008-01-30 19:10:15 UTC (rev
8468)
@@ -32,9 +32,9 @@
<!--<listitem>
<para>Autoconf &autoconf-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Automake &automake-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Bash &bash-version;</para>
</listitem>-->
@@ -68,9 +68,9 @@
<listitem>
<para>File &file-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>Findutils &findutils-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Flex &flex-version;</para>
</listitem>-->
Modified: branches/jh/BOOK/chapter06/linux-headers.xml
===================================================================
--- branches/jh/BOOK/chapter06/linux-headers.xml 2008-01-29 19:54:40 UTC
(rev 8467)
+++ branches/jh/BOOK/chapter06/linux-headers.xml 2008-01-30 19:10:15 UTC
(rev 8468)
@@ -46,13 +46,6 @@
by way of sanitizing various C header files that are shipped in the Linux
kernel source tarball.</para>
- <para>Apply a <command>sed</command> subsitution to suppress the
- installation of header files in <filename
- class='directory'>/usr/include/scsi</filename>. The versions provided by
- Glibc will be used instead:</para>
-
-<screen><userinput remap="pre">sed -i '/scsi/d'
include/Kbuild</userinput></screen>
-
<para>Install the header files:</para>
<screen><userinput remap="install">make mrproper
@@ -69,7 +62,7 @@
<segtitle>Installed headers</segtitle>
<seglistitem>
- <seg>/usr/include/{asm{,-generic},linux,mtd,rdma,sound}/*.h</seg>
+ <seg>/usr/include/{asm{,-generic},linux,mtd,rdma,sound,video}/*.h</seg>
</seglistitem>
</segmentedlist>
Modified: branches/jh/BOOK/chapter06/util-linux-ng.xml
===================================================================
--- branches/jh/BOOK/chapter06/util-linux-ng.xml 2008-01-29 19:54:40 UTC
(rev 8467)
+++ branches/jh/BOOK/chapter06/util-linux-ng.xml 2008-01-30 19:10:15 UTC
(rev 8468)
@@ -14,7 +14,7 @@
<address>&util-linux-ng-url;</address>
</sect1info>
- <title>Util-linux-&util-linux-ng-version;</title>
+ <title>Util-linux-ng-&util-linux-ng-version;</title>
<indexterm zone="ch-system-util-linux-ng">
<primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
Modified: branches/jh/BOOK/general.ent
===================================================================
--- branches/jh/BOOK/general.ent 2008-01-29 19:54:40 UTC (rev 8467)
+++ branches/jh/BOOK/general.ent 2008-01-30 19:10:15 UTC (rev 8468)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20080124">
-<!ENTITY releasedate "January 24, 2007">
+<!ENTITY version "SVN-JH-20080129">
+<!ENTITY releasedate "January 29, 2007">
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: branches/jh/BOOK/packages.ent
===================================================================
--- branches/jh/BOOK/packages.ent 2008-01-29 19:54:40 UTC (rev 8467)
+++ branches/jh/BOOK/packages.ent 2008-01-30 19:10:15 UTC (rev 8468)
@@ -15,10 +15,10 @@
<!ENTITY autoconf-ch6-du "8.1 MB">
<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU">
-<!ENTITY automake-version "1.10">
-<!ENTITY automake-size "873 KB">
+<!ENTITY automake-version "1.10.1">
+<!ENTITY automake-size "897 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
-<!ENTITY automake-md5 "0e2e0f757f9e1e89b66033905860fded">
+<!ENTITY automake-md5 "4510391e6b3edaa4cffb3ced87c9560c">
<!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-ch6-du "7.9 MB">
<!ENTITY automake-ch6-sbu "less than 0.1 SBU">
@@ -136,10 +136,10 @@
<!ENTITY file-ch6-du "7.9 MB">
<!ENTITY file-ch6-sbu "0.1 SBU">
-<!ENTITY findutils-version "4.2.31">
-<!ENTITY findutils-size "1,296 KB">
+<!ENTITY findutils-version "4.2.32">
+<!ENTITY findutils-size "1,398 KB">
<!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
-<!ENTITY findutils-md5 "a0e31a0f18a49709bf5a449867c8049a">
+<!ENTITY findutils-md5 "aaa6beeb41a6f04963dff58f24a55b96">
<!ENTITY findutils-home "&gnu-software;findutils/">
<!ENTITY findutils-ch5-du "13.6 MB">
<!ENTITY findutils-ch5-sbu "0.2 SBU">
@@ -296,12 +296,13 @@
<!ENTITY libtool-ch6-sbu "0.1 SBU">
<!ENTITY linux-major-version "2.6">
-<!ENTITY linux-minor-version "23">
-<!ENTITY linux-patch-version "14">
-<!ENTITY linux-version
"&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "44,403 KB">
+<!ENTITY linux-minor-version "24">
+<!ENTITY linux-patch-version "">
+<!--<!ENTITY linux-version
"&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
+<!ENTITY linux-size "45,642 KB">
<!ENTITY linux-url
"&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "63a6a28ad2480edcffbc09c008b0939d">
+<!ENTITY linux-md5 "3f23ad4b69d0a552042d1ed0f4399857">
<!ENTITY linux-home "http://www.kernel.org/";>
<!ENTITY linux-ch8-du "350 - 450 MB">
<!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
