aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2013-08-30 21:33:21 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2013-08-30 21:33:21 +0000
commit006972d0f9089b855e4d7af34e6c6c0482ec25e6 (patch)
treecb3682b4e085e86e1aed466e02ecf5f792300c4a
parent20dd3342f7a9b550c6ce567f0fd4ed96c70c6fbe (diff)
7.4-rc27.4-rc2
git-svn-id: http://svn.linuxfromscratch.org/LFS/tags/7.4-rc2@10331 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--Makefile2
-rw-r--r--chapter05/glibc.xml8
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
4 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 7c3414d7e..260b2d46c 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ validate: tmpdir
$(Q)xmllint --nonet --noent --xinclude --postvalid \
-o $(RENDERTMP)/lfs-full.xml index.xml
$(Q)rm -f appendices/*.script
- $(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
+ #$(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
@echo "Validation complete."
profile-html: validate
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 0691ddbfb..3eaf21932 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -224,10 +224,10 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
</caution>
- <note><para>Building Binutils in the next section will serve as an additional check that
- the toolchain has been built properly. If Binutils fails to build, it is an
- indication that something has gone wrong with the previous Binutils, GCC, or Glibc
- installations.</para></note>
+ <note><para>Building Binutils in the section after next will serve as an
+ additional check that the toolchain has been built properly. If Binutils
+ fails to build, it is an indication that something has gone wrong with the
+ previous Binutils, GCC, or Glibc installations.</para></note>
</sect2>
diff --git a/general.ent b/general.ent
index 250017cd5..5a8b90855 100644
--- a/general.ent
+++ b/general.ent
@@ -1,8 +1,8 @@
-<!ENTITY version "SVN-20130830">
+<!ENTITY version "7.4-rc2">
<!ENTITY releasedate "August 30, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.4">
-<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
+<!ENTITY generic-version "7.4-rc2"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
<!ENTITY blfs-root "&lfs-root;blfs/">
diff --git a/packages.ent b/packages.ent
index 5d1787162..a2f1d15b0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -311,11 +311,11 @@
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20130821"> <!-- Scripts depend on this format -->
-<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
+<!ENTITY lfs-bootscripts-size "36 KB"> <!-- Updated in Makefile (dev only) -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
-<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->
+<!ENTITY lfs-bootscripts-md5 "9ace533592f36ad36c4abb235eeccab5"> <!-- Updated in Makefile (dev only)-->
<!ENTITY lfs-bootscripts-home " ">
-<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> <!-- Updated in Makefile -->
+<!ENTITY lfs-bootscripts-ch7-du "260 KB"> <!-- Updated in Makefile(dev only) -->
<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
<!ENTITY libpipeline-version "1.2.4">