r1664 - in profiles/LFS/branches/testing: chapter05 chapter06 config scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Dec 30 14:41:34 PST 2004


Author: thomasp
Date: 2004-12-30 15:41:33 -0700 (Thu, 30 Dec 2004)
New Revision: 1664

Modified:
   profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/testing/chapter05/flex.xml
   profiles/LFS/branches/testing/chapter05/gcc-pass1.xml
   profiles/LFS/branches/testing/chapter06/readline.xml
   profiles/LFS/branches/testing/config/general.ent
   profiles/LFS/branches/testing/config/grub.xml
   profiles/LFS/branches/testing/config/package.ent
   profiles/LFS/branches/testing/scripts/wget.lfs.urls
Log:
6.1-testing-r4454, binutils-2.15.94.0.2, some nitpicks

Modified: profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/chapter05/creatingtoolsdir.xml	2004-12-30 22:41:33 UTC (rev 1664)
@@ -123,7 +123,7 @@
 			<source>&procps-package;</source>
 			<source>&psmisc-package;</source>
 			<source>&readline-package;</source>
-			<source>&readline-fixes-patch;</source>
+			<source>&readline-display-wrap-patch;</source>
 			<source>&sed-package;</source>
 			<source>&shadow-package;</source>
 			<source>&syslog-ng-package;</source>

Modified: profiles/LFS/branches/testing/chapter05/flex.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/flex.xml	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/chapter05/flex.xml	2004-12-30 22:41:33 UTC (rev 1664)
@@ -30,7 +30,7 @@
 		</patch>
 
 		<execute command="touch">
-		  <param>doc/flex.1</param>
+		  	<param>doc/flex.1</param>
 		</execute>
 
 		<configure>

Modified: profiles/LFS/branches/testing/chapter05/gcc-pass1.xml
===================================================================
--- profiles/LFS/branches/testing/chapter05/gcc-pass1.xml	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/chapter05/gcc-pass1.xml	2004-12-30 22:41:33 UTC (rev 1664)
@@ -39,7 +39,6 @@
 		</stageinfo>
 
 		<configure command="../&gcc-directory;/configure">
-			<prefix>CC="gcc -B/usr/bin"</prefix>
 			<param>--prefix=/tools</param>
 			<param>--libexecdir=/tools/lib</param>
 			<param>--with-local-prefix=/tools</param>

Modified: profiles/LFS/branches/testing/chapter06/readline.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/readline.xml	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/chapter06/readline.xml	2004-12-30 22:41:33 UTC (rev 1664)
@@ -26,7 +26,7 @@
 		<patch>
 			<param>-N</param>
 			<param>-p1</param>
-			<param>-i &packages_dir;/&readline-fixes-patch;</param>
+			<param>-i &packages_dir;/&readline-display-wrap-patch;</param>
 		</patch>
 
 		<configure>

Modified: profiles/LFS/branches/testing/config/general.ent
===================================================================
--- profiles/LFS/branches/testing/config/general.ent	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/config/general.ent	2004-12-30 22:41:33 UTC (rev 1664)
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "6.1-testing-4341">
+<!ENTITY LFS-version "6.1-testing-4461">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/testing/config/grub.xml
===================================================================
--- profiles/LFS/branches/testing/config/grub.xml	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/config/grub.xml	2004-12-30 22:41:33 UTC (rev 1664)
@@ -21,7 +21,6 @@
 	-->
 
 	<!-- Sample grub configuration-->
-	<!--
 	<textdump>
 		<file>/boot/grub/menu.lst</file>
 		<content>
@@ -52,7 +51,17 @@
 			=#
 		</content>
 	</textdump>
-	-->
+
+	<mkdir>
+		<option>parents</option>
+		<name>/etc/grub</name>
+	</mkdir>
+
+	<link>
+		<option>force</option>
+		<target>/boot/grub/menu.lst</target>
+		<name>/etc/grub</name>
+	</link>
 </stage>
 
 </alfs>

Modified: profiles/LFS/branches/testing/config/package.ent
===================================================================
--- profiles/LFS/branches/testing/config/package.ent	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/config/package.ent	2004-12-30 22:41:33 UTC (rev 1664)
@@ -19,8 +19,8 @@
 <!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-md5 "a87269da4db684da403014b43ec0b89e">
+<!ENTITY binutils-version "2.15.94.0.2">
 <!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-directory "binutils-&binutils-version;">
 
@@ -214,7 +214,7 @@
 <!ENTITY linux-src-location "/usr/src">
 
 <!ENTITY linux-libc-headers-md5 "d3507b2c0203a0760a677022badcf455">
-<!ENTITY linux-libc-headers-version "2.6.9.1">
+<!ENTITY linux-libc-headers-vefixes-rsion "2.6.9.1">
 <!ENTITY linux-libc-headers-package "linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
 <!ENTITY linux-libc-headers-directory "linux-libc-headers-&linux-libc-headers-version;">
 
@@ -292,8 +292,8 @@
 <!ENTITY readline-package "readline-&readline-version;.tar.bz2">
 <!ENTITY readline-directory "readline-&readline-version;">
 
-<!ENTITY readline-fixes-patch-md5 "6693bff25f522b2f7b42a6f48aafac3f">
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
+<!ENTITY readline-display-wrap-patch-md5 "5280d7b859bb8d80e7b8ca709f137970">
+<!ENTITY readline-display-wrap-patch "readline-&readline-version;-display_wrap-1.patch">
 
 <!ENTITY sed-md5 "537f96fa633ed949b0bf1dc9d1c678b4">
 <!ENTITY sed-version "4.1.2">

Modified: profiles/LFS/branches/testing/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/branches/testing/scripts/wget.lfs.urls	2004-12-30 20:56:15 UTC (rev 1663)
+++ profiles/LFS/branches/testing/scripts/wget.lfs.urls	2004-12-30 22:41:33 UTC (rev 1664)
@@ -1,7 +1,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/autoconf/autoconf-2.59.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/automake/automake-1.9.3.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bash/bash-3.0.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/binutils/binutils-2.15.92.0.2.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/binutils/binutils-2.15.94.0.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bison/bison-1.875a.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bzip2/bzip2-1.0.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/coreutils/coreutils-5.2.1.tar.bz2
@@ -76,7 +76,7 @@
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/man-1.5o1-80cols-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/mktemp-1.5-add_tempfile-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/perl-5.8.5-libc-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/readline-5.0-fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/readline-5.0-display_wrap-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/sysvinit-2.85-proclen-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/texinfo-4.7-segfault-1.patch
 




More information about the alfs-log mailing list