r1920 - in profiles/LFS/branches/6.1: chapter05 chapter06 config scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Jun 23 12:00:22 PDT 2005


Author: thomasp
Date: 2005-06-23 13:00:21 -0600 (Thu, 23 Jun 2005)
New Revision: 1920

Modified:
   profiles/LFS/branches/6.1/chapter05/binutils-pass2.xml
   profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml
   profiles/LFS/branches/6.1/chapter05/grep.xml
   profiles/LFS/branches/6.1/chapter06/grep.xml
   profiles/LFS/branches/6.1/chapter06/module-init-tools.xml
   profiles/LFS/branches/6.1/chapter06/shadow.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
Log:
Update to r6111:
* Package upgrades
 - findutils-4.2.23
 - linux-2.6.11.12
 - shadow-4.0.9

* Merged other changes from r1919


Modified: profiles/LFS/branches/6.1/chapter05/binutils-pass2.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/binutils-pass2.xml	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/chapter05/binutils-pass2.xml	2005-06-23 19:00:21 UTC (rev 1920)
@@ -30,6 +30,7 @@
       </stageinfo>
       <configure command="../&binutils-directory;/configure">
         <param>--prefix=/tools</param>
+	<param>--disable-nls</param>
         <param>--enable-shared</param>
         <param>--with-lib-path=/tools/lib</param>
       </configure>

Modified: profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/chapter05/creatingtoolsdir.xml	2005-06-23 19:00:21 UTC (rev 1920)
@@ -121,7 +121,6 @@
         <source>&readline-fixes-patch;</source>
         <source>&sed-package;</source>
         <source>&shadow-package;</source>
-	<source>&shadow-lastlog-patch;</source>
         <source>&sysklogd-package;</source>
         <source>&sysklogd-fixes-patch;</source>		
         <source>&sysvinit-package;</source>

Modified: profiles/LFS/branches/6.1/chapter05/grep.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter05/grep.xml	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/chapter05/grep.xml	2005-06-23 19:00:21 UTC (rev 1920)
@@ -23,7 +23,6 @@
       <configure>
         <param>--prefix=/tools</param>
         <param>--disable-perl-regexp</param>
-        <param>--with-included-regex</param>
       </configure>
       <make>
         <param>&jlevel;</param>

Modified: profiles/LFS/branches/6.1/chapter06/grep.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/grep.xml	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/chapter06/grep.xml	2005-06-23 19:00:21 UTC (rev 1920)
@@ -23,7 +23,6 @@
       <configure>
         <param>--prefix=/usr</param>
         <param>--bindir=/bin</param>
-        <param>--with-included-regex</param>
       </configure>
       <make>
         <param>&jlevel;</param>

Modified: profiles/LFS/branches/6.1/chapter06/module-init-tools.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/module-init-tools.xml	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/chapter06/module-init-tools.xml	2005-06-23 19:00:21 UTC (rev 1920)
@@ -20,13 +20,13 @@
       <stageinfo>
         <base>&build_dir;/&module-init-tools-directory;</base>
       </stageinfo>
+      <execute command="touch modprobe.conf.5" />
       <configure>
         <param>--prefix=""</param>
         <param>--enable-zlib</param>
       </configure>
       <make>
         <param>&jlevel;</param>
-        <param>DOCBOOKTOMAN=""</param>
       </make>
       <make>
         <param>check</param>

Modified: profiles/LFS/branches/6.1/chapter06/shadow.xml
===================================================================
--- profiles/LFS/branches/6.1/chapter06/shadow.xml	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/chapter06/shadow.xml	2005-06-23 19:00:21 UTC (rev 1920)
@@ -20,11 +20,6 @@
       <stageinfo>
         <base>&build_dir;/&shadow-directory;</base>
       </stageinfo>
-      <patch>
-	<param>-N</param>
-	<param>-p1</param>
-	<param>-i &packages_dir;/&shadow-lastlog-patch;</param>
-      </patch>
       <configure>
         <param>--libdir=/lib</param>
         <param>--enable-shared</param>

Modified: profiles/LFS/branches/6.1/config/general.ent
===================================================================
--- profiles/LFS/branches/6.1/config/general.ent	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/config/general.ent	2005-06-23 19:00:21 UTC (rev 1920)
@@ -67,7 +67,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "6.1-testing-5384">
+<!ENTITY LFS-version "6.1-testing-6111">
 
 <!-- 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-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/config/package.ent	2005-06-23 19:00:21 UTC (rev 1920)
