r1463 - in profiles/BLFS/trunk: chapter13 chapter14 chapter15

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Jul 18 16:29:26 PDT 2004


Author: thomasp
Date: 2004-07-18 17:29:24 -0600 (Sun, 18 Jul 2004)
New Revision: 1463

Modified:
   profiles/BLFS/trunk/chapter13/ppp.xml
   profiles/BLFS/trunk/chapter13/wvdial.xml
   profiles/BLFS/trunk/chapter14/dhclient.xml
   profiles/BLFS/trunk/chapter14/dhcpcd.xml
   profiles/BLFS/trunk/chapter15/rp-pppoe.xml
Log:
tidied chapters 13-15

Modified: profiles/BLFS/trunk/chapter13/ppp.xml
===================================================================
--- profiles/BLFS/trunk/chapter13/ppp.xml	2004-07-18 23:21:29 UTC (rev 1462)
+++ profiles/BLFS/trunk/chapter13/ppp.xml	2004-07-18 23:29:24 UTC (rev 1463)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch13.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,49 +10,39 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="ppp" version="&ppp-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&ppp-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&ppp-directory;</base>
-		</stageinfo>
-
-		<patch base="&build_dir;/&ppp-directory;">
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&ppp-patch;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&ppp-directory;</base>
-		</stageinfo>
-
-		<configure />
-
-		<make>
-			<param>ETCDIR=/etc/ppp</param>
-		</make>
-
-		<make>
-			<param>ETCDIR=/etc/ppp</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&ppp-directory;</remove>
-	</stage>
-
-</package>
+  <package name="ppp" version="&ppp-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&ppp-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&ppp-directory;</base>
+      </stageinfo>
+      <patch base="&build_dir;/&ppp-directory;">
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&ppp-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&ppp-directory;</base>
+      </stageinfo>
+      <configure />
+      <make>
+        <param>ETCDIR=/etc/ppp</param>
+      </make>
+      <make>
+        <param>ETCDIR=/etc/ppp</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&ppp-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter13/wvdial.xml
===================================================================
--- profiles/BLFS/trunk/chapter13/wvdial.xml	2004-07-18 23:21:29 UTC (rev 1462)
+++ profiles/BLFS/trunk/chapter13/wvdial.xml	2004-07-18 23:29:24 UTC (rev 1463)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch13.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,47 +10,37 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="wvdial" version="&wvdial-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&wvdial-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&wvdial-directory;</base>
-		</stageinfo>
-
-
-		<make>
-			<param>PREFIX=/usr</param>
-		</make>
-
-		<make>
-			<param>PREFIX=/usr</param>
-			<param>install</param>
-		</make>
-
-		<execute command="touch">
-			<param>/etc/wvdial.conf</param>
-		</execute>
-		
-		<!-- uncomment this if you actually have a modem connected
-		     to your computer
-		<execute command="wvdialconf">
-			<param>/etc/wvdial.conf</param>
-		</execute>
-		-->
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&wvdial-directory;</remove>
-	</stage>
-
-</package>
+  <package name="wvdial" version="&wvdial-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&wvdial-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&wvdial-directory;</base>
+      </stageinfo>
+      <make>
+        <param>PREFIX=/usr</param>
+      </make>
+      <make>
+        <param>PREFIX=/usr</param>
+        <param>install</param>
+      </make>
+      <execute command="touch">
+        <param>/etc/wvdial.conf</param>
+      </execute>
+      <!-- uncomment this if you actually have a modem connected
+                     to your computer
+                <execute command="wvdialconf">
+                        <param>/etc/wvdial.conf</param>
+                </execute>
+                -->
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&wvdial-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter14/dhclient.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhclient.xml	2004-07-18 23:21:29 UTC (rev 1462)
+++ profiles/BLFS/trunk/chapter14/dhclient.xml	2004-07-18 23:29:24 UTC (rev 1463)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch14.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,79 +10,65 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="dhclient" version="&dhclient-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&dhclient-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&dhclient-directory;</base>
-		</stageinfo>
-
-		<configure />
-
-		<make />
-
-		<make>
-			<param>LIBDIR=/usr/lib</param>
-			<param>INCDIR=/usr/include</param>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Install dhclient service script">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-service-dhclient</param>
-		</make>
-	</stage>
-
-	<stage name="Configure dhclient">
-		<textdump>
-			<file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
-			<content>
-			=ONBOOT=yes
-			=DHCP_START="&dhclient-start-params;"
-			=DHCP_STOP="&dhclient-stop-params;"
-			=SERVICE=dhclient"
-			</content>
-		</textdump>
-
-		<textdump>
-			<file>/etc/dhclient.conf</file>
-			<content>
-			=# dhclient.conf
-			=
-			=interface "eth0"{
-			=prepend domain-name-servers 127.0.0.1;
-			=request subnet-mask, broadcast-address, time-offset, routers,
-        		=	domain-name, domain-name-servers, host-name;
-			=require subnet-mask, domain-name-servers;
-			=}
-			=# end dhclient.conf
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&dhclient-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="dhclient" version="&dhclient-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&dhclient-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&dhclient-directory;</base>
+      </stageinfo>
+      <configure />
+      <make />
+      <make>
+        <param>LIBDIR=/usr/lib</param>
+        <param>INCDIR=/usr/include</param>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Install dhclient service script">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-service-dhclient</param>
+      </make>
+    </stage>
+    <stage name="Configure dhclient">
+      <textdump>
+        <file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
+        <content>
+	  =ONBOOT=yes
+	  =DHCP_START="&dhclient-start-params;"
+	  =DHCP_STOP="&dhclient-stop-params;"
+	  =SERVICE=dhclient"
+	</content>
+      </textdump>
+      <textdump>
+        <file>/etc/dhclient.conf</file>
+        <content>
+	  =# dhclient.conf
+	  =
+	  =interface "eth0" {
+	  = prepend domain-name-servers 127.0.0.1;
+	  = request subnet-mask, broadcast-address, time-offset, routers,
+	  = domain-name, domain-name-servers, host-name; =require subnet-mask, domain-name-servers;
+	  =}
+	  =# end dhclient.conf
+	</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&dhclient-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter14/dhcpcd.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhcpcd.xml	2004-07-18 23:21:29 UTC (rev 1462)
+++ profiles/BLFS/trunk/chapter14/dhcpcd.xml	2004-07-18 23:29:24 UTC (rev 1463)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch14.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,78 +10,63 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="dhcpcd" version="&dhcpcd-version;">
-
-	<stage name="Unpacking">
-		<unpack>
-			<archive>&packages_dir;/&dhcpcd-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-	<stage name="Patching">
-		<stageinfo>
-			<base>&build_dir;/&dhcpcd-directory;</base>
-		</stageinfo>
-
-		<patch>
-			<param>-N</param>
-			<param>-p1</param>
-			<param>-i &packages_dir;/&dhcpcd-patch;</param>
-		</patch>
-	</stage>
-
-	<stage name="Installing">
-		<stageinfo>
-			<base>&build_dir;/&dhcpcd-directory;</base>
-		</stageinfo>
-
-		<configure>
-			<param>--prefix=""</param>
-			<param>--sysconfdir=/var/lib</param>
-			<param>--mandir=/usr/share/man</param>
-		</configure>
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing dhcpcd service script">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-service-dhcpcd</param>
-		</make>
-	</stage>
-
-	<stage name="Configuring dhcpcd">
-		<textdump>
-			<file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
-			<content>
-			=ONBOOT=yes
-			=DHCP_START="&dhcpcd-start-params;"
-			=DHCP_STOP="&dhcpcd-stop-params;"
-			=SERVICE=dhcpcd
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup">
-		<remove>&build_dir;/&dhcpcd-directory;</remove>
-		<remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-	</stage>
-
-</package>
+  <package name="dhcpcd" version="&dhcpcd-version;">
+    <stage name="Unpacking">
+      <unpack>
+        <archive>&packages_dir;/&dhcpcd-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Patching">
+      <stageinfo>
+        <base>&build_dir;/&dhcpcd-directory;</base>
+      </stageinfo>
+      <patch>
+        <param>-N</param>
+        <param>-p1</param>
+        <param>-i &packages_dir;/&dhcpcd-patch;</param>
+      </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&dhcpcd-directory;</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=""</param>
+        <param>--sysconfdir=/var/lib</param>
+        <param>--mandir=/usr/share/man</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing dhcpcd service script">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-service-dhcpcd</param>
+      </make>
+    </stage>
+    <stage name="Configuring dhcpcd">
+      <textdump>
+        <file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
+        <content>
+	  =ONBOOT=yes
+	  =DHCP_START="&dhcpcd-start-params;"
+	  =DHCP_STOP="&dhcpcd-stop-params;"
+	  =SERVICE=dhcpcd</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup">
+      <remove>&build_dir;/&dhcpcd-directory;</remove>
+      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+    </stage>
+  </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter15/rp-pppoe.xml
===================================================================
--- profiles/BLFS/trunk/chapter15/rp-pppoe.xml	2004-07-18 23:21:29 UTC (rev 1462)
+++ profiles/BLFS/trunk/chapter15/rp-pppoe.xml	2004-07-18 23:29:24 UTC (rev 1463)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch15.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
@@ -9,63 +10,49 @@
 %config_entities;
 
 ]>
