r1573 - in profiles/LFS/trunk: . chapter05 chapter06 config_separate scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Fri Oct 29 20:12:35 PDT 2004


Author: thomasp
Date: 2004-10-29 21:12:31 -0600 (Fri, 29 Oct 2004)
New Revision: 1573

Modified:
   profiles/LFS/trunk/LFS.xml
   profiles/LFS/trunk/chapter05/bash.xml
   profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
   profiles/LFS/trunk/chapter06/bash.xml
   profiles/LFS/trunk/chapter06/basic-dev.xml
   profiles/LFS/trunk/chapter06/udev.xml
   profiles/LFS/trunk/config_separate/general.ent
   profiles/LFS/trunk/config_separate/package.ent
   profiles/LFS/trunk/scripts/wget.lfs.urls
Log:
SVN-20041017

Modified: profiles/LFS/trunk/LFS.xml
===================================================================
--- profiles/LFS/trunk/LFS.xml	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/LFS.xml	2004-10-30 03:12:31 UTC (rev 1573)
@@ -75,7 +75,6 @@
 		<xi:include href="chapter05/flex.xml" />
 		<xi:include href="chapter05/util-linux.xml" />
 		<xi:include href="chapter05/perl.xml" />
-		<xi:include href="chapter05/udev.xml" />
 		<xi:include href="chapter05/strip.xml" />
 	</stage>
 </stage>

Modified: profiles/LFS/trunk/chapter05/bash.xml
===================================================================
--- profiles/LFS/trunk/chapter05/bash.xml	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/chapter05/bash.xml	2004-10-30 03:12:31 UTC (rev 1573)
@@ -23,6 +23,12 @@
 			<base>&build_dir;/&bash-directory;</base>
 		</stageinfo>
 
+		<patch>
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&bash-wcontinued-patch;</param>
+		</patch>
+
 		<configure>
 			<param>--prefix=/tools</param>
 			<param>--without-bash-malloc</param>

Modified: profiles/LFS/trunk/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/chapter05/creatingtoolsdir.xml	2004-10-30 03:12:31 UTC (rev 1573)
@@ -133,7 +133,7 @@
 			<source>&texinfo-package;</source>
 			<source>&texinfo-segfault-patch;</source>
 			<source>&udev-package;</source>
-			<source>&udev-etcdir-patch;</source>
+			<source>&udev-destdir-patch;</source>
 			<source>&udev-permissions-file;</source>
 			<source>&udev-rules-file;</source>
 			<source>&util-linux-package;</source>

Modified: profiles/LFS/trunk/chapter06/bash.xml
===================================================================
--- profiles/LFS/trunk/chapter06/bash.xml	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/chapter06/bash.xml	2004-10-30 03:12:31 UTC (rev 1573)
@@ -29,6 +29,12 @@
 			<param>-i &packages_dir;/&bash-fixes-patch;</param>
 		</patch>
 
+		<patch>
+			<param>-N</param>
+			<param>-p1</param>
+			<param>-i &packages_dir;/&bash-wcontinued-patch;</param>
+		</patch>
+
 		<configure>
 			<param>--prefix=/usr</param>
 			<param>--bindir=/bin</param>

Modified: profiles/LFS/trunk/chapter06/basic-dev.xml
===================================================================
--- profiles/LFS/trunk/chapter06/basic-dev.xml	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/chapter06/basic-dev.xml	2004-10-30 03:12:31 UTC (rev 1573)
@@ -26,8 +26,35 @@
       <param>/dev</param>
     </execute>
 
-    <execute command="/tools/sbin/udevstart" />
+    <execute command="mknod">
+	<param>-m 622</param>
+	<param>/dev/console</param>
+	<param>c 5 1</param>
+    </execute>
 
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/null</param>
+	<param>c 1 3</param>
+    </execute>
+
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/zero</param>
+	<param>c 1 5</param>
+    </execute>
+
+    <execute command="mknod">
+  	<param>-m 666</param>
+	<param>/dev/ptmx</param>
+	<param>c 5 2</param>
+    </execute>
+
+    <ownership base="/dev" user="root" group="tty">
+	<name>console</name>
+	<name>ptmx</name>
+    </ownership>
+
     <link>
       <target>/proc/self/fd</target>
       <name>/dev/fd</name>

Modified: profiles/LFS/trunk/chapter06/udev.xml
===================================================================
--- profiles/LFS/trunk/chapter06/udev.xml	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/chapter06/udev.xml	2004-10-30 03:12:31 UTC (rev 1573)
@@ -23,17 +23,12 @@
 			<base>&build_dir;/&udev-directory;</base>
 		</stageinfo>
 
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&udev-etcdir-patch;</param>
-		</patch>
-
 		<make>
 		  	<param>udevdir=/dev</param>
 		</make>
 
 		<make>
