[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-735-g47cb63d
git
git at cross-lfs.org
Mon Apr 14 13:29:46 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 47cb63ded800097debcbedd3227316f382fe4955 (commit)
via 8876eda4c89762b0dccfec3181b2ddcfe953eeb4 (commit)
via 1425d8c30c2dc34afe4156b26230b765d463de1e (commit)
via 1d4a45f8b57e6d29d188930325aa2472493c6f26 (commit)
from 79536fe29681d62ad99d9ee86575ad7313d88109 (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 47cb63ded800097debcbedd3227316f382fe4955
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 16:29:31 2014 -0400
sleep is not needed in /bin
diff --git a/BOOK/boot/64/createfiles.xml b/BOOK/boot/64/createfiles.xml
index f5e94ec..fc74434 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,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,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/createfiles.xml b/BOOK/boot/common/createfiles.xml
index 3a8feac..b5ab0c7 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,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,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/mips64/createfiles.xml b/BOOK/boot/mips64/createfiles.xml
index 89f9c6e..3c7fec2 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,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,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 16dabb7..15a041d 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,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,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
commit 8876eda4c89762b0dccfec3181b2ddcfe953eeb4
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 04:46:47 2014 -0400
Removed obsolete LDFLAGS variable from eudev instructions
diff --git a/BOOK/boot/64/eudev.xml b/BOOK/boot/64/eudev.xml
index a275bd7..5b8310a 100644
--- a/BOOK/boot/64/eudev.xml
+++ b/BOOK/boot/64/eudev.xml
@@ -27,11 +27,11 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib:/lib" \
- ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --disable-introspection --disable-gtk-doc-html --disable-gudev \
- --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+ KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+ CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
+ --host=${CLFS_TARGET} --disable-introspection --disable-gtk-doc-html \
+ --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
+ --enable-libkmod</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eudev.xml"
diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index 8ce3daa..2c188b9 100644
--- a/BOOK/boot/common/eudev.xml
+++ b/BOOK/boot/common/eudev.xml
@@ -29,9 +29,8 @@
<para os="a">Prepare Eudev for compilation:</para>
<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
-LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/tools \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+ ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-introspection --disable-gtk-doc-html \
--disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
--enable-libkmod</userinput></screen>
diff --git a/BOOK/boot/multilib/eudev.xml b/BOOK/boot/multilib/eudev.xml
index 4c6d15e..66529fd 100644
--- a/BOOK/boot/multilib/eudev.xml
+++ b/BOOK/boot/multilib/eudev.xml
@@ -27,12 +27,11 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
- ./configure --prefix=/tools --build=${CLFS_HOST} \
+ KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+ CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
--host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
- --disable-introspection --disable-gtk-doc-html --disable-gudev --disable-keymap \
- --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+ --disable-introspection --disable-gtk-doc-html --disable-gudev \
+ --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eudev.xml"
commit 1425d8c30c2dc34afe4156b26230b765d463de1e
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 04:44:58 2014 -0400
Prevent sysvinit from installing unneeded progs (thanks for the reminder, Martin Ward)
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index 85a9e60..7b95129 100644
--- a/BOOK/boot/common/sysvinit.xml
+++ b/BOOK/boot/common/sysvinit.xml
@@ -26,6 +26,13 @@
<sect2 role="installation">
<title>Installation of Sysvinit</title>
+ <para os="s1">Prevent several programs from being built, as better versions
+ were already installed by Util-linux:</para>
+
+<screen os="s2"><userinput>cp -v src/Makefile{,.orig}
+sed -e 's/\ sulogin[^ ]*//' -e '/utmpdump/d' -e '/mountpoint/d' \
+ -e '/mesg/d' src/Makefile.orig > src/Makefile</userinput></screen>
+
<para os="aa">The following modifications help locate files specific to this
particular build:</para>
diff --git a/BOOK/boot/multilib/sysvinit.xml b/BOOK/boot/multilib/sysvinit.xml
index f55d72b..8f5175e 100644
--- a/BOOK/boot/multilib/sysvinit.xml
+++ b/BOOK/boot/multilib/sysvinit.xml
@@ -24,6 +24,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/sysvinit.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/sysvinit.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/sysvinit.xml"
xpointer="xpointer(//*[@os='aa'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 1d4a45f8b57e6d29d188930325aa2472493c6f26
Author: Chris Staub <chris at beaker67.com>
Date: Mon Apr 14 04:44:14 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index d4de969..f133ec4 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "04"> <!-- Use two digits -->
<!ENTITY month_name "April">
-<!ENTITY day "13"> <!-- Use two digits -->
+<!ENTITY day "14"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/createfiles.xml | 2 +-
BOOK/boot/64/eudev.xml | 10 +++++-----
BOOK/boot/common/createfiles.xml | 2 +-
BOOK/boot/common/eudev.xml | 5 ++---
BOOK/boot/common/sysvinit.xml | 7 +++++++
BOOK/boot/mips64/createfiles.xml | 2 +-
BOOK/boot/multilib/createfiles.xml | 2 +-
BOOK/boot/multilib/eudev.xml | 9 ++++-----
BOOK/boot/multilib/sysvinit.xml | 8 ++++++++
BOOK/general.ent | 2 +-
10 files changed, 31 insertions(+), 18 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list