Author: bdubbs
Date: 2012-07-22 16:31:14 -0600 (Sun, 22 Jul 2012)
New Revision: 9916
Modified:
trunk/BOOK/bootscripts/lfs/init.d/udev_retry
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter03/packages.xml
trunk/BOOK/chapter06/chapter06.xml
trunk/BOOK/chapter06/pkgconfig.xml
trunk/BOOK/general.ent
trunk/BOOK/packages.ent
Log:
Update to pkg-config-0.27
Remove popt
Fix udev-retry boot script for latest udev functioanlity
Modified: trunk/BOOK/bootscripts/lfs/init.d/udev_retry
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/udev_retry 2012-07-19 17:31:56 UTC
(rev 9915)
+++ trunk/BOOK/bootscripts/lfs/init.d/udev_retry 2012-07-22 22:31:14 UTC
(rev 9916)
@@ -34,7 +34,9 @@
start)
log_info_msg "Retrying failed uevents, if any..."
- rundir=$(/sbin/udevadm info --run)
+ # As of udev-186, the --run option is no longer valid
+ #rundir=$(/sbin/udevadm info --run)
+ rundir=/run
# From Debian: "copy the rules generated before / was mounted
# read-write":
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/chapter01/changelog.xml 2012-07-22 22:31:14 UTC (rev 9916)
@@ -38,6 +38,21 @@
-->
<listitem>
+ <para>2012-07-22</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Fix udev-retry boot script for latest
+ udev functioanlity. Remove 'udev info --run-dir'</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to pkg-config-0.27.
+ Remove popt. Fixes
+ <ulink url="&lfs-ticket-root;3141">#3141</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-07-19</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/chapter01/whatsnew.xml 2012-07-22 22:31:14 UTC (rev 9916)
@@ -250,11 +250,11 @@
<listitem>
<para>pkg-config-&pkgconfig-version;</para>
</listitem>
-
+<!-- Added and removed in this cycle
<listitem>
<para>popt&popt-version;</para>
</listitem>
-
+-->
</itemizedlist>
<itemizedlist>
Modified: trunk/BOOK/chapter03/packages.xml
===================================================================
--- trunk/BOOK/chapter03/packages.xml 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/chapter03/packages.xml 2012-07-22 22:31:14 UTC (rev 9916)
@@ -459,15 +459,6 @@
</varlistentry>
<varlistentry>
- <term>Popt (&popt-version;) - <token>&popt-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&popt-home;"/></para>
- <para>Download: <ulink url="&popt-url;"/></para>
- <para>MD5 sum: <literal>&popt-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&procps-home;"/></para>
Modified: trunk/BOOK/chapter06/chapter06.xml
===================================================================
--- trunk/BOOK/chapter06/chapter06.xml 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/chapter06/chapter06.xml 2012-07-22 22:31:14 UTC (rev 9916)
@@ -46,7 +46,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="perl.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="popt.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pkgconfig.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="automake.xml"/>
Modified: trunk/BOOK/chapter06/pkgconfig.xml
===================================================================
--- trunk/BOOK/chapter06/pkgconfig.xml 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/chapter06/pkgconfig.xml 2012-07-22 22:31:14 UTC (rev 9916)
@@ -45,7 +45,6 @@
<para>Prepare Pkg-config for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
- --with-installed-popt \
--with-internal-glib \
--docdir=/usr/share/doc/pkg-config-&pkgconfig-version;</userinput></screen>
@@ -63,7 +62,6 @@
</sect2>
-
<sect2 id="contents-pkgconfig" role="content">
<title>Contents of Pkg-config</title>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/general.ent 2012-07-22 22:31:14 UTC (rev 9916)
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120719">
-<!ENTITY releasedate "July 19, 2012">
+<!ENTITY version "SVN-20120722">
+<!ENTITY releasedate "July 22, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2012-07-19 17:31:56 UTC (rev 9915)
+++ trunk/BOOK/packages.ent 2012-07-22 22:31:14 UTC (rev 9916)
@@ -302,7 +302,7 @@
<!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20120617"> <!-- Scripts
depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120722"> <!-- Scripts
depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in
Makefile -->
<!ENTITY lfs-bootscripts-url
"&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in
Makefile -->
@@ -429,18 +429,10 @@
<!ENTITY perl-ch6-du "235 MB">
<!ENTITY perl-ch6-sbu "7.6 SBU">
-<!ENTITY popt-version "1.16">
-<!ENTITY popt-size "692 KB">
-<!ENTITY popt-url "http://rpm5.org/files/popt/popt-&popt-version;.tar.gz";>
-<!ENTITY popt-md5 "3743beefa3dd6247a73f8f7a32c14c33">
-<!ENTITY popt-home "http://directory.fsf.org/wiki/Popt";>
-<!ENTITY popt-ch6-du "8 MB">
-<!ENTITY popt-ch6-sbu "0.1 SBU">
-
-<!ENTITY pkgconfig-version "0.26">
-<!ENTITY pkgconfig-size "1900 KB">
-<!ENTITY pkgconfig-url
"http://people.freedesktop.org/~dbn/pkg-config-&pkgconfig-version;-internal-glib.tar.gz";>
-<!ENTITY pkgconfig-md5 "015af476352e25409ae562b9d465e500">
+<!ENTITY pkgconfig-version "0.27">
+<!ENTITY pkgconfig-size "1872 KB">
+<!ENTITY pkgconfig-url
"http://people.freedesktop.org/pkg-config-&pkgconfig-version;.tar.gz";>
+<!ENTITY pkgconfig-md5 "3a4c9feab14b6719afd8904945d9b4e4">
<!ENTITY pkgconfig-home "http://www.freedesktop.org/wiki/Software/pkg-config";>
<!ENTITY pkgconfig-ch6-du "32 MB">
<!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
