[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-564-g38de0aa
git
git at cross-lfs.org
Sun Mar 16 22:08:55 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 38de0aaa47d291b1218173561ed76743320fad9a (commit)
via 6f5a7c3bc72d633f6c4588c2a0805085f1dd5b27 (commit)
via 49da1d59e4dfaa4997094145fa04533d1fe647a1 (commit)
via 42ff691d8ba2bea7f5c6b19d8842130b3cc3e7d1 (commit)
via 466dec4b203240e0db2892d73751c3799b25effa (commit)
via a76c43af7b4dc66e49d70824915012974167e7f2 (commit)
via e44cb2eac405d9b892c5210665f1092facf3f63a (commit)
via 496c64524c8419733e44826f774fbdd71ff5a943 (commit)
via fb7482cf533842f6b227ff5a5c406af385df070c (commit)
via cb16373b579804f31848517533dc8f02c6e6cdba (commit)
via dd3bdd523e3a1ec0a6f56530539a0ef769458472 (commit)
from f96caf237f7f8040e1d8ad64b1b3ff5fca37ba7a (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 38de0aaa47d291b1218173561ed76743320fad9a
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Mon Mar 17 00:08:49 2014 -0500
Add addition of systemd compat patch to master changelog entries.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index e231e89..5e05c5c 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -42,6 +42,9 @@
<listitem>
<para>[William Harrington] - Remove libdbus and Update Systemd to 211.</para>
</listitem>
+ <listitem>
+ <para>[William Harrington] - Add Systemd compat patch to install pkg-config files.</para>
+ </listitem>
</itemizedlist>
</listitem>
commit 6f5a7c3bc72d633f6c4588c2a0805085f1dd5b27
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Mon Mar 17 00:07:01 2014 -0500
Update master change log for Systemd 211 update and removal of libdbus dependency.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 84e03bc..e231e89 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>17 March 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Remove libdbus and Update Systemd to 211.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>12 March 2014</para>
<itemizedlist>
<listitem>
commit 49da1d59e4dfaa4997094145fa04533d1fe647a1
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Mon Mar 17 00:04:18 2014 -0500
Add systemd compat patch command, adjust test suite commands, adjust configure commands for dbus config files, update configure option description list.
diff --git a/BOOK/final-system/common/systemd.xml b/BOOK/final-system/common/systemd.xml
index 25d176f..905dfea 100644
--- a/BOOK/final-system/common/systemd.xml
+++ b/BOOK/final-system/common/systemd.xml
@@ -24,6 +24,11 @@
<sect2 role="installation">
<title>Installation of systemd</title>
+ <para os="p1">Apply a patch so that compat <command>pkg-config</command>
+ files get installed without installing compat libraries:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
+
<para os="a">Prepare Systemd for compilation:</para>
<screen os="b"><userinput>./configure --prefix=/usr \
@@ -31,7 +36,10 @@
--libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
--with-rootprefix="" --with-rootlibdir=/lib \
--enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
- --with-kbd-setfont=/bin/setfont</userinput></screen>
+ --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+ --with-dbussessionservicedir=/usr/share/dbus-1/services \
+ --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
<variablelist os="c">
<title>The meaning of the configure options:</title>
@@ -62,6 +70,13 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>--with-dbus*</parameter></term>
+ <listitem>
+ <para>These switches ensure that D-Bus configuration files get
+ installed to the correct locations.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para os="d">Compile the package:</para>
@@ -70,9 +85,13 @@
<para os="f">Prevent a broken test case from running:</para>
-<screen os="g"><userinput remap="test">sed -i s:test/udev-test.pl::g Makefile</userinput></screen>
+<screen os="g"><userinput remap="test">
+sed -e "s:test/udev-test.pl::g Makefile" \
+ -e "s:test-bus-cleanup\$(EXEEXT) ::g" \
+ -e "s:test-bus-gvariant\$(EXEEXT) ::g" \
+ -i Makefile</userinput></screen>
- <para os="h">Test test the results, issue:</para>
+ <para os="h">Test the results, issue:</para>
<screen os="i"><userinput remap="test">make check</userinput></screen>
diff --git a/BOOK/final-system/multilib/systemd-64bit.xml b/BOOK/final-system/multilib/systemd-64bit.xml
index ff7cb8b..45d0572 100644
--- a/BOOK/final-system/multilib/systemd-64bit.xml
+++ b/BOOK/final-system/multilib/systemd-64bit.xml
@@ -22,6 +22,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
@@ -30,7 +38,10 @@
--libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
--with-rootprefix="" -with-rootlibdir=/lib64 \
--enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
- --with-kbd-setfont=/bin/setfont</userinput></screen>
+ --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+ --with-dbussessionservicedir=/usr/share/dbus-1/services \
+ --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
@@ -46,6 +57,22 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/systemd-n32.xml b/BOOK/final-system/multilib/systemd-n32.xml
index f43f1bc..a81de88 100644
--- a/BOOK/final-system/multilib/systemd-n32.xml
+++ b/BOOK/final-system/multilib/systemd-n32.xml
@@ -26,6 +26,14 @@
xpointer="xpointer(//*[@os='mlw1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="systemd.xml"
xpointer="xpointer(//*[@os='a'])"/>
@@ -35,7 +43,10 @@
--libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
--with-rootprefix="" -with-rootlibdir=/lib32 \
--enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
- --with-kbd-setfont=/bin/setfont</userinput></screen>
+ --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+ --with-dbussessionservicedir=/usr/share/dbus-1/services \
+ --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
@@ -47,6 +58,22 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/systemd.xml b/BOOK/final-system/multilib/systemd.xml
index ebe88a8..0a2fb2d 100644
--- a/BOOK/final-system/multilib/systemd.xml
+++ b/BOOK/final-system/multilib/systemd.xml
@@ -32,6 +32,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
@@ -40,7 +48,10 @@
--libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
--with-rootprefix="" --with-rootlibdir=/lib \
--enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
- --with-kbd-setfont=/bin/setfont</userinput></screen>
+ --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+ --with-dbussessionservicedir=/usr/share/dbus-1/services \
+ --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
@@ -52,6 +63,22 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/systemd.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 42ff691d8ba2bea7f5c6b19d8842130b3cc3e7d1
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Mon Mar 17 00:03:13 2014 -0500
Remvoe libdbus referernces and adjust commands for library installs.
diff --git a/BOOK/final-system/common/dbus.xml b/BOOK/final-system/common/dbus.xml
index f8e1bdf..f5ece21 100644
--- a/BOOK/final-system/common/dbus.xml
+++ b/BOOK/final-system/common/dbus.xml
@@ -44,13 +44,11 @@
<screen os="g"><userinput>make install</userinput></screen>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="libdbus.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ <para os="h">Move the shared library to <filename class="directory">/lib
+ </filename> and recreate the symbolic link.</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="libdbus.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
<para os="j">Create a symlink so that D-Bus and Systemd can use the same
<filename>machine-id</filename> file:</para>
diff --git a/BOOK/final-system/multilib/dbus-64bit.xml b/BOOK/final-system/multilib/dbus-64bit.xml
index a468e13..f598ddd 100644
--- a/BOOK/final-system/multilib/dbus-64bit.xml
+++ b/BOOK/final-system/multilib/dbus-64bit.xml
@@ -27,7 +27,7 @@
<screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 \
./configure --prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib64 --libexecdir=/usr/lib/dbus-1.0 \
+ --libdir=/usr/lib64 --libexecdir=/usr/lib64/dbus-1.0 \
--localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -50,13 +50,12 @@
href="../common/dbus.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/libdbus-64bit.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ <para os="h">Move the shared library to <filename class="directory">/lib64
+ </filename> and recreate the symbolic link.</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/libdbus-64bit.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /usr/lib64/libdbus-1.so.* /lib64
+ln -sfv ../../lib64/$(readlink /usr/lib64/libdbus-1.so) /usr/lib64/libdbus-1.so
+</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/dbus.xml"
diff --git a/BOOK/final-system/multilib/dbus-n32.xml b/BOOK/final-system/multilib/dbus-n32.xml
index 7a87a1c..a64d5ae 100644
--- a/BOOK/final-system/multilib/dbus-n32.xml
+++ b/BOOK/final-system/multilib/dbus-n32.xml
@@ -27,7 +27,7 @@
<screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 \
./configure --prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib32 --libexecdir=/usr/lib/dbus-1.0 \
+ --libdir=/usr/lib32 --libexecdir=/usr/lib32/dbus-1.0 \
--localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -50,13 +50,12 @@
href="../common/dbus.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/libdbus-n32.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ <para os="h">Move the shared library to <filename class="directory">/lib32
+ </filename> and recreate the symbolic link.</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/libdbus-n32.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /usr/lib32/libdbus-1.so.* /lib32
+ln -sfv ../../lib32/$(readlink /usr/lib32/libdbus-1.so) /usr/lib32/libdbus-1.so
+</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/dbus.xml b/BOOK/final-system/multilib/dbus.xml
index e3b4914..15104dc 100644
--- a/BOOK/final-system/multilib/dbus.xml
+++ b/BOOK/final-system/multilib/dbus.xml
@@ -51,11 +51,11 @@
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
+ href="../common/dbus.xml"
xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
+ href="../common/dbus.xml"
xpointer="xpointer(//*[@os='i'])"/>
</sect2>
commit 466dec4b203240e0db2892d73751c3799b25effa
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Mon Mar 17 00:02:04 2014 -0500
Remove libdbus from final-system chapter indexes.
diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index 70d8dc8..c3fbd99 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 7663eb4..0987caf 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index 37f77be..456c0b7 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index fee84bd..f779ff6 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -120,9 +120,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus-n32.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 6626f91..516b109 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 53e5d9a..88588c1 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -95,8 +95,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index b10a405..4c1deb9 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index be903a5..b2a64ea 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 007cf04..14c3622 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -95,8 +95,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index f618296..b87f53e 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index c4ebc11..60a4341 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -69,7 +69,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index b7f3298..b9c28ff 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -95,8 +95,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libdbus-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
commit a76c43af7b4dc66e49d70824915012974167e7f2
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Mon Mar 17 00:00:50 2014 -0500
Remove libdbus for Systemd 211 update.
diff --git a/BOOK/final-system/common/libdbus.xml b/BOOK/final-system/common/libdbus.xml
deleted file mode 100644
index 74765a4..0000000
--- a/BOOK/final-system/common/libdbus.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-libdbus" role="wrap">
- <?dbhtml filename="libdbus.html"?>
-
- <title>Libdbus-&dbus-version;</title>
-
- <indexterm zone="ch-system-libdbus">
- <primary sortas="a-libdbus">Libdbus</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para>Libdbus package provides a library to communicate with
- D-Bus messagebus daemon. It is only installed to satisfy
- circular dependency between Systemd and D-Bus.</para>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of Libdbus</title>
-
- <para os="a">Prepare Libdbus for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/dbus-1.0 --localstatedir=/var \
- --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
-
- <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make -C dbus libdbus-1.la</userinput></screen>
-
- <para os="e">This package does come with a test suite, but will not run as only the libraries were built.</para>
-
- <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make -C dbus lib_LTLIBRARIES=libdbus-1.la \
- install-libLTLIBRARIES install-dbusincludeHEADERS \
- install-nodist_dbusarchincludeHEADERS
-make install-pkgconfigDATA</userinput></screen>
-
- <para os="h">Move the shared library to <filename class="directory">/lib</filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
-
- </sect2>
-
- <sect2 id="contents-libdbus" role="content">
- <title>Contents of Libdbus</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
- <segtitle>Installed libraries</segtitle>
- <segtitle>Installed directories</segtitle>
-
- <seglistitem>
- <seg>none</seg>
- <seg>libdbus-1.[a,so]</seg>
- <seg>/usr/include/dbus-1.0, /usr/lib/dbus-1.0</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="libdbus-lib">
- <term><filename class="libraryfile">libdbus-1.[a,so]</filename></term>
- <listitem>
- <para>Library containing the API for using the message bus</para>
- <indexterm zone="ch-system-libdbus libdbus-lib">
- <primary sortas="c-libdbus">libdbus</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/final-system/multilib/libdbus-64bit.xml b/BOOK/final-system/multilib/libdbus-64bit.xml
deleted file mode 100644
index d7087c1..0000000
--- a/BOOK/final-system/multilib/libdbus-64bit.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-libdbus" role="wrap">
- <?dbhtml filename="libdbus-64bit.html"?>
-
- <title>Libdbus-&dbus-version; 64 Bit</title>
-
- <indexterm zone="ch-system-libdbus">
- <primary sortas="a-Libdbus">Libdbus 64 Bit</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Libdbus</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 \
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib64 --libexecdir=/usr/lib/dbus-1.0 \
- --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <para os="h">Move the shared library to <filename class="directory">/lib64</filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib64/libdbus-1.so.* /lib64
-ln -sfv ../../lib64/$(readlink /usr/lib64/libdbus-1.so) /usr/lib64/libdbus-1.so</userinput></screen>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(id('contents-libdbus'))"/>
-
-</sect1>
diff --git a/BOOK/final-system/multilib/libdbus-n32.xml b/BOOK/final-system/multilib/libdbus-n32.xml
deleted file mode 100644
index 29e2c7c..0000000
--- a/BOOK/final-system/multilib/libdbus-n32.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-libdbus-n32" role="wrap">
- <?dbhtml filename="libdbus-n32.html"?>
-
- <title>Libdbus-&dbus-version; N32 Libraries</title>
-
- <indexterm zone="ch-system-libdbus-n32">
- <primary sortas="a-Libdbus">Libdbus</primary>
- <secondary>N32</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Libdbus</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 \
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib32 --libexecdir=/usr/lib/dbus-1.0 \
- --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <para os="h">Move the shared library to <filename class="directory">/lib32</filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib32/libdbus-1.so.* /lib32
-ln -sfv ../../lib32/$(readlink /usr/lib32/libdbus-1.so) /usr/lib32/libdbus-1.so</userinput></screen>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-libdbus" role="."/></para>
-
- </sect2>
-</sect1>
-
-
-
diff --git a/BOOK/final-system/multilib/libdbus.xml b/BOOK/final-system/multilib/libdbus.xml
deleted file mode 100644
index ba09ef4..0000000
--- a/BOOK/final-system/multilib/libdbus.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-libdbus-32" role="wrap">
- <?dbhtml filename="libdbus.html"?>
-
- <title>Libdbus-&dbus-version; 32 Bit Libraries</title>
-
- <indexterm zone="ch-system-libdbus-32">
- <primary sortas="a-Libdbus">Libdbus</primary>
- <secondary>32 Bit</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of D-Bus</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 \
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
- --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libdbus.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-libdbus" role="."/></para>
-
- </sect2>
-</sect1>
commit e44cb2eac405d9b892c5210665f1092facf3f63a
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Sun Mar 16 23:59:25 2014 -0500
Add systemd compat patch to materials.
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 11affa7..60b6a9b 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -142,6 +142,15 @@
-->
<varlistentry>
+ <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&systemd-compat-patch;"/></para>
+ <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Tar Man Page Patch - <token>&tar-man-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
commit 496c64524c8419733e44826f774fbdd71ff5a943
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Sun Mar 16 23:59:09 2014 -0500
Add systemd 211 compat patch to patches.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 3e3a229..2e97df8 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -68,6 +68,10 @@
<!ENTITY readline-branch_update-patch-size "4.9 KB">
-->
+<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
+<!ENTITY systemd-compat-patch-md5 "74f877963206d13d8b709175a901d5b5">
+<!ENTITY systemd-compat-patch-size "9.322 KB">
+
<!ENTITY tar-man-patch "tar-&tar-version;-manpage-1.patch">
<!ENTITY tar-man-patch-md5 "68c86c67e67a5c074872a293818f361d">
<!ENTITY tar-man-patch-size "7.924 KB">
commit fb7482cf533842f6b227ff5a5c406af385df070c
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Sun Mar 16 23:58:51 2014 -0500
Update Systemd version, size, and md5 hash for 211 update.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 0ea94a7..c63fa64 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -435,10 +435,10 @@
<!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
-<!ENTITY systemd-version "208">
-<!ENTITY systemd-size "2,332 KB">
+<!ENTITY systemd-version "211">
+<!ENTITY systemd-size "2,665 KB">
<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5 "df64550d92afbffb4f67a434193ee165">
+<!ENTITY systemd-md5 "0a70c382b6089526f98073b4ee85ef75">
<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
<!ENTITY tar-version "1.27.1">
commit cb16373b579804f31848517533dc8f02c6e6cdba
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Sun Mar 16 23:58:10 2014 -0500
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 98ae819..8727f17 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "03"> <!-- Use two digits -->
<!ENTITY month_name "March">
-<!ENTITY day "12"> <!-- Use two digits -->
+<!ENTITY day "16"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit dd3bdd523e3a1ec0a6f56530539a0ef769458472
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Sun Mar 16 23:57:59 2014 -0500
Add systemd-211-compat-1.patch to patches.
diff --git a/patches/systemd-211-compat-1.patch b/patches/systemd-211-compat-1.patch
new file mode 100644
index 0000000..9dfe851
--- /dev/null
+++ b/patches/systemd-211-compat-1.patch
@@ -0,0 +1,215 @@
+Submitted By: William Harrington (kb0iic at cross-lfs dot org)
+Date: 2014-03-16
+Initial Package Version: 211
+Origin: LFS-Systemd
+Upstream Status: Rejected
+Description: Install pkg-config files when not installing compatible libraries.
+
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2014-03-11 23:59:13.901273469 +0100
++++ b/Makefile.am 2014-03-12 14:51:23.377895312 +0100
+@@ -2172,7 +2172,11 @@
+ UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
+ pkgconfiglib_DATA += \
+- src/libsystemd/libsystemd.pc
++ src/libsystemd/libsystemd.pc \
++ src/compat-libs/libsystemd-journal.pc \
++ src/compat-libs/libsystemd-login.pc \
++ src/compat-libs/libsystemd-id128.pc \
++ src/compat-libs/libsystemd-daemon.pc
+
+ pkginclude_HEADERS += \
+ src/systemd/sd-login.h \
+@@ -4593,12 +4597,6 @@
+ libsystemd-id128.la \
+ libsystemd-daemon.la
+
+-pkgconfiglib_DATA += \
+- src/compat-libs/libsystemd-journal.pc \
+- src/compat-libs/libsystemd-login.pc \
+- src/compat-libs/libsystemd-id128.pc \
+- src/compat-libs/libsystemd-daemon.pc
+-
+ # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+ compat-lib-install-hook:
+ libname=libsystemd-login.so && $(move-to-rootlibdir)
+diff -Naur a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2014-03-12 00:00:32.183093655 +0100
++++ b/Makefile.in 2014-03-12 14:51:23.380895364 +0100
+@@ -1088,21 +1088,18 @@
+ @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-id128.la \
+ @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.la
+
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_239 = \
+- at ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-journal.pc \
+- at ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-login.pc \
+- at ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-id128.pc \
+- at ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-daemon.pc
+-
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-install-hook
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_241 = compat-lib-uninstall-hook
+- at ENABLE_MANPAGES_TRUE@am__append_242 = \
++ at ENABLE_COMPAT_LIBS_TRUE@am__append_239 = compat-lib-install-hook
++ at ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-uninstall-hook
++ at ENABLE_MANPAGES_TRUE@am__append_241 = \
+ @ENABLE_MANPAGES_TRUE@ man/custom-entities.ent
+
+- at HAVE_SYSV_COMPAT_TRUE@am__append_243 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_242 = \
+ @HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \
+ @HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README
+
++ at HAVE_SYSV_COMPAT_TRUE@am__append_243 = \
++ at HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
++
+ @HAVE_SYSV_COMPAT_TRUE at am__append_244 = \
+ @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
+
+@@ -1116,9 +1113,6 @@
+ @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
+
+ @HAVE_SYSV_COMPAT_TRUE at am__append_248 = \
+- at HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
+-
+- at HAVE_SYSV_COMPAT_TRUE@am__append_249 = \
+ @HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \
+ @HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \
+ @HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \
+@@ -1127,31 +1121,31 @@
+ @HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \
+ @HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target
+
+- at HAVE_SYSV_COMPAT_TRUE@am__append_250 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_249 = \
+ @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants
+
+- at HAVE_SYSV_COMPAT_TRUE@am__append_251 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_250 = \
+ @HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
+ @HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+
+- at HAVE_SYSV_COMPAT_FALSE@am__append_252 = \
++ at HAVE_SYSV_COMPAT_FALSE@am__append_251 = \
+ @HAVE_SYSV_COMPAT_FALSE@ --with-sysvinit-path= \
+ @HAVE_SYSV_COMPAT_FALSE@ --with-sysvrcnd-path=
+
+- at ENABLE_GTK_DOC_TRUE@am__append_253 = \
++ at ENABLE_GTK_DOC_TRUE@am__append_252 = \
+ @ENABLE_GTK_DOC_TRUE@ --enable-gtk-doc
+
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \
++ at ENABLE_COMPAT_LIBS_TRUE@am__append_253 = \
+ @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_journal_sym_SOURCES) \
+ @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_login_sym_SOURCES) \
+ @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_id128_sym_SOURCES) \
+ @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_daemon_sym_SOURCES)
+
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_255 = \
++ at ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \
+ @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-journal-sym \
+ @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-login-sym \
+ @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-id128-sym \
+@@ -4114,8 +4108,8 @@
+ $(am__append_211) $(am__append_234) $(nodist_systemunit_DATA) \
+ $(nodist_userunit_DATA) $(pkgconfigdata_DATA) \
+ $(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \
+- $(am__append_243) defined undefined
+-DISTCLEANFILES = $(am__append_242)
++ $(am__append_242) defined undefined
++DISTCLEANFILES = $(am__append_241)
+
+ # Really, do not edit this file.
+ EXTRA_DIST = units/getty at .service.m4 units/serial-getty at .service.m4 \
+@@ -4306,16 +4300,16 @@
+ $(nodist_libudev_core_la_SOURCES) $(am__append_99) \
+ $(am__append_235) $(am__append_237) \
+ $(test_libsystemd_sym_SOURCES) $(test_libudev_sym_SOURCES) \
+- $(am__append_254)
++ $(am__append_253)
+ INSTALL_EXEC_HOOKS = install-target-wants-hook \
+ install-directories-hook install-aliases-hook \
+ systemd-detect-virt-install-hook $(am__append_78) \
+ bus-proxyd-install-hook libsystemd-install-hook \
+ libudev-install-hook $(am__append_101) journal-install-hook \
+- $(am__append_240)
++ $(am__append_239)
+ UNINSTALL_EXEC_HOOKS = $(am__append_79) bus-proxyd-uninstall-hook \
+ libsystemd-uninstall-hook libudev-uninstall-hook \
+- $(am__append_102) journal-uninstall-hook $(am__append_241)
++ $(am__append_102) journal-uninstall-hook $(am__append_240)
+ INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \
+ catalog-update-hook
+ UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook
+@@ -4353,7 +4347,11 @@
+ include_HEADERS = src/libudev/libudev.h
+ noinst_DATA = $(am__append_49) $(am__append_51) $(am__append_86)
+ pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \
+- src/libudev/libudev.pc $(am__append_97) $(am__append_239)
++ src/compat-libs/libsystemd-journal.pc \
++ src/compat-libs/libsystemd-login.pc \
++ src/compat-libs/libsystemd-id128.pc \
++ src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \
++ $(am__append_97)
+ polkitpolicy_in_in_files = \
+ src/core/org.freedesktop.systemd1.policy.in.in
+ polkitpolicy_in_files = \
+@@ -4406,7 +4404,7 @@
+ test-journal-verify test-journal-interleaving \
+ test-journal-flush test-mmap-cache test-catalog \
+ $(am__append_196) $(am__append_209) $(am__append_220) \
+- test-libsystemd-sym test-libudev-sym $(am__append_255)
++ test-libsystemd-sym test-libudev-sym $(am__append_254)
+
+ # ------------------------------------------------------------------------------
+ manual_tests = test-engine test-ns test-loopback test-hostname \
+@@ -4469,7 +4467,7 @@
+ # ------------------------------------------------------------------------------
+ INSTALL_DIRS = $(am__append_71) $(sysconfdir)/udev/rules.d \
+ $(sysconfdir)/udev/hwdb.d $(am__append_125) $(am__append_185) \
+- $(am__append_227) $(am__append_250) \
++ $(am__append_227) $(am__append_249) \
+ $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \
+ $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \
+ $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \
+@@ -4480,11 +4478,11 @@
+ $(pkgsysconfdir)/system/getty.target.wants \
+ $(pkgsysconfdir)/user $(dbussessionservicedir) \
+ $(sysconfdir)/xdg/systemd
+-RUNLEVEL1_TARGET_WANTS = $(am__append_244)
+-RUNLEVEL2_TARGET_WANTS = $(am__append_245)
+-RUNLEVEL3_TARGET_WANTS = $(am__append_246)
+-RUNLEVEL4_TARGET_WANTS = $(am__append_247)
+-RUNLEVEL5_TARGET_WANTS = $(am__append_248)
++RUNLEVEL1_TARGET_WANTS = $(am__append_243)
++RUNLEVEL2_TARGET_WANTS = $(am__append_244)
++RUNLEVEL3_TARGET_WANTS = $(am__append_245)
++RUNLEVEL4_TARGET_WANTS = $(am__append_246)
++RUNLEVEL5_TARGET_WANTS = $(am__append_247)
+ SHUTDOWN_TARGET_WANTS =
+ LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount
+ MULTI_USER_TARGET_WANTS = $(am__append_228) getty.target \
+@@ -4509,7 +4507,7 @@
+ USER_BUSNAMES_TARGET_WANTS = $(am__append_165)
+ SYSTEM_UNIT_ALIASES = $(am__append_155) $(am__append_173) \
+ $(am__append_186) $(am__append_202) $(am__append_229) \
+- $(am__append_249) graphical.target default.target \
++ $(am__append_248) graphical.target default.target \
+ reboot.target ctrl-alt-del.target getty at .service \
+ autovt at .service
+ USER_UNIT_ALIASES = $(am__append_166) $(systemunitdir)/shutdown.target \
+@@ -7270,8 +7268,8 @@
+ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
+ --with-rootprefix=$$dc_install_base --disable-split-usr \
+- --enable-kdbus --enable-compat-libs $(am__append_251) \
+- $(am__append_252) $(am__append_253)
++ --enable-kdbus --enable-compat-libs $(am__append_250) \
++ $(am__append_251) $(am__append_252)
+ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
+ OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))
+ ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/alpha-chapter.xml | 1 -
BOOK/final-system/common/dbus.xml | 10 +-
BOOK/final-system/common/libdbus.xml | 89 -----------
BOOK/final-system/common/systemd.xml | 25 +++-
BOOK/final-system/mips-chapter.xml | 1 -
BOOK/final-system/mips64-64-chapter.xml | 1 -
BOOK/final-system/mips64-chapter.xml | 3 -
BOOK/final-system/multilib/dbus-64bit.xml | 13 +-
BOOK/final-system/multilib/dbus-n32.xml | 13 +-
BOOK/final-system/multilib/dbus.xml | 4 +-
BOOK/final-system/multilib/libdbus-64bit.xml | 64 --------
BOOK/final-system/multilib/libdbus-n32.xml | 71 ---------
BOOK/final-system/multilib/libdbus.xml | 71 ---------
BOOK/final-system/multilib/systemd-64bit.xml | 29 ++++-
BOOK/final-system/multilib/systemd-n32.xml | 29 ++++-
BOOK/final-system/multilib/systemd.xml | 29 ++++-
BOOK/final-system/ppc-chapter.xml | 1 -
BOOK/final-system/ppc64-chapter.xml | 2 -
BOOK/final-system/sparc-chapter.xml | 1 -
BOOK/final-system/sparc64-64-chapter.xml | 1 -
BOOK/final-system/sparc64-chapter.xml | 2 -
BOOK/final-system/x86-chapter.xml | 1 -
BOOK/final-system/x86_64-64-chapter.xml | 1 -
BOOK/final-system/x86_64-chapter.xml | 2 -
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 12 ++
BOOK/materials/common/patches.xml | 9 +
BOOK/packages.ent | 6 +-
BOOK/patches.ent | 4 +
patches/systemd-211-compat-1.patch | 215 ++++++++++++++++++++++++++
30 files changed, 368 insertions(+), 344 deletions(-)
delete mode 100644 BOOK/final-system/common/libdbus.xml
delete mode 100644 BOOK/final-system/multilib/libdbus-64bit.xml
delete mode 100644 BOOK/final-system/multilib/libdbus-n32.xml
delete mode 100644 BOOK/final-system/multilib/libdbus.xml
create mode 100644 patches/systemd-211-compat-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list