[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-37-g787b933
git
git at cross-lfs.org
Sat Aug 9 01:57:01 PDT 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, sysvinit has been updated
via 787b93385f40b96f2692ef2293806943043221dc (commit)
from 223a37562b1c0f4655e551dc7caca1836928bcc6 (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 787b93385f40b96f2692ef2293806943043221dc
Author: Chris Staub <chris at beaker67.com>
Date: Sat Aug 9 04:55:10 2014 -0400
Don't use sed -i in temp system
diff --git a/BOOK/boot/multilib/grub-build.xml b/BOOK/boot/multilib/grub-build.xml
index 9d7a416..d4d8f7d 100644
--- a/BOOK/boot/multilib/grub-build.xml
+++ b/BOOK/boot/multilib/grub-build.xml
@@ -31,7 +31,7 @@
xpointer="xpointer(//*[@os='s1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/x86/grub.xml"
+ href="../x86/grub-build.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/sparc/silo-build.xml b/BOOK/boot/sparc/silo-build.xml
index f0b20b6..b4e322a 100644
--- a/BOOK/boot/sparc/silo-build.xml
+++ b/BOOK/boot/sparc/silo-build.xml
@@ -32,7 +32,8 @@
<para os="ae">This sed allows us to compile the bin2h binary separately.</para>
-<screen os="ad"><userinput>sed -i -e 's@\$(PROGRAMS)$@programs\n\nprograms: &@' common/Makefile</userinput></screen>
+<screen os="ad"><userinput>cp -v common/Makefile{,.orig}
+sed -e 's@\$(PROGRAMS)$@programs\n\nprograms: &@' common/Makefile.orig > common/Makefile</userinput></screen>
<para os="af">Compile the bin2h and util binaries for the host.</para>
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/x86/grub-build.xml
index 078bbbe..1438dce 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/x86/grub-build.xml
@@ -30,9 +30,8 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='s1'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='s2'])"/>
+<screen os="s2"><userinput>cp -v grub-core/gnulib/stdio.in.h{,.orig}
+sed -e '/gets is a/d' grub-core/gnulib/stdio.in.h.orig > grub-core/gnulib/stdio.in.h</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/x86/grub.xml"
diff --git a/BOOK/temp-system/64/gcc.xml b/BOOK/temp-system/64/gcc.xml
index 4874288..97c4f97 100644
--- a/BOOK/temp-system/64/gcc.xml
+++ b/BOOK/temp-system/64/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/common/cloog.xml b/BOOK/temp-system/common/cloog.xml
index 220cbe7..fabdd12 100644
--- a/BOOK/temp-system/common/cloog.xml
+++ b/BOOK/temp-system/common/cloog.xml
@@ -32,9 +32,8 @@
href="../../final-system/common/cloog.xml"
xpointer="xpointer(//*[@os='s1'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/cloog.xml"
- xpointer="xpointer(//*[@os='s2'])"/>
+<screen os="s2"><userinput>cp -v Makefile{,.orig}
+sed '/cmake/d' Makefile.orig > Makefile</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/temp-system/common/gcc.xml b/BOOK/temp-system/common/gcc.xml
index 34df939..4441ff1 100644
--- a/BOOK/temp-system/common/gcc.xml
+++ b/BOOK/temp-system/common/gcc.xml
@@ -50,9 +50,8 @@
href="../../final-system/common/gcc.xml"
xpointer="xpointer(//*[@os='fix1'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
- xpointer="xpointer(//*[@os='fix2'])"/>
+<screen os="fix2"><userinput>cp -v gcc/Makefile.in{,.orig}
+sed 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/gcc.xml"
diff --git a/BOOK/temp-system/mips64-64/gcc.xml b/BOOK/temp-system/mips64-64/gcc.xml
index cef81b1..385ac4d 100644
--- a/BOOK/temp-system/mips64-64/gcc.xml
+++ b/BOOK/temp-system/mips64-64/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/mips64/gcc.xml b/BOOK/temp-system/mips64/gcc.xml
index 2b76a78..64d83a4 100644
--- a/BOOK/temp-system/mips64/gcc.xml
+++ b/BOOK/temp-system/mips64/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/cloog.xml b/BOOK/temp-system/multilib/cloog.xml
index ccb9397..8974ced 100644
--- a/BOOK/temp-system/multilib/cloog.xml
+++ b/BOOK/temp-system/multilib/cloog.xml
@@ -35,7 +35,7 @@
xpointer="xpointer(//*[@os='s1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/cloog.xml"
+ href="../common/cloog.xml"
xpointer="xpointer(//*[@os='s2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/gcc.xml b/BOOK/temp-system/multilib/gcc.xml
index c25bedc..2b2a855 100644
--- a/BOOK/temp-system/multilib/gcc.xml
+++ b/BOOK/temp-system/multilib/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/ppc/gcc.xml b/BOOK/temp-system/ppc/gcc.xml
index 8f503e6..236b2ea 100644
--- a/BOOK/temp-system/ppc/gcc.xml
+++ b/BOOK/temp-system/ppc/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/ppc64-64/gcc.xml b/BOOK/temp-system/ppc64-64/gcc.xml
index 538bd19..4650da9 100644
--- a/BOOK/temp-system/ppc64-64/gcc.xml
+++ b/BOOK/temp-system/ppc64-64/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/ppc64/gcc.xml b/BOOK/temp-system/ppc64/gcc.xml
index c5c8308..1138c92 100644
--- a/BOOK/temp-system/ppc64/gcc.xml
+++ b/BOOK/temp-system/ppc64/gcc.xml
@@ -51,7 +51,7 @@
xpointer="xpointer(//*[@os='fix1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/gcc.xml"
+ href="../common/gcc.xml"
xpointer="xpointer(//*[@os='fix2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/multilib/grub-build.xml | 2 +-
BOOK/boot/sparc/silo-build.xml | 3 ++-
BOOK/boot/x86/grub-build.xml | 5 ++---
BOOK/temp-system/64/gcc.xml | 2 +-
BOOK/temp-system/common/cloog.xml | 5 ++---
BOOK/temp-system/common/gcc.xml | 5 ++---
BOOK/temp-system/mips64-64/gcc.xml | 2 +-
BOOK/temp-system/mips64/gcc.xml | 2 +-
BOOK/temp-system/multilib/cloog.xml | 2 +-
BOOK/temp-system/multilib/gcc.xml | 2 +-
BOOK/temp-system/ppc/gcc.xml | 2 +-
BOOK/temp-system/ppc64-64/gcc.xml | 2 +-
BOOK/temp-system/ppc64/gcc.xml | 2 +-
13 files changed, 17 insertions(+), 19 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list