cvs commit: ALFS/profiles/BLFS/chapter11 fcron.xml mc.xml cpio.xml gpm.xml pciutils.xml unzip.xml

vdzuba at linuxfromscratch.org vdzuba at linuxfromscratch.org
Thu Nov 20 12:20:19 PST 2003


vdzuba      03/11/20 13:20:19

  Modified:    profiles/BLFS BLFS.xml packages.ent system.ent
               profiles/BLFS/chapter11 cpio.xml gpm.xml pciutils.xml
                        unzip.xml
  Added:       profiles/BLFS/chapter11 fcron.xml mc.xml
  Log:
  updated chapter 11
  
  Revision  Changes    Path
  1.9       +2 -1      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BLFS.xml	20 Nov 2003 19:13:02 -0000	1.8
  +++ BLFS.xml	20 Nov 2003 20:20:18 -0000	1.9
  @@ -144,7 +144,7 @@
   <stage name="Chapter 11 (system utilities)">
   
       &gpm;
  -    <!-- &fcron; -->
  +    &fcron;
       &hdparm;
       &which;
       &unzip;
  @@ -152,6 +152,7 @@
       &pciutils;
       &pkgconfig;
       &cpio;
  +    &mc;
   
   </stage>
   
  
  
  
  1.12      +24 -14    ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- packages.ent	20 Nov 2003 19:13:02 -0000	1.11
  +++ packages.ent	20 Nov 2003 20:20:18 -0000	1.12
  @@ -238,17 +238,16 @@
   <!ENTITY gpm-package   "gpm-1.20.1.tar.bz2">
   <!ENTITY gpm-directory "gpm-1.20.1">
   
  -<!ENTITY gpm-patch1    "gpm-1.20.1-smooth-cursor.patch">
  -<!ENTITY gpm-patch2    "gpm-1.20.1-segfault.patch">
  -<!ENTITY gpm-patch3    "gpm-1.20.1-silent.patch">
  -
  -<!ENTITY fcron-version   "">
  -<!ENTITY fcron-package   "">
  -<!ENTITY fcron-directory "">
  -
  -<!ENTITY hdparm-version   "5.3">
  -<!ENTITY hdparm-package   "hdparm-5.3.tar.gz">
  -<!ENTITY hdparm-directory "hdparm-5.3">
  +<!ENTITY gpm-patch1    "gpm-1.20.1-segfault.patch">
  +<!ENTITY gpm-patch2    "gpm-1.20.1-silent.patch">
  +
  +<!ENTITY fcron-version   "2.9.3">
  +<!ENTITY fcron-package   "fcron-2.9.3.src.tar.gz">
  +<!ENTITY fcron-directory "fcron-2.9.3">
  +
  +<!ENTITY hdparm-version   "5.4">
  +<!ENTITY hdparm-package   "hdparm-5.4.tar.gz">
  +<!ENTITY hdparm-directory "hdparm-5.4">
   
   <!ENTITY which-version   "2.14">
   <!ENTITY which-package   "which-2.14.tar.gz">
  @@ -258,6 +257,11 @@
   <!ENTITY unzip-package   "unzip550.tar.gz">
   <!ENTITY unzip-directory "unzip-5.50">
   
  +<!ENTITY unzip-patch1    "unzip-5.50-fix-Makefile.patch">
  +<!ENTITY unzip-patch2    "unzip-5.50-fix-libz.patch">
  +<!ENTITY unzip-patch3    "unzip-5.50-dotdot.patch">
  +<!ENTITY unzip-patch4    "unzip-5.50-dont-make-noise.patch">
  +
   <!ENTITY zip-version   "2.3">
   <!ENTITY zip-package   "zip23.tar.gz">
   <!ENTITY zip-directory "zip-2.3">
  @@ -274,11 +278,17 @@
   <!ENTITY cpio-package   "cpio-2.5.tar.gz">
   <!ENTITY cpio-directory "cpio-2.5">
   
  +<!ENTITY mc-version   "4.6.0">
  +<!ENTITY mc-package   "mc-4.6.0.tar.gz">
  +<!ENTITY mc-directory "mc-4.6.0">
  +
   <!--************* packages for chapter 12 *************-->
   
  -<!ENTITY python-version   "2.3">
  -<!ENTITY python-package   "Python-2.3.tgz">
  -<!ENTITY python-directory "Python-2.3">
  +<!ENTITY python-version   "2.3.2">
  +<!ENTITY python-package   "Python-2.3.2.tgz">
  +<!ENTITY python-directory "Python-2.3.2">
  +
  +<!ENTITY python-patch     "Python-2.3.2-gdbm-2.patch">
   
   <!ENTITY librep-version   "0.16.2">
   <!ENTITY librep-package   "librep-0.16.2.tar.gz">
  
  
  
  1.8       +2 -0      ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- system.ent	20 Nov 2003 19:13:02 -0000	1.7
  +++ system.ent	20 Nov 2003 20:20:18 -0000	1.8
  @@ -72,6 +72,7 @@
   
   <!-- chapter 11 -->
   <!ENTITY gpm        SYSTEM "./chapter11/gpm.xml">
  +<!ENTITY fcron      SYSTEM "./chapter11/fcron.xml">
   <!ENTITY hdparm     SYSTEM "./chapter11/hdparm.xml">
   <!ENTITY which      SYSTEM "./chapter11/which.xml">
   <!ENTITY unzip      SYSTEM "./chapter11/unzip.xml">
  @@ -80,6 +81,7 @@
   <!ENTITY pciutils   SYSTEM "./chapter11/pciutils.xml">
   <!ENTITY pkgconfig  SYSTEM "./chapter11/pkgconfig.xml">
   <!ENTITY cpio       SYSTEM "./chapter11/cpio.xml">
  +<!ENTITY mc         SYSTEM "./chapter11/mc.xml">
   
   <!-- chapter 12 -->
   <!ENTITY python     SYSTEM "./chapter12/python.xml">
  
  
  
  1.2       +1 -0      ALFS/profiles/BLFS/chapter11/cpio.xml
  
  Index: cpio.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/cpio.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cpio.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ cpio.xml	20 Nov 2003 20:20:18 -0000	1.2
  @@ -15,6 +15,7 @@
   		<configure>
   			<param>--prefix=/usr</param>
   			<param>--libexec=/usr/sbin</param>
  +			<param>--bindir=/bin</param>
   		</configure>
   
   		<make/>
  
  
  
  1.2       +5 -16     ALFS/profiles/BLFS/chapter11/gpm.xml
  
  Index: gpm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/gpm.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gpm.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ gpm.xml	20 Nov 2003 20:20:18 -0000	1.2
  @@ -15,24 +15,16 @@
   		        <source>&packages_dir;/&gpm-patch2;</source>
   		        <destination>&build_dir;</destination>
   		</copy>
  -
  -		<copy>
  -		        <source>&packages_dir;/&gpm-patch3;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
   		<stageinfo>
   			<base>&build_dir;/&gpm-directory;</base>
  -			<environment>
  -			        <variable name="LDFLAGS">-lm</variable>
  -			</environment>
   		</stageinfo>
   
   		<patch>
   			<param>-N</param>
  -			<param>-p0</param>
  +			<param>-p1</param>
   			<param>-i ../&gpm-patch1;</param>
   		</patch>
   
  @@ -42,13 +34,6 @@
   			<param>-i ../&gpm-patch2;</param>
   		</patch>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&gpm-patch3;</param>
  -		</patch>
  -
  -
   		<configure command="LDFLAGS='-lm' ./configure">
   			<param>--prefix=/usr</param>
   		</configure>
  @@ -58,6 +43,8 @@
   		<make>
   			<param>install</param>
   		</make>
  +
  +		<execute command="ldconfig -n -l /usr/lib/libgpm.so.1.19.0" />
   		
   		<textdump>
   		    <file>/etc/rc.d/init.d/gpm</file>
  @@ -174,6 +161,8 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&gpm-directory;</remove>
  +		<remove>&build_dir;/&gpm-patch1;</remove>
  +		<remove>&build_dir;/&gpm-patch2;</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +9 -1      ALFS/profiles/BLFS/chapter11/pciutils.xml
  
  Index: pciutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/pciutils.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pciutils.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ pciutils.xml	20 Nov 2003 20:20:18 -0000	1.2
  @@ -1,5 +1,10 @@
   <package name="pciutils" version="&pciutils-version;">
   
  +        <packageinfo>
  +                <requires><name>wget</name></requires>
  +                <!--requires><name>lynx</name></requires-->
  +	</packageinfo>
  +
   	<stage name="Unpacking a package.">
   		<unpack>
   			<archive>&packages_dir;/&pciutils-package;</archive>
  @@ -12,9 +17,12 @@
   			<base>&build_dir;/&pciutils-directory;</base>
   		</stageinfo>
   
  -		<make/>
  +		<make>
  +			<param>PREFIX=/usr</param>
  +		</make>
   
   		<make>
  +			<param>PREFIX=/usr</param>
   			<param>install</param>
   		</make>
   		
  
  
  
  1.2       +59 -2     ALFS/profiles/BLFS/chapter11/unzip.xml
  
  Index: unzip.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/unzip.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- unzip.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ unzip.xml	20 Nov 2003 20:20:18 -0000	1.2
  @@ -5,6 +5,26 @@
   			<archive>&packages_dir;/&unzip-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  +
  +		<copy>
  +		        <source>&packages_dir;/&unzip-patch1;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
  +
  +		<copy>
  +		        <source>&packages_dir;/&unzip-patch2;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
  +
  +		<copy>
  +		        <source>&packages_dir;/&unzip-patch3;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
  +
  +		<copy>
  +		        <source>&packages_dir;/&unzip-patch4;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -12,6 +32,30 @@
   			<base>&build_dir;/&unzip-directory;</base>
   		</stageinfo>
   
  +		<patch>
  +		        <param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&unzip-patch1;</param>
  +		</patch>
  +
  +		<patch>
  +		        <param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&unzip-patch2;</param>
  +		</patch>
  +
  +		<patch>
  +		        <param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&unzip-patch3;</param>
  +		</patch>
  +
  +		<patch>
  +		        <param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&unzip-patch4;</param>
  +		</patch>
  +
   		<copy>
   			<source>unix/Makefile</source>
   			<destination>.</destination>
  @@ -24,14 +68,27 @@
   
   		<make>
   		        <param>prefix=/usr</param>
  -		        <param>linux</param>
  +		        <param>linux_shlibz</param>
  +		</make>
  +
  +		<make>
  +		        <param>prefix=/usr</param>
   			<param>install</param>
   		</make>
  -		
  +
  +		<copy>
  +		        <option>archive</option>
  +			<source>libunzip.so*</source>
  +			<destination>/usr/lib</destination>
  +		</copy>
   	</stage>
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&unzip-directory;</remove>
  +		<remove>&build_dir;/&unzip-patch1;</remove>
  +		<remove>&build_dir;/&unzip-patch2;</remove>
  +		<remove>&build_dir;/&unzip-patch3;</remove>
  +		<remove>&build_dir;/&unzip-patch4;</remove>
   	</stage>
   
   </package>
  
  
  
  1.1                  ALFS/profiles/BLFS/chapter11/fcron.xml
  
  Index: fcron.xml
  ===================================================================
  <package name="fcron" version="&fcron-version;">
  
          <packageinfo>
                  <utilizes><name>sendmail</name></utilizes>
                  <utilizes><name>postfix</name></utilizes>
                  <utilizes><name>qmail</name></utilizes>
                  <utilizes><name>exim</name></utilizes>
                  <utilizes><name>courier</name></utilizes>
                  <utilizes><name>linuxpam</name></utilizes>
                  <utilizes><name>openjade</name></utilizes>
                  <utilizes><name>docbook-dsssl</name></utilizes>
          </packageinfo>
  
  
  	<stage name="Unpacking a package.">
  		<unpack>
  			<archive>&packages_dir;/&fcron-package;</archive>
  			<destination>&build_dir;</destination>
  		</unpack>
  	</stage>
  
  	<stage name="Installing a package.">
  		<stageinfo>
  			<base>&build_dir;/&fcron-directory;</base>
  		</stageinfo>
  
  		<textdump>
  		    <file>/etc/syslog.conf</file>
  		    <content>
  		    =# Begin fcron addition to /etc/syslog.conf
  		    =
  		    =cron.* -/var/log/cron.log
  		    =
  		    =# End fcron addition
  		    </content>
  		</textdump>
  
  		<execute command="/etc/rc.d/init.d/sysklogd reload" />
  
  		<execute command="id -u fcron &> /dev/null || groupadd fcron" />
  		<execute command="id -u fcron &> /dev/null || useradd -c fcron -d /dev/null -g fcron fcron" />
  
  		<configure>
  			<param>--without-sendmail</param>
  			<param>--with-answer-all=no</param>
  		</configure>
  
  		<make />
  
  		<make>
  			<param>install</param>
  		</make>
  
  		<execute command="ldconfig -n -l /usr/lib/libfcron.so.1.19.0" />
  		
  		<textdump>
  		    <file>/etc/rc.d/init.d/fcron</file>
  		    <content>
  		    =#!/bin/sh
  		    =# Begin $rc_base/init.d/fcron
  		    =
  		    =# Based on sysklogd script from LFS-3.1 and earlier.
  		    =# Rewritten by Gerard Beekmans  - gerard at linuxfromscratch.org
  		    =
  		    =source /etc/sysconfig/rc
  		    =source $rc_functions
  		    =
  		    =case "$1" in
  		    =        start)
  		    =                echo "Starting fcron..."
  		    =                loadproc fcron
  		    =                ;;
  		    =
  		    =        stop)
  		    =                echo "Stopping fcron..."
  		    =                killproc fcron
  		    =                ;;
  		    =
  		    =        restart)
  		    =                $0 stop
  		    =                sleep 1
  		    =                $0 start
  		    =                ;;
  		    =
  		    =        status)
  		    =                statusproc fcron
  		    =                ;;
  		    =
  		    =        *)
  		    =                echo "Usage: $0 {start|stop|restart|status}"
  		    =                exit 1
  		    =                ;;
  		    =esac
  		    =
  		    =# End $rc_base/init.d/fcron
  		    </content>
  		</textdump>
  		<permissions mode="755">
  		    <name>/etc/rc.d/init.d/fcron</name>
  		</permissions>
  
  		<link base="/etc/rc.d/init.d">
  		    <option>force</option>
  		    <target>../init.d/fcron</target>
  		    <name>../rc0.d/K08fcron</name>
  		</link>
  
  		<link base="/etc/rc.d/init.d">
  		    <option>force</option>
  		    <target>../init.d/fcron</target>
  		    <name>../rc2.d/S40fcron</name>
  		</link>
  
  		<link base="/etc/rc.d/init.d">
  		    <option>force</option>
  		    <target>../init.d/fcron</target>
  		    <name>../rc3.d/S40fcron</name>
  		</link>
  
  		<link base="/etc/rc.d/init.d">
  		    <option>force</option>
  		    <target>../init.d/fcron</target>
  		    <name>../rc4.d/S40fcron</name>
  		</link>
  
  		<link base="/etc/rc.d/init.d">
  		    <option>force</option>
  		    <target>../init.d/fcron</target>
  		    <name>../rc5.d/S40fcron</name>
  		</link>
  
  		<link base="/etc/rc.d/init.d">
  		    <option>force</option>
  		    <target>../init.d/fcron</target>
  		    <name>../rc6.d/K08fcron</name>
  		</link>
  	</stage>
  
  	<stage name="Clean-up.">
  		<remove>&build_dir;/&fcron-directory;</remove>
  	</stage>
  
  </package>
  
  
  
  1.1                  ALFS/profiles/BLFS/chapter11/mc.xml
  
  Index: mc.xml
  ===================================================================
  <package name="mc" version="&mc-version;">
  
          <packageinfo>
                  <requires><name>glib2</name></requires>
                  <utilizes><name>xfree86</name></utilizes>
                  <utilizes><name>samba</name></utilizes>
                  <utilizes><name>slang</name></utilizes>
                  <utilizes><name>zip</name></utilizes>
                  <utilizes><name>unzip</name></utilizes>
  	</packageinfo>
  
  	<stage name="Unpacking a package.">
  		<unpack>
  			<archive>&packages_dir;/&mc-package;</archive>
  			<destination>&build_dir;</destination>
  		</unpack>
  	</stage>
  
  	<stage name="Installing a package.">
  		<stageinfo>
  			<base>&build_dir;/&mc-directory;</base>
  		</stageinfo>
  
  		<configure>
  			<param>--prefix=/usr</param>
  		</configure>
  
  		<make/>
  
  		<make>
  			<param>install</param>
  		</make>
  		
  	</stage>
  
  	<stage name="Clean-up.">
  		<remove>&build_dir;/&mc-directory;</remove>
  	</stage>
  
  </package>
  
  
  



More information about the alfs-log mailing list