r1073 - in trunk/profiles/BLFS: . chapter03 config_standard

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Jul 5 11:08:11 PDT 2004


Author: thomasp
Date: 2004-07-05 12:08:10 -0600 (Mon, 05 Jul 2004)
New Revision: 1073

Modified:
   trunk/profiles/BLFS/BLFS.xml
   trunk/profiles/BLFS/chapter03/bash_startup.xml
   trunk/profiles/BLFS/chapter03/configusers.xml
   trunk/profiles/BLFS/chapter03/inputrc.xml
   trunk/profiles/BLFS/chapter03/issue.xml
   trunk/profiles/BLFS/chapter03/maninfo.xml
   trunk/profiles/BLFS/chapter03/netfs.xml
   trunk/profiles/BLFS/chapter03/random.xml
   trunk/profiles/BLFS/chapter03/shells.xml
   trunk/profiles/BLFS/chapter03/vimrc.xml
   trunk/profiles/BLFS/config_standard/general.ent
Log:
Chapter 3 converted to XIncludes

Modified: trunk/profiles/BLFS/BLFS.xml
===================================================================
--- trunk/profiles/BLFS/BLFS.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/BLFS.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -32,7 +32,7 @@
 
 ]>
 
-<alfs version="3.1">
+<alfs version="3.1" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <stage name="Beyond Linux From Scratch">
     <stageinfo>
@@ -53,15 +53,15 @@
 
 <stage name="Chapter 3 (After LFS Configuration Issues)">
 
-    &configusers;
-    &inputrc;
-    &bash_startup;
-    &vimrc;
-    &issue;
-    &shells;
-    &random;
-    &compressman;
-    &netfs;
+    <xi:include href="chapter03/configusers.xml" />
+    <xi:include href="chapter03/inputrc.xml" />
+    <xi:include href="chapter03/bash_startup.xml" />
+    <xi:include href="chapter03/vimrc.xml" />
+    <xi:include href="chapter03/issue.xml" />
+    <xi:include href="chapter03/shells.xml" />
+    <xi:include href="chapter03/random.xml" />
+    <xi:include href="chapter03/maninfo.xml" />
+    <xi:include href="chapter03/netfs.xml" />
 
 </stage>
 

Modified: trunk/profiles/BLFS/chapter03/bash_startup.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/bash_startup.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/bash_startup.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
+%general_entities;
+%config_entities;
+%files;
+
+]>
+
+<alfs>
+
 <stage name="The Bash Shell Startup Files">
 	
 	<copy>
@@ -20,14 +32,14 @@
 		<name>/etc/profile.d</name>
 	</permissions>
 
-	<copy>
-		<source>&blfs-config;/etc/profile.d/dircolors.sh</source>
-		<source>&blfs-config;/etc/profile.d/extrapaths.sh</source>
-		<source>&blfs-config;/etc/profile.d/readline.sh</source>
-		<source>&blfs-config;/etc/profile.d/tinker-term.sh</source>
-		<source>&blfs-config;/etc/profile.d/umask.sh</source>
-		<source>&blfs-config;/etc/profile.d/X.sh</source>
-		<source>&blfs-config;/etc/profile.d/xterm-titlebars.sh</source>
+	<copy base="&blfs-config;/etc/profile.d">
+		<source>dircolors.sh</source>
+		<source>extrapaths.sh</source>
+		<source>readline.sh</source>
+		<source>tinker-term.sh</source>
+		<source>umask.sh</source>
+		<source>X.sh</source>
+		<source>xterm-titlebars.sh</source>
 		<destination>/etc/profile.d</destination>
 	</copy>	
 
@@ -52,3 +64,5 @@
 	</copy>
 
 </stage>
+
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/configusers.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/configusers.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/configusers.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
+%general_entities;
+%config_entities;
+%files;
+
+]>
+
+<alfs>
+
 <stage name="Configuring for adding users.">
 
 	<textdump base="/etc/default">
@@ -39,4 +51,4 @@
 	</copy>
 </stage>
 
-
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/inputrc.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/inputrc.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/inputrc.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
 
+%general_entities;
+%config_entities;
+
+]>
+
+<alfs>
+
 <stage name="/etc/inputrc">
 	<textdump base="/etc">
         	<file>inputrc</file>
@@ -46,3 +56,5 @@
 	</textdump>
 </stage>
 
+</alfs>
+

Modified: trunk/profiles/BLFS/chapter03/issue.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/issue.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/issue.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
+%general_entities;
+%config_entities;
+%files;
+
+]>
+
+<alfs>
+
 <stage name="/etc/issue">
 
 	<copy>
@@ -8,3 +20,5 @@
 	</copy>
 
 </stage>
+
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/maninfo.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/maninfo.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/maninfo.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
+<!ENTITY % files SYSTEM "../config/files.ent">
 
+%general_entities;
+%config_entities;
+%files;
+
+]>
+
+<alfs>
+
 <stage name="Compressing man and info pages">
 	<stageinfo>
 		<base>/usr/sbin</base>
@@ -18,3 +30,4 @@
 	</permissions>
 </stage>
 
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/netfs.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/netfs.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/netfs.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
 
+%general_entities;
+%config_entities;
+
+]>
+
+<alfs>
+
 <stage name="Configuring for Network Filesystems">
 
 	<stage name="Unpacking">
@@ -25,3 +35,4 @@
 
 </stage>
 
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/random.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/random.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/random.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [
+<!ENTITY % general_entities SYSTEM "../config/general.ent">
+<!ENTITY % config_entities SYSTEM  "../config/config.ent">
 
+%general_entities;
+%config_entities;
+
+
+]>
+
+<alfs>
+
 <stage name="Random Number Generation">
 
 	<stage name="Unpacking">
@@ -24,4 +35,4 @@
 	</stage>
 
 </stage>
-
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/shells.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/shells.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/shells.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" []>
 
+<alfs>
+
 <stage name="/etc/shells">
 
 	<textdump base="/etc">
@@ -15,3 +18,5 @@
 	</textdump>
 
 </stage>
+
+</alfs>

Modified: trunk/profiles/BLFS/chapter03/vimrc.xml
===================================================================
--- trunk/profiles/BLFS/chapter03/vimrc.xml	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/chapter03/vimrc.xml	2004-07-05 18:08:10 UTC (rev 1073)
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS-3.1.dtd" [ ]>
 
+<alfs>
+
 <stage name="/etc/vimrc">
 
 	<textdump base="/etc">
@@ -24,3 +27,4 @@
 
 </stage>
 
+</alfs>

Modified: trunk/profiles/BLFS/config_standard/general.ent
===================================================================
--- trunk/profiles/BLFS/config_standard/general.ent	2004-07-05 17:44:59 UTC (rev 1072)
+++ trunk/profiles/BLFS/config_standard/general.ent	2004-07-05 18:08:10 UTC (rev 1073)
@@ -50,3 +50,6 @@
 
 <!ENTITY ldconfig "<execute command='/sbin/ldconfig' />">
 
+<!ENTITY blfs-bootscripts-version "5.1">
+<!ENTITY blfs-bootscripts-package "blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
+<!ENTITY blfs-bootscripts-directory "blfs-bootscripts-2004-05-22">




More information about the alfs-log mailing list