Changeset 38f82f9

Timestamp:

Sep 5, 2006, 12:36:05 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

4724655

Parents:

e671c085

Message:

IPRoute2 - On multilib builds, change /usr/lib/tc to /usr/lib64/tc, to keep

consistency through the system

Location:

BOOK

Files:

• final-system/multilib/iproute2.xml (modified) (2 diffs)
• materials/mips64/patches.xml (modified) (1 diff)
• materials/ppc64/patches.xml (modified) (1 diff)
• materials/sparc64/patches.xml (modified) (1 diff)
• materials/x86_64/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/final-system/multilib/iproute2.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='s2'])"/>
 
+    <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&iproute2-tclibdir-patch;</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64 SBINDIR=/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -48 +52 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+<screen os="f"><userinput>make LIBDIR=/usr/lib64 SBINDIR=/sbin install</userinput></screen>
 
   </sect2>

BOOK/materials/mips64/patches.xml

@@ -50 +50 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='iproute2-tclibdir-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='linux-mips-patch'])"/>

BOOK/materials/ppc64/patches.xml

@@ -54 +54 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='iproute2-tclibdir-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 

BOOK/materials/sparc64/patches.xml

@@ -30 +30 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='iproute2-tclibdir-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>

BOOK/materials/x86_64/patches.xml

@@ -39 +39 @@
     </varlistentry>
 
+    <varlistentry os="iproute2-tclibdir-patch">
+      <term>IPRoute2 Lib64 Patch - <token>&iproute2-tclibdir-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&iproute2-tclibdir-patch;"/></para>
+        <para>MD5 sum: <literal>&iproute2-tclibdir-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry os="perl-multilib-patch">
       <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>

BOOK/patches.ent

@@ -155 +155 @@
 <!ENTITY binutils-multilib-patch-size "2.6 KB">
 
+<!ENTITY iproute2-tclibdir-patch "iproute2-&iproute2-version;-tc_libdir-1.patch">
+<!ENTITY iproute2-tclibdir-patch-md5 "f34d6c0300cde64b42d2be74753ec415">
+<!ENTITY iproute2-tclibdir-patch-size "4 KB">
+
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
 <!ENTITY perl-multilib-patch-md5 "1f79780e26bc3493f7891e12841c38ed">