فهرست منبع

Replace the Linux-Libc-Headers package with the 'headers_install' target from the kernel Makefile

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7816 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 19 سال پیش
والد
کامیت
93bc4a2875
8فایلهای تغییر یافته به همراه36 افزوده شده و 32 حذف شده
  1. 5 0
      chapter01/changelog.xml
  2. 0 9
      chapter03/packages.xml
  3. 12 3
      chapter03/patches.xml
  4. 1 1
      chapter05/chapter05.xml
  5. 1 1
      chapter06/chapter06.xml
  6. 4 3
      chapter06/util-linux.xml
  7. 4 9
      packages.ent
  8. 9 6
      patches.ent

+ 5 - 0
chapter01/changelog.xml

@@ -38,6 +38,11 @@
     <listitem>
       <para>2006-10-02</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Remove Linux-Libc-Headers, replacing it with the
+          &quot;make headers_install&quot; target now available in the upstream
+          kernel sources.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Udev-101.</para>
         </listitem>

+ 0 - 9
chapter03/packages.xml

@@ -328,15 +328,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-version;) - <token>&linux-libc-headers-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&linux-libc-headers-home;"/></para>
-        <para>Download: <ulink url="&linux-libc-headers-url;"/></para>
-        <para>MD5 sum: <literal>&linux-libc-headers-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
       <listitem>

+ 12 - 3
chapter03/patches.xml

@@ -171,10 +171,10 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux Libc Headers Inotify Patch - <token>&linux-inotify-patch-size;</token>:</term>
+      <term>Linux Unifdef Patch - <token>&linux-unifdef-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&linux-inotify-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-inotify-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&linux-unifdef-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-unifdef-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
@@ -283,6 +283,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Util-linux Lseek Patch - <token>&util-linux-lseek-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&util-linux-lseek-patch;"/></para>
+        <para>MD5 sum: <literal>&util-linux-lseek-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+
     <varlistentry>
       <term>Vim Upstream Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
       <listitem>

+ 1 - 1
chapter05/chapter05.xml

@@ -15,7 +15,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="toolchaintechnotes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils-pass1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcl.xml"/>

+ 1 - 1
chapter06/chapter06.xml

@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-libc-headers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readjusting.xml"/>

+ 4 - 3
chapter06/util-linux.xml

@@ -52,10 +52,11 @@ mkdir -p /var/lib/hwclock</userinput></screen>
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>Util-linux fails to compile against newer versions of Linux-Libc-Headers.
-    The following patch properly fixes this issue:</para>
+    <para>Util-linux fails to compile against newer versions of Linux kernel
+    headers. The following patches properly fix the problems:</para>
 
-<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;
+patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen>
 
     <para>Prepare Util-linux for compilation:</para>
 

+ 4 - 9
packages.ent

@@ -306,15 +306,10 @@
 <!ENTITY linux-ch8-du "310 - 350 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3 SBU">
 
-<!ENTITY linux-libc-headers-version "2.6.12.0">
-<!ENTITY linux-libc-headers-size "2,481 KB">
-<!ENTITY linux-libc-headers-url "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
-<!ENTITY linux-libc-headers-md5 "eae2f562afe224ad50f65a6acfb4252c">
-<!ENTITY linux-libc-headers-home " ">
-<!ENTITY linux-libc-headers-ch5-du "27 MB">
-<!ENTITY linux-libc-headers-ch5-sbu "less than 0.1 SBU">
-<!ENTITY linux-libc-headers-ch6-du "27 MB">
-<!ENTITY linux-libc-headers-ch6-sbu "less than 0.1 SBU">
+<!ENTITY linux-headers-ch5-du "27 MB">
+<!ENTITY linux-headers-ch5-sbu "less than 0.1 SBU">
+<!ENTITY linux-headers-ch6-du "27 MB">
+<!ENTITY linux-headers-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY m4-version "1.4.7">
 <!ENTITY m4-size "500 KB">

+ 9 - 6
patches.ent

@@ -90,9 +90,9 @@
 <!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
 
 
-<!ENTITY linux-inotify-patch "linux-libc-headers-&linux-libc-headers-version;-inotify-3.patch">
-<!ENTITY linux-inotify-patch-md5 "8fd71a4bd3344380bd16caf2c430fa9b">
-<!ENTITY linux-inotify-patch-size "4.7 KB">
+<!ENTITY linux-unifdef-patch "linux-&linux-version;-unifdef-1.patch">
+<!ENTITY linux-unifdef-patch-md5 "7d6a92f0d10492e06a3275627377df86">
+<!ENTITY linux-unifdef-patch-size "32 KB">
 
 
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
@@ -121,9 +121,9 @@
 <!ENTITY sysklogd-8bit-patch-md5 "cc0d9c3bd67a6b6357e42807cf06073e">
 <!ENTITY sysklogd-8bit-patch-size "0.9 KB">
 
-<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
-<!ENTITY sysklogd-fixes-patch-md5 "508104f058d1aef26b3bc8059821935f">
-<!ENTITY sysklogd-fixes-patch-size "27 KB">
+<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-2.patch">
+<!ENTITY sysklogd-fixes-patch-md5 "ed5b25ca9a4eeb4f4f82b300a27b1ef4">
+<!ENTITY sysklogd-fixes-patch-size "32 KB">
 
 
 <!ENTITY tar-gcc4_fix-patch "tar-&tar-version;-gcc4_fix_tests-1.patch">
@@ -152,6 +152,9 @@
 <!ENTITY util-linux-cramfs-patch-md5 "1c3f40b30e12738eb7b66a35b7374572">
 <!ENTITY util-linux-cramfs-patch-size "2.8 KB">
 
+<!ENTITY util-linux-lseek-patch "util-linux-&util-linux-version;-lseek-1.patch">
+<!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
+<!ENTITY util-linux-lseek-patch-size "10 KB">
 
 <!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-7.patch">
 <!ENTITY vim-fixes-patch-md5 "d274219566702b0bafcb83ab4685bbde">