[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-730-g54b143f

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, systemd has been updated
       via  54b143f48f87e3ff3916bd05e592a55439da1468 (commit)
       via  f6dfda59db09b65472fc951b777577a779abadc6 (commit)
      from  a092cc7cbd03bc56be15e7c050ee40986189093d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 54b143f48f87e3ff3916bd05e592a55439da1468
Author: Chris Staub <chris at beaker67.com>
Date:   Mon Apr 14 00:14:08 2014 -0400

    Updated bootscripts to be used in /tools

diff --git a/BOOK/boot/common/bootscripts.xml b/BOOK/boot/common/bootscripts.xml
index 3da69dd..b32e4fd 100644
--- a/BOOK/boot/common/bootscripts.xml
+++ b/BOOK/boot/common/bootscripts.xml
@@ -26,22 +26,13 @@
   <sect2 role="installation">
     <title>Installation of Bootscripts</title>
 
-    <para os="s1">Remove references to Makefile targets that do not need
-    to be used at this time:</para>
+    <para os="s1">Update the bootscripts so they can be used in /tools:</para>
 
-<screen os="s2"><userinput>cp Makefile{,.orig}
-sed -e '/^install-minimal/s/ udev_device_dirs udev_device_links//' \
-    -e '/ mknod_devices/d' \
-    Makefile.orig > Makefile</userinput></screen>
-
-    <para os="s3">Account for udev now being in /tools:</para>
-
-<screen os="s4"><userinput>cp clfs/init.d/udev{,.orig}
-sed 's@/sbin/udev@/tools&@' clfs/init.d/udev.orig > clfs/init.d/udev</userinput></screen>
+<screen os="s2"><userinput>patch -Np1 -i ../bootscripts-cross-lfs-2.1-pre1-updates-1.patch</userinput></screen>
 
     <para os="a">Install the package:</para>
 
-<screen os="b"><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
+<screen os="b"><userinput>make DESTDIR=/tools install-minimal</userinput></screen>
 
   <para os="c">The <command>setclock</command> script reads the time from the
   hardware clock, also known as the BIOS or the Complementary Metal Oxide
@@ -65,12 +56,12 @@ sed 's@/sbin/udev@/tools&@' clfs/init.d/udev.orig > clfs/init.d/udev</userin
   to a value of <option>0</option> (zero) if the hardware clock
   is <emphasis>not</emphasis> set to UTC time.</para>
 
-<screen os="f"><userinput>cat > ${CLFS}/etc/sysconfig/clock << "EOF"
-<literal># Begin /etc/sysconfig/clock
+<screen os="f"><userinput>cat > /tools/etc/sysconfig/clock << "EOF"
+<literal># Begin /tools/etc/sysconfig/clock
 
 UTC=1
 
-# End /etc/sysconfig/clock</literal>
+# End /tools/etc/sysconfig/clock</literal>
 EOF</userinput></screen>
 
   </sect2>
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index 41f1e1d..85a9e60 100644
--- a/BOOK/boot/common/sysvinit.xml
+++ b/BOOK/boot/common/sysvinit.xml
@@ -70,15 +70,15 @@ ln -svf /tools/sbin/init ${CLFS}/sbin</userinput></screen>
 
 id:3:initdefault:
 
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
+si::sysinit:/tools/etc/rc.d/init.d/rc sysinit
+
+l0:0:wait:/tools/etc/rc.d/init.d/rc 0
+l1:S1:wait:/tools/etc/rc.d/init.d/rc 1
+l2:2:wait:/tools/etc/rc.d/init.d/rc 2
+l3:3:wait:/tools/etc/rc.d/init.d/rc 3
+l4:4:wait:/tools/etc/rc.d/init.d/rc 4
+l5:5:wait:/tools/etc/rc.d/init.d/rc 5
+l6:6:wait:/tools/etc/rc.d/init.d/rc 6
 
 ca:12345:ctrlaltdel:/tools/sbin/shutdown -t1 -a -r now
 

commit f6dfda59db09b65472fc951b777577a779abadc6
Author: Chris Staub <chris at beaker67.com>
Date:   Mon Apr 14 00:13:46 2014 -0400

    Fix for eudev to install a rules file into /tools

diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index 3abd568..8ce3daa 100644
--- a/BOOK/boot/common/eudev.xml
+++ b/BOOK/boot/common/eudev.xml
@@ -52,7 +52,7 @@ LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/tools \
     <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
 
 <screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
-> ${CLFS}/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
+> /tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
 
  </sect2>
 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/boot/common/bootscripts.xml |   21 ++++++---------------
 BOOK/boot/common/eudev.xml       |    2 +-
 BOOK/boot/common/sysvinit.xml    |   18 +++++++++---------
 3 files changed, 16 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book