r1839 - in profiles/LFS/branches/6.1: . chapter05 chapter06 config

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Apr 4 18:44:25 PDT 2005


Author: thomasp
Date: 2005-04-04 19:44:24 -0600 (Mon, 04 Apr 2005)
New Revision: 1839

Modified:
   profiles/LFS/branches/6.1/README
   profiles/LFS/branches/6.1/chapter05/bzip2.xml
   profiles/LFS/branches/6.1/chapter06/bzip2.xml
   profiles/LFS/branches/6.1/chapter06/e2fsprogs.xml
   profiles/LFS/branches/6.1/chapter06/hotplug.xml
   profiles/LFS/branches/6.1/config/general.ent
Log:
merge changes from trunk

Modified: profiles/LFS/branches/6.1/README
===================================================================
--- profiles/LFS/branches/6.1/README	2005-04-05 01:44:10 UTC (rev 1838)
+++ profiles/LFS/branches/6.1/README	2005-04-05 01:44:24 UTC (rev 1839)
@@ -1,5 +1,5 @@
 ==============================================
-        LFS-SVN PROFILE
+        LFS-6.1 PROFILE
 ==============================================
 
 This profile must be used with nALFS 1.2.3 or later.

Modified: profiles/LFS/branches/6.1/chapter05/bzip2.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/bzip2.xml	2005-04-05 01:44:10 UTC (rev 1838)
+++ profiles/LFS/branches/6.1/chapter05/bzip2.xml	2005-04-05 01:44:24 UTC (rev 1839)
@@ -21,6 +21,9 @@
         <base>&build_dir;/&bzip2-directory;</base>
       </stageinfo>
       <make />
+      <!--<make>
+	<param>test</param>
+      </make>-->
       <make>
         <param>PREFIX=/tools</param>
         <param>install</param>

Modified: profiles/LFS/branches/6.1/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/bzip2.xml	2005-04-05 01:44:10 UTC (rev 1838)
+++ profiles/LFS/branches/6.1/chapter06/bzip2.xml	2005-04-05 01:44:24 UTC (rev 1839)
@@ -27,6 +27,9 @@
         <param>clean</param>
       </make>
       <make />
+      <!--<make>
+	<param>test</param>
+      </make>-->
       <make>
         <param>install</param>
       </make>

Modified: profiles/LFS/branches/6.1/chapter06/e2fsprogs.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/e2fsprogs.xml	2005-04-05 01:44:10 UTC (rev 1838)
+++ profiles/LFS/branches/6.1/chapter06/e2fsprogs.xml	2005-04-05 01:44:24 UTC (rev 1839)
@@ -23,6 +23,10 @@
       <stageinfo>
         <base>&build_dir;/e2fsprogs-build</base>
       </stageinfo>
+      <execute command="sed">
+	<param>-i -e 's/-DTEST/$(ALL_CFLAGS) &real-amp;/'</param>
+	<param>lib/e2p/Makefile.in</param>
+      </execute>
       <configure command="../&e2fsprogs-directory;/configure">
         <param>--prefix=/usr</param>
         <param>--with-root-prefix=""</param>

Modified: profiles/LFS/branches/6.1/chapter06/hotplug.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/hotplug.xml	2005-04-05 01:44:10 UTC (rev 1838)
+++ profiles/LFS/branches/6.1/chapter06/hotplug.xml	2005-04-05 01:44:24 UTC (rev 1839)
@@ -31,7 +31,6 @@
       <remove>/etc/hotplug/net.agent</remove>
       <mkdir>
       	<option>parents</option>
-	<name>/var/log/hotplug</name>
 	<name>/lib/firmware</name>
       </mkdir>
       <execute command="touch /var/log/hotplug/events" />

Modified: profiles/LFS/branches/6.1/config/general.ent
===================================================================
--- profiles/LFS/branches/6.1/config/general.ent	2005-04-05 01:44:10 UTC (rev 1838)
+++ profiles/LFS/branches/6.1/config/general.ent	2005-04-05 01:44:24 UTC (rev 1839)
@@ -67,7 +67,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "SVN-4836">
+<!ENTITY LFS-version "6.1-testing-4836">
 
 <!-- THE FOLLOWING THREE ENTITY DECLARATIONS SHOULDN'T BE MODIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING




More information about the alfs-log mailing list