[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-714-gdbc8e54
git
git at cross-lfs.org
Sat Apr 12 03:43:02 PDT 2014
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 dbc8e54aa7c4ed75e814d04692476d942b503220 (commit)
via 9a995bdecac75ad231627c869067945e682a66bb (commit)
from 63dcff4ecbc0f95a5b4f00f925cf09907934dee8 (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 dbc8e54aa7c4ed75e814d04692476d942b503220
Author: Chris Staub <chris at beaker67.com>
Date: Sat Apr 12 06:43:00 2014 -0400
Started moving stuff in boot section to /tools, starting with inittab and its references to agetty
diff --git a/BOOK/boot/64/createfiles.xml b/BOOK/boot/64/createfiles.xml
index f62e030..f5e94ec 100644
--- a/BOOK/boot/64/createfiles.xml
+++ b/BOOK/boot/64/createfiles.xml
@@ -19,7 +19,6 @@
<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
diff --git a/BOOK/boot/common/createfiles.xml b/BOOK/boot/common/createfiles.xml
index 7370a07..3a8feac 100644
--- a/BOOK/boot/common/createfiles.xml
+++ b/BOOK/boot/common/createfiles.xml
@@ -16,7 +16,6 @@
the next chapter after the software has been installed.</para>
<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
ln -sv /tools/bin/file ${CLFS}/usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index aa77cae..774dac5 100644
--- a/BOOK/boot/common/sysvinit.xml
+++ b/BOOK/boot/common/sysvinit.xml
@@ -33,6 +33,11 @@
sed -e 's,/usr/lib,/tools/lib,g' \
src/Makefile.orig > src/Makefile</userinput></screen>
+ <para os="bc">Change the location of inittab:</para>
+
+<screen os="bd"><userinput>cp -v src/paths.h{,.orig}
+sed 's@/etc/inittab@/tools&@' src/paths.h.orig > src/paths.h</userinput></screen>
+
<para os ="c">Compile the package:</para>
<screen os="ac"><userinput>make -C src clobber
@@ -56,11 +61,11 @@ make -C src CC="${CC}"</userinput></screen>
<primary sortas="e-/etc/inittab">/etc/inittab</primary>
</indexterm>
- <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by running the
+ <para>Create a new file <filename>/tools/etc/inittab</filename> by running the
following:</para>
-<screen><userinput>cat > ${CLFS}/etc/inittab << "EOF"
-<literal># Begin /etc/inittab
+<screen><userinput>cat > /tools/etc/inittab << "EOF"
+<literal># Begin /tools/etc/inittab
id:3:initdefault:
@@ -76,36 +81,36 @@ l6:6:wait:/etc/rc.d/init.d/rc 6
ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-su:S016:once:/sbin/sulogin
+su:S016:once:/tools/sbin/sulogin
</literal>
EOF</userinput></screen>
<para>The following command adds the standard virtual terminals to
- <filename>${CLFS}/etc/inittab</filename>. If your system only has a serial
+ <filename>/tools/etc/inittab</filename>. If your system only has a serial
console skip the following command:</para>
-<screen><userinput>cat >> ${CLFS}/etc/inittab << "EOF"
-<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
+<screen><userinput>cat >> /tools/etc/inittab << "EOF"
+<literal>1:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty1 9600
+2:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty2 9600
+3:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty3 9600
+4:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty4 9600
+5:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty5 9600
+6:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty6 9600
</literal>
EOF</userinput></screen>
<para>If your system has a serial console, run the following command to add
- the entry to <filename>${CLFS}/etc/inittab</filename>.</para>
+ the entry to <filename>/tools/etc/inittab</filename>.</para>
-<screen><userinput>cat >> ${CLFS}/etc/inittab << "EOF"
-<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
+<screen><userinput>cat >> /tools/etc/inittab << "EOF"
+<literal>c0:12345:respawn:/tools/sbin/agetty --noclear 115200 ttyS0 vt100
</literal>
EOF</userinput></screen>
- <para>Finally, add the end line to <filename>${CLFS}/etc/inittab</filename>.</para>
+ <para>Finally, add the end line to <filename>/tools/etc/inittab</filename>.</para>
-<screen><userinput>cat >> ${CLFS}/etc/inittab << "EOF"
-<literal># End /etc/inittab</literal>
+<screen><userinput>cat >> /tools/etc/inittab << "EOF"
+<literal># End /tools/etc/inittab</literal>
EOF</userinput></screen>
<para>The <parameter>-I '\033(K'</parameter> option tells
diff --git a/BOOK/boot/mips64/createfiles.xml b/BOOK/boot/mips64/createfiles.xml
index 1228ed2..89f9c6e 100644
--- a/BOOK/boot/mips64/createfiles.xml
+++ b/BOOK/boot/mips64/createfiles.xml
@@ -16,7 +16,6 @@
<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
diff --git a/BOOK/boot/multilib/createfiles.xml b/BOOK/boot/multilib/createfiles.xml
index eb7dc15..16dabb7 100644
--- a/BOOK/boot/multilib/createfiles.xml
+++ b/BOOK/boot/multilib/createfiles.xml
@@ -16,7 +16,6 @@
<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
diff --git a/BOOK/boot/multilib/sysvinit.xml b/BOOK/boot/multilib/sysvinit.xml
index 36983e2..f55d72b 100644
--- a/BOOK/boot/multilib/sysvinit.xml
+++ b/BOOK/boot/multilib/sysvinit.xml
@@ -32,6 +32,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/sysvinit.xml"
+ xpointer="xpointer(//*[@os='bc'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/sysvinit.xml"
+ xpointer="xpointer(//*[@os='bd'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/sysvinit.xml"
xpointer="xpointer(//*[@os='c'])"/>
<screen os="ac"><userinput>make -C src clobber
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index ed34e50..15c41e3 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>12 April 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Modified sysvinit installation to allow it
+ to use /tools/etc/inittab and /tools/sbin/agetty.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>11 April 2014</para>
<itemizedlist>
<listitem>
commit 9a995bdecac75ad231627c869067945e682a66bb
Author: Chris Staub <chris at beaker67.com>
Date: Sat Apr 12 06:37:48 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 5f914e2..2547159 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "04"> <!-- Use two digits -->
<!ENTITY month_name "April">
-<!ENTITY day "11"> <!-- Use two digits -->
+<!ENTITY day "12"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/createfiles.xml | 1 -
BOOK/boot/common/createfiles.xml | 1 -
BOOK/boot/common/sysvinit.xml | 41 ++++++++++++++++++--------------
BOOK/boot/mips64/createfiles.xml | 1 -
BOOK/boot/multilib/createfiles.xml | 1 -
BOOK/boot/multilib/sysvinit.xml | 8 ++++++
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 10 +++++++
8 files changed, 42 insertions(+), 23 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list