[Clfs-commits] commit: r4864 - in /branches/clfs-sysroot/BOOK: cross-tools/arm/ cross-tools/common/ final-system/common/ network/common/ the-end/
svn at cross-lfs.org
svn at cross-lfs.org
Sun Mar 15 19:07:43 PDT 2009
Author: jciccone
Date: Mon Mar 16 02:07:43 2009
New Revision: 4864
Log:
Use cat instead of echo wherever possible.
Modified:
branches/clfs-sysroot/BOOK/cross-tools/arm/variables.xml
branches/clfs-sysroot/BOOK/cross-tools/common/cflags.xml
branches/clfs-sysroot/BOOK/cross-tools/common/glibc.xml
branches/clfs-sysroot/BOOK/cross-tools/common/shadow.xml
branches/clfs-sysroot/BOOK/final-system/common/bison.xml
branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml
branches/clfs-sysroot/BOOK/final-system/common/findutils.xml
branches/clfs-sysroot/BOOK/final-system/common/gettext.xml
branches/clfs-sysroot/BOOK/final-system/common/kbd.xml
branches/clfs-sysroot/BOOK/final-system/common/patch.xml
branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml
branches/clfs-sysroot/BOOK/final-system/common/shadow.xml
branches/clfs-sysroot/BOOK/final-system/common/variables.xml
branches/clfs-sysroot/BOOK/final-system/common/vim.xml
branches/clfs-sysroot/BOOK/network/common/hostname.xml
branches/clfs-sysroot/BOOK/the-end/theend.xml
Modified: branches/clfs-sysroot/BOOK/cross-tools/arm/variables.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/arm/variables.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/arm/variables.xml Mon Mar 16 02:07:43 2009
@@ -34,7 +34,9 @@
<para os="e">Now add these to <filename>~/.bashrc</filename>, just in
case you have to exit and restart building later:</para>
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" >> ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+EOF</userinput></screen>
</sect1>
Modified: branches/clfs-sysroot/BOOK/cross-tools/common/cflags.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/common/cflags.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/common/cflags.xml Mon Mar 16 02:07:43 2009
@@ -22,7 +22,9 @@
<para>Now add these to <filename>~/.bashrc</filename>, just in
case you have to exit and restart building later:</para>
-<screen><userinput>echo unset CFLAGS >> ~/.bashrc
-echo unset CXXFLAGS >> ~/.bashrc</userinput></screen>
+<screen><userinput>cat >> ~/.bashrc << EOF
+unset CFLAGS
+unset CXXFLAGS
+EOF</userinput></screen>
</sect1>
Modified: branches/clfs-sysroot/BOOK/cross-tools/common/glibc.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/common/glibc.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/common/glibc.xml Mon Mar 16 02:07:43 2009
@@ -80,7 +80,9 @@
<para os="f">The following line needs to be added to
<filename>configparms</filename> to adjust installation paths:</para>
-<screen os="g"><userinput>echo "install_root=${CLFS}" > configparms</userinput></screen>
+<screen os="g"><userinput>cat > configparms << EOF
+install_root=${CLFS}
+EOF</userinput></screen>
<para os="h">Prepare Glibc for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/cross-tools/common/shadow.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/common/shadow.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/common/shadow.xml Mon Mar 16 02:07:43 2009
@@ -22,13 +22,17 @@
<para>The following value is added to <filename>config.cache</filename> to
make sure that the <filename>passwd</filename> program is found:</para>
-<screen><userinput>echo "shadow_cv_passwd_dir=${CLFS}/bin" > config.cache</userinput></screen>
+<screen><userinput>cat > config.cache << EOF
+shadow_cv_passwd_dir=${CLFS}/bin"
+EOF</userinput></screen>
<para>The following value causes Shadow to use its internal lckpwdf
instead of the one provided by Glibc. The one provided by Glibc will
attempt to modify the host system:</para>
-<screen><userinput>echo "ac_cv_func_lckpwdf=no" >> config.cache</userinput></screen>
+<screen><userinput>cat > config.cache << EOF
+ac_cv_func_lckpwdf=no
+EOF</userinput></screen>
<para>Prepare Shadow for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/bison.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/bison.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/bison.xml Mon Mar 16 02:07:43 2009
@@ -34,7 +34,9 @@
program is not already in ${PATH}. The following addition will correct
this:</para>
-<screen os="b2"><userinput>echo '#define YYENABLE_NLS 1' >> config.h</userinput></screen>
+<screen os="b2"><userinput>cat >> config.h << "EOF"
+#define YYENABLE_NLS 1
+EOF</userinput></screen>
<para os="c">Compile the package:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml Mon Mar 16 02:07:43 2009
@@ -56,7 +56,9 @@
not be built. Add the following entry to <filename>config.cache</filename>
to correct this:</para>
-<screen os="b"><userinput>echo "fu_cv_sys_stat_statfs2_bsize=yes" > config.cache</userinput></screen>
+<screen os="b"><userinput>cat > config.cache << EOF
+fu_cv_sys_stat_statfs2_bsize=yes
+EOF</userinput></screen>
<para os="c">Now prepare Coreutils 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 Mon Mar 16 02:07:43 2009
@@ -30,9 +30,11 @@
<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>
+<screen os="c2"><userinput>cat > config.cache << EOF
+gl_cv_func_wcwidth_works=yes
+gl_cv_header_working_fcntl_h=yes
+ac_cv_func_fnmatch_gnu=yes
+EOF</userinput></screen>
<para os="a">Prepare Findutils for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/gettext.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gettext.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gettext.xml Mon Mar 16 02:07:43 2009
@@ -30,10 +30,12 @@
<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 "am_cv_func_iconv_works=yes" > config.cache
-echo "gl_cv_func_wcwidth_works=yes" >> config.cache
-echo "gt_cv_func_printf_posix=yes" >> config.cache
-echo "gt_cv_int_divbyzero_sigfpe=yes" >> config.cache</userinput></screen>
+<screen os="c2"><userinput>cat > config.cache << EOF
+am_cv_func_iconv_works=yes
+gl_cv_func_wcwidth_works=yes
+gt_cv_func_printf_posix=yes
+gt_cv_int_divbyzero_sigfpe=yes
+EOF</userinput></screen>
<para os="a">Prepare Gettext for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/kbd.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/kbd.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/kbd.xml Mon Mar 16 02:07:43 2009
@@ -28,9 +28,11 @@
<para os="cc1">When Cross Compiling the configure script does not
run a select few tests, Set the values manually:</para>
-<screen os="cc1"><userinput>echo "ac_cv_func_setpgrp_void=yes" > config.cache
-echo "ac_cv_func_malloc_0_nonnull=yes" >> config.cache
-echo "ac_cv_func_realloc_0_nonnull=yes" >> config.cache</userinput></screen>
+<screen os="cc1"><userinput>cat > config.cache << EOF
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes
+EOF</userinput></screen>
<para os="a">Prepare Kbd for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/patch.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/patch.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/patch.xml Mon Mar 16 02:07:43 2009
@@ -32,7 +32,9 @@
isn't installed by default but it may be installed on the host, Lets
force the fallback value.</para>
-<screen os="b"><userinput>echo "ac_cv_path_ed_PROGRAM=ed" > config.cache</userinput></screen>
+<screen os="b"><userinput>cat > config.cache << EOF
+ac_cv_path_ed_PROGRAM=ed
+EOF</userinput></screen>
<para os="c">Prepare Patch for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml Mon Mar 16 02:07:43 2009
@@ -29,8 +29,10 @@
macro will assume that the malloc provided is not GNU Compatible. The
following tells it that we do:</para>
-<screen os="a2"><userinput>echo "ac_cv_func_malloc_0_nonnull=yes" > config.cache
-echo "ac_cv_func_realloc_0_nonnull=yes" >> config.cache</userinput></screen>
+<screen os="a2"><userinput>cat > config.cache << EOF
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes
+EOF</userinput></screen>
<para os="a">Prepare Psmisc for compilation:</para>
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 Mon Mar 16 02:07:43 2009
@@ -36,7 +36,9 @@
<para os="b">Create a config.cache containing information about a test that
cannot be run when cross-compiling:</para>
-<screen os="c"><userinput>echo "ac_cv_func_setpgrp_void=yes" > config.cache</userinput></screen>
+<screen os="c"><userinput>cat > config.cache << EOF
+ac_cv_func_setpgrp_void=yes
+EOF</userinput></screen>
<para os="d">Prepare Shadow for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/common/variables.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/variables.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/variables.xml Mon Mar 16 02:07:43 2009
@@ -24,12 +24,14 @@
<para>Then add the build variables to <filename>~/.bashrc</filename> to
prevent issues if you stop and come back later:</para>
-<screen><userinput>echo export CC=\""${CC}\"" >> ~/.bashrc
-echo export CXX=\""${CXX}\"" >> ~/.bashrc
-echo export AR=\""${AR}\"" >> ~/.bashrc
-echo export AS=\""${AS}\"" >> ~/.bashrc
-echo export RANLIB=\""${RANLIB}\"" >> ~/.bashrc
-echo export LD=\""${LD}\"" >> ~/.bashrc
-echo export STRIP=\""${STRIP}\"" >> ~/.bashrc</userinput></screen>
+<screen><userinput>cat > config.cache << EOF
+export CC="${CC}"
+export CXX="${CXX}"
+export AR="${AR}"
+export AS="${AS}"
+export RANLIB="${RANLIB}"
+export LD="${LD}"
+export STRIP="${STRIP}"
+EOF</userinput></screen>
</sect1>
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 Mon Mar 16 02:07:43 2009
@@ -61,7 +61,9 @@
the <filename>vimrc</filename> configuration file to <filename
class="directory">/etc</filename>:</para>
-<screen os="c"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen>
+<screen os="c"><userinput>cat >> src/feature.h << "EOF"
+#define SYS_VIMRC_FILE "/etc/vimrc"
+EOF</userinput></screen>
<para os="d">Prepare Vim for compilation:</para>
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 Mon Mar 16 02:07:43 2009
@@ -21,7 +21,9 @@
<para>Create the <filename>/etc/sysconfig/network</filename> file
and enter a hostname by running:</para>
- <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" > ${CLFS}/etc/sysconfig/network</userinput></screen>
+<screen><userinput>cat > ${CLFS}/etc/sysconfig/network << EOF
+HOSTNAME=<replaceable>[clfs]</replaceable>
+EOF</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/the-end/theend.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/the-end/theend.xml (original)
+++ branches/clfs-sysroot/BOOK/the-end/theend.xml Mon Mar 16 02:07:43 2009
@@ -23,6 +23,8 @@
point) to find out which CLFS version is installed on the system.
Create this file by running:</para>
-<screen><userinput>echo CLFS-Sysroot-&version; > ${CLFS}/etc/clfs-release</userinput></screen>
+<screen><userinput>cat > ${CLFS}/etc/clfs-release << EOF
+CLFS-Sysroot-&version;
+EOF</userinput></screen>
</sect1>
More information about the Clfs-commits
mailing list