r1837 - in profiles/LFS/trunk: chapter05 chapter06

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Apr 4 18:31:29 PDT 2005


Author: thomasp
Date: 2005-04-04 19:31:27 -0600 (Mon, 04 Apr 2005)
New Revision: 1837

Modified:
   profiles/LFS/trunk/chapter05/bzip2.xml
   profiles/LFS/trunk/chapter06/bzip2.xml
   profiles/LFS/trunk/chapter06/e2fsprogs.xml
   profiles/LFS/trunk/chapter06/hotplug.xml
Log:
Update to r4868:
* add capability to run bzip2 testsuite
* fixed problem with e2fsprogs testsuite
* don't create /var/log/hotplug, already generated by make install


Modified: profiles/LFS/trunk/chapter05/bzip2.xml
===================================================================
--- profiles/LFS/trunk/chapter05/bzip2.xml	2005-04-05 01:19:42 UTC (rev 1836)
+++ profiles/LFS/trunk/chapter05/bzip2.xml	2005-04-05 01:31:27 UTC (rev 1837)
@@ -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/trunk/chapter06/bzip2.xml
===================================================================
--- profiles/LFS/trunk/chapter06/bzip2.xml	2005-04-05 01:19:42 UTC (rev 1836)
+++ profiles/LFS/trunk/chapter06/bzip2.xml	2005-04-05 01:31:27 UTC (rev 1837)
@@ -27,6 +27,9 @@
         <param>clean</param>
       </make>
       <make />
+      <!--<make>
+	<param>test</param>
+      </make>-->
       <make>
         <param>install</param>
       </make>

Modified: profiles/LFS/trunk/chapter06/e2fsprogs.xml
===================================================================
--- profiles/LFS/trunk/chapter06/e2fsprogs.xml	2005-04-05 01:19:42 UTC (rev 1836)
+++ profiles/LFS/trunk/chapter06/e2fsprogs.xml	2005-04-05 01:31:27 UTC (rev 1837)
@@ -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/trunk/chapter06/hotplug.xml
===================================================================
--- profiles/LFS/trunk/chapter06/hotplug.xml	2005-04-05 01:19:42 UTC (rev 1836)
+++ profiles/LFS/trunk/chapter06/hotplug.xml	2005-04-05 01:31:27 UTC (rev 1837)
@@ -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" />




More information about the alfs-log mailing list