Changeset cb23c1a

Timestamp:

01/20/2014 01:18:30 AM (10 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

053b206

Parents:

cde2ae7

Message:

Added a Chapter 5 build of util-linux in preparation for
moving the Chapter 6 build to after udev. This satisfies a circular
dependency. This is not the complete fix as this build has not yet
been incorporated into Chapter 6.

Mount /run as a tmpfs for Chapter 6. This allows use by test processes
during Chapter 6 without carying the files over to the new system.

Other minor cleanups.

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

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (2 diffs)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter05/chapter05.xml (modified) (1 diff)
• chapter05/ncurses.xml (modified) (2 diffs)
• chapter05/util-linux-ng.xml (deleted)
• chapter05/util-linux.xml (added)
• chapter06/creatingdirs.xml (modified) (1 diff)
• chapter06/kernfs.xml (modified) (3 diffs)
• chapter06/revisedchroot.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• packages.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -2092 +2092 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
+         Gettext, Glibc, Grep, Make, Ncurses, Sed, Udev, and Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>

chapter01/changelog.xml

@@ -37 +37 @@
 -->
     <listitem>
+      <para>2014-01-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Added a Chapter 5 build of util-linux after
+          udev to satify a circular dependency.  This is not the 
+          complete fix as this build has not yet been incorporated into
+          Chapter 6.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Moutn /run as a tmpfs for Chapter 6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-01-14</para>
       <itemizedlist>
@@ -47 +62 @@
         <listitem>
           <para>[bdubbs] - Fix hardcoded reference to /tools in
-          Chapter 6 glibc.  Fixes
+          Chapter 6 gcc.  Fixes
           <ulink url="&lfs-ticket-root;3466">#3466</ulink>.</para>
         </listitem>

chapter01/whatsnew.xml

@@ -107 +107 @@
       <para>IANA-Etc &iana-etc-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Inetutils &inetutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>

chapter05/chapter05.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux-ng.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.xml"/>

chapter05/ncurses.xml

@@ -46 +46 @@
     <para>Prepare Ncurses for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools --with-shared \
-    --without-debug --without-ada --enable-overwrite</userinput></screen>
+<screen><userinput remap="configure">
+./configure --prefix=/tools \
+            --with-shared   \
+            --without-debug \
+            --without-ada   \
+            --enable-widec  \
+            --enable-overwrite</userinput></screen>
 
     <variablelist>
@@ -69 +74 @@
           ensure that other packages can find the Ncurses headers
           successfully.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-widec</parameter></term>
+        <listitem>
+          <para>This switch causes wide-character libraries (e.g., <filename
+          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+          to be built instead of normal ones (e.g., <filename
+          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+          These wide-character libraries are usable in both multibyte and
+          traditional 8-bit locales, while normal libraries work properly
+          only in 8-bit locales. Wide-character and normal libraries are
+          source-compatible, but not binary-compatible.</para>
         </listitem>
       </varlistentry>

chapter06/creatingdirs.xml

@@ -14 +14 @@
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt,run}
+<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt}
 mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root

chapter06/kernfs.xml

@@ -23 +23 @@
     mounted:</para>
 
-<screen><userinput>mkdir -pv $LFS/{dev,proc,sys}</userinput></screen>
+<screen><userinput>mkdir -pv $LFS/{dev,proc,sys,run}</userinput></screen>
 
   <sect2>
@@ -71 +71 @@
 <screen><userinput>mount -vt devpts devpts $LFS/dev/pts -o gid=5,mode=620
 mount -vt proc proc $LFS/proc
-mount -vt sysfs sysfs $LFS/sys</userinput></screen>
+mount -vt sysfs sysfs $LFS/sys
+mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
 
     <variablelist>
@@ -103 +104 @@
       <para>In some host systems, <filename>/dev/shm</filename> is a
       symbolic link to <filename class="directory">/run/shm</filename>.
-      Inside a chroot environment, this temporary file system needs
-      to be mounted separate from the host file system:</para>
+      The /run tmpfs was mounted above so in this case only a 
+      directory needs to be created.</para>
 
 <screen><userinput>if [ -h $LFS/dev/shm ]; then
-  link=$(readlink $LFS/dev/shm)
-  mkdir -pv $LFS/$link
-  mount -vt tmpfs shm $LFS/$link
-  unset link
-else
-  mount -vt tmpfs shm $LFS/dev/shm
+  mkdir -pv $LFS/$(readlink $LFS/dev/shm)
 fi</userinput></screen>
 

chapter06/revisedchroot.xml

@@ -13 +13 @@
   <para>Finally, clean up some extra files left around from running tests:</para>
 
-<screen><userinput>rm -rf /run/* /tmp/*</userinput></screen>
+<screen><userinput>rm -rf /tmp/*</userinput></screen>
 
   <para>From now on, when reentering the chroot environment after

general.ent

@@ -1 @@
-<!ENTITY version         "SVN-20140114">
-<!ENTITY releasedate     "January 14, 2014">
+<!ENTITY version         "SVN-20140119">
+<!ENTITY releasedate     "January 19, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">

packages.ent

@@ -566 +566 @@
 <!ENTITY util-linux-md5 "4fac6443427f575fc5f3531a4ad2ca01">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
+<!ENTITY util-linux-ch5-du "89 MB">
+<!ENTITY util-linux-ch5-sbu "0.6 SBU">
 <!ENTITY util-linux-ch6-du "89 MB">
 <!ENTITY util-linux-ch6-sbu "0.6 SBU">