diff options
| author | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2008-12-05 20:46:02 +0000 |
|---|---|---|
| committer | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2008-12-05 20:46:02 +0000 |
| commit | 4e82d4787a775438ce10fc7e3ccefe9fcd23ccd0 (patch) | |
| tree | 1bbf7f140bdabeb1748d651a6885ec9f10c4e7ad /chapter06 | |
| parent | 6e886330cf157dc71e6a0a1fca410d7005683167 (diff) | |
Bring in DIY's next generation build method. Move GRUB to chapter 8.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8755 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/chapter06.xml | 1 | ||||
| -rw-r--r-- | chapter06/creatingdirs.xml | 5 | ||||
| -rw-r--r-- | chapter06/readjusting.xml | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 9266c3fc0..52e6fe6b7 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -48,7 +48,6 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grub.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="groff.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/> diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index 382b1e504..edd659738 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -24,8 +24,9 @@ mkdir -pv /usr/{,local/}share/man/man{1..8} for dir in /usr /usr/local; do ln -sv share/{man,doc,info} $dir done -ln -sv lib /lib64 -ln -sv lib /usr/lib64 +case $(uname -m) in + x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 ;; +esac mkdir -v /var/{lock,log,mail,run,spool} mkdir -pv /var/{opt,cache,lib/{misc,locate},local}</userinput></screen> diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml index 8bda83151..695a6d684 100644 --- a/chapter06/readjusting.xml +++ b/chapter06/readjusting.xml @@ -33,9 +33,10 @@ mv -v /tools/bin/{ld-new,ld} ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen> <para>Next, amend the GCC specs file so that it points to the new - dynamic linker, and so that GCC knows where to find the correct headers - and Glibc start files. A <command>sed</command> command accomplishes - this:</para> + dynamic linker. Simply deleting all instances of <quote>/tools</quote> should + leave us with the correct path to the dynamic linker. Also adjust the specs file + so that GCC knows where to find the correct headers and Glibc start files. + A <command>sed</command> command accomplishes this:</para> <screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \ -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \ |