aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2018-04-11 21:37:07 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2018-04-11 21:37:07 +0000
commit5cc23954938f57808d88c75198a69dfc3b33bf16 (patch)
tree817c164855a0cb43fe09bde5d94d672f75a7603a
parentc9627324775e6358c3e664c2aad8fe23100e62dd (diff)
Fix appdata.loc file in gettext.
Update to linux-4.16.1. Update to procps-ng-3.3.14. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11399 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml17
-rw-r--r--chapter06/gettext.xml17
-rw-r--r--chapter06/revisedchroot.xml10
-rw-r--r--general.ent4
-rw-r--r--packages.ent16
5 files changed, 47 insertions, 17 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5f0086190..13ace23f2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,23 @@
-->
<listitem>
+ <para>2018-04-11</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Fix appdata.loc file in gettext.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-4.16.1. Fixes
+ <ulink url="&lfs-ticket-root;4256">#4256</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to procps-ng-3.3.14. Fixes
+ <ulink url="&lfs-ticket-root;4267">#4257</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2018-04-06</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 630febf1d..1213b2265 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -43,15 +43,28 @@
<sect2 role="installation">
<title>Installation of Gettext</title>
- <!-- this has been fixed in upstream gnulib, when a new version of
+ <!-- This has been fixed in upstream gnulib, when a new version of
gettext is released, please check #4055 to see if the change has been
- picked up in this package -->
+ picked up in this package
+
+ As of April 11, 2018, 'TESTS = test-lock' is in gettext-runtime/tests/Makefile.am
+ Perhaps the test is fixed.
+
+ There is no reference to 'test' or TEST in gettext-tools/gnulib-tests/Makefile.am
+ -->
<para>First, suppress two invocations of test-lock which on some machines
can loop forever:</para>
<screen><userinput remap="pre">sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in &amp;&amp;
sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>
+ <!-- As of April 11, 2018 appdata.* is NOT in git master, but appears
+ to be in metainfo.{its,loc}, When updating, check BLFS gnome-screenshot. -->
+ <para>Now fix a configuration file:</para>
+
+<screen><userinput remap="pre">sed -e '/AppData/N;N;p;s/\.appdata\./.metainfo./' \
+ -i gettext-tools/its/appdata.loc</userinput></screen>
+
<para>Prepare Gettext for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index db361a6eb..8436600f0 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -55,12 +55,12 @@ rm -f /usr/lib/libfl.a
rm -f /usr/lib/libfl_pic.a
rm -f /usr/lib/libz.a</userinput></screen>
- <para>There are also several files installed in the /usr/lib directory with a
- file name extention of .la. These are "libtool archive" files and generally
- unneeded on a linux system. None of these are necessary at this point. To
- remove them, run:</para>
+ <para>There are also several files installed in the /usr/lib and /usr/libexec
+ directories with a file name extention of .la. These are "libtool archive"
+ files and generally unneeded on a linux system. None of these are necessary
+ at this point. To remove them, run:</para>
-<screen><userinput>find /usr/lib -name \*.la -delete</userinput></screen>
+<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
<para>For more information about libtool archive files, see the <ulink
url="&blfs-book;/introduction/la-files.html">BLFS section "About Libtool
diff --git a/general.ent b/general.ent
index dfcef8633..eb65078c4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY version "SVN-20180406">
+<!ENTITY version "SVN-20180411">
<!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}]" -->
@@ -7,7 +7,7 @@
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "April 6, 2018">
+<!ENTITY releasedate "April 11, 2018">
<!ENTITY copyrightdate "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.3">
diff --git a/packages.ent b/packages.ent
index 86c744392..cff231772 100644
--- a/packages.ent
+++ b/packages.ent
@@ -416,12 +416,12 @@
<!ENTITY linux-major-version "4">
<!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "0">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -->
-<!ENTITY linux-size "100,606 KB">
+<!ENTITY linux-patch-version "1">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!ENTITY linux-size "100,610 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "1357fb4ee7c288fdeac5d4e0048f5c18">
+<!ENTITY linux-md5 "16123b843ad2efa394a060d8f72c91c2">
<!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,
@@ -548,10 +548,10 @@
<!ENTITY pkgconfig-ch6-du "28 MB">
<!ENTITY pkgconfig-ch6-sbu "0.3 SBU">
-<!ENTITY procps-ng-version "3.3.13">
-<!ENTITY procps-ng-size "881 KB">
+<!ENTITY procps-ng-version "3.3.14">
+<!ENTITY procps-ng-size "906 KB">
<!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
-<!ENTITY procps-ng-md5 "ad20fe97b3f45797dd43e2d3e046ff32">
+<!ENTITY procps-ng-md5 "fce371ccc1c15a67af9d85e4057e559d">
<!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
<!ENTITY procps-ng-ch6-du "15 MB">
<!ENTITY procps-ng-ch6-sbu "0.1 SBU">