r1496 - in profiles/LFS/trunk: chapter05 chapter06 config_separate scripts

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Aug 14 08:13:38 PDT 2004


Author: kpfleming
Date: 2004-08-14 09:13:36 -0600 (Sat, 14 Aug 2004)
New Revision: 1496

Modified:
   profiles/LFS/trunk/chapter05/glibc.xml
   profiles/LFS/trunk/chapter06/coreutils.xml
   profiles/LFS/trunk/chapter06/glibc.xml
   profiles/LFS/trunk/config_separate/package.ent
   profiles/LFS/trunk/scripts/wget.lfs.urls
Log:
merge changes from testing



Modified: profiles/LFS/trunk/chapter05/glibc.xml
===================================================================
--- profiles/LFS/trunk/chapter05/glibc.xml	2004-08-14 15:05:21 UTC (rev 1495)
+++ profiles/LFS/trunk/chapter05/glibc.xml	2004-08-14 15:13:36 UTC (rev 1496)
@@ -37,10 +37,12 @@
 			<param>--disable-profile</param>
 			<param>--enable-add-ons=nptl</param>
 			<param>--with-tls</param>
-			<param>--with-headers=/tools/glibc-kernheaders</param>
+			<param>--with-__thread</param>
+			<param>--enable-kernel=2.6.0</param>
 			<param>--with-binutils=/tools/bin</param>
 			<param>--without-gd</param>
 			<param>--without-cvs</param>
+			<param>--with-headers=/tools/glibc-kernheaders</param>
 		</configure>
 
 		<make />

Modified: profiles/LFS/trunk/chapter06/coreutils.xml
===================================================================
--- profiles/LFS/trunk/chapter06/coreutils.xml	2004-08-14 15:05:21 UTC (rev 1495)
+++ profiles/LFS/trunk/chapter06/coreutils.xml	2004-08-14 15:13:36 UTC (rev 1496)
@@ -78,6 +78,7 @@
 		</make>
 
 		<move base="/usr/bin">
