Changeset 01672b8 for BOOK/temp-system

Timestamp:

Nov 12, 2012, 1:25:42 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

3d8b4f6

Parents:

5759332

Message:

Do not use sed -i in temp-system as the host cannot be guaranteed to have GNU sed

Location:

BOOK/temp-system

Files:

• common/coreutils.xml (modified) (2 diffs)
• common/vim.xml (modified) (1 diff)
• multilib/coreutils.xml (modified) (1 diff)

BOOK/temp-system/common/coreutils.xml

@@ -48 +48 @@
     <para os="h1">Coreutils does not build make-prime-list properly and the host cannot execute it. We build it using the host compiler so it can be executed for the generation of data required for the build.</para>
 
-<screen os="h2"><userinput>sed '/src_make_prime_list/d' -i Makefile
+<screen os="h2"><userinput>cp -v Makefile{,.orig}
+sed '/src_make_prime_list/d' Makefile.orig > Makefile
 depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&amp;|;s|\.o$||'`;\
     gcc -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src  \
@@ -61 +62 @@
     <para os="h3">Remove the building of the hostname man page as it is affected by the previous commands.</para>
 
-<screen os="h4"><userinput>sed -i '/hostname.1/d' -i Makefile</userinput></screen>
+<screen os="h4"><userinput>cp -v Makefile{,.bak}
+sed -e '/hostname.1/d' Makefile.bak > Makefile</userinput></screen>
 <!-- End hack -->
 

BOOK/temp-system/common/vim.xml

@@ -35 +35 @@
     following command:</para>
 
-<screen os="s2"><userinput>sed -i "/using uint32_t/s/as_fn_error/#&amp;/" src/auto/configure</userinput></screen>
+<screen os="s2"><userinput>cp -v src/auto/configure{,.orig}
+sed "/using uint32_t/s/as_fn_error/#&amp;/" src/auto/configure.orig > src/auto/configure</userinput></screen>
 
     <para os="c1">The <command>configure</command> script is full of logic

BOOK/temp-system/multilib/coreutils.xml

@@ -53 +53 @@
     xpointer="xpointer(//*[@os='h1'])"/>
 
-<screen os="h2"><userinput>sed '/src_make_prime_list/d' -i Makefile
+<screen os="h2"><userinput>cp -v Makefile{,.orig}
+sed '/src_make_prime_list/d' Makefile.orig > Makefile
 depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&amp;|;s|\.o$||'`;\
     gcc -m64 -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src \