r1449 - in profiles/LFS/branches/testing: . chapter05 chapter06 config_seperate scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 12 18:30:20 PDT 2004


Author: thomasp
Date: 2004-07-12 19:30:18 -0600 (Mon, 12 Jul 2004)
New Revision: 1449

Added:
   profiles/LFS/branches/testing/chapter06/iproute2.xml
Removed:
   profiles/LFS/branches/testing/chapter06/net-tools.xml
Modified:
   profiles/LFS/branches/testing/LFS.xml
   profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/testing/config_seperate/general.ent
   profiles/LFS/branches/testing/config_seperate/package.ent
   profiles/LFS/branches/testing/scripts/wget.lfs.urls
Log:
replaced net-tools with iproute2

Modified: profiles/LFS/branches/testing/LFS.xml
===================================================================
--- profiles/LFS/branches/testing/LFS.xml	2004-07-12 20:08:19 UTC (rev 1448)
+++ profiles/LFS/branches/testing/LFS.xml	2004-07-13 01:30:18 UTC (rev 1449)
@@ -129,8 +129,8 @@
 		<xi:include href="chapter06/flex.xml" />
 		<xi:include href="chapter06/gettext.xml" />
 		<xi:include href="chapter06/vim.xml" />
-		<xi:include href="chapter06/net-tools.xml" />
 		<xi:include href="chapter06/inetutils.xml" />
+		<xi:include href="chapter06/iproute2.xml" />
 		<xi:include href="chapter06/perl.xml" />
 		<xi:include href="chapter06/texinfo.xml" />
 		<xi:include href="chapter06/autoconf.xml" />

Modified: profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-07-12 20:08:19 UTC (rev 1448)
+++ profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-07-13 01:30:18 UTC (rev 1449)
@@ -93,6 +93,8 @@
 			<source>&inetutils-package;</source>
 			<source>&inetutils-no-man-pages-patch;</source>
 			<source>&inetutils-kernel-headers-patch;</source>
+			<source>&iproute2-package;</source>
+			<source>&iproute2-remove-db-patch;</source>
 			<source>&kbd-package;</source>
 			<source>&less-package;</source>
 			<source>&lfs-bootscripts-package;</source>
@@ -111,8 +113,6 @@
 			<source>&module-tools-package;</source>
 			<source>&ncurses-package;</source>
 			<source>&nALFS-package;</source>
-			<source>&net-tools-package;</source>
-			<source>&net-tools-gcc34-patch;</source>
 			<source>&patch-package;</source>
 			<source>&perl-package;</source>
 			<source>&perl-libc-1-patch;</source>

Copied: profiles/LFS/branches/testing/chapter06/iproute2.xml (from rev 1437, profiles/LFS/branches/testing/chapter06/net-tools.xml)
===================================================================
--- profiles/LFS/branches/testing/chapter06/net-tools.xml	2004-07-11 16:06:16 UTC (rev 1437)
+++ profiles/LFS/branches/testing/chapter06/iproute2.xml	2004-07-13 01:30:18 UTC (rev 1449)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % package_entities SYSTEM "../config/package.ent">
+
+%general_entities;
+%package_entities;
+]>
+
+<alfs>
+
+<package name="iproute2" version="&iproute2-version;">
+	<stage name="Unpacking.">
+		<unpack>
+			<digest>&iproute2-md5;</digest>
+			<archive>&packages_dir;/&iproute2-package;</archive>
+			<destination>&build_dir;</destination>
+		</unpack>
+	</stage>
+
+	<stage name="Installing.">
+		<stageinfo>
+			<base>&build_dir;/&iproute2-directory;</base>
+		</stageinfo>
+
+		<patch>
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&iproute2-remove-db-patch;</param>
+		</patch>
+
+		<configure />
+
+		<make />
+
+		<make>
+			<param>install</param>
+		</make>
+	</stage>
+
+	<stage name="Cleaning up.">
+		<remove>&build_dir;/&iproute2-directory;</remove>
+	</stage>
+</package>
+
+</alfs>

Deleted: profiles/LFS/branches/testing/chapter06/net-tools.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/net-tools.xml	2004-07-12 20:08:19 UTC (rev 1448)
+++ profiles/LFS/branches/testing/chapter06/net-tools.xml	2004-07-13 01:30:18 UTC (rev 1449)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
-<!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/package.ent">
-
-%general_entities;
-%package_entities;
-]>
-
-<alfs>
-
-<package name="net-tools" version="&net-tools-version;">
-	<stage name="Unpacking.">
-		<unpack>
-			<digest>&net-tools-md5;</digest>
-			<archive>&packages_dir;/&net-tools-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&net-tools-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&net-tools-gcc34-patch;</param>
-		</patch>
-
-		<search_replace>
-			<file>lib/x25_sr.c</file>
-			<find>x25_address</find>
-			<replace>struct x25_address</replace>
-		</search_replace>
-
-		<execute command="yes">
-			<param>""</param>
-			<param>| make</param>
-			<param>config</param>
-		</execute>
-
-		<make />
-
-		<make>
-			<param>update</param>
-		</make>
-	</stage>
-
-	<stage name="Cleaning up.">
-		<remove>&build_dir;/&net-tools-directory;</remove>
-	</stage>
-</package>
-
-</alfs>