+			<param>udevdir=/dev</param>
 			<param>install</param>
 		</make>
 
@@ -47,7 +42,9 @@
         		<option>force</option>
         		<source>&udev-rules-file;</source>
         		<destination>/etc/udev/rules.d/25-lfs.rules</destination>
-		</copy>		
+		</copy>
+
+		<execute command="/sbin/udevstart" />	
 	</stage>
 
 	<stage name="Cleanup">

Modified: profiles/LFS/trunk/config_separate/general.ent
===================================================================
--- profiles/LFS/trunk/config_separate/general.ent	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/config_separate/general.ent	2004-10-30 03:12:31 UTC (rev 1573)
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "SVN-unstable-4256">
+<!ENTITY LFS-version "SVN-unstable-4297">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/trunk/config_separate/package.ent
===================================================================
--- profiles/LFS/trunk/config_separate/package.ent	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/config_separate/package.ent	2004-10-30 03:12:31 UTC (rev 1573)
@@ -16,6 +16,9 @@
 <!ENTITY bash-fixes-patch-md5 "a2eec57fcbd4e03d913853e66f3836ca">
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
 
+<!ENTITY bash-wcontinued-patch-md5 "93eb380f4dd903ee25e47c7950894578">
+<!ENTITY bash-wcontinued-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
+
 <!ENTITY binutils-md5 "702bc82d8b10914e112fb5c5d8b66498">
 <!ENTITY binutils-version "2.15.92.0.2">
 <!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
@@ -118,9 +121,9 @@
 <!ENTITY gettext-package "gettext-&gettext-version;.tar.gz">
 <!ENTITY gettext-directory "gettext-&gettext-version;">
 
-<!ENTITY glibc-md5 "ec29bf73a4fd0897dcaf564fa8ae4c4c">
-<!ENTITY glibc-version "2.3.4">
-<!ENTITY glibc-cvs-tag "-20040828">
+<!ENTITY glibc-md5 "9a79721c5edf1684fcb0f24e8c7618c3">
+<!ENTITY glibc-version "20041011">
+<!ENTITY glibc-cvs-tag "">
 <!ENTITY glibc-package "glibc-&glibc-version;&glibc-cvs-tag;.tar.bz2">
 <!ENTITY glibc-directory "glibc-&glibc-version;&glibc-cvs-tag;">
 
@@ -233,8 +236,8 @@
 <!ENTITY man-80cols-patch-md5 "9c93fd4384b6b69273278ae5621e1f4a">
 <!ENTITY man-80cols-patch "man-&man-version;-80cols-1.patch">
 
-<!ENTITY man-pages-md5 "c31112bbfdd907f77c1419308a8cafba">
-<!ENTITY man-pages-version "1.67">
+<!ENTITY man-pages-md5 "cb31f64227949214691e9266473cd4a1">
+<!ENTITY man-pages-version "1.69">
 <!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
 <!ENTITY man-pages-directory "man-pages-&man-pages-version;">
 
@@ -333,13 +336,13 @@
 <!ENTITY texinfo-segfault-patch-md5 "ce5aa1bb05b3c6638e071d2b0283fdd6">
 <!ENTITY texinfo-segfault-patch "texinfo-&texinfo-version;-segfault-1.patch">
 
-<!ENTITY udev-md5 "6df7392c3f5fe44d7cf261a0d2497b99">
-<!ENTITY udev-version "032">
+<!ENTITY udev-md5 "b4de833f8afd0ded074bc2d389b48f24">
+<!ENTITY udev-version "035">
 <!ENTITY udev-package "udev-&udev-version;.tar.bz2">
 <!ENTITY udev-directory "udev-&udev-version;">
 
-<!ENTITY udev-etcdir-patch-md5 "452b4fba55a6b60cf9e5a858ef6f7ffc">
-<!ENTITY udev-etcdir-patch "udev-&udev-version;-etcdir-2.patch">
+<!ENTITY udev-destdir-patch-md5 "e062f55b90e34531697dfdfbf790ff97">
+<!ENTITY udev-destdir-patch "udev-&udev-version;-DESTDIR-1.patch">
 
 <!ENTITY udev-rules-md5 "b60fa9f4b83cb5902f0686521278fc6d">
 <!ENTITY udev-rules-version "1">
@@ -349,13 +352,13 @@
 <!ENTITY udev-permissions-version "2">
 <!ENTITY udev-permissions-file "udev-config-&udev-permissions-version;.permissions">
 
