diff options
| author | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2008-12-02 09:54:01 +0000 |
|---|---|---|
| committer | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2008-12-02 09:54:01 +0000 |
| commit | b943097fb7a188a2c4732891f90e407382d65dd7 (patch) | |
| tree | abde71f2e2b45c3696eff77f83c707dfadb3ea80 | |
| parent | 2a6c7b3e263e3d4f2c575ebc4f2c029d7213c621 (diff) | |
Move grep up in the build order. Thanks, Greg Schafer for the reminder.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8751 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 2 | ||||
| -rw-r--r-- | chapter06/createfiles.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index de00d0bf4..f0ef6ebd4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,18 @@ --> <listitem> + <para>2008-12-02</para> + <itemizedlist> + <listitem> + <para>[jhuntwork] - Moved grep up in the build order of chapter 6 + to be before libtool which hardcodes references to grep in its installed + files. Was previously circumvented by a symlink, but this approach sticks + more closely to our build order policy. Thanks to Greg Schafer for the reminder.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2008-12-01</para> <itemizedlist> <listitem> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 0f079bf50..9266c3fc0 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -34,6 +34,7 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtool.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="zlib.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/> @@ -49,7 +50,6 @@ <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="grep.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"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/> diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 4913d7d91..3a725ea08 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -39,7 +39,7 @@ 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,grep,pwd,stty} /bin +<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin ln -sv /tools/bin/perl /usr/bin ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib diff --git a/general.ent b/general.ent index a981e0256..135f225f7 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "SVN-20081201"> -<!ENTITY releasedate "December 1, 2008"> +<!ENTITY version "SVN-20081202"> +<!ENTITY releasedate "December 2, 2008"> <!ENTITY copyrightdate "1999-2008"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.0"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |