r1707 - in profiles/LFS/branches/testing: chapter06 config scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Feb 6 10:59:04 PST 2005


Author: thomasp
Date: 2005-02-06 11:59:03 -0700 (Sun, 06 Feb 2005)
New Revision: 1707

Modified:
   profiles/LFS/branches/testing/chapter06/hotplug.xml
   profiles/LFS/branches/testing/chapter06/shadow.xml
   profiles/LFS/branches/testing/config/general.ent
   profiles/LFS/branches/testing/config/package.ent
   profiles/LFS/branches/testing/scripts/wget.lfs.urls
Log:
update to r4617, procps-3.2.5, sed-4.1.4, shadow-4.0.7 (plus change to install to /lib), and util-linux-2.12q, also added copying of hotplug's pnp.distmap file

Modified: profiles/LFS/branches/testing/chapter06/hotplug.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/hotplug.xml	2005-02-06 16:13:15 UTC (rev 1706)
+++ profiles/LFS/branches/testing/chapter06/hotplug.xml	2005-02-06 18:59:03 UTC (rev 1707)
@@ -27,6 +27,11 @@
 			<param>install</param>
 		</make>
 
+		<copy>
+			<source>etc/hotplug/pnp.distmap</source>
+			<destination>/etc/hotplug</source>
+		</copy>
+
 		<remove>/etc/init.d</remove>
 		<remove>/etc/hotplug/net.agent</remove>
 

Modified: profiles/LFS/branches/testing/chapter06/shadow.xml
===================================================================
--- profiles/LFS/branches/testing/chapter06/shadow.xml	2005-02-06 16:13:15 UTC (rev 1706)
+++ profiles/LFS/branches/testing/chapter06/shadow.xml	2005-02-06 18:59:03 UTC (rev 1707)
@@ -24,10 +24,26 @@
 		</stageinfo>
 
 		<configure>
-			<param>--libdir=/usr/lib</param>
+			<param>--libdir=/lib</param>
 			<param>--enable-shared</param>
 		</configure>
 
+		<search_replace>
+			<file>src/Makefile</file>
+			<find>groups$(EXEEXT) </find>
+			<replace></replace>
+		</search_replace>
+
+		<!--
+		  Note: the next step uses sed, because the matching
+		  lines need to be removed from the file.
+		-->
+		<execute command="sed">
+			<param>-i</param>
+			<param>-e '/groups/d'</param>
+			<param>man/Makefile</param>
+		</execute>
+
 		<make />
 
 		<make>
@@ -62,11 +78,13 @@
 			<destination>/bin</destination>
 		</move>
 
-		<move base="/usr/lib">
-			<source>libshadow.so.0*</source>
-			<destination>/lib</destination>
+		<move>
+			<source>/lib/libshadow.*a</source>
+			<destination>/usr/lib</destination>
 		</move>
 
+		<remove>/lib/libshadow.so</remove>
+
 		<link>
 			<option>force</option>
 			<target>../../lib/libshadow.so.0</target>
@@ -76,8 +94,6 @@
 		<mkdir>
 			<name>/etc/default</name>
 		</mkdir>
-
-		<remove>/bin/groups</remove>
 	</stage>
 
 	<stage name="Configuring">

Modified: profiles/LFS/branches/testing/config/general.ent
===================================================================
--- profiles/LFS/branches/testing/config/general.ent	2005-02-06 16:13:15 UTC (rev 1706)
+++ profiles/LFS/branches/testing/config/general.ent	2005-02-06 18:59:03 UTC (rev 1707)
@@ -26,7 +26,7 @@
                  enter the wrong directory, nALFS will try to download
                  all the packages in it !!!
      -->
-<!ENTITY orig_packages_dir "/home/tomp/tempsrc-testing">
+<!ENTITY orig_packages_dir "/your/LFS-testing/packages">
 
 <!-- Partition of your new LFS system.
      This entity is used only to initialize the new fstab file.
@@ -121,7 +121,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "6.1-testing-4532">
+<!ENTITY LFS-version "6.1-testing-4617">
 
 <!-- THE FOLLOWING TWO ENTITIES DECLARATIONS SHOULDN'T BE MOFIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/testing/config/package.ent
