r1457 - in profiles/LFS/trunk: . chapter05 chapter07 config_seperate scripts

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 17 10:25:59 PDT 2004


Author: kpfleming
Date: 2004-07-17 11:25:57 -0600 (Sat, 17 Jul 2004)
New Revision: 1457

Modified:
   profiles/LFS/trunk/LFS.xml
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
   profiles/LFS/trunk/chapter07/network.xml
   profiles/LFS/trunk/config_seperate/general.ent
   profiles/LFS/trunk/config_seperate/package.ent
   profiles/LFS/trunk/scripts/wget.lfs.urls
Log:
merge recent changes:
  net-tools replaced with iproute2
  udev upgraded to -030
  lfs-bootscripts upgrated to 2.2.1
  network configuration changed


Modified: profiles/LFS/trunk/LFS.xml
===================================================================
--- profiles/LFS/trunk/LFS.xml	2004-07-17 17:17:08 UTC (rev 1456)
+++ profiles/LFS/trunk/LFS.xml	2004-07-17 17:25:57 UTC (rev 1457)
@@ -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/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2004-07-17 17:17:08 UTC (rev 1456)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2004-07-17 17:25:57 UTC (rev 1457)
@@ -97,6 +97,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>
@@ -115,8 +117,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>

Modified: profiles/LFS/trunk/chapter07/network.xml
===================================================================
--- profiles/LFS/trunk/chapter07/network.xml	2004-07-17 17:17:08 UTC (rev 1456)
+++ profiles/LFS/trunk/chapter07/network.xml	2004-07-17 17:25:57 UTC (rev 1457)
@@ -8,14 +8,19 @@
 <alfs>
 
 <stage name="Configuring the network script">
-	<textdump mode="append">
-		<file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
+	<mkdir>
+		<option>parents</option>
+		<name>/etc/sysconfig/network-devices/ifconfig.eth0</name>
+	</mkdir>
+
+	<textdump>
+		<file>/etc/sysconfig/network-devices/ifconfig.eth0/ipv4</file>
 		<content>
 			=ONBOOT=&on_boot;
-			=SERVICE=static
+			=SERVICE=ipv4-static
 			=IP=&IP;
 			=GATEWAY=&gateway;
-			=NETMASK=&netmask;
+			=PREFIX=&prefix;
 			=BROADCAST=&broadcast;
 		</content>
 	</textdump>

Modified: profiles/LFS/trunk/config_seperate/general.ent
===================================================================
--- profiles/LFS/trunk/config_seperate/general.ent	2004-07-17 17:17:08 UTC (rev 1456)
+++ profiles/LFS/trunk/config_seperate/general.ent	2004-07-17 17:25:57 UTC (rev 1457)
@@ -64,7 +64,7 @@
 <!ENTITY gateway    "172.16.1.1">
 <!ENTITY on_boot    "yes">
 <!ENTITY IP         "172.16.1.22">
-<!ENTITY netmask    "255.255.255.0">
+<!ENTITY prefix     "24">
 <!ENTITY broadcast  "172.16.1.255">
 
 <!-- In the entity below replace 127.0.0.1 with the IP address of the DNS server most appropriate for
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "CVS-20040702">
+<!ENTITY LFS-version "SVN-20040717">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/trunk/config_seperate/package.ent
===================================================================
--- profiles/LFS/trunk/config_seperate/package.ent	2004-07-17 17:17:08 UTC (rev 1456)
+++ profiles/LFS/trunk/config_seperate/package.ent	2004-07-17 17:25:57 UTC (rev 1457)
@@ -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">
@@ -171,6 +171,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">
@@ -181,8 +190,8 @@
 <!ENTITY less-package "less-&less-version;.tar.gz">
 <!ENTITY less-directory "less-&less-version;">
 
-<!ENTITY lfs-bootscripts-md5 "c30c3804bd057271ef3ac51810e64dc5">
-<!ENTITY lfs-bootscripts-version "2.1.2">
+<!ENTITY lfs-bootscripts-md5 "a45f3ea51b00808ee725c3f92c826aa1">
+<!ENTITY lfs-bootscripts-version "2.2.1">
 <!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
 
@@ -253,14 +262,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">
@@ -339,8 +340,8 @@
 <!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
 <!ENTITY texinfo-directory "texinfo-&texinfo-version;">
 
-<!ENTITY udev-md5 "ec35587f00cc688505eadedf2625a5e6">
-<!ENTITY udev-version "029">
+<!ENTITY udev-md5 "8202bf86e9f2cb5483d473f9977eeafc">
+<!ENTITY udev-version "030">
 <!ENTITY udev-package "udev-&udev-version;.tar.bz2">
 <!ENTITY udev-directory "udev-&udev-version;">
 

Modified: profiles/LFS/trunk/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/trunk/scripts/wget.lfs.urls	2004-07-17 17:17:08 UTC (rev 1456)
+++ profiles/LFS/trunk/scripts/wget.lfs.urls	2004-07-17 17:25:57 UTC (rev 1457)
@@ -25,7 +25,7 @@
 ftp://ftp.ca.kernel.org/pub/linux/docs/manpages/man-pages-1.67.tar.bz2
 ftp://ftp.ca.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.0.tar.bz2
 ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_04_01.tar.bz2
-ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-029.tar.bz2
+ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-030.tar.bz2
 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.7.tar.bz2
 ftp://ftp.pld.org.pl/software/shadow/shadow-4.0.4.1.tar.bz2
 ftp://ftp.gnu.org/gnu/m4/m4-1.4.1.tar.gz
@@ -36,6 +36,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
@@ -53,12 +54,11 @@
 http://umn.dl.sourceforge.net/sourceforge/lex/flex-2.5.31.tar.bz2
 http://www.gzip.org/zlib/zlib-1.2.1.tar.bz2
 http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.4.1.tar.gz
-http://downloads.linuxfromscratch.org/lfs-bootscripts-2.1.2.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://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
@@ -69,9 +69,9 @@
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/hotplug-2004_04_01-isapnp-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/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