cvs commit: ALFS/profiles/LFS/chapter06 coreutils.xml ed.xml findutils.xml gawk.xml glibc.xml ncurses.xml shadow.xml tar.xml util-linux.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Dec 15 17:26:50 PST 2003


thomasp     03/12/15 18:26:50

  Modified:    profiles/LFS package.ent
               profiles/LFS/chapter05 ncurses.xml
               profiles/LFS/chapter06 coreutils.xml ed.xml findutils.xml
                        gawk.xml glibc.xml ncurses.xml shadow.xml tar.xml
                        util-linux.xml
  Log:
  streamlined build commands of ed, stopped installing kill from coreutils and util-linux, now /etc/default is created during install of shadow, stopped moving (dir,dircolors,du,mkfifo,shred,vdir) from coreutils to /bin, adjusted libexecdir on (glibc,findutils,gawk and tar) and removed unnecessary vsscanf patch from ncurses.
  
  Revision  Changes    Path
  1.5       +0 -3      ALFS/profiles/LFS/package.ent
  
  Index: package.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/package.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- package.ent	14 Dec 2003 23:31:01 -0000	1.4
  +++ package.ent	16 Dec 2003 01:26:49 -0000	1.5
  @@ -256,9 +256,6 @@
   <!ENTITY ncurses-etip-patch-md5 "f23e4804d186bf184b9829770f6b63cc">
   <!ENTITY ncurses-etip-patch "ncurses-&ncurses-version;-etip-2.patch">
   
  -<!ENTITY ncurses-vsscanf-patch-md5 "d0755e0b1d0d5e3e454c38f1316b08e1">
  -<!ENTITY ncurses-vsscanf-patch "ncurses-&ncurses-version;-vsscanf.patch">
  -
   <!ENTITY net-tools-md5 "888774accab40217dde927e21979c165">
   <!ENTITY net-tools-version "1.60">
   <!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
  
  
  
  1.4       +1 -9      ALFS/profiles/LFS/chapter05/ncurses.xml
  
  Index: ncurses.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/ncurses.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ncurses.xml	9 Dec 2003 17:01:41 -0000	1.3
  +++ ncurses.xml	16 Dec 2003 01:26:49 -0000	1.4
  @@ -8,7 +8,6 @@
   
   		<copy>
   			<source>&packages_dir;/&ncurses-etip-patch;</source>
  -			<source>&packages_dir;/&ncurses-vsscanf-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
   	</stage>
  @@ -24,13 +23,7 @@
                           <param>-i ../&ncurses-etip-patch;</param>
                   </patch>
   
  -                <patch>
  -                        <param>-N</param>
  -                        <param>-p1</param>
  -                        <param>-i ../&ncurses-vsscanf-patch;</param>
  -                </patch>
  -
  -		<configure>
  +                <configure>
   			<param>--prefix=/tools</param>
   			<param>--with-shared</param>
   			<param>--without-debug</param>
  @@ -48,6 +41,5 @@
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&ncurses-directory;</remove>
   		<remove>&build_dir;/&ncurses-etip-patch;</remove>
  -		<remove>&build_dir;/&ncurses-vsscanf-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.3       +2 -6      ALFS/profiles/LFS/chapter06/coreutils.xml
  
  Index: coreutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/coreutils.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- coreutils.xml	9 Dec 2003 17:21:55 -0000	1.2
  +++ coreutils.xml	16 Dec 2003 01:26:49 -0000	1.3
  @@ -83,9 +83,6 @@
   			<source>cp</source>
   			<source>dd</source>
   			<source>df</source>
  -			<source>dir</source>
  -			<source>dircolors</source>
  -			<source>du</source>
   			<source>date</source>
   			<source>echo</source>
   			<source>false</source>
  @@ -94,13 +91,11 @@
   			<source>ln</source>
   			<source>ls</source>
   			<source>mkdir</source>
  -			<source>mkfifo</source>
   			<source>mknod</source>
   			<source>mv</source>
   			<source>pwd</source>
   			<source>rm</source>
   			<source>rmdir</source>
  -			<source>shred</source>
   			<source>sync</source>
   			<source>sleep</source>
   			<source>stty</source>
  @@ -109,7 +104,6 @@
   			<source>touch</source>
   			<source>true</source>
   			<source>uname</source>
  -			<source>vdir</source>
   			<destination>/bin</destination>
   		</move>
   
  @@ -117,6 +111,8 @@
   			<source>/usr/bin/chroot</source>
   			<destination>/usr/sbin</destination>
   		</move>
  +
  +		<remove>/usr/bin/kill</remove>
   
   		<link>
   			<option>force</option>
  
  
  
  1.3       +1 -5      ALFS/profiles/LFS/chapter06/ed.xml
  
  Index: ed.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/ed.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ed.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ ed.xml	16 Dec 2003 01:26:49 -0000	1.3
  @@ -25,6 +25,7 @@
   
   		<configure>
   			<param>--prefix=/usr</param>
  +			<param>--exec-prefix=""</param>
   		</configure>
   
   		<make />
  @@ -39,11 +40,6 @@
   			<param>install</param>
   		</make>
   
  -		<move base="/usr/bin">
  -			<source>ed</source>
  -			<source>red</source>
  -			<destination>/bin</destination>
  -		</move>
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.3       +1 -1      ALFS/profiles/LFS/chapter06/findutils.xml
  
  Index: findutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/findutils.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- findutils.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ findutils.xml	16 Dec 2003 01:26:49 -0000	1.3
  @@ -14,7 +14,7 @@
   
   		<configure>
   			<param>--prefix=/usr</param>
  -			<param>--libexecdir=/usr/bin</param>
  +			<param>--libexecdir=/usr/lib/locate</param>
   		</configure>
   
   		<make />
  
  
  
  1.3       +1 -1      ALFS/profiles/LFS/chapter06/gawk.xml
  
  Index: gawk.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/gawk.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gawk.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ gawk.xml	16 Dec 2003 01:26:49 -0000	1.3
  @@ -25,7 +25,7 @@
   
   		<configure>
   			<param>--prefix=/usr</param>
  -			<param>--libexecdir=/usr/bin</param>
  +			<param>--libexecdir=/usr/lib/gawk</param>
   		</configure>
   
   		<make />
  
  
  
  1.4       +1 -1      ALFS/profiles/LFS/chapter06/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/glibc.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- glibc.xml	9 Dec 2003 17:21:55 -0000	1.3
  +++ glibc.xml	16 Dec 2003 01:26:49 -0000	1.4
  @@ -46,7 +46,7 @@
   			<param>--prefix=/usr</param>
   			<param>--disable-profile</param>
   			<param>--enable-add-ons</param>
  -			<param>--libexecdir=/usr/bin</param>
  +			<param>--libexecdir=/usr/lib</param>
   			<param>--with-headers=/usr/include</param>
   		</configure>
   
  
  
  
  1.4       +0 -8      ALFS/profiles/LFS/chapter06/ncurses.xml
  
  Index: ncurses.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/ncurses.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ncurses.xml	9 Dec 2003 17:21:55 -0000	1.3
  +++ ncurses.xml	16 Dec 2003 01:26:49 -0000	1.4
  @@ -8,7 +8,6 @@
   
   		<copy>
   			<source>&packages_dir;/&ncurses-etip-patch;</source>
  -			<source>&packages_dir;/&ncurses-vsscanf-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
   	</stage>
  @@ -24,12 +23,6 @@
   			<param>-i ../&ncurses-etip-patch;</param>
   		</patch>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&ncurses-vsscanf-patch;</param>
  -		</patch>
  -
   		<configure>
   			<param>--prefix=/usr</param>
   			<param>--with-shared</param>
  @@ -71,6 +64,5 @@
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&ncurses-directory;</remove>
   		<remove>&build_dir;/&ncurses-etip-patch;</remove>
  -		<remove>&build_dir;/&ncurses-vsscanf-patch;</remove>
   	</stage>
   </package>
  
  
  
  1.4       +4 -0      ALFS/profiles/LFS/chapter06/shadow.xml
  
  Index: shadow.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/shadow.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- shadow.xml	9 Dec 2003 17:21:55 -0000	1.3
  +++ shadow.xml	16 Dec 2003 01:26:49 -0000	1.4
  @@ -104,6 +104,10 @@
   			<target>../../lib/libmisc.so.0</target>
   			<name>/usr/lib/libmisc.so</name>
   		</link>
  +		
  +		<mkdir>
  +			<name>/etc/default</name>
  +		</mkdir>
   
   		<remove>/bin/groups</remove>
   	</stage>
  
  
  
  1.3       +1 -1      ALFS/profiles/LFS/chapter06/tar.xml
  
  Index: tar.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/tar.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tar.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ tar.xml	16 Dec 2003 01:26:49 -0000	1.3
  @@ -15,7 +15,7 @@
   		<configure>
   			<param>--prefix=/usr</param>
   			<param>--bindir=/bin</param>
  -			<param>--libexecdir=/usr/bin</param>
  +			<param>--libexecdir=/usr/sbin</param>
   		</configure>
   
   		<make />
  
  
  
  1.3       +2 -0      ALFS/profiles/LFS/chapter06/util-linux.xml
  
  Index: util-linux.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/util-linux.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util-linux.xml	9 Dec 2003 17:21:55 -0000	1.2
  +++ util-linux.xml	16 Dec 2003 01:26:49 -0000	1.3
  @@ -26,10 +26,12 @@
   		<configure />
   
   		<make>
  +			<param>HAVE_KILL=yes</param>
   			<param>HAVE_SLN=yes</param>
   		</make>
   
   		<make>
  +			<param>HAVE_KILL=yes</param>
   			<param>HAVE_SLN=yes</param>
   			<param>install</param>
   		</make>
  
  
  



More information about the alfs-log mailing list