r1890 - in profiles/LFS/branches/6.1: chapter05 chapter06 config scripts skeleton/etc

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu May 5 17:36:57 PDT 2005


Author: thomasp
Date: 2005-05-05 18:36:54 -0600 (Thu, 05 May 2005)
New Revision: 1890

Modified:
   profiles/LFS/branches/6.1/chapter05/glibc.xml
   profiles/LFS/branches/6.1/chapter06/glibc.xml
   profiles/LFS/branches/6.1/chapter06/hotplug.xml
   profiles/LFS/branches/6.1/config/general.ent
   profiles/LFS/branches/6.1/config/package.ent
   profiles/LFS/branches/6.1/scripts/wget.lfs.urls
   profiles/LFS/branches/6.1/skeleton/etc/profile
Log:
Update to r5134: Add patch to fix glibc testsuite when running 2.6.11.x kernels, removed creation of /var/log/hotplug/events as it's handled by the bootscripts.

Modified: profiles/LFS/branches/6.1/chapter05/glibc.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/glibc.xml	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/chapter05/glibc.xml	2005-05-06 00:36:54 UTC (rev 1890)
@@ -20,6 +20,16 @@
         <name>glibc-build</name>
       </mkdir>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&glibc-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&glibc-fix-testsuite-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <environment>

Modified: profiles/LFS/branches/6.1/chapter06/glibc.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/glibc.xml	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/chapter06/glibc.xml	2005-05-06 00:36:54 UTC (rev 1890)
@@ -25,6 +25,16 @@
         <name>glibc-build</name>
       </mkdir>
     </stage>
+    <stage name="Patching">
+      <stageinfo>
+	<base>&build_dir;/&glibc-directory;</base>
+      </stageinfo>
+      <patch>
+	<param>-N</param>
+	<param>-p1</param>
+	<param>-i &packages_dir;/&glibc-fix-testsuite-patch;</param>
+      </patch>
+    </stage>
     <stage name="Installing">
       <stageinfo>
         <environment>

Modified: profiles/LFS/branches/6.1/chapter06/hotplug.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/hotplug.xml	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/chapter06/hotplug.xml	2005-05-06 00:36:54 UTC (rev 1890)
@@ -33,7 +33,6 @@
       	<option>parents</option>
 	<name>/lib/firmware</name>
       </mkdir>
-      <execute command="touch /var/log/hotplug/events" />
     </stage>
     <stage name="Cleaning up.">
       <remove>&build_dir;/&hotplug-directory;</remove>

Modified: profiles/LFS/branches/6.1/config/general.ent
===================================================================
--- profiles/LFS/branches/6.1/config/general.ent	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/config/general.ent	2005-05-06 00:36:54 UTC (rev 1890)
@@ -67,7 +67,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "6.1-testing-4869">
+<!ENTITY LFS-version "6.1-testing-5134">
 
 <!-- THE FOLLOWING THREE ENTITY DECLARATIONS SHOULDN'T BE MODIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/6.1/config/package.ent
===================================================================
--- profiles/LFS/branches/6.1/config/package.ent	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/config/package.ent	2005-05-06 00:36:54 UTC (rev 1890)
@@ -117,6 +117,8 @@
 <!ENTITY glibc-linuxthreads-md5 "7a199cd4965eb5622163756ae64358fe">
 <!ENTITY glibc-linuxthreads-package "glibc-linuxthreads-&glibc-version;&glibc-cvs-tag;.tar.bz2">
 
+<!ENTITY glibc-fix-testsuite-patch "glibc-&glibc-version;&glibc-cvs-tag;-fix_test-1.patch">
+
 <!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
 <!ENTITY grep-version "2.5.1a">
 <!ENTITY grep-package "grep-&grep-version;.tar.bz2">

Modified: profiles/LFS/branches/6.1/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/branches/6.1/scripts/wget.lfs.urls	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/scripts/wget.lfs.urls	2005-05-06 00:36:54 UTC (rev 1890)
@@ -70,6 +70,7 @@
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/gcc-3.4.3-linkonce-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/gcc-3.4.3-specs-2.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/gcc-3.4.3-no_fixincludes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/svn/trunk/glibc-2.3.4-fix_test-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/inetutils-1.4.2-kernel_headers-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/inetutils-1.4.2-no_server_man_pages-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/iproute2-2.6.11_050330-remove_db-1.patch

Modified: profiles/LFS/branches/6.1/skeleton/etc/profile
===================================================================
--- profiles/LFS/branches/6.1/skeleton/etc/profile	2005-05-05 02:43:53 UTC (rev 1889)
+++ profiles/LFS/branches/6.1/skeleton/etc/profile	2005-05-06 00:36:54 UTC (rev 1890)
@@ -2,8 +2,7 @@
 # Written for Linux From Scratch
 # by Alexander E. Patrakov 
 
-export LC_ALL=en_US
-export LANG=en_US
+export LANG=en_US.iso88591
 export INPUTRC=/etc/inputrc 
 
 # End /etc/profile




More information about the alfs-log mailing list