-
 <alfs>
-<package name="rp-pppoe" version="&rp-pppoe-version;">
-
-	<packageinfo>
-		<requires><name>ppp</name></requires>
-	</packageinfo>
-
-	<stage name="Unpacking.">
-		<unpack>
-			<archive>&packages_dir;/&rp-pppoe-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-
-		<unpack>
-			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-			<destination>&build_dir;</destination>
-		</unpack>
-	</stage>
-
-
-	<stage name="Installing.">
-		<stageinfo>
-			<base>&build_dir;/&rp-pppoe-directory;/src</base>
-		</stageinfo>
-
-		<configure />
-
-		<make />
-
-		<make>
-			<param>install</param>
-		</make>
-	</stage>
-
-	<stage name="Installing rp-pppoe service script">
-		<stageinfo>
-			<base>&build_dir;/&blfs-bootscripts-directory;</base>
-		</stageinfo>
-
-		<make>
-			<param>install-service-pppoe</param>
-		</make>
-	</stage>
-
-	<stage name="Configure rp-pppoe">
-		<textdump>
-			<file>/etc/sysconfig/network-devices/ifconfig.pppoe</file>
-			<content>
-			=ONBOOT=yes
-			=SERVICE=pppoe
-			</content>
-		</textdump>
-	</stage>
-
-	<stage name="Cleanup.">
-		<remove>&build_dir;/&rp-pppoe-directory;</remove>
-	</stage>
-</package>
+  <package name="rp-pppoe" version="&rp-pppoe-version;">
+    <packageinfo>
+      <requires>
+        <name>ppp</name>
+      </requires>
+    </packageinfo>
+    <stage name="Unpacking.">
+      <unpack>
+        <archive>&packages_dir;/&rp-pppoe-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+      <unpack>
+        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+        <destination>&build_dir;</destination>
+      </unpack>
+    </stage>
+    <stage name="Installing.">
+      <stageinfo>
+        <base>&build_dir;/&rp-pppoe-directory;/src</base>
+      </stageinfo>
+      <configure />
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing rp-pppoe service script">
+      <stageinfo>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
+      </stageinfo>
+      <make>
+        <param>install-service-pppoe</param>
+      </make>
+    </stage>
+    <stage name="Configure rp-pppoe">
+      <textdump>
+        <file>/etc/sysconfig/network-devices/ifconfig.pppoe</file>
+        <content>=ONBOOT=yes =SERVICE=pppoe</content>
+      </textdump>
+    </stage>
+    <stage name="Cleanup.">
+      <remove>&build_dir;/&rp-pppoe-directory;</remove>
+    </stage>
+  </package>
 </alfs>




More information about the alfs-log mailing list