Browse Source

Fix binutils extracted directory version in binutils
build instructions. This will be reverted at the next upstream release
when the tarball name is again synced with the extracted directory
name.

Fix bootscripts to properly export IN_BOOT variable.

Adjust minimum kernel for the host sysem to 2.6.25
due to a udev requirement.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9592 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 14 years ago
parent
commit
13e7d79417

+ 4 - 1
bootscripts/lfs/init.d/rc

@@ -100,7 +100,10 @@ if [ "${previous}" != "N" ]; then
    done
 fi
 
-[ "${previous}" = "N" ] && IN_BOOT=1
+if [ "${previous}" = "N" ]; then
+   IN_BOOT=1
+   export IN_BOOT
+fi
 
 #Start all functions in this runlevel
 for i in $( ls -v /etc/rc.d/rc${runlevel}.d/S* 2> /dev/null)

+ 25 - 0
chapter01/changelog.xml

@@ -36,6 +36,31 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2011-09-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix binutils extracted directory version in binutils 
+          build instructions.  This will be reverted at the next upstream release
+          when the tarball name is again synced with the extracted directory
+          name.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix bootscripts to properly export IN_BOOT variable.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2011-09-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Adjust minimum kernel for the host sysem to 2.6.25
+          due to a udev requirement.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2011-08-31</para>
       <itemizedlist>

+ 2 - 1
chapter05/binutils-pass1.xml

@@ -72,7 +72,8 @@ cd ../binutils-build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure \
+<!-- <screen><userinput remap="configure">../binutils-&binutils-version;/configure \ -->
+<screen><userinput remap="configure">../binutils-&binutils-dir;/configure \
     --target=$LFS_TGT --prefix=/tools \
     --disable-nls --disable-werror</userinput></screen>
 

+ 2 - 1
chapter05/binutils-pass2.xml

@@ -52,7 +52,8 @@ cd ../binutils-build</userinput></screen>
 
 <screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
    AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
-   ../binutils-&binutils-version;/configure --prefix=/tools \
+<!--   ../binutils-&binutils-version;/configure - -prefix=/tools \ -->
+   ../binutils-&binutils-dir;/configure --prefix=/tools \
    --disable-nls --with-lib-path=/tools/lib</userinput></screen>
 
     <variablelist>

+ 3 - 3
chapter05/glibc.xml

@@ -77,7 +77,7 @@ esac</userinput></screen>
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \
     --host=$LFS_TGT --build=$(../glibc-&glibc-version;/scripts/config.guess) \
     --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.22.5 --with-headers=/tools/include \
+    --enable-kernel=2.6.25 --with-headers=/tools/include \
     libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes</userinput></screen>
 
     <variablelist>
@@ -109,10 +109,10 @@ esac</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--enable-kernel=2.6.22.5</parameter></term>
+        <term><parameter>--enable-kernel=2.6.25</parameter></term>
         <listitem>
           <para>This tells Glibc to compile the library with support
-          for 2.6.22.5 and later Linux kernels.  Workarounds for older
+          for 2.6.25 and later Linux kernels.  Workarounds for older
           kernels are not enabled.</para>
         </listitem>
       </varlistentry>

+ 2 - 1
chapter06/binutils.xml

@@ -77,7 +77,8 @@ cd ../binutils-build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr \
+<!-- <screen><userinput remap="configure">../binutils-&binutils-version;/configure - -prefix=/usr \ -->
+<screen><userinput remap="configure">../binutils-&binutils-dir;/configure --prefix=/usr \
     --enable-shared</userinput></screen>
 
     <para>Compile the package:</para>

+ 1 - 1
chapter06/glibc.xml

@@ -131,7 +131,7 @@ esac</userinput></screen>
 
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.22.5 --libexecdir=/usr/lib/glibc</userinput></screen>
+    --enable-kernel=2.6.25 --libexecdir=/usr/lib/glibc</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110831">
-<!ENTITY releasedate "Aug 31, 2011">
+<!ENTITY version "SVN-20110903">
+<!ENTITY releasedate "Sep 3, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 2 - 1
packages.ent

@@ -35,6 +35,7 @@
 <!ENTITY bash-ch6-sbu "1.4 SBU">
 
 <!ENTITY binutils-version "2.21.1a">
+<!ENTITY binutils-dir "2.21.1">
 <!ENTITY binutils-size "18,553 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-md5 "bde820eac53fa3a8d8696667418557ad">
@@ -297,7 +298,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20110830">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110903">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->

+ 5 - 4
prologue/hostreqs.xml

@@ -81,17 +81,18 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Linux Kernel-2.6.22.5</emphasis>
+      <para><emphasis role="strong">Linux Kernel-2.6.25</emphasis>
       (having been compiled with GCC-4.1.2 or greater)</para>
 
       <para>The reason for the kernel version requirement is that we specify
       that version when building <application>glibc</application> in Chapter 6
-      at the recommendation of the developers.  </para>
+      at the recommendation of the developers.  It is also required by
+      udev.</para>
 
-      <para>If the host kernel is either earlier than 2.6.22.5, or it was not
+      <para>If the host kernel is either earlier than 2.6.25, or it was not
       compiled using a GCC-4.1.2 (or later) compiler, you will need to replace
       the kernel with one adhering to the specifications. There are two ways
-      you can go about this. First, see if your Linux vendor provides a 2.6.22.5
+      you can go about this. First, see if your Linux vendor provides a 2.6.25
       or later kernel package. If so, you may wish to install it. If your
       vendor doesn't offer an acceptable kernel package, or you would prefer not to
       install it, you can compile a kernel yourself. Instructions for