Forráskód Böngészése

Updated to systemd-221.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10922 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 10 éve
szülő
commit
da5445e65d
3 módosított fájl, 26 hozzáadás és 16 törlés
  1. 9 0
      chapter01/changelog.xml
  2. 12 11
      chapter06/systemd.xml
  3. 5 5
      packages.ent

+ 9 - 0
chapter01/changelog.xml

@@ -36,6 +36,15 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2015-06-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Updated to systemd-221.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-06-23</para>
       <itemizedlist>

+ 12 - 11
chapter06/systemd.xml

@@ -45,6 +45,8 @@
 
 <screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"
 <literal>KILL=/bin/kill
+MOUNT_PATH=/bin/mount
+UMOUNT_PATH=/bin/umount
 HAVE_BLKID=1
 BLKID_LIBS="-lblkid"
 BLKID_CFLAGS="-I/tools/include/blkid"
@@ -69,9 +71,11 @@ EOF</userinput></screen>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
 
-    <para>Disable a test case that always fails:</para>
+    <para>Disable two tests that always fail:</para>
 
-<screen><userinput remap="pre">sed -i "s:test/udev-test.pl ::g" Makefile.in</userinput></screen>
+<screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
+    -e 's:test-copy$(EXEEXT) ::g' \
+    -i Makefile.in</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
 
@@ -82,7 +86,6 @@ EOF</userinput></screen>
             --with-rootprefix=                                      \
             --with-rootlibdir=/lib                                  \
             --enable-split-usr                                      \
-            --disable-gudev                                         \
             --disable-firstboot                                     \
             --disable-ldconfig                                      \
             --disable-sysusers                                      \
@@ -123,10 +126,11 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-gudev --without-python</parameter></term>
+        <term><parameter>--without-python</parameter></term>
         <listitem>
-          <para>These switches disable optional features because
-          LFS does not provide their dependencies.</para>
+          <para>This switch prevents <command>configure</command>
+          from trying to use Python since it's not part
+          of LFS.</para>
         </listitem>
       </varlistentry>
 
@@ -199,12 +203,9 @@ EOF</userinput></screen>
 done
 ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
 
-    <para>Remove a reference to a non-existent group and fix
-    a configuration file so it doesn't cause
-    <command>systemd-tmpfiles</command> to fail at boot:</para>
+    <para>Remove a reference to a non-existent group:</para>
 
-<screen><userinput remap="install">sed -i "s:0775 root lock:0755 root root:g" /usr/lib/tmpfiles.d/legacy.conf
-sed -i "/pam.d/d" /usr/lib/tmpfiles.d/etc.conf</userinput></screen>
+<screen><userinput remap="install">sed -i "s:0775 root lock:0755 root root:g" /usr/lib/tmpfiles.d/legacy.conf</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
     <command>systemd-journald</command>:</para>

+ 5 - 5
packages.ent

@@ -525,13 +525,13 @@
 <!ENTITY shadow-ch6-du "52 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "219">
-<!ENTITY systemd-size    "3,848 KB">
+<!ENTITY systemd-version "221">
+<!ENTITY systemd-size    "3,920 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "e0d6c9a4b4f69f66932d2230298c9a34">
+<!ENTITY systemd-md5     "b4d5a253841cf28a98b7ec99c45e3716">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "815 MB">
-<!ENTITY systemd-ch6-sbu "2.1 SBU">
+<!ENTITY systemd-ch6-du  "965 MB">
+<!ENTITY systemd-ch6-sbu "2.2 SBU">
 
 <!ENTITY tar-version "1.28">
 <!ENTITY tar-size "1,921 KB">