[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-rc1-systemd-73-gf0b15e4
git
git at cross-lfs.org
Mon Aug 18 16:02:33 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, master has been updated
via f0b15e4d7f1a218ecea87de90c89b9e8e39a5548 (commit)
via 1ecf563861560ce82386ea69c7077369faeeba50 (commit)
via 782b8809940791e0687d60dd0bdc32819770e634 (commit)
from 4d44a2ab4c991e24d7bf9dc914d9677661d9209b (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 f0b15e4d7f1a218ecea87de90c89b9e8e39a5548
Author: Chris Staub <chris at beaker67.com>
Date: Mon Aug 18 19:02:20 2014 -0400
Added one more nodump
diff --git a/BOOK/network/multilib/dhcpcd.xml b/BOOK/network/multilib/dhcpcd.xml
index ea981d7..24e4409 100644
--- a/BOOK/network/multilib/dhcpcd.xml
+++ b/BOOK/network/multilib/dhcpcd.xml
@@ -29,7 +29,7 @@
href="../common/dhcpcd.xml"
xpointer="xpointer(//*[@os='b'])"/>
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
+<screen os="c" role="nodump"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
--sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib64/dhcpcd \
--libdir=/usr/lib64</userinput></screen>
commit 1ecf563861560ce82386ea69c7077369faeeba50
Author: Chris Staub <chris at beaker67.com>
Date: Mon Aug 18 18:57:02 2014 -0400
Use nodump to prevent jhalfs from processing network config commands
diff --git a/BOOK/network/common/dhcpcd.xml b/BOOK/network/common/dhcpcd.xml
index fb195ee..0701134 100644
--- a/BOOK/network/common/dhcpcd.xml
+++ b/BOOK/network/common/dhcpcd.xml
@@ -30,18 +30,18 @@
<para os="b">Prepare DHCPCD for compilation:</para>
-<screen os="c"><userinput>./configure --prefix=/usr --sbindir=/sbin \
+<screen os="c" role="nodump"><userinput>./configure --prefix=/usr --sbindir=/sbin \
--sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
<para os="d">Compile the package:</para>
-<screen os="e"><userinput>make</userinput></screen>
+<screen os="e" role="nodump"><userinput>make</userinput></screen>
<para os="f">This package does not come with a test suite.</para>
<para os="g">Install the package:</para>
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="h" role="nodump"><userinput>make install</userinput></screen>
</sect2>
@@ -55,7 +55,7 @@
<para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
using the following commands. Adjust appropriately for additional options:</para>
-<screen><userinput>cd /etc &&
+<screen role="nodump"><userinput>cd /etc &&
cat > dhcpcd.conf << "EOF"
<literal># dhcpcd configuration eth0 interface
# See dhcpcd.conf(5) for details.
diff --git a/BOOK/network/common/hostname.xml b/BOOK/network/common/hostname.xml
index 937eb02..03b2750 100644
--- a/BOOK/network/common/hostname.xml
+++ b/BOOK/network/common/hostname.xml
@@ -20,7 +20,7 @@
<para>Create the <filename>/etc/hostname</filename> file and enter a hostname
by running:</para>
- <screen><userinput>echo "<replaceable>[clfs]</replaceable>" > /etc/hostname</userinput></screen>
+ <screen role="nodump"><userinput>echo "<replaceable>[clfs]</replaceable>" > /etc/hostname</userinput></screen>
<para><replaceable>[clfs]</replaceable> needs to be replaced with the
name given to the computer. Do not enter the Fully Qualified
diff --git a/BOOK/network/common/hosts.xml b/BOOK/network/common/hosts.xml
index 71b3db0..e986364 100644
--- a/BOOK/network/common/hosts.xml
+++ b/BOOK/network/common/hosts.xml
@@ -52,7 +52,7 @@
<para>Create the <filename>/etc/hosts</filename> file by running:</para>
-<screen><userinput>cat > /etc/hosts << "EOF"
+<screen role="nodump"><userinput>cat > /etc/hosts << "EOF"
<literal># Begin /etc/hosts (network card version)
127.0.0.1 localhost
@@ -71,7 +71,7 @@ EOF</userinput></screen>
<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 role="nodump"><userinput>cat > /etc/hosts << "EOF"
<literal># Begin /etc/hosts (no network card version)
127.0.0.1 <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost
diff --git a/BOOK/network/common/network-scripts.xml b/BOOK/network/common/network-scripts.xml
index cd9873f..774b6cb 100644
--- a/BOOK/network/common/network-scripts.xml
+++ b/BOOK/network/common/network-scripts.xml
@@ -33,7 +33,7 @@
<para>Install the package:</para>
-<screen><userinput remap="install">make install</userinput></screen>
+<screen role="nodump"><userinput remap="install">make install</userinput></screen>
</sect2>
diff --git a/BOOK/network/common/resolv.xml b/BOOK/network/common/resolv.xml
index 6f713c4..bd9d91e 100644
--- a/BOOK/network/common/resolv.xml
+++ b/BOOK/network/common/resolv.xml
@@ -26,7 +26,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 role="nodump"><userinput>cat > /etc/resolv.conf << "EOF"
<literal># Begin /etc/resolv.conf
domain <replaceable>[Your Domain Name]</replaceable>
diff --git a/BOOK/network/common/sysconfig-network.xml b/BOOK/network/common/sysconfig-network.xml
index 7858851..687b7f7 100644
--- a/BOOK/network/common/sysconfig-network.xml
+++ b/BOOK/network/common/sysconfig-network.xml
@@ -35,7 +35,7 @@
<para>The following command creates a sample <filename>ipv4</filename>
file for the <emphasis>eth0</emphasis> device:</para>
-<screen><userinput>mkdir -pv /etc/sysconfig &&
+<screen role="nodump"><userinput>mkdir -pv /etc/sysconfig &&
cd /etc/sysconfig &&
cat > ifconfig.eth0 << "EOF"
<literal>IFACE="eth0"
diff --git a/BOOK/network/common/systemd-network.xml b/BOOK/network/common/systemd-network.xml
index f529ee7..89d3829 100644
--- a/BOOK/network/common/systemd-network.xml
+++ b/BOOK/network/common/systemd-network.xml
@@ -31,7 +31,7 @@
to systemd.network(5) and systemd.netdev(5). Configure a network
interface with a config file. Adjust Name= as required:</para>
- <screen><userinput>cd /etc/systemd/network &&
+ <screen role="nodump"><userinput>cd /etc/systemd/network &&
cat > static.network << "EOF"
[Match]
Name=enp2s0
@@ -65,7 +65,7 @@ EOF</userinput></screen>
<filename>systemd.netdev(5)</filename>. Configure a network interface
with a config file. Adjust Name= as required:</para>
-<screen><userinput>cd /etc/systemd/network &&
+<screen role="nodump"><userinput>cd /etc/systemd/network &&
cat > dhcp.network << "EOF"
[Match]
Name=enp2s0
@@ -79,7 +79,7 @@ EOF</userinput></screen>
If you did not manually create <filename>/etc/resolv.conf</filename>,
create a symlink:</para>
-<screen><userinput>ln -sv /run/systemd/network/resolv.conf /etc</userinput></screen>
+<screen role="nodump"><userinput>ln -sv /run/systemd/network/resolv.conf /etc</userinput></screen>
</sect3>
@@ -93,13 +93,13 @@ EOF</userinput></screen>
default. If you want to enable it, you will first need to add a required
user and group:</para>
-<screen><userinput>groupadd -g &gid-systemd-timesync; systemd-timesync
+<screen role="nodump"><userinput>groupadd -g &gid-systemd-timesync; systemd-timesync
useradd -g systemd-timesync -u &uid-systemd-timesync; -d /dev/null -s /bin/false systemd-timesync</userinput></screen>
<para>Then, actually enable <command>systemd-timesyncd</command> so that
it will run on system boot:</para>
-<screen><userinput>systemctl enable systemd-timesyncd</userinput></screen>
+<screen role="nodump"><userinput>systemctl enable systemd-timesyncd</userinput></screen>
<para>You can configure <command>systemd-timesyncd</command> by editing
<filename>/etc/systemd/timesyncd.conf</filename>.</para>
commit 782b8809940791e0687d60dd0bdc32819770e634
Author: Chris Staub <chris at beaker67.com>
Date: Mon Aug 18 18:47:02 2014 -0400
Removed obsolete configure options from Glibc
diff --git a/BOOK/cross-tools/64/glibc.xml b/BOOK/cross-tools/64/glibc.xml
index 0e6b90c..610efbc 100644
--- a/BOOK/cross-tools/64/glibc.xml
+++ b/BOOK/cross-tools/64/glibc.xml
@@ -58,7 +58,7 @@
AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
../glibc-&glibc-version;/configure --prefix=/tools \
--host=${CLFS_TARGET} --build=${CLFS_HOST} \
- --disable-profile --with-tls --enable-kernel=&glibc-kernel-version; --with-__thread \
+ --disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
--enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
@@ -105,14 +105,6 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='dg10'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dg11'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dg12'])"/>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/cross-tools/common/glibc.xml b/BOOK/cross-tools/common/glibc.xml
index 59cc12d..b48812c 100644
--- a/BOOK/cross-tools/common/glibc.xml
+++ b/BOOK/cross-tools/common/glibc.xml
@@ -54,10 +54,9 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu
AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
../glibc-&glibc-version;/configure --prefix=/tools \
--host=${CLFS_TARGET} --build=${CLFS_HOST} \
- --disable-profile --with-tls --enable-kernel=&glibc-kernel-version; \
- --with-__thread --with-binutils=/cross-tools/bin \
- --with-headers=/tools/include --enable-obsolete-rpc \
- --cache-file=config.cache</userinput></screen>
+ --disable-profile --enable-kernel=&glibc-kernel-version; \
+ --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+ --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
<variablelist os="dg">
<title>The meaning of the new configure options:</title>
@@ -103,13 +102,6 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu
</varlistentry>
<varlistentry os="dg6">
- <term><parameter>--with-tls</parameter></term>
- <listitem>
- <para>This tells Glibc to use Thread Local Storage.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="dg7">
<term><parameter>--enable-kernel=&glibc-kernel-version;</parameter></term>
<listitem>
<para>This tells Glibc to compile the library with support
@@ -117,15 +109,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu
</listitem>
</varlistentry>
- <varlistentry os="dg8">
- <term><parameter>--with-__thread</parameter></term>
- <listitem>
- <para>This tells Glibc to use use the __thread for libc and
- libpthread builds.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="dg9">
+ <varlistentry os="dg7">
<term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
<listitem>
<para>This tells Glibc to use the Binutils that are specific to
@@ -133,7 +117,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu
</listitem>
</varlistentry>
- <varlistentry os="dg10">
+ <varlistentry os="dg8">
<term><parameter>--with-headers=/tools/include</parameter></term>
<listitem>
<para>This tells Glibc to compile itself against the headers
@@ -143,7 +127,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu
</listitem>
</varlistentry>
- <varlistentry os="dg11">
+ <varlistentry os="dg9">
<term><parameter>--enable-obsolete-rpc</parameter></term>
<listitem>
<para>This tells Glibc to install rpc headers that are not installed
@@ -151,7 +135,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu
</listitem>
</varlistentry>
- <varlistentry os="dg12">
+ <varlistentry os="dg10">
<term><parameter>--cache-file=config.cache</parameter></term>
<listitem>
<para>This tells Glibc to utilize a premade cache file.</para>
diff --git a/BOOK/cross-tools/mips64/glibc-n32.xml b/BOOK/cross-tools/mips64/glibc-n32.xml
index 84f83d5..5936140 100644
--- a/BOOK/cross-tools/mips64/glibc-n32.xml
+++ b/BOOK/cross-tools/mips64/glibc-n32.xml
@@ -63,7 +63,7 @@
AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
../glibc-&glibc-version;/configure --prefix=/tools \
--host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \
- --disable-profile --with-tls --enable-kernel=&glibc-kernel-version; --with-__thread \
+ --disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
--enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
diff --git a/BOOK/cross-tools/multilib/glibc-64bit.xml b/BOOK/cross-tools/multilib/glibc-64bit.xml
index b199288..42bd87f 100644
--- a/BOOK/cross-tools/multilib/glibc-64bit.xml
+++ b/BOOK/cross-tools/multilib/glibc-64bit.xml
@@ -63,7 +63,7 @@
AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
../glibc-&glibc-version;/configure --prefix=/tools \
--host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
- --disable-profile --with-tls --enable-kernel=&glibc-kernel-version; --with-__thread \
+ --disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
--enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
diff --git a/BOOK/cross-tools/multilib/glibc.xml b/BOOK/cross-tools/multilib/glibc.xml
index ba39206..de9d40d 100644
--- a/BOOK/cross-tools/multilib/glibc.xml
+++ b/BOOK/cross-tools/multilib/glibc.xml
@@ -58,7 +58,7 @@
AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
../glibc-&glibc-version;/configure --prefix=/tools \
--host=${CLFS_TARGET32} --build=${CLFS_HOST} \
- --disable-profile --with-tls --enable-kernel=&glibc-kernel-version; --with-__thread \
+ --disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
--enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
@@ -109,14 +109,6 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='dg10'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dg11'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dg12'])"/>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 3fcbc98..05c59f9 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>18 August 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Removed obsolete --with-tls and --with-__thread
+ options from Cross-Tools Glibc builds - those options have long since
+ been removed from Glibc.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>17 August 2014</para>
<itemizedlist>
<listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/cross-tools/64/glibc.xml | 10 +--------
BOOK/cross-tools/common/glibc.xml | 30 ++++++----------------------
BOOK/cross-tools/mips64/glibc-n32.xml | 2 +-
BOOK/cross-tools/multilib/glibc-64bit.xml | 2 +-
BOOK/cross-tools/multilib/glibc.xml | 10 +--------
BOOK/introduction/common/changelog.xml | 11 ++++++++++
BOOK/network/common/dhcpcd.xml | 8 +++---
BOOK/network/common/hostname.xml | 2 +-
BOOK/network/common/hosts.xml | 4 +-
BOOK/network/common/network-scripts.xml | 2 +-
BOOK/network/common/resolv.xml | 2 +-
BOOK/network/common/sysconfig-network.xml | 2 +-
BOOK/network/common/systemd-network.xml | 10 ++++----
BOOK/network/multilib/dhcpcd.xml | 2 +-
14 files changed, 38 insertions(+), 59 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list