[Clfs-commits] commit: r4315 - in /branches/clfs-sysroot/BOOK: ./ bootable/arm/ bootscripts/common/ final-system/common/ partitioning/common/ the-end/
svn at cross-lfs.org
svn at cross-lfs.org
Sun Jan 4 13:51:37 PST 2009
Author: jciccone
Date: Sun Jan 4 21:51:36 2009
New Revision: 4315
Log:
Change BLFS references to CBLFS.
Fix Findutils compilation issue by adding config.cache entriers.
Remove unneeded config.h modification from the gawk page.
Modified:
branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml
branches/clfs-sysroot/BOOK/bootscripts/common/symlinks.xml
branches/clfs-sysroot/BOOK/final-system/common/bash.xml
branches/clfs-sysroot/BOOK/final-system/common/findutils.xml
branches/clfs-sysroot/BOOK/final-system/common/gawk.xml
branches/clfs-sysroot/BOOK/final-system/common/inetutils.xml
branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml
branches/clfs-sysroot/BOOK/final-system/common/man.xml
branches/clfs-sysroot/BOOK/final-system/common/readline.xml
branches/clfs-sysroot/BOOK/final-system/common/shadow.xml
branches/clfs-sysroot/BOOK/final-system/common/vim.xml
branches/clfs-sysroot/BOOK/general.ent
branches/clfs-sysroot/BOOK/partitioning/common/creatingfilesystem.xml
branches/clfs-sysroot/BOOK/the-end/whatnow.xml
Modified: branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml (original)
+++ branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml Sun Jan 4 21:51:36 2009
@@ -38,10 +38,10 @@
<para os="h">Configure the kernel via a menu-driven interface.
Please note that the udev bootscript requires "rtc" and "tmpfs" to be
- enabled and built into the kernel, not as modules. BLFS has
+ enabled and built into the kernel, not as modules. CBLFS has
some information regarding particular kernel configuration requirements of
packages outside of CLFS at <ulink
- url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
+ url="&cblfs-root;"/>:</para>
<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
Modified: branches/clfs-sysroot/BOOK/bootscripts/common/symlinks.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootscripts/common/symlinks.xml (original)
+++ branches/clfs-sysroot/BOOK/bootscripts/common/symlinks.xml Sun Jan 4 21:51:36 2009
@@ -99,7 +99,7 @@
fixable by creating udev rules for custom persistent symlinks.
The case of network cards is covered separately in
<xref linkend="ch-scripts-network"/>, and sound card configuration can
- be found in <ulink url="&blfs-root;">BLFS</ulink>.</para>
+ be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
<para>For each of your devices that is likely to have this problem
(even if the problem doesn't exist in your current Linux distribution),
Modified: branches/clfs-sysroot/BOOK/final-system/common/bash.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/bash.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/bash.xml Sun Jan 4 21:51:36 2009
@@ -34,11 +34,27 @@
<screen os="p2"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
<para os="c">When bash is cross-compiled, it cannot test for the presence
- of named pipes. If you used <command>su</command> to become an unprivileged
- user, this combination will cause Bash to build without <emphasis>process
- substitution</emphasis>.</para>
+ of named pipes, amoung other things. If you used <command>su</command> to
+ become an unprivileged user, this combination will cause Bash to build
+ without <emphasis>process substitution</emphasis>, which will break one
+ of the c++ test scripts in <literal>glibc</literal>. The following prevents
+ future problems by skipping tests that can not run while cross-compiling
+ or that do not run properly:</para>
- <screen os="d"><userinput>echo "bash_cv_sys_named_pipes=yes" > config.cache</userinput></screen>
+<screen os="d"><userinput>cat > config.cache << "EOF"
+ac_cv_func_mmap_fixed_mapped=yes
+ac_cv_func_strcoll_works=yes
+ac_cv_func_working_mktime=yes
+bash_cv_func_sigsetjmp=present
+bash_cv_getcwd_malloc=yes
+bash_cv_job_control_missing=present
+bash_cv_printf_a_format=yes
+bash_cv_sys_named_pipes=present
+bash_cv_ulimit_maxfds=yes
+bash_cv_under_sys_siglist=yes
+bash_cv_unusable_rtsigs=no
+gt_cv_int_divbyzero_sigfpe=yes
+EOF</userinput></screen>
<para os="e">Prepare Bash for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/findutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/findutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/findutils.xml Sun Jan 4 21:51:36 2009
@@ -27,10 +27,18 @@
<sect2 role="installation">
<title>Installation of Findutils</title>
+ <para os="c1">When Cross Compiling the configure script does not
+ run a select few tests, Set the values manually:</para>
+
+<screen os="c2"><userinput>echo "gl_cv_func_wcwidth_works=yes" > config.cache
+echo "gl_cv_header_working_fcntl_h=yes" >> config.cache
+echo "ac_cv_func_fnmatch_gnu=yes" >> config.cache</userinput></screen>
+
<para os="a">Prepare Findutils for compilation:</para>
<screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --prefix=/usr --libexecdir=/usr/lib/locate \
+ --prefix=/usr --cache-file=config.cache \
+ --libexecdir=/usr/lib/locate \
--localstatedir=/var/lib/locate</userinput></screen>
<variablelist os="c">
Modified: branches/clfs-sysroot/BOOK/final-system/common/gawk.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gawk.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gawk.xml Sun Jan 4 21:51:36 2009
@@ -29,14 +29,6 @@
<screen os="d"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--prefix=/usr --libexecdir=/usr/lib</userinput></screen>
-
- <para os="e">The <command>configure</command> script does not detect the
- following properly:</para>
-
-<screen os="f"><userinput>cat >> config.h << "EOF"
-#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LC_MESSAGES 1
-EOF</userinput></screen>
<para os="g">Compile the package:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/inetutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/inetutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/inetutils.xml Sun Jan 4 21:51:36 2009
@@ -83,12 +83,7 @@
<listitem>
<para>This disables the installation of the various network
servers included as part of the Inetutils package. These servers are
- deemed not appropriate in a basic CLFS system. Some are insecure by
- nature and are only considered safe on trusted networks. More
- information can be found at <ulink
- url="&blfs-root;view/svn/basicnet/inetutils.html"/>. Note that
- better replacements are available for many of these
- servers.</para>
+ deemed not appropriate in a basic CLFS system.</para>
</listitem>
</varlistentry>
</variablelist>
Modified: branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml Sun Jan 4 21:51:36 2009
@@ -33,40 +33,53 @@
sed 's/0755 -s/0755/' ${dir}/Makefile.orig > ${dir}/Makefile
done</userinput></screen>
- <para os="s3">The <command>arpd</command> binary included in this package is
+ <para os="cb1">The <command>arpd</command> binary included in this package is
dependent on Berkeley DB. Because <command>arpd</command> is not a
very common requirement on a base Linux system, remove the dependency
on Berkeley DB by applying the <command>sed</command> command below.
If the <command>arpd</command> binary is needed, instructions for
- compiling Berkeley DB can be found in the BLFS Book at <ulink
- url="&blfs-root;view/svn/server/databases.html#db"/>.</para>
+ compiling Berkeley DB can be found in CBLFS at <ulink
+ url="&cblfs-root;index.php/Berkeley_DB"/>.</para>
<screen os="s4"><userinput>cp misc/Makefile{,.orig}
sed '/^TARGETS/s at arpd@@g' misc/Makefile.orig > misc/Makefile</userinput></screen>
<para os="a">Compile the package:</para>
-<screen os="b"><userinput>make CC="${CC}" SBINDIR=/sbin</userinput></screen>
+<screen os="b"><userinput>make DESTDIR=${CLFS} CC="${CC}" \
+ DOCDIR=/usr/share/doc/iproute2 \
+ MANDIR=/usr/share/man
+</userinput></screen>
<variablelist os="c">
<title>The meaning of the make option:</title>
<varlistentry>
- <term><parameter>SBINDIR=/sbin</parameter></term>
- <listitem>
- <para>This ensures that the IPRoute2 binaries will install into
+ <term><parameter>DESTDIR=/</parameter></term>
+ <listitem>
+ <para>This option overrides the default DESTDIR of /usr, so that
+ that the IPRoute2 binaries will be installed into
<filename class="directory">/sbin</filename>. This is the correct
location according to the FHS, because some of the IPRoute2 binaries
are used by the CLFS-Bootscripts package.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><parameter>DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</parameter></term>
+ <listitem>
+ <para>The DESTDIR=/ parameter would cause documentation to be
+ installed into /share/doc and /share/man. These options ensure
+ the docs are installed to the correct locations.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
-
- <para os="d">This package does not come with a test suite.</para>
-
- <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make DESTDIR=${CLFS} SBINDIR=/sbin install</userinput></screen>
+
+ <para os="d">Install the package:</para>
+
+<screen os="e"><userinput>make DESTDIR=${CLFS} \
+ DOCDIR=/usr/share/doc/iproute2 \
+ MANDIR=/usr/share/man install</userinput></screen>
</sect2>
Modified: branches/clfs-sysroot/BOOK/final-system/common/man.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/man.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/man.xml Sun Jan 4 21:51:36 2009
@@ -125,10 +125,6 @@
The second issue is not of concern because the CLFS installation does
not support multibyte character sets.</para>
- <para os="v">Additional information with regards to the compression of
- man and info pages can be found in the BLFS book at
- <ulink url="&blfs-root;view/svn/postlfs/compressdoc.html"/>.</para>
-
</sect2>
<sect2 id="contents-man" role="content">
Modified: branches/clfs-sysroot/BOOK/final-system/common/readline.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/readline.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/readline.xml Sun Jan 4 21:51:36 2009
@@ -56,20 +56,15 @@
<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
- <para os="h">Give Readline's dynamic libraries more appropriate
- permissions:</para>
+ <para os="h">Now move the static libraries to a more appropriate location:</para>
-<screen os="i"><userinput>chmod -v 755 ${CLFS}/lib/lib{readline,history}.so*</userinput></screen>
+<screen os="i"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
- <para os="j">Now move the static libraries to a more appropriate location:</para>
-
-<screen os="k"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
-
- <para os="l">Next, remove the <filename class="extension">.so</filename>
+ <para os="j">Next, remove the <filename class="extension">.so</filename>
files in <filename class="directory">/lib</filename> and relink them into
<filename class="directory">/usr/lib</filename>.</para>
-<screen os="m"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
+<screen os="k"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
ln -sfv ../../lib/libreadline.so.5 ${CLFS}/usr/lib/libreadline.so
ln -sfv ../../lib/libhistory.so.5 ${CLFS}/usr/lib/libhistory.so</userinput></screen>
Modified: branches/clfs-sysroot/BOOK/final-system/common/shadow.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/shadow.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/shadow.xml Sun Jan 4 21:51:36 2009
@@ -27,7 +27,7 @@
<note os="a">
<para>If you would like to enforce the use of strong passwords,
- refer to <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/>
+ refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
for installing Cracklib prior to building Shadow. Then add
<parameter>--with-libcrack</parameter> to the <command>configure</command>
command below.</para>
@@ -59,7 +59,7 @@
however PAM is not installed on a base CLFS system, so this switch
disables PAM support in Shadow. For instructions to install PAM and
link Shadow to it, you can look at
- <ulink url="&blfs-root;view/svn/postlfs/shadow.html"/>.</para></listitem>
+ <ulink url="&cblfs-root;index.php/Linux-PAM"/>.</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-audit</parameter></term>
@@ -162,7 +162,7 @@
<para>To view or change the default settings for new user accounts that
you create, you can edit <filename>/etc/default/useradd</filename>. See
<command>man useradd</command> or
- <ulink url="&blfs-root;view/svn/postlfs/skel.html"/> for more
+ <ulink url="&cblfs-root;index.php/Configuring_for_Adding_Users"/> for more
information.</para>
</sect2>
Modified: branches/clfs-sysroot/BOOK/final-system/common/vim.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/vim.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/vim.xml Sun Jan 4 21:51:36 2009
@@ -24,7 +24,7 @@
<para>If you prefer another editor—such as Emacs, Joe, or
Nano—please refer to <ulink
- url="&blfs-root;view/svn/postlfs/editors.html"/>
+ url="&cblfs-root;index.php/Category:Text_Editors"/>
for suggested installation instructions.</para>
</tip>
@@ -102,9 +102,8 @@
system, you may want to recompile Vim after installing X. Vim
comes with a GUI version of the editor that requires X and some
additional libraries to be installed. For more information, refer to the
- Vim documentation and the Vim installation page
- in the BLFS book at <ulink
- url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
+ Vim documentation and the Vim installation page in CBLFS at <ulink
+ url="&cblfs-root;index.php/Vim"/>.</para>
</sect2>
Modified: branches/clfs-sysroot/BOOK/general.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/general.ent (original)
+++ branches/clfs-sysroot/BOOK/general.ent Sun Jan 4 21:51:36 2009
@@ -22,7 +22,7 @@
<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
<!ENTITY clfs-root "http://cross-lfs.org/">
<!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
-<!ENTITY blfs-root "&lfs-root;blfs/">
+<!ENTITY cblfs-root "http://cblfs.cross-lfs.org/">
<!ENTITY faq-root "&clfs-wiki;wiki/faq">
<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
<!ENTITY hints-index "&lfs-root;hints/list.html">
Modified: branches/clfs-sysroot/BOOK/partitioning/common/creatingfilesystem.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/partitioning/common/creatingfilesystem.xml (original)
+++ branches/clfs-sysroot/BOOK/partitioning/common/creatingfilesystem.xml Sun Jan 4 21:51:36 2009
@@ -15,8 +15,8 @@
extended file system (ext2), but with newer high-capacity hard disks,
journaling file systems are becoming increasingly popular. We will create
an <systemitem class="filesystem">ext2</systemitem> file system.
- Build instructions for other file systems can be found at
- <ulink url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
+ Instructions for other file systems can be found at
+ <ulink url="&cblfs-root;index.php?section=6#File_System"/>.</para>
<para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
system on the CLFS partition, run the following:</para>
Modified: branches/clfs-sysroot/BOOK/the-end/whatnow.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/the-end/whatnow.xml (original)
+++ branches/clfs-sysroot/BOOK/the-end/whatnow.xml Sun Jan 4 21:51:36 2009
@@ -61,11 +61,14 @@
</listitem>
<listitem>
- <para>Beyond Linux From Scratch</para>
+ <para>Community Driven Beyond Linux From Scratch</para>
- <para>The Beyond Linux From Scratch book covers installation
- procedures for a wide range of software beyond the scope of the LFS
- Book. The BLFS project is located at <ulink url="&blfs-root;"/>.</para>
+ <para>The Community Driven Beyond Linux From Scratch wiki covers installation
+ procedures for a wide range of software beyond the scope of the CLFS
+ Book. CBLFS is designed specifically to work with the CLFS book, and has all
+ the necessary information to continue the builds in the same manner that CLFS
+ uses. This is a community driven project, which means anyone can contribute and
+ provide updates. The CBLFS project is located at <ulink url="&cblfs-root;"/>.</para>
</listitem>
<listitem>
More information about the Clfs-commits
mailing list