Update to pkg-config-0.27

Remove popt
Fix udev-retry boot script for latest udev functioanlity


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9916 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

8 files changed, 27 insertions, 30 deletions

diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry
index 4f258ac19..3790d0657 100644
--- a/bootscripts/lfs/init.d/udev_retry
+++ b/bootscripts/lfs/init.d/udev_retry
@@ -34,7 +34,9 @@ case "${1}" in
    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":
     
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f3ef58dd0..e5b4fcd28 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -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>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 71f1e85ca..d6555274f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -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>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 7a500aec6..a2fb77f02 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -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>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 27c16cfb3..3d15ebf75 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -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"/>
diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml
index 0862520f9..cd94b2f6f 100644
--- a/chapter06/pkgconfig.xml
+++ b/chapter06/pkgconfig.xml
@@ -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>
 
diff --git a/general.ent b/general.ent
index 23a5334aa..f3eb21aaf 100644
--- a/general.ent
+++ b/general.ent
@@ -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 &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 4e2ef6e23..09ad29223 100644
--- a/packages.ent
+++ b/packages.ent
@@ -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">