Fixes to scripts

Update dependencies



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

7 files changed, 66 insertions, 61 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index ee6ee3b36..5bc3867e6 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -432,14 +432,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin DejaGNU dependency info -->
-  <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
+<!-- Begin D-Bus dependency info -->
+  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         Make, Sed, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -463,19 +464,18 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Xorg Libs</seg>
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Diffutils dependency info -->
-  <bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
+<!-- Begin DejaGNU dependency info -->
+  <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep,
-          Make, Sed, and Texinfo</seg>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -483,7 +483,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, Perl</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -503,15 +503,15 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="ieudev-dep">Eudev</bridgehead>
+<!-- Begin Diffutils dependency info -->
+  <bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Kmod, Make, Sed, and Util-linux</seg>
+          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep,
+          Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -519,7 +519,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Diffutils, Perl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -535,7 +535,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>Glib, Pci-Utils, Python, USB-Utils</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2153,6 +2153,43 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, 
+         GCC, Glibc, Gperf, Grep, Intltool, Libcap,
+         Make, Sed, and Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Sysvinit dependency info -->
   <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
 
diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs
index efbb29d87..4f34451d6 100644
--- a/bootscripts/lfs/init.d/mountvirtfs
+++ b/bootscripts/lfs/init.d/mountvirtfs
@@ -56,9 +56,6 @@ case "${1}" in
          mount -o mode=0755,nosuid /dev  || failed=1
       fi
 
-      # Copy devices that Udev >= 155 doesn't handle to /dev
-      cp -a /lib/udev/devices/* /dev
-
       ln -sfn /run/shm /dev/shm
       
       (exit ${failed})
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index 9e784ccb2..c7257805c 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -49,7 +49,7 @@ case "${1}" in
 
       # Start the udev daemon to continually watch for, and act on,
       # uevents
-      /lib/systemd-udevd --daemon
+      /lib/systemd/systemd-udevd --daemon
 
       # Now traverse /sys in order to "coldplug" devices that have
       # already been discovered
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 954558afd..154407799 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -166,25 +166,8 @@
         <para>MD5 sum: <literal>&expect-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&eudev-home;"/></para>
-        <para>Download: <ulink url="&eudev-url;"/></para>
-        <para>MD5 sum: <literal>&eudev-md5;</literal></para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry>
-      <term>Eudev Manpages (&eudev-version;) - <token>&eudev-manpages-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&eudev-manpages-url;"/></para>
-        <para>MD5 sum: <literal>&eudev-manpages-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
-    <varlistentry>
       <term>File (&file-version;) - <token>&file-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&file-home;"/></para>
@@ -329,15 +312,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libcap-home;"/></para>
-        <para>Download: <ulink url="&libcap-url;"/></para>
-        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Inetutils (&inetutils-version;) - <token>&inetutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&inetutils-home;"/></para>
@@ -401,6 +375,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libcap-home;"/></para>
+        <para>Download: <ulink url="&libcap-url;"/></para>
+        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Libpipeline (&libpipeline-version;) - <token>&libpipeline-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&libpipeline-home;"/></para>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 780c36a42..644520d4a 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -182,7 +182,7 @@ ln -svfn init-systemd   /sbin/init
 ln -svfn init.d-systemd /etc/init.d
 
 for tool in halt poweroff reboot runlevel shutdown telinit; do
-  ln -sfvn  $(tool}-systemd   /sbin/${tool}
+  ln -sfvn  ${tool}-systemd   /sbin/${tool}
   ln -svfn  ${tool}-systemd.8 /usr/share/man/man8/${tool}.8
 done
 
diff --git a/general.ent b/general.ent
index 124767608..58f16a50a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20140403">
-<!ENTITY releasedate     "April 3, 2014">
+<!ENTITY version         "SVN-20140404">
+<!ENTITY releasedate     "April 4, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 04b7ef235..d1623eef7 100644
--- a/packages.ent
+++ b/packages.ent
@@ -164,18 +164,6 @@
 <!ENTITY expect-ch5-du "4.4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY eudev-version "1.5.3">
-<!ENTITY eudev-size "1,684 KB">
-<!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "51380938b489385cc394f4ebabc048f0">
-<!ENTITY eudev-home "http://www.gentoo.org/proj/en/eudev/">
-<!ENTITY eudev-ch6-du "7.4 MB">
-<!ENTITY eudev-ch6-sbu "0.3 SBU">
-
-<!ENTITY eudev-manpages-size "6 KB">
-<!ENTITY eudev-manpages-url "&anduin-other;eudev-&eudev-version;-manpages.tar.bz2">
-<!ENTITY eudev-manpages-md5 "eaa5b9af344e958c29288e5376b97a28">
-
 <!ENTITY file-version "5.17">
 <!ENTITY file-size "694 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
@@ -370,7 +358,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20140331">              <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20140404">              <!-- 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 -->