Changeset 03e6a40 for BOOK/materials/common/patches.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/materials/common/patches.xml (modified) (4 diffs)

BOOK/materials/common/patches.xml

@@ -47 +47 @@
     </varlistentry>
 
+    <varlistentry>
+      <term>Coreutils Noman Patch - <token>&coreutils-noman-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&coreutils-noman-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-noman-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
 <!-- GCC Branch Update Area -->
     <varlistentry>
@@ -54 +63 @@
         url="&patches-root;&gcc-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Iana-Etc Get Fix Patch - <token>&iana-etc-get_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iana-etc-get_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-get_fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -130 +130 @@
 
     <varlistentry>
-      <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
-        <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&procps-ps_cgroup-patch;"/></para>
-        <para>MD5 sum: <literal>&procps-ps_cgroup-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
       <listitem>
@@ -153 +135 @@
         url="&patches-root;&readline-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&readline-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <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>