Author: randy Date: 2005-12-07 03:29:58 -0700 (Wed, 07 Dec 2005) New Revision: 5365
Modified: trunk/BOOK/general/sysutils/cpio.xml Log: Condensed the sed commands and changed a hard-coded GCC version to an entity in the cpio instructions Modified: trunk/BOOK/general/sysutils/cpio.xml =================================================================== --- trunk/BOOK/general/sysutils/cpio.xml 2005-12-07 10:16:30 UTC (rev 5364) +++ trunk/BOOK/general/sysutils/cpio.xml 2005-12-07 10:29:58 UTC (rev 5365) @@ -5,11 +5,11 @@ %general-entities; <!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz";> - <!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz";> - <!ENTITY cpio-md5sum "76b4145f33df088a5bade3bf4373d17d"> - <!ENTITY cpio-size "561 KB"> - <!ENTITY cpio-buildsize "5.3 MB"> - <!ENTITY cpio-time "0.1 SBU"> + <!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz";> + <!ENTITY cpio-md5sum "76b4145f33df088a5bade3bf4373d17d"> + <!ENTITY cpio-size "561 KB"> + <!ENTITY cpio-buildsize "5.3 MB"> + <!ENTITY cpio-time "0.1 SBU"> ]> <sect1 id="cpio" xreflabel="cpio-&cpio-version;"> @@ -24,14 +24,14 @@ </keywordset> </sect1info> - <title>Cpio-&cpio-version;</title> + <title>cpio-&cpio-version;</title> <indexterm zone="cpio"> <primary sortas="a-Cpio">Cpio</primary> </indexterm> <sect2 role="package"> - <title>Introduction to Cpio</title> + <title>Introduction to cpio</title> <para>The <application>cpio</application> package contains tools for archiving.</para> @@ -69,12 +69,12 @@ </sect2> <sect2 role="installation"> - <title>Installation of Cpio</title> + <title>Installation of cpio</title> <para>Install <application>cpio</application> by running the following commands:</para> -<screen><userinput>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c && +<screen><userinput>sed -i "s/invalid_arg/argmatch_invalid/" src/mt.c && patch -Np1 -i ../cpio-&cpio-version;-security_fixes-1.patch && ./configure CPIO_MT_PROG=mt --prefix=/usr \ --bindir=/bin --libexecdir=/tmp \ @@ -84,11 +84,8 @@ make</userinput></screen> <para>To test the results, issue:</para> -<screen><userinput>sed -i -e 's/static const char \*argp_program_version/ \ - const char \*argp_program_version/' \ - -e 's/static const char \*argp_program_bug_address/ \ - const char \*argp_program_bug_address/' \ - tests/genfile.c && + +<screen><userinput>sed -i 's/static const char/const char/' tests/genfile.c && make check</userinput></screen> <para>Now, as the <systemitem class="username">root</systemitem> user:</para> @@ -100,12 +97,10 @@ <sect2 role="commands"> <title>Command Explanations</title> - <para><command>sed -i -e "s/invalid_arg/argmatch_invalid/" + <para><command>sed -i "s/invalid_arg/argmatch_invalid/" src/mt.c</command>: This command fixes a build problem with the <command>mt</command> program.</para> - - <para><parameter>CPIO_MT_PROG=mt</parameter>: This parameter forces the building and installation of the <command>mt</command> program.</para> @@ -131,8 +126,8 @@ define fixes a bug that causes <command>cpio</command> to convert symlinks into regular files during archive creation.</para> - <para><command>sed -i -e 's/static const ...</command>: This command fixes a build problem when - compiling the tests with gcc-4.0.1</para> + <para><command>sed -i 's/static const ...</command>: This command fixes + a build problem when compiling the tests with GCC-&gcc-version;.</para> </sect2> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
