From d1a862d74d0ce5562de4a207d243466ce6285551 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Sat, 13 May 2017 16:07:52 +0000 Subject: Add additional symlinks to avoid /tools references in final system. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11247 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 +++++++ chapter06/createfiles.xml | 67 ++++++++++++++++++++++++++++++++++++++++++----- 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 @@ -42,6 +42,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2017-05-13 + + + [dj] - Add additional symlinks to avoid "/tools" references + in final system. + + + + 2017-05-07 diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 312888c0b..99cc0da9f 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -34,16 +34,28 @@ /var/log/wtmp - 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: + 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: -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin -ln -sv /tools/bin/perl /usr/bin +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 + +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 @@ -64,6 +76,14 @@ ln -sv bash /bin/sh + + /bin/dd + + The path to dd will be hard-coded into the + /usr/bin/libtool utility. + + + /bin/echo @@ -72,6 +92,23 @@ ln -sv bash /bin/sh + + /usr/bin/install + + The path to install will be hard-coded into + the /usr/lib/bash/Makefile.inc file. + + + + + /bin/ln + + The path to ln will be hard-coded into the + /usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl + file. + + + /bin/pwd @@ -80,6 +117,15 @@ ln -sv bash /bin/sh + + /bin/rm + + The path to rm will be hard-coded into the + /usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl + file. + + + /bin/stty @@ -120,6 +166,15 @@ ln -sv bash /bin/sh + + /usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*} + + These links prevent systemd utilties from being poluted with an + unnecessary reference to the + /tools directory. + + + /bin/sh diff --git a/general.ent b/general.ent index a318ff805..a139a75cf 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + -- cgit v1.2.3-54-g00ecf