[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-835-g8f0942a
git
git at cross-lfs.org
Sun Feb 2 11:49:33 PST 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, systemd has been updated
via 8f0942a7a4d339e11630dcf481433f9b2f6baed2 (commit)
via 8000b262b330335b83f25d55fbd6ff9ca462f3f6 (commit)
via ec222b5aceaabb06d4e7ae62dd3303248f64e699 (commit)
from 7ffbb9cabe3c19d4e960b314e76fa4970c1a2324 (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 8f0942a7a4d339e11630dcf481433f9b2f6baed2
Merge: 8000b26 7ffbb9c
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Feb 2 13:50:56 2014 -0600
Merge branch 'systemd' of cross-lfs.org:cross-lfs into systemd
commit 8000b262b330335b83f25d55fbd6ff9ca462f3f6
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Feb 2 13:48:38 2014 -0600
Add missing sed commands to multilib books, which are in the 32bit and pure64 books, regarding the installation of the man pages and prefix.
diff --git a/BOOK/final-system/multilib/bzip2-64bit.xml b/BOOK/final-system/multilib/bzip2-64bit.xml
index 99a349d..3ed87fe 100644
--- a/BOOK/final-system/multilib/bzip2-64bit.xml
+++ b/BOOK/final-system/multilib/bzip2-64bit.xml
@@ -29,6 +29,14 @@
href="bzip2.xml"
xpointer="xpointer(//*[@os='s2'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bzip2.xml"
+ xpointer="xpointer(//*[@os='s3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bzip2.xml"
+ xpointer="xpointer(//*[@os='s4'])"/>
+
<para os="m1">We need to change the default lib path
to <filename class="directory">lib64</filename>:</para>
diff --git a/BOOK/final-system/multilib/bzip2-n32.xml b/BOOK/final-system/multilib/bzip2-n32.xml
index 6a689aa..5b4ac6f 100644
--- a/BOOK/final-system/multilib/bzip2-n32.xml
+++ b/BOOK/final-system/multilib/bzip2-n32.xml
@@ -30,6 +30,14 @@
href="bzip2.xml"
xpointer="xpointer(//*[@os='s2'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bzip2.xml"
+ xpointer="xpointer(//*[@os='s3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bzip2.xml"
+ xpointer="xpointer(//*[@os='s4'])"/>
+
<para os="m1">We need to change the default lib path
to <filename class="directory">lib32</filename>:</para>
diff --git a/BOOK/final-system/multilib/bzip2.xml b/BOOK/final-system/multilib/bzip2.xml
index bb2ea15..d087c20 100644
--- a/BOOK/final-system/multilib/bzip2.xml
+++ b/BOOK/final-system/multilib/bzip2.xml
@@ -32,6 +32,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bzip2.xml"
+ xpointer="xpointer(//*[@os='s3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bzip2.xml"
+ xpointer="xpointer(//*[@os='s4'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bzip2.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
commit ec222b5aceaabb06d4e7ae62dd3303248f64e699
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Feb 2 13:47:08 2014 -0600
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index f38e9c9..b09e404 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "01"> <!-- Use two digits -->
-<!ENTITY month_name "January">
-<!ENTITY day "29"> <!-- Use two digits -->
+<!ENTITY month "02"> <!-- Use two digits -->
+<!ENTITY month_name "February">
+<!ENTITY day "02"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/multilib/bzip2-64bit.xml | 8 ++++++++
BOOK/final-system/multilib/bzip2-n32.xml | 8 ++++++++
BOOK/final-system/multilib/bzip2.xml | 8 ++++++++
BOOK/general.ent | 6 +++---
4 files changed, 27 insertions(+), 3 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list