[Clfs-commits] commit: r4836 - in /branches/clfs-sysroot/BOOK: ./ bootscripts/ bootscripts/common/ introduction/common/ materials/common/ network/ network/common/
svn at cross-lfs.org
svn at cross-lfs.org
Sun Mar 15 14:42:22 PDT 2009
Author: jciccone
Date: Sun Mar 15 21:42:22 2009
New Revision: 4836
Log:
Update bootscript configuration from trunk. Update bootscripts to 1.2-pre6.
Added:
branches/clfs-sysroot/BOOK/bootscripts/common/bootscripts.xml
- copied, changed from r4818, trunk/BOOK/bootscripts/common/bootscripts.xml
branches/clfs-sysroot/BOOK/bootscripts/common/console.xml
- copied unchanged from r4818, trunk/BOOK/bootscripts/common/console.xml
branches/clfs-sysroot/BOOK/bootscripts/common/inputrc.xml
- copied, changed from r4818, trunk/BOOK/bootscripts/common/inputrc.xml
branches/clfs-sysroot/BOOK/bootscripts/common/introduction.xml
- copied unchanged from r4818, trunk/BOOK/bootscripts/common/introduction.xml
branches/clfs-sysroot/BOOK/bootscripts/common/locale.xml
- copied, changed from r4818, trunk/BOOK/bootscripts/common/locale.xml
branches/clfs-sysroot/BOOK/bootscripts/common/profile.xml
- copied unchanged from r4818, trunk/BOOK/bootscripts/common/profile.xml
branches/clfs-sysroot/BOOK/bootscripts/common/setclock.xml
- copied, changed from r4818, trunk/BOOK/bootscripts/common/setclock.xml
branches/clfs-sysroot/BOOK/bootscripts/common/symlinks.xml
- copied, changed from r4818, trunk/BOOK/bootscripts/common/symlinks.xml
branches/clfs-sysroot/BOOK/bootscripts/common/udev.xml
- copied unchanged from r4818, trunk/BOOK/bootscripts/common/udev.xml
branches/clfs-sysroot/BOOK/bootscripts/common/usage.xml
- copied unchanged from r4818, trunk/BOOK/bootscripts/common/usage.xml
branches/clfs-sysroot/BOOK/network/
- copied from r4818, trunk/BOOK/network/
Removed:
branches/clfs-sysroot/BOOK/bootscripts/common/hostname.xml
branches/clfs-sysroot/BOOK/bootscripts/common/hosts.xml
branches/clfs-sysroot/BOOK/bootscripts/common/network.xml
branches/clfs-sysroot/BOOK/bootscripts/common/sysklogd.xml
Modified:
branches/clfs-sysroot/BOOK/alpha-index.xml
branches/clfs-sysroot/BOOK/arm-index.xml
branches/clfs-sysroot/BOOK/bootscripts/alpha-chapter.xml
branches/clfs-sysroot/BOOK/bootscripts/arm-chapter.xml
branches/clfs-sysroot/BOOK/bootscripts/hppa-chapter.xml
branches/clfs-sysroot/BOOK/bootscripts/x86-chapter.xml
branches/clfs-sysroot/BOOK/hppa-index.xml
branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
branches/clfs-sysroot/BOOK/materials/common/packages.xml
branches/clfs-sysroot/BOOK/network/common/dhcp.xml
branches/clfs-sysroot/BOOK/network/common/hostname.xml
branches/clfs-sysroot/BOOK/network/common/hosts.xml
branches/clfs-sysroot/BOOK/network/common/resolv.xml
branches/clfs-sysroot/BOOK/network/common/static.xml
branches/clfs-sysroot/BOOK/packages.ent
branches/clfs-sysroot/BOOK/x86-index.xml
Modified: branches/clfs-sysroot/BOOK/alpha-index.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/alpha-index.xml (original)
+++ branches/clfs-sysroot/BOOK/alpha-index.xml Sun Mar 15 21:42:22 2009
@@ -49,6 +49,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/alpha-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/alpha-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/alpha-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
Modified: branches/clfs-sysroot/BOOK/arm-index.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/arm-index.xml (original)
+++ branches/clfs-sysroot/BOOK/arm-index.xml Sun Mar 15 21:42:22 2009
@@ -49,6 +49,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/arm-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/arm-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/arm-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
Modified: branches/clfs-sysroot/BOOK/bootscripts/alpha-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootscripts/alpha-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/bootscripts/alpha-chapter.xml Sun Mar 15 21:42:22 2009
@@ -14,15 +14,12 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/locale.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/bootscripts/arm-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootscripts/arm-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/bootscripts/arm-chapter.xml Sun Mar 15 21:42:22 2009
@@ -14,15 +14,12 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/locale.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/bootscripts/hppa-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootscripts/hppa-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/bootscripts/hppa-chapter.xml Sun Mar 15 21:42:22 2009
@@ -14,15 +14,12 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/locale.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/bootscripts/x86-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootscripts/x86-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/bootscripts/x86-chapter.xml Sun Mar 15 21:42:22 2009
@@ -14,15 +14,12 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/locale.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/hppa-index.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/hppa-index.xml (original)
+++ branches/clfs-sysroot/BOOK/hppa-index.xml Sun Mar 15 21:42:22 2009
@@ -49,6 +49,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/hppa-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/hppa-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/hppa-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
Modified: branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-sysroot/BOOK/introduction/common/changelog.xml Sun Mar 15 21:42:22 2009
@@ -39,6 +39,12 @@
<listitem>
<para>March 15, 2009</para>
<itemizedlist>
+ <listitem>
+ <para>[jciccone] - Copied bootscript sections from trunk.</para>
+ </listitem>
+ <listitem>
+ <para>[jciccone] - Updated Bootscripts to 1.2-pre6.</para>
+ </listitem>
<listitem>
<para>[jciccone] - Added DHCPCD to the final system.</para>
</listitem>
Modified: branches/clfs-sysroot/BOOK/materials/common/packages.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/materials/common/packages.xml (original)
+++ branches/clfs-sysroot/BOOK/materials/common/packages.xml Sun Mar 15 21:42:22 2009
@@ -69,11 +69,11 @@
</varlistentry>
<varlistentry>
- <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - <token>&clfs-bootscripts-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&clfs-bootscripts-home;"/></para>
- <para>Download: <ulink url="&clfs-bootscripts-url;"/></para>
- <para>MD5 sum: <literal>&clfs-bootscripts-md5;</literal></para>
+ <term>CLFS-Bootscripts (&bootscripts-clfs-version;) - <token>&bootscripts-clfs-size;</token>:</term>
+ <listitem>
+ <para>Home page: <ulink url="&bootscripts-clfs-home;"/></para>
+ <para>Download: <ulink url="&bootscripts-clfs-url;"/></para>
+ <para>MD5 sum: <literal>&bootscripts-clfs-md5;</literal></para>
</listitem>
</varlistentry>
Modified: branches/clfs-sysroot/BOOK/network/common/dhcp.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/network/common/dhcp.xml (original)
+++ branches/clfs-sysroot/BOOK/network/common/dhcp.xml Sun Mar 15 21:42:22 2009
@@ -17,26 +17,25 @@
<screen><userinput>tar -jxvf bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2
cd -v bootscripts-cross-lfs-&bootscripts-clfs-version;
-make install-service-dhcpcd</userinput></screen>
+make DESTDIR="${CLFS}" install-service-dhcpcd</userinput></screen>
<para>Finally, create the
<filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename>
configuration file using the following commands. Adjust appropriately for
additional interfaces:</para>
-<screen><userinput><literal>install -v -d /etc/sysconfig/network-devices/ifconfig.eth0
-cat > /etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd << "EOF"
-ONBOOT="yes"
+<screen><userinput>cd ${CLFS}/etc/sysconfig/network-devices &&
+mkdir -v ifconfig.eth0 &&
+cat > ifconfig.eth0/dhcpcd << "EOF"
+<literal>ONBOOT="yes"
SERVICE="dhcpcd"
# Start Command for DHCPCD
-#
DHCP_START="-q"
# Stop Command for DHCPCD
-#
-DHCP_STOP="-k"
-EOF</literal>
+DHCP_STOP="-k"</literal>
+EOF
</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Modified: branches/clfs-sysroot/BOOK/network/common/hostname.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/network/common/hostname.xml (original)
+++ branches/clfs-sysroot/BOOK/network/common/hostname.xml Sun Mar 15 21:42:22 2009
@@ -21,7 +21,7 @@
<para>Create the <filename>/etc/sysconfig/network</filename> file
and enter a hostname by running:</para>
- <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" > /etc/sysconfig/network</userinput></screen>
+ <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" > ${CLFS}/etc/sysconfig/network</userinput></screen>
<para><replaceable>[clfs]</replaceable> needs to be replaced with the
name given to the computer. Do not enter the Fully Qualified
Modified: branches/clfs-sysroot/BOOK/network/common/hosts.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/network/common/hosts.xml (original)
+++ branches/clfs-sysroot/BOOK/network/common/hosts.xml Sun Mar 15 21:42:22 2009
@@ -49,7 +49,7 @@
<para>Create the <filename>/etc/hosts</filename> file by running:</para>
-<screen><userinput>cat > /etc/hosts << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/hosts << "EOF"
<literal># Begin /etc/hosts (network card version)
127.0.0.1 localhost
@@ -68,7 +68,7 @@
<para>If a network card is not going to be configured, create the
<filename>/etc/hosts</filename> file by running:</para>
-<screen><userinput>cat > /etc/hosts << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/hosts << "EOF"
<literal># Begin /etc/hosts (no network card version)
127.0.0.1 <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost
Modified: branches/clfs-sysroot/BOOK/network/common/resolv.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/network/common/resolv.xml (original)
+++ branches/clfs-sysroot/BOOK/network/common/resolv.xml Sun Mar 15 21:42:22 2009
@@ -29,7 +29,7 @@
network interfaces or manually set your DNS using DHCP then create the
file by running the following:</para>
-<screen><userinput>cat > /etc/resolv.conf << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/resolv.conf << "EOF"
<literal># Begin /etc/resolv.conf
domain <replaceable>[Your Domain Name]</replaceable>
Modified: branches/clfs-sysroot/BOOK/network/common/static.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/network/common/static.xml (original)
+++ branches/clfs-sysroot/BOOK/network/common/static.xml Sun Mar 15 21:42:22 2009
@@ -25,7 +25,7 @@
<para>The following command creates a sample <filename>ipv4</filename>
file for the <emphasis>eth0</emphasis> device:</para>
-<screen><userinput>cd /etc/sysconfig/network-devices &&
+<screen><userinput>cd ${CLFS}/etc/sysconfig/network-devices &&
mkdir -v ifconfig.eth0 &&
cat > ifconfig.eth0/ipv4 << "EOF"
<literal>ONBOOT=yes
Modified: branches/clfs-sysroot/BOOK/packages.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/packages.ent (original)
+++ branches/clfs-sysroot/BOOK/packages.ent Sun Mar 15 21:42:22 2009
@@ -41,11 +41,11 @@
<!ENTITY bzip2-md5 "3c15a0c8d1d3ee1c46a1634d00617b1a">
<!ENTITY bzip2-home "http://www.bzip.org">
-<!ENTITY clfs-bootscripts-version "1.2-pre3">
-<!ENTITY clfs-bootscripts-size "40 KB">
-<!ENTITY clfs-bootscripts-url "&packages-root;bootscripts-cross-lfs-&clfs-bootscripts-version;.tar.bz2">
-<!ENTITY clfs-bootscripts-md5 "b02b13426d55d306c3cf9da75be790aa">
-<!ENTITY clfs-bootscripts-home " ">
+<!ENTITY bootscripts-clfs-version "1.2-pre3">
+<!ENTITY bootscripts-clfs-size "40 KB">
+<!ENTITY bootscripts-clfs-url "&packages-root;bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2">
+<!ENTITY bootscripts-clfs-md5 "b02b13426d55d306c3cf9da75be790aa">
+<!ENTITY bootscripts-clfs-home " ">
<!ENTITY coreutils-version "6.12">
<!ENTITY coreutils-size "8,808 KB">
Modified: branches/clfs-sysroot/BOOK/x86-index.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/x86-index.xml (original)
+++ branches/clfs-sysroot/BOOK/x86-index.xml Sun Mar 15 21:42:22 2009
@@ -49,6 +49,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
More information about the Clfs-commits
mailing list