r1448 - in profiles/BLFS/trunk: chapter12 chapter23 chapter25 chapter34 chapter44 config_standard

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 12 13:08:21 PDT 2004


Author: thomasp
Date: 2004-07-12 14:08:19 -0600 (Mon, 12 Jul 2004)
New Revision: 1448

Modified:
   profiles/BLFS/trunk/chapter12/gcc295.xml
   profiles/BLFS/trunk/chapter23/db3.xml
   profiles/BLFS/trunk/chapter23/mysql.xml
   profiles/BLFS/trunk/chapter25/xfree86.xml
   profiles/BLFS/trunk/chapter34/openoffice.xml
   profiles/BLFS/trunk/chapter44/docbook-xsl.xml
   profiles/BLFS/trunk/chapter44/xml-dtd.xml
   profiles/BLFS/trunk/config_standard/general.ent
Log:
replaced occurences of & with &real-amp;

Modified: profiles/BLFS/trunk/chapter12/gcc295.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gcc295.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter12/gcc295.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -61,12 +61,14 @@
 		        <param>install</param>
 		</make>
 
-		<execute command="L=`find /opt/gcc-&gcc295-version;/lib -name '*libstdc++*.so' -type f` &&
-IL=`basename $L` &&
-for i in /opt/gcc-&gcc295-version;/lib/*.so*; do mv -f $i /usr/lib;ln -sf /usr/lib/`basename $i` /opt/gcc-&gcc295-version;/lib; done &&
-ln -sf $IL /usr/lib/libstdc++-libc6.1-1.so.2 &&
-ln -sf $IL /usr/lib/libstdc++-libc6.2-2.so.3 &&
-ln -sf $IL /usr/lib/libstdc++-libc6.3-2.so.3" />
+		<execute command="L=`find /opt/gcc-&gcc295-version;/lib -name '*libstdc++*.so' -type f` &real-amp;&real-amp;">
+			<param>IL=`basename $L` &real-amp;&real-amp;</param>
+			<param>for i in /opt/gcc-&gcc295-version;/lib/*.so*;</param>
+			<param>do mv -f $i /usr/lib;ln -sf /usr/lib/`basename $i` /opt/gcc-&gcc295-version;/lib; done &real-amp;&real-amp;</param>
+			<param>ln -sf $IL /usr/lib/libstdc++-libc6.1-1.so.2 &real-amp;&real-amp;</param>
+			<param>ln -sf $IL /usr/lib/libstdc++-libc6.2-2.so.3 &real-amp;&real-amp;</param>
+			<param>ln -sf $IL /usr/lib/libstdc++-libc6.3-2.so.3</param>
+		</execute>
 		
 	</stage>
 

Modified: profiles/BLFS/trunk/chapter23/db3.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/db3.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter23/db3.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -40,7 +40,7 @@
 
 		<remove>/opt/db-3.3/lib/libdb.so</remove>
 
-		<execute command="cd /opt/db-3.3/lib/ && for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done" />
+		<execute command="cd /opt/db-3.3/lib/ &real-amp;&real-amp; for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done" />
 		<execute command="sed 's/^DB185/DB/' /opt/db-3.3/include/db_185.h > /opt/db-3.3/include/db_185.h.new" />
 
 		<move>

Modified: profiles/BLFS/trunk/chapter23/mysql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/mysql.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter23/mysql.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -72,7 +72,7 @@
 			<param>install</param>
 		</make>
 
-		<execute command="cd /usr/lib && 
+		<execute command="cd /usr/lib &real-amp;&real-amp; 
 			ln -sf mysql/libmysqlclient{,_r}.so* ." />
 
 		<!-- CONFIGURATION -->
@@ -91,7 +91,7 @@
 
 		<!--
 
-		<execute command="safe_mysqld 2>&1 >/dev/null &" />
+		<execute command="safe_mysqld 2>&real-amp;1 >/dev/null &real-amp;" />
 
 		<textdump>
 		        <file>/tmp/mysql.script</file>

Modified: profiles/BLFS/trunk/chapter25/xfree86.xml
===================================================================
--- profiles/BLFS/trunk/chapter25/xfree86.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter25/xfree86.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -240,8 +240,8 @@
 		    	<file>.xinitrc</file>
 		    	<content>
                         =# Begin .xinitrc file
-                        =xterm  -g 80x40+0+0   &
-                        =xclock -g 100x100-0+0 &
+                        =xterm  -g 80x40+0+0   &real-amp;
+                        =xclock -g 100x100-0+0 &real-amp;
                         =twm
                         =# End .xinitrc file
 		    	</content>

Modified: profiles/BLFS/trunk/chapter34/openoffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/openoffice.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter34/openoffice.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -102,8 +102,8 @@
 		<textdump>
 			<file>&build_dir;/install-oo.sh</file>
 			<content>
-			=cd instsetoo/unxlngi4.pro/01/normal &&
-			=sed -i "s:^oo_home=.*.:oo_home=openoffice:" install &&
+			=cd instsetoo/unxlngi4.pro/01/normal &real-amp;&real-amp;
+			=sed -i "s:^oo_home=.*.:oo_home=openoffice:" install &real-amp;&real-amp;
 			=# The following code was extracted from Tushar Teredesai's build
 			=# scripts for openoffice at 
 			=# http://www.linuxfromscratch.org/~tushar/openoffice
@@ -117,7 +117,7 @@
 			=	then
 			=		sleep 10s
 			=		# Start a Xserver
-			=		Xvfb :$DISPLAY_NUM >& /dev/null &
+			=		Xvfb :$DISPLAY_NUM >&real-amp; /dev/null &real-amp;
 			=		sleep 10s
 			=		# Check if server started properly
 			=		if [ -f /tmp/.X$DISPLAY_NUM-lock ]
@@ -129,8 +129,8 @@
 			=done
 			=echo "Using Display Number $DISPLAY_NUM..."
 			=export DISPLAY=:$DISPLAY_NUM
-			=./install --prefix=/opt &&
-			=kill `cat /tmp/.X$DISPLAY_NUM-lock` >& /dev/null
+			=./install --prefix=/opt &real-amp;&real-amp;
+			=kill `cat /tmp/.X$DISPLAY_NUM-lock` >&real-amp; /dev/null
 			=unset DISPLAY
 			=for appl in swriter scalc sdraw simpress smath soffice
 			=do

Modified: profiles/BLFS/trunk/chapter44/docbook-xsl.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter44/docbook-xsl.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -69,7 +69,7 @@
 			<file>&build_dir;/dircheck.sh</file>
 			<content>
 			=if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
-			=--create /etc/xml/catalog; fi &&
+			=--create /etc/xml/catalog; fi &real-amp;&real-amp;
 			=if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
 			=/etc/xml/docbook; fi
 			</content>

Modified: profiles/BLFS/trunk/chapter44/xml-dtd.xml
===================================================================
--- profiles/BLFS/trunk/chapter44/xml-dtd.xml	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/chapter44/xml-dtd.xml	2004-07-12 20:08:19 UTC (rev 1448)
@@ -51,7 +51,7 @@
 			<file>&build_dir;/dircheck.sh</file>
 			<content>
 			=if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
-			=--create /etc/xml/catalog; fi &&
+			=--create /etc/xml/catalog; fi &real-amp;&real-amp;
 			=if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
 			=/etc/xml/docbook; fi
 			</content>

Modified: profiles/BLFS/trunk/config_standard/general.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/general.ent	2004-07-12 19:20:47 UTC (rev 1447)
+++ profiles/BLFS/trunk/config_standard/general.ent	2004-07-12 20:08:19 UTC (rev 1448)
@@ -1,3 +1,4 @@
+<!ENTITY real-amp "&#38;">
 <!-- book version -->
 <!ENTITY blfs-version "5.1">
 




More information about the alfs-log mailing list