[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-702-gb8bd862
git
git at cross-lfs.org
Thu Jan 9 10:27:39 PST 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 b8bd862289df012ab506361807c6c22dd7fa9aba (commit)
via cb56f0d97f1f4d154d04b718f23873d5a8481f72 (commit)
via 6be82d86cea23da791e2bf4b475e9bd4fe842390 (commit)
via 1082f869a75ff177e9c6faad5efd04277ef55aa8 (commit)
via 979f0f0f2e1260eb7b82229042e0b3aeeba1d612 (commit)
from e1bee3d4f38c91dbfa8b6a47888b7b03c30886b4 (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 b8bd862289df012ab506361807c6c22dd7fa9aba
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jan 9 13:27:36 2014 -0500
Remove documentation symlinks
diff --git a/BOOK/boot/common/creatingdirs.xml b/BOOK/boot/common/creatingdirs.xml
index 7ca6793..a45f997 100644
--- a/BOOK/boot/common/creatingdirs.xml
+++ b/BOOK/boot/common/creatingdirs.xml
@@ -22,10 +22,7 @@ install -dv -m 1777 ${CLFS}{/var,}/tmp
mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib,sbin,src}
mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
- ln -sv share/{man,doc,info} $dir
-done</userinput></screen>
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></screen>
<para os="c">Directories are, by default, created with permission mode 755,
but this is not desirable for all directories. In the commands above,
diff --git a/BOOK/boot/mips64/creatingdirs.xml b/BOOK/boot/mips64/creatingdirs.xml
index 1cf9cdc..0a9f4d9 100644
--- a/BOOK/boot/mips64/creatingdirs.xml
+++ b/BOOK/boot/mips64/creatingdirs.xml
@@ -24,9 +24,6 @@ mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,32,64},sbin,src}
mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
- ln -sv share/{man,doc,info} $dir
-done
install -dv ${CLFS}/usr/lib/locale
ln -sv ../lib/locale ${CLFS}/usr/lib32
ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
diff --git a/BOOK/boot/multilib/creatingdirs.xml b/BOOK/boot/multilib/creatingdirs.xml
index e0c6d79..44e16a6 100644
--- a/BOOK/boot/multilib/creatingdirs.xml
+++ b/BOOK/boot/multilib/creatingdirs.xml
@@ -24,9 +24,6 @@ mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,64},sbin,src}
mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
- ln -sv share/{man,doc,info} $dir
-done
install -dv ${CLFS}/usr/lib/locale
ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
diff --git a/BOOK/chroot/common/creatingdirs.xml b/BOOK/chroot/common/creatingdirs.xml
index 03aaced..a4c8010 100644
--- a/BOOK/chroot/common/creatingdirs.xml
+++ b/BOOK/chroot/common/creatingdirs.xml
@@ -23,10 +23,7 @@ install -dv -m 1777 {/var,}/tmp
mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
- ln -sv share/{man,doc,info} $dir
-done</userinput></screen>
+mkdir -pv /usr/{,local/}share/man/man{1..8}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../boot/common/creatingdirs.xml"
diff --git a/BOOK/chroot/mips64/creatingdirs.xml b/BOOK/chroot/mips64/creatingdirs.xml
index 7a39055..a3f956f 100644
--- a/BOOK/chroot/mips64/creatingdirs.xml
+++ b/BOOK/chroot/mips64/creatingdirs.xml
@@ -24,9 +24,6 @@ mkdir -pv /usr/{,local/}{bin,include,lib{,32,64},sbin,src}
mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
- ln -sv share/{man,doc,info} $dir
-done
install -dv /usr/lib/locale
ln -sv ../lib/locale /usr/lib32
ln -sv ../lib/locale /usr/lib64</userinput></screen>
diff --git a/BOOK/chroot/multilib/creatingdirs.xml b/BOOK/chroot/multilib/creatingdirs.xml
index f71ef1d..e1ffbf2 100644
--- a/BOOK/chroot/multilib/creatingdirs.xml
+++ b/BOOK/chroot/multilib/creatingdirs.xml
@@ -24,9 +24,6 @@ mkdir -pv /usr/{,local/}{bin,include,lib{,64},sbin,src}
mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
- ln -sv share/{man,doc,info} $dir
-done
install -dv /usr/lib/locale
ln -sv ../lib/locale /usr/lib64</userinput></screen>
diff --git a/BOOK/final-system/common/bc.xml b/BOOK/final-system/common/bc.xml
index 56c0d2b..c1f83bd 100644
--- a/BOOK/final-system/common/bc.xml
+++ b/BOOK/final-system/common/bc.xml
@@ -26,7 +26,8 @@
<para os="a">Prepare Bc for compilation:</para>
-<screen os="b"><userinput>./configure --prefix=/usr --with-readline</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --with-readline \
+ --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/common/bzip2.xml b/BOOK/final-system/common/bzip2.xml
index 7d3c0b2..c2edb17 100644
--- a/BOOK/final-system/common/bzip2.xml
+++ b/BOOK/final-system/common/bzip2.xml
@@ -33,6 +33,12 @@
<screen os="s2"><userinput>sed -i -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' Makefile</userinput></screen>
+ <para os="s3">Make Bzip2 install its manpages in
+ <filename class="directory">/usr/share/man</filename> instead of
+ <filename class="directory">/usr/man</filename>:</para>
+
+<screen os="s4"><userinput>sed -i 's at X)/man at X)/share/man at g' ./Makefile</userinput></screen>
+
<para os="a">The Bzip2 package does not contain a <command>configure</command>
script. Compile it with:</para>
diff --git a/BOOK/final-system/common/man.xml b/BOOK/final-system/common/man.xml
index 7e2f45c..29cb5c4 100644
--- a/BOOK/final-system/common/man.xml
+++ b/BOOK/final-system/common/man.xml
@@ -49,7 +49,7 @@ sed -i 's at MANPATH./usr/local/man@#&@g' src/man.conf.in</userinput></screen>
<para os="h">Prepare Man for compilation:</para>
-<screen os="i"><userinput>./configure -confdir=/etc</userinput></screen>
+<screen os="i"><userinput>./configure -confdir=/etc -mandir=/usr/share/man</userinput></screen>
<variablelist os="j">
<title>The meaning of the configure options:</title>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index d1c3e88..edadaca 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,11 @@
<para>09 January 2014</para>
<itemizedlist>
<listitem>
+ <para>[Chris] - Removed /usr/{doc,info,man} symlinks and edited
+ instructions for packages to ensure all documentation is installed
+ to /usr/share.</para>
+ </listitem>
+ <listitem>
<para>[Chris] - Moved libcap so it's built just before iputils,
which can use libcap.</para>
</listitem>
commit cb56f0d97f1f4d154d04b718f23873d5a8481f72
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jan 9 12:46:55 2014 -0500
Moved libcap earlier in the build so iputils can use it
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index 409bfd8..a8dd211 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -1038,7 +1038,7 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
- <seg>Bash, Binutils, Coreutils, EGLIBC, GCC and Make</seg>
+ <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Libcap and Make</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index ee880ce..686a273 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/common/iputils.xml b/BOOK/final-system/common/iputils.xml
index 345335d..c5f2c67 100644
--- a/BOOK/final-system/common/iputils.xml
+++ b/BOOK/final-system/common/iputils.xml
@@ -31,7 +31,7 @@
<para os="a">Compile the package:</para>
-<screen os="b"><userinput>make USE_CAP=no \
+<screen os="b"><userinput>make \
IPV4_TARGETS="tracepath ping clockdiff rdisc" \
IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 7c7c924..9bf1843 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index 37b7296..ee500f8 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index f50df8f..ebecf94 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -101,11 +101,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-n32.xml"/>
diff --git a/BOOK/final-system/multilib/iputils.xml b/BOOK/final-system/multilib/iputils.xml
index a598b76..2136824 100644
--- a/BOOK/final-system/multilib/iputils.xml
+++ b/BOOK/final-system/multilib/iputils.xml
@@ -33,7 +33,7 @@
href="../common/iputils.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
IPV4_TARGETS="tracepath ping clockdiff rdisc" \
IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 494e941..59044bd 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/ppc64-64-chapter.xml b/BOOK/final-system/ppc64-64-chapter.xml
index b7cba84..1208106 100644
--- a/BOOK/final-system/ppc64-64-chapter.xml
+++ b/BOOK/final-system/ppc64-64-chapter.xml
@@ -60,6 +60,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index a021c1e..eda7129 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -81,10 +81,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index 051863d..bfe04c9 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index 5c8c53b..3d5cf29 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 97a3994..1d7b42b 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -81,10 +81,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index f1a21b2..c4e5744 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index 6dc2c8b..1edbca7 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -60,9 +60,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 97be34f..56621f0 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -81,10 +81,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 5d5d1c7..d1c3e88 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>09 January 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Moved libcap so it's built just before iputils,
+ which can use libcap.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>08 January 2014</para>
<itemizedlist>
<listitem>
commit 6be82d86cea23da791e2bf4b475e9bd4fe842390
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jan 9 12:36:55 2014 -0500
Removed redundant changelog entry
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 31ef1d2..5d5d1c7 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -134,16 +134,6 @@
</listitem>
<listitem>
- <para>01 January 2014</para>
- <itemizedlist>
- <listitem>
- <para>[Chris] - Added command to EGLIBC instructions to remove
- extraneous '.x' files from /usr/include/rpcsvc.</para>
- </listitem>
- </itemizedlist>
- </listitem>
-
- <listitem>
<para>23 December 2013</para>
<itemizedlist>
<listitem>
commit 1082f869a75ff177e9c6faad5efd04277ef55aa8
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jan 9 12:27:15 2014 -0500
Update file/symlink creation for other archs
diff --git a/BOOK/boot/64/createfiles.xml b/BOOK/boot/64/createfiles.xml
index 7d15620..96eb9a3 100644
--- a/BOOK/boot/64/createfiles.xml
+++ b/BOOK/boot/64/createfiles.xml
@@ -21,7 +21,8 @@
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/libstd*so* ${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
ln -sv bash ${CLFS}/bin/sh
ln -sv ../run ${CLFS}/var/run</userinput></screen>
@@ -29,6 +30,6 @@ ln -sv ../run ${CLFS}/var/run</userinput></screen>
to link, create a directory and make some symbolic links:</para>
<screen><userinput>mkdir -pv ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib64</userinput></screen>
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib64</userinput></screen>
</sect1>
diff --git a/BOOK/boot/mips64/createfiles.xml b/BOOK/boot/mips64/createfiles.xml
index 63f9137..4bb5bec 100644
--- a/BOOK/boot/mips64/createfiles.xml
+++ b/BOOK/boot/mips64/createfiles.xml
@@ -20,9 +20,10 @@ 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
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv /tools/lib32/libstd*so* ${CLFS}/usr/lib32
-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
+ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
ln -sv bash ${CLFS}/bin/sh
ln -sv ../run ${CLFS}/var/run</userinput></screen>
diff --git a/BOOK/boot/multilib/createfiles.xml b/BOOK/boot/multilib/createfiles.xml
index c90c489..752e829 100644
--- a/BOOK/boot/multilib/createfiles.xml
+++ b/BOOK/boot/multilib/createfiles.xml
@@ -19,8 +19,9 @@ 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/libstd*so* ${CLFS}/usr/lib
-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
+ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > ${CLFS}/usr/lib/libstdc++.la
ln -sv bash ${CLFS}/bin/sh
ln -sv ../run ${CLFS}/var/run</userinput></screen>
diff --git a/BOOK/chroot/64/createfiles.xml b/BOOK/chroot/64/createfiles.xml
index 9bccdff..866f91e 100644
--- a/BOOK/chroot/64/createfiles.xml
+++ b/BOOK/chroot/64/createfiles.xml
@@ -19,7 +19,8 @@
<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
ln -sv /tools/bin/file /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstd* /usr/lib
+ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run</userinput></screen>
diff --git a/BOOK/chroot/mips64/createfiles.xml b/BOOK/chroot/mips64/createfiles.xml
index 4e2ba28..d461975 100644
--- a/BOOK/chroot/mips64/createfiles.xml
+++ b/BOOK/chroot/mips64/createfiles.xml
@@ -19,9 +19,10 @@ ln -sv /tools/bin/file /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32
ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
-ln -sv /tools/lib/libstd* /usr/lib
-ln -sv /tools/lib32/libstd* /usr/lib32
-ln -sv /tools/lib64/libstd* /usr/lib64
+ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
+ln -sv /tools/lib32/libstdc++.so{.6,} /usr/lib32
+ln -sv /tools/lib64/libstdc++.so{.6,} /usr/lib64
+sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh
ln -sv /run /var/run</userinput></screen>
commit 979f0f0f2e1260eb7b82229042e0b3aeeba1d612
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jan 9 04:03:43 2014 -0500
Fix make version mentioned in procps
diff --git a/BOOK/final-system/common/procps.xml b/BOOK/final-system/common/procps.xml
index 8d97a05..291c63f 100644
--- a/BOOK/final-system/common/procps.xml
+++ b/BOOK/final-system/common/procps.xml
@@ -35,7 +35,7 @@
<screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
- <para os="s1">The following fixes an issue with Make 3.82:</para>
+ <para os="s1">The following fixes an issue with Make &make-version;:</para>
<screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>
-----------------------------------------------------------------------
Summary of changes:
BOOK/appendices/dependencies/common.xml | 2 +-
BOOK/boot/64/createfiles.xml | 5 +++--
BOOK/boot/common/creatingdirs.xml | 5 +----
BOOK/boot/mips64/createfiles.xml | 7 ++++---
BOOK/boot/mips64/creatingdirs.xml | 3 ---
BOOK/boot/multilib/createfiles.xml | 5 +++--
BOOK/boot/multilib/creatingdirs.xml | 3 ---
BOOK/chroot/64/createfiles.xml | 3 ++-
BOOK/chroot/common/creatingdirs.xml | 5 +----
BOOK/chroot/mips64/createfiles.xml | 7 ++++---
BOOK/chroot/mips64/creatingdirs.xml | 3 ---
BOOK/chroot/multilib/creatingdirs.xml | 3 ---
BOOK/final-system/alpha-chapter.xml | 2 +-
BOOK/final-system/common/bc.xml | 3 ++-
BOOK/final-system/common/bzip2.xml | 6 ++++++
BOOK/final-system/common/iputils.xml | 2 +-
BOOK/final-system/common/man.xml | 2 +-
BOOK/final-system/common/procps.xml | 2 +-
BOOK/final-system/mips-chapter.xml | 2 +-
BOOK/final-system/mips64-64-chapter.xml | 2 +-
BOOK/final-system/mips64-chapter.xml | 4 ++--
BOOK/final-system/multilib/iputils.xml | 2 +-
BOOK/final-system/ppc-chapter.xml | 2 +-
BOOK/final-system/ppc64-64-chapter.xml | 1 +
BOOK/final-system/ppc64-chapter.xml | 4 ++--
BOOK/final-system/sparc-chapter.xml | 2 +-
BOOK/final-system/sparc64-64-chapter.xml | 2 +-
BOOK/final-system/sparc64-chapter.xml | 4 ++--
BOOK/final-system/x86-chapter.xml | 2 +-
BOOK/final-system/x86_64-64-chapter.xml | 2 +-
BOOK/final-system/x86_64-chapter.xml | 4 ++--
BOOK/introduction/common/changelog.xml | 25 +++++++++++++++----------
32 files changed, 63 insertions(+), 63 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list