aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-08-26 20:12:51 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-08-26 20:12:51 +0000
commit035ccc16f0848cf64d57605620f572542d460789 (patch)
tree637ba5c3b00cd397d6a0c0dbf5e7163e70d95ea8
parentdfdc93a055c8644b5267b80167997c6418631fb0 (diff)
Remove && from tzdata intallation instructions.
Install all .tab files from tzdata. Add make fixes patch to pateches section. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9962 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/glibc.xml8
-rw-r--r--patches.ent2
4 files changed, 16 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ad78050aa..4239ac293 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
<para>2012-08-26</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Install both .tab files in tzdata.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Apply upstream patches to make.</para>
</listitem>
</itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7a63a83fa..2b23625d6 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -100,6 +100,14 @@
</varlistentry>
<varlistentry>
+ <term>Make Upstream Fixes Patch - <token>&make-fixes-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&make-fixes-patch;"/></para>
+ <para>MD5 sum: <literal>&make-fixes-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Patch Testsuite Fix Patch - <token>&patch-test-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&patch-test-patch;"/></para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index c9aa82bec..bedbcde0f 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -327,16 +327,16 @@ EOF</userinput></screen>
<para>Install timezone data:</para>
<screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
-mkdir -pv /usr/share/zoneinfo/{posix,right} &amp;&amp;
+mkdir -pv /usr/share/zoneinfo/{posix,right}
for tz in etcetera southamerica northamerica europe africa antarctica \
asia australasia backward pacificnew solar87 solar88 solar89 systemv; do
- zic -L /dev/null -d /usr/share/zoneinfo -y "sh yearistype.sh" ${tz} &amp;&amp;
- zic -L /dev/null -d /usr/share/zoneinfo/posix -y "sh yearistype.sh" ${tz} &amp;&amp;
+ zic -L /dev/null -d /usr/share/zoneinfo -y "sh yearistype.sh" ${tz}
+ zic -L /dev/null -d /usr/share/zoneinfo/posix -y "sh yearistype.sh" ${tz}
zic -L leapseconds -d /usr/share/zoneinfo/right -y "sh yearistype.sh" ${tz}
done
-cp -v zone.tab /usr/share/zoneinfo &amp;&amp;
+cp -v zone.tab iso3166.tab /usr/share/zoneinfo
zic -d /usr/share/zoneinfo -p America/New_York</userinput></screen>
<variablelist>
diff --git a/patches.ent b/patches.ent
index a1faeaed6..f962f2904 100644
--- a/patches.ent
+++ b/patches.ent
@@ -60,7 +60,7 @@
<!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-2.patch">
-<!ENTITY make-fixes-md5 "02c0f3989185a7345233872b1ae5f46d">
+<!ENTITY make-fixes-patch-md5 "02c0f3989185a7345233872b1ae5f46d">
<!ENTITY make-fixes-patch-size "9.7 KB">