cvs commit: ALFS/profiles/LFS/chapter06 lfs-utils.xml zlib.xml

jamie at linuxfromscratch.org jamie at linuxfromscratch.org
Sat Dec 20 13:17:41 PST 2003


jamie       03/12/20 14:17:41

  Modified:    profiles/LFS package.ent
               profiles/LFS/chapter06 lfs-utils.xml zlib.xml
  Log:
  Upgraded to Lfs-Utils-0.4.2.
  Upgraded to Tcl-8.4.5.
  Upgraded to Zlib-1.2.1. Obsoletes the Zlib Vsnprintf patch. Added chmod command to fix static library permissions. Closes Bug 728.
  
  Revision  Changes    Path
  1.6       +7 -10     ALFS/profiles/LFS/package.ent
  
  Index: package.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/package.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- package.ent	16 Dec 2003 01:26:49 -0000	1.5
  +++ package.ent	20 Dec 2003 21:17:41 -0000	1.6
  @@ -193,8 +193,8 @@
   <!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
   <!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
   
  -<!ENTITY lfs-utils-md5 "0ce407ff714c7262f556bd7d850d6c06">
  -<!ENTITY lfs-utils-version "0.3">
  +<!ENTITY lfs-utils-md5 "2ff5b542a1d3ab7cd7da22d6fe93e113">
  +<!ENTITY lfs-utils-version "0.4.2">
   <!ENTITY lfs-utils-package "lfs-utils-&lfs-utils-version;.tar.bz2">
   <!ENTITY lfs-utils-directory "lfs-utils-&lfs-utils-version;">
   
  @@ -320,8 +320,8 @@
   <!ENTITY tar-package "tar-&tar-version;.tar.gz">
   <!ENTITY tar-directory "tar-&tar-version;">
   
  -<!ENTITY tcl-md5 "e503db5f1d762c2a3bbe7cb02c630659">
  -<!ENTITY tcl-version "8.4.4">
  +<!ENTITY tcl-md5 "3fb354dba28166a1004f9103553a3974">
  +<!ENTITY tcl-version "8.4.5">
   <!ENTITY tcl-package "tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-directory "tcl&tcl-version;">
   
  @@ -340,10 +340,7 @@
   <!ENTITY vim-package "vim-&vim-version;.tar.bz2">
   <!ENTITY vim-directory "vim62">
   
  -<!ENTITY zlib-md5 "ea16358be41384870acbdc372f9db152">
  -<!ENTITY zlib-version "1.1.4">
  +<!ENTITY zlib-md5 "8106069990476a3c5187301465bd7a60">
  +<!ENTITY zlib-version "1.2.1">
   <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
  -<!ENTITY zlib-directory "zlib-&zlib-version;">
  -
  -<!ENTITY zlib-vsnprintf-patch-md5 "b617c580e5d099844215ca5829da9de0">
  -<!ENTITY zlib-vsnprintf-patch "zlib-&zlib-version;-vsnprintf.patch">
  +<!ENTITY zlib-directory "zlib-&zlib-version;">
  \ No newline at end of file
  
  
  
  1.3       +5 -0      ALFS/profiles/LFS/chapter06/lfs-utils.xml
  
  Index: lfs-utils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/lfs-utils.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- lfs-utils.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ lfs-utils.xml	20 Dec 2003 21:17:41 -0000	1.3
  @@ -12,6 +12,11 @@
   			<base>&build_dir;/&lfs-utils-directory;</base>
   		</stageinfo>
   
  +		<configure>
  +			<param>--prefix=/usr</param>
  +			<param>--with-libc</param>
  +		</configure>
  +
   		<make />
   
   		<make>
  
  
  
  1.4       +11 -18    ALFS/profiles/LFS/chapter06/zlib.xml
  
  Index: zlib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/zlib.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- zlib.xml	9 Dec 2003 17:21:55 -0000	1.3
  +++ zlib.xml	20 Dec 2003 21:17:41 -0000	1.4
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&zlib-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&zlib-vsnprintf-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -17,12 +12,6 @@
   			<base>&build_dir;/&zlib-directory;</base>
   		</stageinfo>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&zlib-vsnprintf-patch;</param>
  -		</patch>
  -
   		<configure>
   			<param>--prefix=/usr</param>
   			<param>--shared</param>
  @@ -30,6 +19,12 @@
   
   		<make />
   
  +<!--
  +		<make>
  +			<param>check</param>
  +		</make>
  +-->
  +
   		<make>
   			<param>install</param>
   		</make>
  @@ -46,7 +41,7 @@
   
   <!--
   		<make>
  -			<param>test</param>
  +			<param>check</param>
   		</make>
   -->
   
  @@ -54,6 +49,10 @@
   			<param>install</param>
   		</make>
   
  +		<permissions mode="644">
  +			<name>/usr/lib/libz.a</name>
  +		 </permissions>
  +
   		<move>
   			<source>/usr/lib/libz.so.*</source>
   			<destination>/lib</destination>
  @@ -64,15 +63,9 @@
   			<target>../../lib/libz.so.1</target>
   			<name>/usr/lib/libz.so</name>
   		</link>
  -
  -		<copy>
  -			<source>zlib.3</source>
  -			<destination>/usr/share/man/man3</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&zlib-directory;</remove>
  -		<remove>&build_dir;/&zlib-vsnprintf-patch;</remove>
   	</stage>
   </package>
  
  
  



More information about the alfs-log mailing list