Pārlūkot izejas kodu

Merged r8463, r8464, r8465, r8466, r8467 from trunk to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8468 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork 17 gadi atpakaļ
vecāks
revīzija
9912f8799f
7 mainītis faili ar 39 papildinājumiem un 27 dzēšanām
  1. 1 1
      Makefile
  2. 18 0
      chapter01/changelog.xml
  3. 4 4
      chapter01/whatsnew.xml
  4. 1 8
      chapter06/linux-headers.xml
  5. 1 1
      chapter06/util-linux-ng.xml
  6. 2 2
      general.ent
  7. 12 11
      packages.ent

+ 1 - 1
Makefile

@@ -34,7 +34,7 @@ lfs: validxml profile-html
 	$(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 "s@text/html@application/xhtml+xml@g" $$filename; \
 	done;
 

+ 18 - 0
chapter01/changelog.xml

@@ -36,6 +36,24 @@
     </listitem>
 -->
 
+    <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>

+ 4 - 4
chapter01/whatsnew.xml

@@ -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>-->

+ 1 - 8
chapter06/linux-headers.xml

@@ -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 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <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>
 

+ 1 - 1
chapter06/util-linux-ng.xml

@@ -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>

+ 2 - 2
general.ent

@@ -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}]" -->
 

+ 12 - 11
packages.ent

@@ -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">