Modified: profiles/LFS/branches/testing/config_seperate/general.ent
===================================================================
--- profiles/LFS/branches/testing/config_seperate/general.ent	2004-07-12 20:08:19 UTC (rev 1448)
+++ profiles/LFS/branches/testing/config_seperate/general.ent	2004-07-13 01:30:18 UTC (rev 1449)
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "CVS-20040702">
+<!ENTITY LFS-version "6.0-testing-20040712">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/testing/config_seperate/package.ent
===================================================================
--- profiles/LFS/branches/testing/config_seperate/package.ent	2004-07-12 20:08:19 UTC (rev 1448)
+++ profiles/LFS/branches/testing/config_seperate/package.ent	2004-07-13 01:30:18 UTC (rev 1449)
@@ -36,8 +36,8 @@
 <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2">
 <!ENTITY coreutils-directory "coreutils-&coreutils-version;">
 
-<!ENTITY coreutils-dupes-patch-md5 "2aab9aa8d0f8c55fafff56fee64497e3">
-<!ENTITY coreutils-dupes-patch "coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch">
+<!ENTITY coreutils-dupes-patch-md5 "9867078057cde905a8d431cc7a42403a">
+<!ENTITY coreutils-dupes-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
 
 <!ENTITY coreutils-uname-patch-md5 "b7c081bac1b6a8e4629d5be9314d5184">
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-2.patch">
@@ -157,6 +157,15 @@
 <!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-package "iproute2-&iproute2-version;-&iproute2-cvs-ver;.tar.gz">
+<!ENTITY iproute2-directory "iproute2-2.6.8">
+
+<!ENTITY iproute2-remove-db-patch-md5 "b3964c194cda7a36979d245380b4556f">
+<!ENTITY iproute2-remove-db-patch "iproute2-&iproute2-version;_&iproute2-cvs-ver;-remove_db-1.patch">
+
 <!ENTITY kbd-md5 "7892c7010512a9bc6697a295c921da25">
 <!ENTITY kbd-version "1.12">
 <!ENTITY kbd-package "kbd-&kbd-version;.tar.gz">
@@ -239,14 +248,6 @@
 <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-directory "ncurses-&ncurses-version;">
 
-<!ENTITY net-tools-md5 "888774accab40217dde927e21979c165">
-<!ENTITY net-tools-version "1.60">
-<!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
-<!ENTITY net-tools-directory "net-tools-&net-tools-version;">
-
-<!ENTITY net-tools-gcc34-patch-md5 "20697137d49bc0f6b7ba2b35cdb3e27d">
-<!ENTITY net-tools-gcc34-patch "net-tools-&net-tools-version;-gcc34-3.patch">
-
 <!ENTITY patch-md5 "ee5ae84d115f051d87fcaaef3b4ae782">
 <!ENTITY patch-version "2.5.4">
 <!ENTITY patch-package "patch-&patch-version;.tar.gz">

Modified: profiles/LFS/branches/testing/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/branches/testing/scripts/wget.lfs.urls	2004-07-12 20:08:19 UTC (rev 1448)
+++ profiles/LFS/branches/testing/scripts/wget.lfs.urls	2004-07-13 01:30:18 UTC (rev 1449)
@@ -35,6 +35,7 @@
 ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/glibc/glibc-2.3.4-2004701.tar.bz2
 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://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://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/gzip,dev/1.3.5/gzip-1.3.5.tar.bz2
@@ -55,9 +56,8 @@
 http://downloads.linuxfromscratch.org/lfs-bootscripts-2.1.2.tar.bz2
 http://downloads.linuxfromscratch.org/udev-config-2.permissions
 http://downloads.linuxfromscratch.org/udev-config-1.rules 
-http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/bash-2.05b-gnu_fixes-2.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch
+http://www.linuxfromscratch.org/patches/downloads/coreutils/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/flex-2.5.31-debian_fixes-2.patch
@@ -65,9 +65,9 @@
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/gcc-3.4.1-no_fixincludes-1.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/downloads/iproute2/iproute2-2.6.X_ss040702-remove_db-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/man-1.5m2-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/net-tools-1.60-gcc34-3.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/perl-5.8.4-libc-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/readline-4.3-gnu_fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/sysklogd-1.4.1-kernel_headers-1.patch




More information about the alfs-log mailing list