@@ -66,8 +66,8 @@
 <!ENTITY file-package "file-&file-version;.tar.bz2">
 <!ENTITY file-directory "file-&file-version;">
 
-<!ENTITY findutils-md5 "eef3ce5851f48527792f1f7ed77d0a3a">
-<!ENTITY findutils-version "4.2.20">
+<!ENTITY findutils-md5 "">
+<!ENTITY findutils-version "4.2.23">
 <!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
 <!ENTITY findutils-directory "findutils-&findutils-version;">
 
@@ -76,7 +76,7 @@
 <!ENTITY flex-package "flex-&flex-version;.tar.bz2">
 <!ENTITY flex-directory "flex-&flex-version;">
 
-<!ENTITY flex-debian-fixes-patch "flex-&flex-version;-debian_fixes-2.patch">
+<!ENTITY flex-debian-fixes-patch "flex-&flex-version;-debian_fixes-3.patch">
 
 <!ENTITY gawk-md5 "b8b532beaf02350e69d2d5dc98cb1e37">
 <!ENTITY gawk-version "3.1.4">
@@ -192,8 +192,8 @@
 <!ENTITY libxml2-package "libxml2-&libxml2-version;.tar.bz2">
 <!ENTITY libxml2-directory "libxml2-&libxml2-version;">
 
-<!ENTITY linux-md5 "6a66a372a1f8395f241f248f5fe8222a">
-<!ENTITY linux-version "2.6.11.10">
+<!ENTITY linux-md5 "7e3b6e630bb05c1a8c1ba46e010dbe44">
+<!ENTITY linux-version "2.6.11.12">
 <!ENTITY linux-package "linux-&linux-version;.tar.bz2">
 <!ENTITY linux-directory "linux-&linux-version;">
 <!ENTITY linux-src-location "/usr/src">
@@ -279,13 +279,11 @@
 <!ENTITY sed-package "sed-&sed-version;.tar.bz2">
 <!ENTITY sed-directory "sed-&sed-version;">
 
-<!ENTITY shadow-md5 "89ebec0d1c0d861a5bd5c4c63e5cb0cc">
-<!ENTITY shadow-version "4.0.7">
+<!ENTITY shadow-md5 "66e3a3a60ea6b021a7babff311b07607">
+<!ENTITY shadow-version "4.0.9">
 <!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-directory "shadow-&shadow-version;">
 
-<!ENTITY shadow-lastlog-patch "shadow-&shadow-version;-fix_lastlog-1.patch">
-
 <!ENTITY sysklogd-md5 "f587720988bc1670071f31d3694ca0fb">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">

Modified: profiles/LFS/branches/6.1/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/branches/6.1/scripts/wget.lfs.urls	2005-06-23 18:32:51 UTC (rev 1919)
+++ profiles/LFS/branches/6.1/scripts/wget.lfs.urls	2005-06-23 19:00:21 UTC (rev 1920)
@@ -10,7 +10,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/e2fsprogs/e2fsprogs-1.37.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/expect/expect-5.43.0.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/file/file-4.13.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.2.20.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.2.23.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/flex/flex-2.5.31.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gawk/gawk-3.1.4.tar.bz2
 ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.3/gcc-3.4.3.tar.bz2
@@ -32,7 +32,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/less/less-382.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/lfs-bootscripts/lfs-bootscripts-3.2.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libtool/libtool-1.5.14.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.11.10.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.11.12.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux-libc-headers/linux-libc-headers-2.6.11.2.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/m4/m4-1.4.3.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/make/make-3.80.tar.bz2
@@ -47,7 +47,7 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/psmisc/psmisc-21.6.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/readline/readline-5.0.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sed/sed-4.1.4.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/shadow/shadow-4.0.7.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/shadow/shadow-4.0.9.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sysklogd/sysklogd-1.4.1.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/sysvinit/sysvinit-2.86.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tar/tar-1.15.1.tar.bz2
@@ -78,7 +78,6 @@
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/mktemp-1.5-add_tempfile-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/perl-5.8.6-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/shadow-4.0.7-fix_lastlog-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/sysklogd-1.4.1-fixes-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/tar-1.15.1-sparse_fix-1.patch
 http://www.linuxfromscratch.org/patches/lfs/svn/trunk/util-linux-2.12q-cramfs-1.patch




More information about the alfs-log mailing list