===================================================================
--- profiles/LFS/branches/testing/config/package.ent	2005-02-06 16:13:15 UTC (rev 1706)
+++ profiles/LFS/branches/testing/config/package.ent	2005-02-06 18:59:03 UTC (rev 1707)
@@ -277,8 +277,8 @@
 <!ENTITY perl-libc-1-patch-md5 "f033161efa8b4b174ec6667e4e739efa">
 <!ENTITY perl-libc-1-patch "perl-&perl-version;-libc-1.patch">
 
-<!ENTITY procps-md5 "213e7783317c672afccfecda7b81528c">
-<!ENTITY procps-version "3.2.4">
+<!ENTITY procps-md5 "4a6faa1ca606546f16504f27a895c98f">
+<!ENTITY procps-version "3.2.5">
 <!ENTITY procps-package "procps-&procps-version;.tar.bz2">
 <!ENTITY procps-directory "procps-&procps-version;">
 
@@ -295,13 +295,13 @@
 <!ENTITY readline-display-wrap-patch-md5 "5280d7b859bb8d80e7b8ca709f137970">
 <!ENTITY readline-display-wrap-patch "readline-&readline-version;-display_wrap-1.patch">
 
-<!ENTITY sed-md5 "537f96fa633ed949b0bf1dc9d1c678b4">
-<!ENTITY sed-version "4.1.2">
+<!ENTITY sed-md5 "356901f3b2a9ae87b3926074847800e9">
+<!ENTITY sed-version "4.1.4">
 <!ENTITY sed-package "sed-&sed-version;.tar.bz2">
 <!ENTITY sed-directory "sed-&sed-version;">
 
-<!ENTITY shadow-md5 "3ca79b02c0aaa82128f4c32cb68ffe4f">
-<!ENTITY shadow-version "4.0.6">
+<!ENTITY shadow-md5 "89ebec0d1c0d861a5bd5c4c63e5cb0cc">
+<!ENTITY shadow-version "4.0.7">
 <!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-directory "shadow-&shadow-version;">
 
@@ -346,8 +346,8 @@
 <!ENTITY udev-permissions-version "2">
 <!ENTITY udev-permissions-file "udev-config-&udev-permissions-version;.permissions">
 
-<!ENTITY util-linux-md5 "1bdf2ce5e3fd65fbbe87d67b4f3852e7">
-<!ENTITY util-linux-version "2.12p">
+<!ENTITY util-linux-md5 "54320aa1abbce00c0dc030e2c3afe5d7">
+<!ENTITY util-linux-version "2.12q">
 <!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-directory "util-linux-&util-linux-version;">
 

Modified: profiles/LFS/branches/testing/scripts/wget.lfs.urls
===================================================================
--- profiles/LFS/branches/testing/scripts/wget.lfs.urls	2005-02-06 16:13:15 UTC (rev 1706)
+++ profiles/LFS/branches/testing/scripts/wget.lfs.urls	2005-02-06 18:59:03 UTC (rev 1707)
@@ -43,18 +43,18 @@
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/ncurses/ncurses-5.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/patch/patch-2.5.4.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/perl/perl-5.8.6.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/procps/procps-3.2.4.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/procps/procps-3.2.5.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/psmisc/psmisc-21.5.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.2.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/shadow/shadow-4.0.6.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/syslog-ng/syslog-ng-1.6.5.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
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/tcl/tcl8.4.9-src.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/texinfo/texinfo-4.8.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/udev/udev-050.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/util-linux/util-linux-2.12p.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/util-linux/util-linux-2.12q.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/vim/vim-6.3.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/vim/vim-6.3-lang.tar.bz2
 ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/zlib/zlib-1.2.2.tar.bz2
@@ -77,7 +77,7 @@
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/mktemp-1.5-add_tempfile-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/perl-5.8.6-libc-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/readline-5.0-display_wrap-1.patch
-http://www.linuxfromscratch.org/patches/lfs/cvs/testing/util-linux-2.12p-cramfs-1.patch
+http://www.linuxfromscratch.org/patches/lfs/cvs/testing/util-linux-2.12q-cramfs-1.patch
 http://www.linuxfromscratch.org/patches/lfs/cvs/testing/vim-6.3-security_fix-1.patch
 
 




More information about the alfs-log mailing list