aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-12-18 23:52:58 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-12-18 23:52:58 +0000
commited480958a9aa7bb203b574d532e7a057e12cf43d (patch)
treef879920005a8700e5ac0a139ae41784f86a0142c
parent7bec09274f417b73c964819353265340d4964d85 (diff)
Update to automake-1.12.6 and linux-3.7.1
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10070 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--Makefile4
-rw-r--r--chapter01/changelog.xml14
-rw-r--r--general.ent4
-rw-r--r--packages.ent16
4 files changed, 27 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index f173b59a3..9588f6c47 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,9 @@ pdf: validate
$(Q)if [ ! -e $(BASEDIR) ]; then \
mkdir -p $(BASEDIR); \
fi;
- $(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+ $(Q)fop -q $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) 2>fop.log
+ @echo "$(BASEDIR)/$(PDF_OUTPUT) created"
+ @echo "fop.log created"
nochunks: validate profile-html
@echo "Generating non chunked XHTML file..."
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d2b911310..d79d6eaf5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,20 @@
-->
<listitem>
+ <para>2012-12-18</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Upgrade to Automake-1.12.6. Fixes
+ <ulink url="&lfs-ticket-root;3253">#3253</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Upgrade to Linux-3.7.1. Fixes
+ <ulink url="&lfs-ticket-root;3254">#3254</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-12-16</para>
<itemizedlist>
<listitem>
diff --git a/general.ent b/general.ent
index 952aae898..1c5f3577a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20121216">
-<!ENTITY releasedate "December 16, 2012">
+<!ENTITY version "SVN-20121218">
+<!ENTITY releasedate "December 18, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 0bf929d27..f8f358c09 100644
--- a/packages.ent
+++ b/packages.ent
@@ -15,11 +15,11 @@
<!ENTITY autoconf-ch6-du "17.1 MB">
<!ENTITY autoconf-ch6-sbu "4.5 SBU">
-<!ENTITY automake-version "1.12.5">
+<!ENTITY automake-version "1.12.6">
<!ENTITY am-minor-version "1.12">
-<!ENTITY automake-size "1,356 KB">
+<!ENTITY automake-size "1,368 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "2bc1aef898712c7e56320f264040972d">
+<!ENTITY automake-md5 "140e084223bf463a24c1a28427c6aec7">
<!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-ch6-du "100 MB">
<!ENTITY automake-ch6-sbu "less than 0.1 SBU (34.1 SBU with tests)">
@@ -328,12 +328,12 @@
<!ENTITY linux-major-version "3">
<!ENTITY linux-minor-version "7">
-<!--<!ENTITY linux-patch-version "10">-->
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "68,102 KB">
+<!ENTITY linux-patch-version "1">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-size "68,432 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "21223369d682bcf44bcdfe1521095983">
+<!ENTITY linux-md5 "b3f99fb945b270b503b2a0996b8b29e7">
<!ENTITY linux-home "http://www.kernel.org/">
<!ENTITY linux-ch8-du "540 - 800 MB">
<!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">