diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter06/createfiles.xml | 67 | ||||
| -rw-r--r-- | general.ent | 6 |
3 files changed, 74 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4a72226af..3972da4f4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,16 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2017-05-13</para> + <itemizedlist> + <listitem> + <para>[dj] - Add additional symlinks to avoid "/tools" references + in final system.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2017-05-07</para> <itemizedlist> <listitem> diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 312888c0b..99cc0da9f 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -34,18 +34,30 @@ <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary> </indexterm> - <para>Some programs use hard-wired paths to programs which do not exist yet. In - order to satisfy these programs, create a number of symbolic links which will be - replaced by real files throughout the course of this chapter after the software - has been installed:</para> + <para>Some programs use hard-wired paths to programs which do not exist yet. + In order to satisfy these programs, create a number of symbolic links which + will be replaced by real files throughout the course of this chapter after the + software has been installed:</para> -<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin -ln -sv /tools/bin/perl /usr/bin +<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 sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la ln -sv bash /bin/sh</userinput></screen> +<screen revision="systemd"><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 +sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la +for lib in blkid lzma mount uuid +do + ln -sv /tools/lib/lib$lib.{a,so*} /usr/lib + sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la +done +ln -sv bash /bin/sh</userinput></screen> + <variablelist> <title>The purpose of each link:</title> @@ -65,6 +77,14 @@ ln -sv bash /bin/sh</userinput></screen> </varlistentry> <varlistentry> + <term><parameter><filename>/bin/dd</filename></parameter></term> + <listitem> + <para>The path to <filename>dd</filename> will be hard-coded into the + <filename>/usr/bin/libtool</filename> utility.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter><filename>/bin/echo</filename></parameter></term> <listitem> <para>This is to satisfy one of the tests in Glibc's test suite, which @@ -73,6 +93,23 @@ ln -sv bash /bin/sh</userinput></screen> </varlistentry> <varlistentry> + <term><parameter><filename>/usr/bin/install</filename></parameter></term> + <listitem> + <para>The path to <filename>install</filename> will be hard-coded into + the <filename>/usr/lib/bash/Makefile.inc</filename> file.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter><filename>/bin/ln</filename></parameter></term> + <listitem> + <para>The path to <filename>ln</filename> will be hard-coded into the + <filename>/usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl</filename> + file.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter><filename>/bin/pwd</filename></parameter></term> <listitem> <para>Some <command>configure</command> scripts, particularly Glibc's, @@ -81,6 +118,15 @@ ln -sv bash /bin/sh</userinput></screen> </varlistentry> <varlistentry> + <term><parameter><filename>/bin/rm</filename></parameter></term> + <listitem> + <para>The path to <filename>rm</filename> will be hard-coded into the + <filename>/usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl</filename> + file.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter><filename>/bin/stty</filename></parameter></term> <listitem> <para>This pathname is hard-coded into Expect, therefore it is needed @@ -120,6 +166,15 @@ ln -sv bash /bin/sh</userinput></screen> </listitem> </varlistentry> + <varlistentry revision="systemd"> + <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term> + <listitem> + <para>These links prevent systemd utilties from being poluted with an + unnecessary reference to the + <filename class="directory">/tools</filename> directory.</para> + </listitem> + </varlistentry> + <varlistentry> <term><parameter><filename>/bin/sh</filename></parameter></term> <listitem> diff --git a/general.ent b/general.ent index a318ff805..a139a75cf 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20170507"> +<!ENTITY version "SVN-20170513"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20170507-systemd"> +<!ENTITY versiond "20170513-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "May 7, 2017"> +<!ENTITY releasedate "May 13, 2017"> <!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "8.1"> |