Changeset 668e60a in clfs-sysroot for BOOK

Timestamp:

Dec 11, 2006, 2:25:14 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

5ed871a

Parents:

16ca464

Message:

Removed MINOR patch and replaced it with a more complete upstream patch will all current updates to the 2.5 branch of Glibc.

Location:

BOOK

Files:

• cross-tools/common/glibc.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (2 diffs)
• patches.ent (modified) (1 diff)

BOOK/cross-tools/common/glibc.xml

@@ -63 +63 @@
 <screen os="p6"><userinput>patch -Np1 -i ../&glibc-cross_hacks-patch;</userinput></screen>
 
-    <para os="p7">The following patch corrects the Minor version, changing the
-    value from 4 to 5:</para>
-
-<screen os="p8"><userinput>patch -Np1 -i ../&glibc-minor-patch;</userinput></screen>
+    <para os="p7">The following patches merges all updates from the 2.5 Branch from
+    the Glibc developers:</para>
+
+<screen os="p8"><userinput>patch -Np1 -i ../&glibc-branch_update-patch;</userinput></screen>
 
     <para os="b">The Glibc documentation recommends building Glibc outside of the

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>December 11, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Removed MINOR patch and replaced it with a more
+          complete upstream patch will all current updates to the 2.5 branch
+          of Glibc.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Tar to 1.16.1.</para>

BOOK/materials/common/patches.xml

@@ -128 +128 @@
 
     <varlistentry>
+      <term>Glibc Branch Update - <token>&glibc-branch_update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&glibc-branch_update-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Glibc Cross-Compiling Hacks Patch- <token>&glibc-cross_hacks-patch-size;</token>:</term>
       <listitem>
@@ -136 +145 @@
     </varlistentry>
  
-    <varlistentry>
-      <term>Glibc Versioning Update - <token>&glibc-minor-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-minor-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-minor-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Glibc Disable linking with libgcc_eh.a - <token>&glibc-libgcc_eh-patch-size;</token>:</term>

BOOK/patches.ent

@@ -53 +53 @@
 <!ENTITY gcc-posix-patch-size "9 KB">
 
+<!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-1.patch">
+<!ENTITY glibc-branch_update-patch-md5 "2b061a8e78e54c88ae5a162a677d239f">
+<!ENTITY glibc-branch_update-patch-size "20 KB">
+
 <!ENTITY glibc-cross_hacks-patch "glibc-&glibc-version;-cross_hacks-2.patch">
 <!ENTITY glibc-cross_hacks-patch-md5 "b932942fea39a9beb2ba8a0664344493">
 <!ENTITY glibc-cross_hacks-patch-size "20 KB">
-
-<!ENTITY glibc-minor-patch "glibc-&glibc-version;-MINOR-1.patch">
-<!ENTITY glibc-minor-patch-md5 "b782dff6ec9531e062aa019cb4198aed">
-<!ENTITY glibc-minor-patch-size "4 KB">
 
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-2.patch">