cvs commit: ALFS/profiles/LFS/chapter06 automake.xml bzip2.xml configure.xml coreutils.xml createfiles.xml creatingdirs.xml flex.xml gcc.xml glibc.xml groff.xml gzip.xml kbd.xml kernel.xml modutils.xml ncurses.xml patch.xml psmisc.xml pwdgroup.xml shadow.xml util-linux.xml vim.xml zlib.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Tue Dec 9 09:21:55 PST 2003


kpfleming    03/12/09 10:21:55

  Modified:    profiles/LFS/chapter06 automake.xml bzip2.xml configure.xml
                        coreutils.xml createfiles.xml creatingdirs.xml
                        flex.xml gcc.xml glibc.xml groff.xml gzip.xml
                        kbd.xml kernel.xml modutils.xml ncurses.xml
                        patch.xml psmisc.xml pwdgroup.xml shadow.xml
                        util-linux.xml vim.xml zlib.xml
  Log:
  minor cleanups
  
  Revision  Changes    Path
  1.3       +2 -1      ALFS/profiles/LFS/chapter06/automake.xml
  
  Index: automake.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/automake.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- automake.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ automake.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -28,7 +28,8 @@
   			<param>install</param>
   		</make>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>automake-1.7</target>
   			<name>/usr/share/automake</name>
   		</link>
  
  
  
  1.3       +7 -4      ALFS/profiles/LFS/chapter06/bzip2.xml
  
  Index: bzip2.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/bzip2.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bzip2.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ bzip2.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -37,7 +37,8 @@
   			<destination>/lib</destination>
   		</copy>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>../../lib/libbz2.so.1.0</target>
   			<name>/usr/lib/libbz2.so</name>
   		</link>
  @@ -53,12 +54,14 @@
   			<destination>/bin</destination>
   		</move>
   
  -		<link type="symbolic">
  -			<target>bzip2</target>
  +		<link>
  +			<option>force</option>
  + 			<target>bzip2</target>
   			<name>/bin/bunzip2</name>
   		</link>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>bzip2</target>
   			<name>/bin/bzcat</name>
   		</link>
  
  
  
  1.2       +2 -1      ALFS/profiles/LFS/chapter06/configure.xml
  
  Index: configure.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/configure.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ configure.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -1,5 +1,6 @@
   <stage name="Configuring system components">
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>&keymap;</target>
   		<name>/usr/share/kbd/keymaps/defkeymap.map.gz</name>
   	</link>
  
  
  
  1.2       +2 -0      ALFS/profiles/LFS/chapter06/coreutils.xml
  
  Index: coreutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/coreutils.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- coreutils.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ coreutils.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -119,11 +119,13 @@
   		</move>
   
   		<link>
  +			<option>force</option>
   			<target>test</target>
   			<name>/bin/[</name>
   		</link>
   
   		<link>
  +			<option>force</option>
   			<target>../../bin/install</target>
   			<name>/usr/bin</name>
   		</link>
  
  
  
  1.2       +8 -4      ALFS/profiles/LFS/chapter06/createfiles.xml
  
  Index: createfiles.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/createfiles.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- createfiles.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ createfiles.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -1,5 +1,6 @@
   <stage name="Creating essential symlinks.">
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>/tools/bin/bash</target>
   		<target>/tools/bin/cat</target>
   		<target>/tools/bin/pwd</target>
  @@ -7,17 +8,20 @@
   		<name>/bin</name>
   	</link>
   
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>/tools/bin/perl</target>
   		<name>/usr/bin</name>
   	</link>
   
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>/tools/lib/libgcc_s.so.1</target>
   		<name>/usr/lib</name>
   	</link>
   
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>bash</target>
   		<name>/bin/sh</name>
   	</link>
  
  
  
  1.2       +4 -2      ALFS/profiles/LFS/chapter06/creatingdirs.xml
  
  Index: creatingdirs.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/creatingdirs.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- creatingdirs.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ creatingdirs.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -31,7 +31,8 @@
   		<name>src</name>
   	</mkdir>
   
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>share/man</target>
   		<target>share/doc</target>
   		<target>share/info</target>
  @@ -77,7 +78,8 @@
   		<name>src</name>
   	</mkdir>
   
  -	<link type="symbolic">
  +	<link>
  +		<option>force</option>
   		<target>share/man</target>
   		<target>share/doc</target>
   		<target>share/info</target>
  
  
  
  1.3       +2 -1      ALFS/profiles/LFS/chapter06/flex.xml
  
  Index: flex.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/flex.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- flex.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ flex.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -28,7 +28,8 @@
   			<param>install</param>
   		</make>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>libfl.a</target>
   			<name>/usr/lib/libl.a</name>
   		</link>
  
  
  
  1.3       +4 -2      ALFS/profiles/LFS/chapter06/gcc.xml
  
  Index: gcc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/gcc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gcc.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ gcc.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -73,12 +73,14 @@
   			<param>install</param>
   		</make>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>../usr/bin/cpp</target>
   			<name>/lib</name>
   		</link>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>gcc</target>
   			<name>/usr/bin/cc</name>
   		</link>
  
  
  
  1.3       +2 -2      ALFS/profiles/LFS/chapter06/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/glibc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- glibc.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ glibc.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -77,11 +77,11 @@
   		<execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
   
   		<make>
  -			<param>-C ../glibc-2.3.2/linuxthreads/man</param>
  +			<param>-C ../&glibc-directory;/linuxthreads/man</param>
   		</make>
   
   		<make>
  -			<param>-C ../glibc-2.3.2/linuxthreads/man</param>
  +			<param>-C ../&glibc-directory;/linuxthreads/man</param>
   			<param>install</param>
   		</make>
   	</stage>
  
  
  
  1.3       +3 -0      ALFS/profiles/LFS/chapter06/groff.xml
  
  Index: groff.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/groff.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- groff.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ groff.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -24,16 +24,19 @@
   		</make>
   
   		<link>
  +			<option>force</option>
   			<target>soelim</target>
   			<name>/usr/bin/zsoelim</name>
   		</link>
   
   		<link>
  +			<option>force</option>
   			<target>eqn</target>
   			<name>/usr/bin/geqn</name>
   		</link>
   
   		<link>
  +			<option>force</option>
   			<target>tbl</target>
   			<name>/usr/bin/gtbl</name>
   		</link>
  
  
  
  1.3       +6 -3      ALFS/profiles/LFS/chapter06/gzip.xml
  
  Index: gzip.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/gzip.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gzip.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ gzip.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -36,17 +36,20 @@
   		<remove>/usr/bin/gunzip</remove>
   		<remove>/usr/bin/zcat</remove>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>gzip</target>
   			<name>/bin/gunzip</name>
   		</link>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>gzip</target>
   			<name>/bin/zcat</name>
   		</link>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>gunzip</target>
   			<name>/bin/uncompress</name>
   		</link>
  
  
  
  1.3       +1 -1      ALFS/profiles/LFS/chapter06/kbd.xml
  
  Index: kbd.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/kbd.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- kbd.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ kbd.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -23,7 +23,7 @@
   			<param>-i ../&kbd-more-programs-patch;</param>
   		</patch>
   
  -		<configure/>
  +		<configure />
   
   		<make />
   
  
  
  
  1.2       +9 -1      ALFS/profiles/LFS/chapter06/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/kernel.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- kernel.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ kernel.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -29,7 +29,15 @@
   			<param>symlinks</param>
   		</make>
   		
  -		<execute command="cp -HR include/asm /usr/include"/>
  +		<mkdir>
  +			<option>parents</option>
  +			<name>/usr/include/asm</name>
  +		</mkdir>
  +
  +		<copy>
  +			<source>include/asm/*</source>
  +			<destination>/usr/include/asm</destination>
  +		</copy>
   
   		<copy>
   			<option>recursive</option>
  
  
  
  1.3       +1 -1      ALFS/profiles/LFS/chapter06/modutils.xml
  
  Index: modutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/modutils.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- modutils.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ modutils.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -12,7 +12,7 @@
   			<base>&build_dir;/&modutils-directory;</base>
   		</stageinfo>
   
  -		<configure/>
  +		<configure />
   
   		<make />
   
  
  
  
  1.3       +2 -2      ALFS/profiles/LFS/chapter06/ncurses.xml
  
  Index: ncurses.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/ncurses.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ncurses.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ ncurses.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -55,13 +55,13 @@
   			<destination>/lib</destination>
   		</move>
   
  -		<link type="symbolic">
  +		<link>
   			<option>force</option>
   			<target>../../lib/libncurses.so.5</target>
   			<name>/usr/lib/libcurses.so</name>
   		</link>
   
  -		<link type="symbolic">
  +		<link>
   			<option>force</option>
   			<target>libncurses.so</target>
   			<name>/usr/lib/libcurses.so</name>
  
  
  
  1.3       +2 -1      ALFS/profiles/LFS/chapter06/patch.xml
  
  Index: patch.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/patch.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- patch.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ patch.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -12,7 +12,8 @@
   			<base>&build_dir;/&patch-directory;</base>
   		</stageinfo>
   
  -		<configure command="CPPFLAGS=-D_GNU_SOURCE ./configure">
  +		<configure>
  +			<prefix>CPPFLAGS=-D_GNU_SOURCE</prefix>
   			<param>--prefix=/usr</param>
   		</configure>
   
  
  
  
  1.3       +1 -0      ALFS/profiles/LFS/chapter06/psmisc.xml
  
  Index: psmisc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/psmisc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- psmisc.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ psmisc.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -24,6 +24,7 @@
   		</make>
   
   		<link>
  +			<option>force</option>
   			<target>killall</target>
   			<name>/bin/pidof</name>
   		</link>
  
  
  
  1.2       +0 -1      ALFS/profiles/LFS/chapter06/pwdgroup.xml
  
  Index: pwdgroup.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/pwdgroup.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pwdgroup.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ pwdgroup.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -6,7 +6,6 @@
   
   	<textdump base="/etc">
   		<file>group</file>
  -
   		<content>
   			=root:x:0:
   			=bin:x:1:
  
  
  
  1.3       +4 -3      ALFS/profiles/LFS/chapter06/shadow.xml
  
  Index: shadow.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/shadow.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- shadow.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ shadow.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -74,7 +74,8 @@
   			<replace>MD5_CRYPT_ENAB	yes</replace>
   		</search_replace>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>vipw</target>
   			<name>/usr/sbin/vigr</name>
   		</link>
  @@ -92,13 +93,13 @@
   			<destination>/lib</destination>
   		</move>
   
  -		<link type="symbolic">
  +		<link>
   			<option>force</option>
   			<target>../../lib/libshadow.so.0</target>
   			<name>/usr/lib/libshadow.so</name>
   		</link>
   
  -		<link type="symbolic">
  +		<link>
   			<option>force</option>
   			<target>../../lib/libmisc.so.0</target>
   			<name>/usr/lib/libmisc.so</name>
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- util-linux.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ util-linux.xml	9 Dec 2003 17:21:55 -0000	1.2
  @@ -23,7 +23,7 @@
   			<name>/var/lib/hwclock</name>
   		</mkdir>
   
  -		<configure/>
  +		<configure />
   
   		<make>
   			<param>HAVE_SLN=yes</param>
  
  
  
  1.3       +8 -7      ALFS/profiles/LFS/chapter06/vim.xml
  
  Index: vim.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/vim.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- vim.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ vim.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -30,7 +30,8 @@
   			<param>install</param>
   		</make>
   
  -		<link type="symbolic">
  +		<link>
  +			<option>force</option>
   			<target>vim</target>
   			<name>/usr/bin/vi</name>
   		</link>
  @@ -38,12 +39,12 @@
   		<textdump>
   			<file>/root/.vimrc</file>
   			<content>
  -			=" Begin /root/.vimrc
  -			=
  -			=set nocompatible
  -			=set bs=2
  -			=
  -			=" End /root/.vimrc
  +				=" Begin /root/.vimrc
  +				=
  +				=set nocompatible
  +				=set bs=2
  +				=
  +				=" End /root/.vimrc
   			</content>
   		</textdump>
   	</stage>
  
  
  
  1.3       +1 -1      ALFS/profiles/LFS/chapter06/zlib.xml
  
  Index: zlib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/zlib.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- zlib.xml	9 Dec 2003 16:49:50 -0000	1.2
  +++ zlib.xml	9 Dec 2003 17:21:55 -0000	1.3
  @@ -59,7 +59,7 @@
   			<destination>/lib</destination>
   		</move>
   
  -		<link type="symbolic">
  +		<link>
   			<option>force</option>
   			<target>../../lib/libz.so.1</target>
   			<name>/usr/lib/libz.so</name>
  
  
  



More information about the alfs-log mailing list