[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 7c59b6050acf71166eb2224e248c32fcab798d1e
git
git at cross-lfs.org
Mon Aug 2 19:06:10 PDT 2010
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, master has been updated
via 7c59b6050acf71166eb2224e248c32fcab798d1e (commit)
via 2447f2bc064cd411b4dd79e41101d6d3ac5ae601 (commit)
via c173967990ddfaa94c5d6ca9978d666d243df00f (commit)
from 986e898df65cb8e41c570cdcc9cfdb0748d08e1a (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 7c59b6050acf71166eb2224e248c32fcab798d1e
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Aug 2 22:06:52 2010 -0400
Updated IPRoute2 to 2.6.34.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 70afff3..a52f0fc 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,9 +37,12 @@
-->
<listitem>
- <para>August 01, 2010</para>
+ <para>August 02, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated IPRoute2 to 2.6.34.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated Libtool to 2.2.10.</para>
</listitem>
</itemizedlist>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 97f00b3..4b2ed99 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -221,10 +221,10 @@
<!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
<!ENTITY iana-etc-home "http://sethwklein.net/iana-etc">
-<!ENTITY iproute2-version "2.6.29-1">
-<!ENTITY iproute2-size "359 KB">
+<!ENTITY iproute2-version "2.6.34">
+<!ENTITY iproute2-size "380 KB">
<!ENTITY iproute2-url "http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
-<!ENTITY iproute2-md5 "c1bc258a6c345905e79935ac7a3cc582">
+<!ENTITY iproute2-md5 "5c5742bdac05a1688f266512e685b83c">
<!ENTITY iproute2-home "http://www.linuxfoundation.org/en/Net:Iproute2">
<!ENTITY iputils-version "s20071127">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 22e98fd..41cafd1 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -95,8 +95,8 @@
<!-- Start of multilib patches -->
<!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "50b6b3301974fe52b0eed24f95a5f76b">
-<!ENTITY iproute2-libdir-patch-size "2 KB">
+<!ENTITY iproute2-libdir-patch-md5 "7abb69b57dc2a5caa481b1798c1d7fc9">
+<!ENTITY iproute2-libdir-patch-size "4 KB">
<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
<!ENTITY perl-multilib-patch-md5 "1dd7df742630213d55c0749948baa9b9">
diff --git a/patches/iproute2-2.6.29-1-libdir-1.patch b/patches/iproute2-2.6.29-1-libdir-1.patch
deleted file mode 100644
index a5b5b69..0000000
--- a/patches/iproute2-2.6.29-1-libdir-1.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Submitted By: Jim Gifford < jim at cross-lfs dot org>
-Date: 2009-02-08
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: This patch gives the ability to change the libdir.
- Updated for Iproute2-2.6.28 by Jim Gifford
- Discovered tc directory is text files moved to /usr/share
-
-diff -Naur iproute2-2.6.28.orig/include/iptables.h iproute2-2.6.28/include/iptables.h
---- iproute2-2.6.28.orig/include/iptables.h 2009-01-15 12:25:04.000000000 -0800
-+++ iproute2-2.6.28/include/iptables.h 2009-02-08 16:52:27.636947898 -0800
-@@ -4,8 +4,12 @@
- #include "iptables_common.h"
- #include "libiptc/libiptc.h"
-
-+#ifndef LIBDIR
-+#define LIBDIR "/lib"
-+#endif
-+
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR LIBDIR "/iptables"
- #endif
-
- #ifndef IPPROTO_SCTP
-diff -Naur iproute2-2.6.28.orig/Makefile iproute2-2.6.28/Makefile
---- iproute2-2.6.28.orig/Makefile 2009-01-15 12:25:04.000000000 -0800
-+++ iproute2-2.6.28/Makefile 2009-02-08 16:54:40.912668809 -0800
-@@ -4,6 +4,7 @@
- CONFDIR=/etc/iproute2
- DOCDIR=/share/doc/iproute2
- MANDIR=/share/man
-+SHAREDIR=/usr/share
-
- # Path to db_185.h include
- DBM_INCLUDE:=/usr/include
-diff -Naur iproute2-2.6.28.orig/netem/Makefile iproute2-2.6.28/netem/Makefile
---- iproute2-2.6.28.orig/netem/Makefile 2009-01-15 12:25:04.000000000 -0800
-+++ iproute2-2.6.28/netem/Makefile 2009-02-08 16:52:27.636947898 -0800
-@@ -20,9 +20,9 @@
- $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
-
- install: all
-- mkdir -p $(DESTDIR)/lib/tc
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
- for i in $(DISTDATA); \
-- do install -m 755 $$i $(DESTDIR)/lib/tc; \
-+ do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \
- done
-
- clean:
-diff -Naur iproute2-2.6.28.orig/tc/Makefile iproute2-2.6.28/tc/Makefile
---- iproute2-2.6.28.orig/tc/Makefile 2009-01-15 12:25:04.000000000 -0800
-+++ iproute2-2.6.28/tc/Makefile 2009-02-08 16:54:21.971717000 -0800
-@@ -75,10 +75,10 @@
- $(AR) rcs $@ $(TCLIB)
-
- install: all
-- mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
- install -m 0755 tc $(DESTDIR)$(SBINDIR)
- for i in $(TCSO); \
-- do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+ do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \
- done
-
- clean:
-diff -Naur iproute2-2.6.28.orig/tc/tc_util.c iproute2-2.6.28/tc/tc_util.c
---- iproute2-2.6.28.orig/tc/tc_util.c 2009-01-15 12:25:04.000000000 -0800
-+++ iproute2-2.6.28/tc/tc_util.c 2009-02-08 16:56:15.030906272 -0800
-@@ -24,8 +24,8 @@
- #include "utils.h"
- #include "tc_util.h"
-
--#ifndef LIBDIR
--#define LIBDIR "/usr/lib/"
-+#ifndef SHAREDIR
-+#define SHAREDIR "/usr/share"
- #endif
-
- const char *get_tc_lib(void)
-@@ -34,7 +34,7 @@
-
- lib_dir = getenv("TC_LIB_DIR");
- if (!lib_dir)
-- lib_dir = LIBDIR "/tc/";
-+ lib_dir = SHAREDIR "/tc";
-
- return lib_dir;
- }
diff --git a/patches/iproute2-2.6.34-libdir-1.patch b/patches/iproute2-2.6.34-libdir-1.patch
new file mode 100644
index 0000000..7c18754
--- /dev/null
+++ b/patches/iproute2-2.6.34-libdir-1.patch
@@ -0,0 +1,65 @@
+Submitted By: Joe Ciccone <jciccone at gmail.com>
+Date: 2010-08-02
+Initial Package Version: 2.6.18
+Upstream Status: Unknown
+Origin: Joe Ciccone
+Description: This patch gives the ability to change the libdir.
+ Updated for Iproute2-2.6.28 by Jim Gifford
+ Updated for Iproute2-2.6.24 by Joe Ciccone
+
+diff -Naur iproute2-2.6.34.orig/Makefile iproute2-2.6.34/Makefile
+--- iproute2-2.6.34.orig/Makefile 2010-05-19 15:32:43.000000000 +0000
++++ iproute2-2.6.34/Makefile 2010-08-03 01:55:53.157660978 +0000
+@@ -12,7 +12,7 @@
+
+ SHARED_LIBS = y
+
+-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
+ ifneq ($(SHARED_LIBS),y)
+ DEFINES+= -DNO_SHARED_LIBS
+ endif
+diff -Naur iproute2-2.6.34.orig/include/iptables.h iproute2-2.6.34/include/iptables.h
+--- iproute2-2.6.34.orig/include/iptables.h 2010-05-19 15:32:43.000000000 +0000
++++ iproute2-2.6.34/include/iptables.h 2010-08-03 01:56:54.042453134 +0000
+@@ -4,8 +4,12 @@
+ #include "iptables_common.h"
+ #include "libiptc/libiptc.h"
+
++#ifndef LIBDIR
++#define LIBDIR "/usr/lib"
++#endif
++
+ #ifndef IPT_LIB_DIR
+-#define IPT_LIB_DIR "/usr/local/lib/iptables"
++#define IPT_LIB_DIR LIBDIR "/iptables"
+ #endif
+
+ #ifndef IPPROTO_SCTP
+diff -Naur iproute2-2.6.34.orig/misc/arpd.c iproute2-2.6.34/misc/arpd.c
+--- iproute2-2.6.34.orig/misc/arpd.c 2010-05-19 15:32:43.000000000 +0000
++++ iproute2-2.6.34/misc/arpd.c 2010-08-03 01:53:40.570451501 +0000
+@@ -40,7 +40,7 @@
+ int resolve_hosts;
+
+ DB *dbase;
+-char *dbname = "/var/lib/arpd/arpd.db";
++char *dbname = ARPDDIR "/arpd.db";
+
+ int ifnum;
+ int *ifvec;
+diff -Naur iproute2-2.6.34.orig/netem/Makefile iproute2-2.6.34/netem/Makefile
+--- iproute2-2.6.34.orig/netem/Makefile 2010-05-19 15:32:43.000000000 +0000
++++ iproute2-2.6.34/netem/Makefile 2010-08-03 01:52:20.742452152 +0000
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)/lib/tc
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 755 $$i $(DESTDIR)/lib/tc; \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+
+ clean:
commit 2447f2bc064cd411b4dd79e41101d6d3ac5ae601
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Aug 2 22:04:49 2010 -0400
Fix mismatched xincludes for flex.
diff --git a/BOOK/final-system/multilib/flex-64bit.xml b/BOOK/final-system/multilib/flex-64bit.xml
index 439a834..13f684c 100644
--- a/BOOK/final-system/multilib/flex-64bit.xml
+++ b/BOOK/final-system/multilib/flex-64bit.xml
@@ -41,7 +41,7 @@
xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="flex.xml"
+ href="../common/flex.xml"
xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/multilib/flex-n32.xml b/BOOK/final-system/multilib/flex-n32.xml
index 3ef593b..19571e0 100644
--- a/BOOK/final-system/multilib/flex-n32.xml
+++ b/BOOK/final-system/multilib/flex-n32.xml
@@ -46,18 +46,18 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="flex.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="flex.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
- <para os="g">There are some packages that expect to find the
+ <para os="h">There are some packages that expect to find the
<filename class="libraryfile">lex</filename> library in <filename
class="directory">/usr/lib32</filename>. Create a symlink to account for
this:</para>
-<screen os="h"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
+<screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/flex.xml b/BOOK/final-system/multilib/flex.xml
index 79a51f3..3413795 100644
--- a/BOOK/final-system/multilib/flex.xml
+++ b/BOOK/final-system/multilib/flex.xml
@@ -40,21 +40,21 @@
href="../common/flex.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="h"><userinput>make libfl.a</userinput></screen>
+<screen os="d"><userinput>make libfl.a libfl_pic.a</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/flex.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='f'])"/>
-<screen os="e"><userinput>make install-libLIBRARIES</userinput></screen>
+<screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/flex.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/flex.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
</sect2>
commit c173967990ddfaa94c5d6ca9978d666d243df00f
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Aug 2 21:30:27 2010 -0400
Updated Libtool to 2.2.10.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 1571a10..70afff3 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,15 @@
<para>August 01, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated Libtool to 2.2.10.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>August 01, 2010</para>
+ <itemizedlist>
+ <listitem>
<para>[jciccone] - Updated E2fsprogs to 1.14.12.</para>
</listitem>
<listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 27a6820..97f00b3 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -245,10 +245,10 @@
<!ENTITY less-md5 "817bf051953ad2dea825a1cdf460caa4">
<!ENTITY less-home "http://www.greenwoodsoftware.com/less">
-<!ENTITY libtool-version "2.2.6a">
-<!ENTITY libtool-size "716 KB">
+<!ENTITY libtool-version "2.2.10">
+<!ENTITY libtool-size "772 KB">
<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.lzma">
-<!ENTITY libtool-md5 "b121e4848cc53fdd69e796aed73b9ccf">
+<!ENTITY libtool-md5 "2eba13ecd07653d0e34d4efe8e2974d8">
<!ENTITY libtool-home "&gnu-software;libtool">
<!ENTITY lilo-version "22.8">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/multilib/flex-64bit.xml | 2 +-
BOOK/final-system/multilib/flex-n32.xml | 8 +-
BOOK/final-system/multilib/flex.xml | 10 ++--
BOOK/introduction/common/changelog.xml | 12 ++++
BOOK/packages.ent | 12 ++--
BOOK/patches.ent | 4 +-
patches/iproute2-2.6.29-1-libdir-1.patch | 90 -----------------------------
patches/iproute2-2.6.34-libdir-1.patch | 65 +++++++++++++++++++++
8 files changed, 95 insertions(+), 108 deletions(-)
delete mode 100644 patches/iproute2-2.6.29-1-libdir-1.patch
create mode 100644 patches/iproute2-2.6.34-libdir-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list