-<!ENTITY util-linux-md5 "3781296c4e6ba9ff7f68e18814f63d56">
-<!ENTITY util-linux-version "2.12g">
+<!ENTITY util-linux-md5 "f8f1b2096abbf52fadf86d470c5035dd">
+<!ENTITY util-linux-version "2.12h">
 <!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.gz">
 <!ENTITY util-linux-directory "util-linux-&util-linux-version;">
 
-<!ENTITY util-linux-sfdisk-patch-md5 "abccfbd333292073cd619a604bd19231">
-<!ENTITY util-linux-sfdisk-patch "util-linux-&util-linux-version;-sfdisk-2.patch">
+<!ENTITY util-linux-sfdisk-patch-md5 "5a369b755115efc546ff616c18021cc1">
+<!ENTITY util-linux-sfdisk-patch "util-linux-&util-linux-version;-sfdisk-1.patch">
 
 <!ENTITY vim-md5 "821fda8f14d674346b87e3ef9cb96389">
 <!ENTITY vim-version "6.3">

Modified: profiles/LFS/trunk/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/trunk/scripts/wget.lfs.urls	2004-10-27 03:35:34 UTC (rev 1572)
+++ profiles/LFS/trunk/scripts/wget.lfs.urls	2004-10-30 03:12:31 UTC (rev 1573)
@@ -4,13 +4,12 @@
 ftp://cpan.pair.com/pub/CPAN/src/perl-5.8.5.tar.bz2
 ftp://ftp.astron.com/pub/file/file-4.10.tar.gz
 ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz
-ftp://ftp.lfs-matrix.de/pub/lfs/packages/conglomeration/glibc/glibc-2.3.4-20040828.tar.bz2
 ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.5.tar.gz
 ftp://ftp.pld.org.pl/software/shadow/shadow-4.0.4.1.tar.bz2
 ftp://ftp.vim.org/pub/vim/unix/vim-6.3.tar.bz2
 ftp://ftp.vim.org/pub/vim/extra/vim-6.3-lang.tar.gz
 ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/kbd-1.12.tar.gz
-ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/util-linux/util-linux-2.12g.tar.gz
+ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/util-linux/util-linux-2.12h.tar.gz
 ftp://mirrors.usc.edu/pub/gnu/autoconf/autoconf-2.59.tar.bz2
 ftp://mirrors.usc.edu/pub/gnu/automake/automake-1.9.2.tar.bz2
 ftp://mirrors.usc.edu/pub/gnu/bash/bash-3.0.tar.gz
@@ -33,12 +32,13 @@
 ftp://mirrors.usc.edu/pub/gnu/tar/tar-1.14.tar.bz2
 ftp://mirrors.usc.edu/pub/kernel/pub/linux/devel/binutils/binutils-2.15.92.0.2.tar.bz2
 ftp://mirrors.usc.edu/pub/kernel/pub/linux/utils/man/man-1.5o1.tar.bz2
-ftp://mirrors.usc.edu/pub/kernel/pub/linux/docs/manpages/man-pages-1.67.tar.bz2
+ftp://mirrors.usc.edu/pub/kernel/pub/linux/docs/manpages/man-pages-1.69.tar.bz2
 ftp://mirrors.usc.edu/pub/kernel/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.0.tar.bz2
 ftp://mirrors.usc.edu/pub/kernel/pub/linux/utils/kernel/hotplug/hotplug-2004_09_23.tar.bz2
-ftp://mirrors.usc.edu/pub/kernel/pub/linux/utils/kernel/hotplug/udev-032.tar.bz2
+ftp://mirrors.usc.edu/pub/kernel/pub/linux/utils/kernel/hotplug/udev-035.tar.bz2
 ftp://mirrors.usc.edu/pub/kernel/pub/linux/kernel/v2.6/linux-2.6.8.1.tar.bz2
 ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz
+ftp://sources.redhat.com/pub/glibc/snapshots/glibc-20041011.tar.bz2
 
 http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.9-ss040831.tar.gz
 http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/grep/2.5.1/grep-2.5.1.tar.bz2
@@ -58,6 +58,7 @@
 http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.5.tar.gz
 http://www.gzip.org/zlib/zlib-1.2.1.tar.bz2
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/bash-3.0-fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/bash-3.0-avoid_WCONTINUED-1.patch
 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.42.1-spawn-1.patch
@@ -74,8 +75,8 @@
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/readline-5.0-fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/sysvinit-2.85-proclen-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/texinfo-4.7-segfault-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/udev-032-etcdir-2.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/util-linux-2.12g-sfdisk-2.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/udev-035-DESTDIR-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/util-linux-2.12h-sfdisk-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/unstable/zlib-1.2.1-security-1.patch
 http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-1.02.tar.bz2
 




More information about the alfs-log mailing list