Changeset 8054162 for chapter06

Timestamp:

07/06/2018 07:02:39 PM (6 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, 12.2, 12.2-rc1, 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/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

403b39c

Parents:

fd824cf

Message:

Make symbolic links in inital part of Chapter 6 consistent
for all versions of the book. Allows removing environment
variables no longer needed with e2fsprogs.

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

Location:

chapter06

Files:

• createfiles.xml (modified) (2 diffs)
• e2fsprogs.xml (modified) (3 diffs)

chapter06/createfiles.xml

@@ -40 +40 @@
   software has been installed:</para>
 
+<!--
 <screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
 ln -sv /tools/bin/{install,perl} /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-ln -sv bash /bin/sh</userinput></screen>
-
+ln -sv bash /bin/sh
+
+
+</userinput></screen>
+-->
 <!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
 
-<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+<!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
+<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
 ln -sv /tools/bin/{env,install,perl} /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
@@ -177 +182 @@
     </varlistentry>
 -->
-    <varlistentry revision="systemd">
+    <!--<varlistentry revision="systemd">-->
+    <varlistentry>
       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
       <listitem>
-        <para>These links prevent systemd utilities from acquiring an
+        <para>These links prevent <!--systemd--> utilities from acquiring an
         unnecessary reference to the
         <filename class="directory">/tools</filename> directory.</para>

chapter06/e2fsprogs.xml

@@ -53 +53 @@
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
+<!--<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
+CFLAGS=-I/tools/include              \
 CFLAGS=-I/tools/include              \
 PKG_CONFIG_PATH=/tools/lib/pkgconfig \
-../configure --prefix=/usr           \
+../configure - -prefix=/usr           \-->
+<screen><userinput remap="configure">../configure --prefix=/usr           \
              --bindir=/bin           \
              --with-root-prefix=""   \
@@ -67 +69 @@
     <variablelist>
       <title>The meaning of the environment variable and configure options:</title>
-
+<!--
       <varlistentry>
         <term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
@@ -75 +77 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--with-root-prefix=""</parameter> and