[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-737-g4b9dcd7
git
git at cross-lfs.org
Mon Apr 14 13:50:26 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, systemd has been updated
via 4b9dcd76bee2285a968a2c144fb771c02f63f4b5 (commit)
via f584773a77da17b1cfdfcb84f48912409efba28d (commit)
from 47cb63ded800097debcbedd3227316f382fe4955 (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 4b9dcd76bee2285a968a2c144fb771c02f63f4b5
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 16:50:11 2014 -0400
Remove extraneous mention of Shadow's lack of testsuite
diff --git a/BOOK/boot/64/shadow.xml b/BOOK/boot/64/shadow.xml
index 99bec02..616eacc 100644
--- a/BOOK/boot/64/shadow.xml
+++ b/BOOK/boot/64/shadow.xml
@@ -69,10 +69,6 @@
href="../common/shadow.xml"
xpointer="xpointer(//*[@os='m'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/shadow.xml"
- xpointer="xpointer(//*[@os='n'])"/>
-
</sect2>
<sect2 role="content">
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index 9ad0baf..d864d5a 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -56,11 +56,9 @@ sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&@' config.h.orig > config.h</us
<screen os="k"><userinput>make</userinput></screen>
- <para os="l">This package does not come with a test suite.</para>
+ <para os="l">Install the package:</para>
- <para os="m">Install the package:</para>
-
-<screen os="n"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="m"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
</sect2>
commit f584773a77da17b1cfdfcb84f48912409efba28d
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 16:49:16 2014 -0400
Use passwd in /tools
diff --git a/BOOK/boot/64/createfiles.xml b/BOOK/boot/64/createfiles.xml
index fc74434..a381d40 100644
--- a/BOOK/boot/64/createfiles.xml
+++ b/BOOK/boot/64/createfiles.xml
@@ -17,7 +17,7 @@
links which will be replaced by real files throughout the course of
the next chapter after the software has been installed.</para>
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
diff --git a/BOOK/boot/64/shadow.xml b/BOOK/boot/64/shadow.xml
index 257083b..99bec02 100644
--- a/BOOK/boot/64/shadow.xml
+++ b/BOOK/boot/64/shadow.xml
@@ -65,6 +65,14 @@
href="../common/shadow.xml"
xpointer="xpointer(//*[@os='l'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/shadow.xml"
+ xpointer="xpointer(//*[@os='n'])"/>
+
</sect2>
<sect2 role="content">
diff --git a/BOOK/boot/common/createfiles.xml b/BOOK/boot/common/createfiles.xml
index b5ab0c7..5fdc8f4 100644
--- a/BOOK/boot/common/createfiles.xml
+++ b/BOOK/boot/common/createfiles.xml
@@ -15,7 +15,7 @@
links which will be replaced by real files throughout the course of
the next chapter after the software has been installed.</para>
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index d7a6c6b..9ad0baf 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -47,16 +47,20 @@ sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
</variablelist>
+ <para os="h">Tell Shadow to use passwd in /tools/bin:</para>
- <para os="h">Compile the package:</para>
+<screen os="i"><userinput>cp config.h{,.orig}
+sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&@' config.h.orig > config.h</userinput></screen>
-<screen os="i"><userinput>make</userinput></screen>
+ <para os="j">Compile the package:</para>
- <para os="j">This package does not come with a test suite.</para>
+<screen os="k"><userinput>make</userinput></screen>
- <para os="k">Install the package:</para>
+ <para os="l">This package does not come with a test suite.</para>
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+ <para os="m">Install the package:</para>
+
+<screen os="n"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
</sect2>
diff --git a/BOOK/boot/mips64/createfiles.xml b/BOOK/boot/mips64/createfiles.xml
index 3c7fec2..e818e5a 100644
--- a/BOOK/boot/mips64/createfiles.xml
+++ b/BOOK/boot/mips64/createfiles.xml
@@ -14,7 +14,7 @@
href="../common/createfiles.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
diff --git a/BOOK/boot/multilib/createfiles.xml b/BOOK/boot/multilib/createfiles.xml
index 15a041d..11af2db 100644
--- a/BOOK/boot/multilib/createfiles.xml
+++ b/BOOK/boot/multilib/createfiles.xml
@@ -14,7 +14,7 @@
href="../common/createfiles.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
ln -sv /tools/bin/file ${CLFS}/usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/createfiles.xml | 2 +-
BOOK/boot/64/shadow.xml | 4 ++++
BOOK/boot/common/createfiles.xml | 2 +-
BOOK/boot/common/shadow.xml | 12 +++++++-----
BOOK/boot/mips64/createfiles.xml | 2 +-
BOOK/boot/multilib/createfiles.xml | 2 +-
6 files changed, 15 insertions(+), 9 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list