r1941 - in profiles/LFS/trunk: chapter05 chapter06 config scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Jul 14 12:25:28 PDT 2005


Author: thomasp
Date: 2005-07-14 13:25:27 -0600 (Thu, 14 Jul 2005)
New Revision: 1941

Modified:
   profiles/LFS/trunk/chapter05/expect.xml
   profiles/LFS/trunk/chapter06/basic-dev.xml
   profiles/LFS/trunk/chapter06/gzip.xml
   profiles/LFS/trunk/chapter06/kernfs.xml
   profiles/LFS/trunk/config/package.ent
   profiles/LFS/trunk/scripts/required.packages.urls
Log:
merged missing changes from 6.1 branch

Modified: profiles/LFS/trunk/chapter05/expect.xml
===================================================================
--- profiles/LFS/trunk/chapter05/expect.xml	2005-07-14 19:15:51 UTC (rev 1940)
+++ profiles/LFS/trunk/chapter05/expect.xml	2005-07-14 19:25:27 UTC (rev 1941)
@@ -28,6 +28,7 @@
       <configure>
         <param>--prefix=/tools</param>
         <param>--with-tcl=/tools/lib</param>
+	<param>--with-tclinclude=&build_dir;/&tcl-directory;</param>
         <param>--with-x=no</param>
       </configure>
       <make />

Modified: profiles/LFS/trunk/chapter06/basic-dev.xml
===================================================================
--- profiles/LFS/trunk/chapter06/basic-dev.xml	2005-07-14 19:15:51 UTC (rev 1940)
+++ profiles/LFS/trunk/chapter06/basic-dev.xml	2005-07-14 19:25:27 UTC (rev 1941)
@@ -18,7 +18,7 @@
     <stage name="Mounting ramfs and Populating /dev">
       <execute command="mount">
         <param>-n</param>
-        <param>-t ramfs</param>
+        <param>-t tmpfs</param>
         <param>none</param>
         <param>/dev</param>
       </execute>

Modified: profiles/LFS/trunk/chapter06/gzip.xml
===================================================================
--- profiles/LFS/trunk/chapter06/gzip.xml	2005-07-14 19:15:51 UTC (rev 1940)
+++ profiles/LFS/trunk/chapter06/gzip.xml	2005-07-14 19:25:27 UTC (rev 1941)
@@ -57,6 +57,11 @@
       </link>
       <link>
         <option>force</option>
+        <target>gzip</target>
+        <name>/bin/compress</name>
+      </link>
+      <link>
+        <option>force</option>
         <target>gunzip</target>
         <name>/bin/uncompress</name>
       </link>

Modified: profiles/LFS/trunk/chapter06/kernfs.xml
===================================================================
--- profiles/LFS/trunk/chapter06/kernfs.xml	2005-07-14 19:15:51 UTC (rev 1940)
+++ profiles/LFS/trunk/chapter06/kernfs.xml	2005-07-14 19:25:27 UTC (rev 1941)
@@ -24,8 +24,8 @@
     </execute>
     <execute command="mount">
       <param>-f</param>
-      <param>-t ramfs</param>
-      <param>ramfs</param>
+      <param>-t tmpfs</param>
+      <param>tmpfs</param>
       <param>&LFS;/dev</param>
     </execute>
     <execute command="mount">

Modified: profiles/LFS/trunk/config/package.ent
===================================================================
--- profiles/LFS/trunk/config/package.ent	2005-07-14 19:15:51 UTC (rev 1940)
+++ profiles/LFS/trunk/config/package.ent	2005-07-14 19:25:27 UTC (rev 1941)
@@ -226,7 +226,7 @@
 <!ENTITY mktemp-package "mktemp-&mktemp-version;.tar.bz2">
 <!ENTITY mktemp-directory "mktemp-&mktemp-version;">
 
-<!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-1.patch">
+<!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-2.patch">
 
 <!ENTITY module-init-tools-md5 "8ddecbcf0e56aef8617f67a3906faf3e">
 <!ENTITY module-init-tools-version "3.1">

Modified: profiles/LFS/trunk/scripts/required.packages.urls
===================================================================
--- profiles/LFS/trunk/scripts/required.packages.urls	2005-07-14 19:15:51 UTC (rev 1940)
+++ profiles/LFS/trunk/scripts/required.packages.urls	2005-07-14 19:25:27 UTC (rev 1941)
@@ -74,7 +74,7 @@
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/gzip-1.3.5-security_fixes-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/mktemp-1.5-add_tempfile-1.patch
+http://www.linuxfromscratch.org/patches/lfs/svn/trunk/mktemp-1.5-add_tempfile-2.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/perl-5.8.7-libc-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/readline-5.0-fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/sysklogd-1.4.1-fixes-1.patch




More information about the alfs-log mailing list