aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/createfiles.xml14
-rw-r--r--chapter06/e2fsprogs.xml10
2 files changed, 16 insertions, 8 deletions
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 5a44725db..cd90477df 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -39,15 +39,20 @@
will be replaced by real files throughout the course of this chapter after the
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
ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
@@ -176,10 +181,11 @@ ln -sv bash /bin/sh</userinput></screen>
</listitem>
</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>
</listitem>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index f95317273..7b6a07955 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -52,10 +52,12 @@ cd build</userinput></screen>
<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="" \
--enable-elf-shlibs \
@@ -66,7 +68,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
<variablelist>
<title>The meaning of the environment variable and configure options:</title>
-
+<!--
<varlistentry>
<term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
<listitem>
@@ -74,7 +76,7 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
<xref linkend="ch-tools-util-linux"/> package built earlier.</para>
</listitem>
</varlistentry>
-
+-->
<varlistentry>
<term><parameter>--with-root-prefix=""</parameter> and
<parameter>--bindir=/bin</parameter></term>