+			<source>[</source>
 			<source>basename</source>
 			<source>cat</source>
 			<source>chgrp</source>
@@ -90,6 +91,7 @@
 			<source>echo</source>
 			<source>false</source>
 			<source>head</source>
+			<source>hostname</source>
 			<source>install</source>
 			<source>ln</source>
 			<source>ls</source>
@@ -114,16 +116,8 @@
 			<destination>/usr/sbin</destination>
 		</move>
 
-		<remove>/usr/bin/kill</remove>
-
 		<link>
 			<option>force</option>
-			<target>test</target>
-			<name>/bin/[</name>
-		</link>
-
-		<link>
-			<option>force</option>
 			<target>../../bin/install</target>
 			<name>/usr/bin</name>
 		</link>

Modified: profiles/LFS/trunk/chapter06/glibc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/glibc.xml	2004-08-14 15:05:21 UTC (rev 1495)
+++ profiles/LFS/trunk/chapter06/glibc.xml	2004-08-14 15:13:36 UTC (rev 1496)
@@ -37,9 +37,11 @@
 			<param>--disable-profile</param>
 			<param>--enable-add-ons=nptl</param>
 			<param>--with-tls</param>
-			<param>--libexecdir=/tmp/pt_chown</param>
+			<param>--with-__thread</param>
+			<param>--with-kernel=2.6.0</param>
+			<param>--without-cvs</param>
+			<param>--libexecdir=/usr/lib/glibc</param>
 			<param>--with-headers=/tools/glibc-kernheaders</param>
-			<param>--without-cvs</param>
 		</configure>
 
 		<make />

Modified: profiles/LFS/trunk/config_separate/package.ent
===================================================================
--- profiles/LFS/trunk/config_separate/package.ent	2004-08-14 15:05:21 UTC (rev 1495)
+++ profiles/LFS/trunk/config_separate/package.ent	2004-08-14 15:13:36 UTC (rev 1496)
@@ -54,10 +54,10 @@
 <!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!ENTITY e2fsprogs-directory "e2fsprogs-&e2fsprogs-version;">
 
-<!ENTITY expect-md5 "490664773286690d111d9cd055c50700">
-<!ENTITY expect-version "5.41.0">
+<!ENTITY expect-md5 "fea346fac6aaf74b0851f2441f478571">
+<!ENTITY expect-version "5.42.1">
 <!ENTITY expect-package "expect-&expect-version;.tar.gz">
-<!ENTITY expect-directory "expect-5.41">
+<!ENTITY expect-directory "expect-5.42">
 
 <!ENTITY expect-spawn-patch-md5 "ef6d0d0221c571fb420afb7033b3bbba">
 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-1.patch">
@@ -168,11 +168,11 @@
 <!ENTITY inetutils-kernel-headers-patch-md5 "de1f835265b7ed818d7c0fb8c0be334b">
 <!ENTITY inetutils-kernel-headers-patch "inetutils-&inetutils-version;-kernel_headers-1.patch">
 
-<!ENTITY iproute2-md5 "cecf5ee39e8d9033ad0a6f6af274cdab">
-<!ENTITY iproute2-version "2.6.X">
-<!ENTITY iproute2-cvs-ver "ss040702">
+<!ENTITY iproute2-md5 "0d8c23f6c3a42bb680c3bdf9f580987a">
+<!ENTITY iproute2-version "2.6.8">
+<!ENTITY iproute2-cvs-ver "ss040730">
 <!ENTITY iproute2-package "iproute2-&iproute2-version;-&iproute2-cvs-ver;.tar.gz">
-<!ENTITY iproute2-directory "iproute2-2.6.8">
+<!ENTITY iproute2-directory "iproute2-&iproute2-version;">
 
 <!ENTITY iproute2-remove-db-patch-md5 "b3964c194cda7a36979d245380b4556f">
 <!ENTITY iproute2-remove-db-patch "iproute2-&iproute2-version;_&iproute2-cvs-ver;-remove_db-1.patch">
@@ -192,8 +192,8 @@
 <!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
 
-<!ENTITY libtool-md5 "f9b709f4ac6d094afdee9cdbe1c6ffe7">
-<!ENTITY libtool-version "1.5.6">
+<!ENTITY libtool-md5 "ed04093bc9d88faa3e476ac6f4db8d50">
+<!ENTITY libtool-version "1.5.8">
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.gz">
 <!ENTITY libtool-directory "libtool-&libtool-version;">
 

Modified: profiles/LFS/trunk/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/trunk/scripts/wget.lfs.urls	2004-08-14 15:05:21 UTC (rev 1495)
+++ profiles/LFS/trunk/scripts/wget.lfs.urls	2004-08-14 15:13:36 UTC (rev 1496)
@@ -15,7 +15,7 @@
 ftp://ftp.cis.ohio-state.edu/mirror/gnu/gettext/gettext-0.14.1.tar.gz
 ftp://ftp.cis.ohio-state.edu/mirror/gnu/inetutils/inetutils-1.4.2.tar.gz
 ftp://ftp.cis.ohio-state.edu/mirror/gnu/less/less-382.tar.gz
-ftp://ftp.cis.ohio-state.edu/mirror/gnu/libtool/libtool-1.5.6.tar.gz
+ftp://ftp.cis.ohio-state.edu/mirror/gnu/libtool/libtool-1.5.8.tar.gz
 ftp://ftp.cis.ohio-state.edu/mirror/gnu/m4/m4-1.4.1.tar.gz
 ftp://ftp.cis.ohio-state.edu/mirror/gnu/make/make-3.80.tar.bz2
 ftp://ftp.cis.ohio-state.edu/mirror/gnu/ncurses/ncurses-5.4.tar.gz
@@ -40,13 +40,13 @@
 ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/kbd-1.12.tar.gz
 ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz
 
-http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.X-ss040702.tar.gz
+http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.8-ss040730.tar.gz
 http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/grep/2.5.1/grep-2.5.1.tar.bz2
 http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/groff/1.19.1/groff-1.19.1.tar.bz2
 http://downloads.linuxfromscratch.org/lfs-bootscripts-2.2.1.tar.bz2
 http://downloads.linuxfromscratch.org/udev-config-2.permissions
 http://downloads.linuxfromscratch.org/udev-config-1.rules 
-http://expect.nist.gov/old/expect-5.41.0.tar.gz
+http://expect.nist.gov/old/expect-5.42.1.tar.gz
 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.7.0.tar.bz2
 http://freshmeat.net/redir/mktemp/20624/url_tgz/mktemp-1.5.tar.gz
 http://freshmeat.net/redir/util-linux/11029/url_tgz/util-linux-2.12a.tar.gz
@@ -60,7 +60,7 @@
 http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.4.1.tar.gz
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/coreutils-5.2.1-suppress_uptime_kill_su-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/coreutils-5.2.1-uname-2.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/expect-5.41.0-spawn-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/expect-5.42.1-spawn-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/flex-2.5.31-debian_fixes-2.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/gcc-3.4.1-no_fixincludes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/gcc-3.4.1-specs-1.patch
@@ -68,7 +68,7 @@
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/hotplug-2004_04_01-device-2.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/inetutils-1.4.2-kernel_headers-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/inetutils-1.4.2-no_server_man_pages-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/iproute2-2.6.X_ss040702-remove_db-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/iproute2-2.6.8_ss040730-remove_db-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/man-1.5n-80cols-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/mktemp-1.5-add_tempfile-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/perl-5.8.5-libc-1.patch




More information about the alfs-log mailing list