aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2017-04-28 17:41:47 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2017-04-28 17:41:47 +0000
commitc43581a5d7294e18775471a5dbc3087ad0559dbf (patch)
treecfe86e4172b28ceca7ad2ff97d6e21fb625b687f
parent6749655df9f428461f62756219f21e406f28cc86 (diff)
Add a patch to fix a flex regresion in version 2.6.3.
Update to linux-4.10.13. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11235 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml13
-rw-r--r--chapter01/whatsnew.xml3
-rw-r--r--chapter03/patches.xml4
-rw-r--r--chapter06/flex.xml4
-rw-r--r--general.ent6
-rw-r--r--packages.ent6
-rw-r--r--patches.ent8
7 files changed, 32 insertions, 12 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ae9a7eacf..fc93605b9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,6 +46,19 @@
<para>2017-04-26</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Add a patch to fix a flex regresion in version 2.6.3.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-4.10.13. Fixes
+ <ulink url="&lfs-ticket-root;4079">#4079</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2017-04-26</para>
+ <itemizedlist>
+ <listitem>
<para>[bdubbs] - Update to grub-2.02. Fixes
<ulink url="&lfs-ticket-root;4042">#4042</ulink>.</para>
</listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b61aa6a61..09214c8a4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -259,6 +259,9 @@
<para>gcc-6.1.0-asan-1.patch</para>
</listitem>
-->
+ <listitem>
+ <para>flex-2.6.3-upstream_fix-1.patch</para>
+ </listitem>
</itemizedlist>
<itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 0fd3124d5..662afd611 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -49,7 +49,7 @@
<para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
</listitem>
</varlistentry>
-<!--
+
<varlistentry>
<term>Flex Fixes Patch - <token>&flex-fixes-patch-size;</token>:</term>
<listitem>
@@ -57,7 +57,7 @@
<para>MD5 sum: <literal>&flex-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
-
+<!--
<varlistentry>
<term>Gccc ASAN Patch - <token>&gcc-asan-patch-size;</token>:</term>
<listitem>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 5536772dc..168d0ceed 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,6 +41,10 @@
<sect2 role="installation">
<title>Installation of Flex</title>
+ <para>First, fix a problem with the latest version:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
+
<para>The build procedure assumes the <application>help2man</application>
program is available to create a man page from the executable --help option.
This is not present, so we use an environment variable to skip this process.
diff --git a/general.ent b/general.ent
index 05d4447e1..005cb31c6 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20170426">
+<!ENTITY version "SVN-20170428">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20170426-systemd">
+<!ENTITY versiond "20170428-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "April 26, 2017">
+<!ENTITY releasedate "April 28, 2017">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.1">
diff --git a/packages.ent b/packages.ent
index a2aa7370d..da68a33b7 100644
--- a/packages.ent
+++ b/packages.ent
@@ -392,12 +392,12 @@
<!ENTITY linux-major-version "4">
<!ENTITY linux-minor-version "10">
-<!ENTITY linux-patch-version "12">
+<!ENTITY linux-patch-version "13">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "92,041 KB">
+<!ENTITY linux-size "92,033 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "64ea1adbb60a311e03c24c99471db3f7">
+<!ENTITY linux-md5 "c3ea815abc2784bed9414ea91a691fb4">
<!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
diff --git a/patches.ent b/patches.ent
index 7587bc567..dd519a9c4 100644
--- a/patches.ent
+++ b/patches.ent
@@ -20,11 +20,11 @@
<!ENTITY coreutils-i18n-patch-md5 "a9404fb575dfd5514f3c8f4120f9ca7d">
<!ENTITY coreutils-i18n-patch-size "168 KB">
-<!--
-<!ENTITY flex-fixes-patch "flex-&flex-version;-fixes-1.patch">
-<!ENTITY flex-fixes-patch-md5 "ab07c395c5c96839f4fbc7801ed4cf73">
-<!ENTITY flex-fixes-patch-size "200 KB">
+<!ENTITY flex-fixes-patch "flex-&flex-version;-upstream_fix-1.patch">
+<!ENTITY flex-fixes-patch-md5 "799f2a14a31eaae831fb141b48f7b81c">
+<!ENTITY flex-fixes-patch-size "0.9 KB">
+<!--
<!ENTITY gcc-asan-patch "gcc-&gcc-version;-asan-1.patch">
<!ENTITY gcc-asan-patch-md5 "c12ab2e323010fda83bfccc27f58f0b5">
<!ENTITY gcc-asan-patch-size "2.8 KB">