r1540 - in profiles/BLFS/trunk: chapter03 chapter04 chapter08 chapter11 chapter14 chapter15 chapter18 chapter21 chapter22 chapter23 chapter24 chapter37 chapter41 config_standard

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Tue Sep 21 12:48:26 PDT 2004


Author: kpfleming
Date: 2004-09-21 13:48:24 -0600 (Tue, 21 Sep 2004)
New Revision: 1540

Added:
   profiles/BLFS/trunk/config_standard/bootscripts_clean.ent
   profiles/BLFS/trunk/config_standard/bootscripts_get.ent
Modified:
   profiles/BLFS/trunk/chapter03/netfs.xml
   profiles/BLFS/trunk/chapter03/random.xml
   profiles/BLFS/trunk/chapter04/heimdal.xml
   profiles/BLFS/trunk/chapter04/mitkrb.xml
   profiles/BLFS/trunk/chapter08/libfam.xml
   profiles/BLFS/trunk/chapter08/libusb.xml
   profiles/BLFS/trunk/chapter11/gpm.xml
   profiles/BLFS/trunk/chapter14/dhclient.xml
   profiles/BLFS/trunk/chapter14/dhcpcd.xml
   profiles/BLFS/trunk/chapter15/rp-pppoe.xml
   profiles/BLFS/trunk/chapter18/ncpfs.xml
   profiles/BLFS/trunk/chapter18/nfs-utils.xml
   profiles/BLFS/trunk/chapter18/ntp.xml
   profiles/BLFS/trunk/chapter18/portmap.xml
   profiles/BLFS/trunk/chapter21/exim.xml
   profiles/BLFS/trunk/chapter21/postfix.xml
   profiles/BLFS/trunk/chapter21/sendmail.xml
   profiles/BLFS/trunk/chapter22/bind.xml
   profiles/BLFS/trunk/chapter22/dhcp.xml
   profiles/BLFS/trunk/chapter22/openssh.xml
   profiles/BLFS/trunk/chapter22/samba.xml
   profiles/BLFS/trunk/chapter22/xinetd.xml
   profiles/BLFS/trunk/chapter23/mysql.xml
   profiles/BLFS/trunk/chapter23/postgresql.xml
   profiles/BLFS/trunk/chapter24/apache.xml
   profiles/BLFS/trunk/chapter24/proftpd.xml
   profiles/BLFS/trunk/chapter37/alsa-utils.xml
   profiles/BLFS/trunk/chapter41/cups.xml
   profiles/BLFS/trunk/chapter41/lprng.xml
Log:
move common bootscript unpack/cleanup stages into entity files



Modified: profiles/BLFS/trunk/chapter03/netfs.xml
===================================================================
--- profiles/BLFS/trunk/chapter03/netfs.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter03/netfs.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -7,15 +7,13 @@
 %general_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <stage name="Configuring for Network Filesystems">
-    <stage name="Unpacking">
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&blfs-bootscripts-directory;</base>
@@ -24,8 +22,6 @@
         <param>install-netfs</param>
       </make>
     </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-    </stage>
+    &bootscripts-clean;
   </stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter03/random.xml
===================================================================
--- profiles/BLFS/trunk/chapter03/random.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter03/random.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -7,16 +7,13 @@
 %general_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
 
 ]>
 <alfs>
   <stage name="Random Number Generation">
-    <stage name="Unpacking">
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&blfs-bootscripts-directory;</base>
@@ -25,8 +22,6 @@
         <param>install-random</param>
       </make>
     </stage>
-    <stage name="Cleanup">
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
-    </stage>
+    &bootscripts-clean;
   </stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/heimdal.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/heimdal.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter04/heimdal.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -8,6 +8,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 
 <alfs>
@@ -40,11 +43,8 @@
       <archive>&packages_dir;/&heimdal-package;</archive>
       <destination>&build_dir;</destination>
     </unpack>
-    <unpack>
-      <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>	
   </stage>
+  &bootscripts-get;
   <stage name="Patching.">
     <stageinfo>
       <base>&build_dir;/&heimdal-directory;</base>
@@ -177,9 +177,9 @@
     </textdump>
     <!-- all other configuration concerning heimdal must be done manually -->
   </stage>
+  &bootscripts-clean;
   <stage name="Cleanup.">
     <remove>&build_dir;/&heimdal-directory;</remove>
-    <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
   </stage>
 </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter04/mitkrb.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/mitkrb.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter04/mitkrb.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -8,6 +8,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 
 <alfs>
@@ -32,11 +35,8 @@
       <archive>&build_dir;/&mitkrb-krb5-package;</archive>
       <destination>&build_dir;</destination>
     </unpack>
-    <unpack>
-      <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-      <destination>&build_dir;</destination>
-    </unpack>
   </stage>
+  &bootscripts-get;
   <stage name="Installing.">
     <stageinfo>
       <base>&build_dir;/&mitkrb-directory;</base>
@@ -114,9 +114,9 @@
       </content>
     </textdump>
   </stage>
+  &bootscripts-clean;
   <stage name="Cleanup.">
     <remove>&build_dir;/&mitkrb-directory;</remove>
-    <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
   </stage>
 </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter08/libfam.xml
===================================================================
--- profiles/BLFS/trunk/chapter08/libfam.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter08/libfam.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="libfam" version="&libfam-version;">
@@ -22,11 +25,8 @@
         <archive>&packages_dir;/&libfam-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&libfam-directory;</base>
@@ -57,9 +57,9 @@
         <param>install-fam</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&libfam-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter08/libusb.xml
===================================================================
--- profiles/BLFS/trunk/chapter08/libusb.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter08/libusb.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="libusb" version="&libusb-version;">
@@ -25,11 +28,8 @@
         <archive>&packages_dir;/&libusb-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating group">
       <execute command="groupadd">
         <param>-f</param>
@@ -58,9 +58,9 @@
         <param>install-usb</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&libusb-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter11/gpm.xml
===================================================================
--- profiles/BLFS/trunk/chapter11/gpm.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter11/gpm.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="gpm" version="&gpm-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&gpm-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
     <stageinfo>
       <base>&build_dir;/&gpm-directory;</base>
@@ -67,9 +67,9 @@
 	</content>
       </textdump>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&gpm-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter14/dhclient.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhclient.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter14/dhclient.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="dhclient" version="&dhclient-version;">
@@ -17,11 +20,8 @@
         <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>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&dhclient-directory;</base>
@@ -66,9 +66,9 @@
 	</content>
       </textdump>
     </stage>
+    &bootscripts-clean;
     <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-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter14/dhcpcd.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="dhcpcd" version="&dhcpcd-version;">
@@ -17,11 +20,8 @@
         <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>
+    &bootscripts-get;
     <stage name="Patching">
       <stageinfo>
         <base>&build_dir;/&dhcpcd-directory;</base>
@@ -64,9 +64,9 @@
 	  =SERVICE=dhcpcd</content>
       </textdump>
     </stage>
+    &bootscripts-clean;
     <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-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter15/rp-pppoe.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="rp-pppoe" version="&rp-pppoe-version;">
@@ -22,11 +25,8 @@
         <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>
+    &bootscripts-get;
     <stage name="Installing.">
       <stageinfo>
         <base>&build_dir;/&rp-pppoe-directory;/src</base>
@@ -51,6 +51,7 @@
         <content>=ONBOOT=yes =SERVICE=pppoe</content>
       </textdump>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup.">
       <remove>&build_dir;/&rp-pppoe-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter18/ncpfs.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ncpfs.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter18/ncpfs.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="ncpfs" version="&ncpfs-version;">
@@ -25,11 +28,8 @@
         <archive>&packages_dir;/&ncpfs-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&ncpfs-directory;</base>
@@ -65,9 +65,9 @@
 	</content>
       </textdump>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&ncpfs-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/nfs-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/nfs-utils.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter18/nfs-utils.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="nfs-utils" version="&nfs-utils-version;">
@@ -22,11 +25,8 @@
         <archive>&packages_dir;/&nfs-utils-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-g 65534</param>
@@ -65,9 +65,9 @@
         <param>install-nfs-client</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&nfs-utils-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/ntp.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/ntp.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter18/ntp.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="ntp" version="&ntp-version;">
@@ -25,11 +28,8 @@
         <archive>&packages_dir;/&ntp-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&ntp-directory;</base>
@@ -61,9 +61,9 @@
         <param>install-ntp</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&ntp-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter18/portmap.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/portmap.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter18/portmap.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="portmap" version="&portmap-version;">
@@ -22,11 +25,8 @@
         <archive>&packages_dir;/&portmap-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Patching">
       <stageinfo>
         <base>&build_dir;/&portmap-directory;</base>
@@ -59,9 +59,9 @@
         <param>install-portmap</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&portmap-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/exim.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/exim.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter21/exim.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="exim" version="&exim-version;">
@@ -22,11 +25,8 @@
         <archive>&packages_dir;/&exim-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -75,6 +75,7 @@
         <param>install-exim</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup.">
       <remove>&build_dir;/&exim-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter21/postfix.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/postfix.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter21/postfix.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="postfix" version="&postfix-version;">
@@ -22,11 +25,8 @@
         <archive>&packages_dir;/&postfix-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -109,9 +109,9 @@
         <param>install-postfix</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&postfix-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter21/sendmail.xml
===================================================================
--- profiles/BLFS/trunk/chapter21/sendmail.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter21/sendmail.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="sendmail" version="&sendmail-version;">
@@ -25,11 +28,8 @@
         <archive>&packages_dir;/&sendmail-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -100,9 +100,9 @@
         <param>install-sendmail</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup.">
       <remove>&build_dir;/&sendmail-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/bind.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/bind.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter22/bind.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="bind" version="&bind-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&bind-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -189,9 +189,9 @@
         <param>install-bind</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&bind-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/dhcp.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/dhcp.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter22/dhcp.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="dhcp" version="&dhcp-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&dhcp-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing.">
       <stageinfo>
         <base>&build_dir;/&dhcp-package;</base>
@@ -59,9 +59,9 @@
         <param>install-dhcp</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup.">
       <remove>&build_dir;/&dhcp-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openssh.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter22/openssh.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="openssh" version="&openssh-version;">
@@ -25,11 +28,8 @@
         <archive>&packages_dir;/&openssh-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -83,9 +83,9 @@
         <param>install-sshd</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&openssh-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/samba.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/samba.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter22/samba.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="samba" version="&samba-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&samba-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Patching.">
       <stageinfo>
         <base>&build_dir;/&samba-directory;/source</base>
@@ -106,9 +106,9 @@
         <param>install-winbind</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup.">
       <remove>&build_dir;/&samba-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/xinetd.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/xinetd.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter22/xinetd.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="xinetd" version="&xinetd-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&xinetd-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&xinetd-directory;</base>
@@ -51,9 +51,9 @@
         <param>install-xinetd</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&xinetd-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter23/mysql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/mysql.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter23/mysql.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="mysql" version="&mysql-version;">
@@ -28,11 +31,8 @@
         <archive>&packages_dir;/&mysql-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -103,9 +103,9 @@
         <param>install-mysql</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&mysql-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter23/postgresql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/postgresql.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter23/postgresql.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="postgresql" version="&postgresql-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&postgresql-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user">
       <execute command="grep -q ^postgres /etc/passwd || useradd">
         <param>-d /var/pgsql/data</param>
@@ -63,9 +63,9 @@
         <param>install-postgresql</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&postgresql-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter24/apache.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/apache.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter24/apache.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="apache" version="&apache-version;">
@@ -34,11 +37,8 @@
         <archive>&packages_dir;/&apache-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -93,9 +93,10 @@
         <replace>Group apache</replace>
       </search_replace>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&apache-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>
+

Modified: profiles/BLFS/trunk/chapter24/proftpd.xml
===================================================================
--- profiles/BLFS/trunk/chapter24/proftpd.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter24/proftpd.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="proftpd" version="&proftpd-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&proftpd-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="groupadd">
         <param>-f</param>
@@ -114,9 +114,9 @@
 	</content>
       </textdump>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&proftpd-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter37/alsa-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-utils.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter37/alsa-utils.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="alsa-utils" version="&alsa-utils-version;">
@@ -22,11 +25,8 @@
         <archive>&packages_dir;/&alsa-utils-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&alsa-utils-directory;</base>
@@ -52,9 +52,9 @@
         <param>install-alsa</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&alsa-utils-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter41/cups.xml
===================================================================
--- profiles/BLFS/trunk/chapter41/cups.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter41/cups.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="cups" version="&cups-version;">
@@ -40,11 +43,8 @@
         <archive>&packages_dir;/&cups-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&cups-directory;</base>
@@ -63,9 +63,9 @@
         <param>install-cups</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&cups-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter41/lprng.xml
===================================================================
--- profiles/BLFS/trunk/chapter41/lprng.xml	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/chapter41/lprng.xml	2004-09-21 19:48:24 UTC (rev 1540)
@@ -9,6 +9,9 @@
 %package_entities;
 %config_entities;
 
+<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
+<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
+
 ]>
 <alfs>
   <package name="lprng" version="&lprng-version;">
@@ -17,11 +20,8 @@
         <archive>&packages_dir;/&lprng-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
-      <unpack>
-        <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
     </stage>
+    &bootscripts-get;
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&lprng-directory;</base>
@@ -44,9 +44,9 @@
         <param>install-lprng</param>
       </make>
     </stage>
+    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&lprng-directory;</remove>
-      <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
     </stage>
   </package>
 </alfs>

Added: profiles/BLFS/trunk/config_standard/bootscripts_clean.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/bootscripts_clean.ent	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/config_standard/bootscripts_clean.ent	2004-09-21 19:48:24 UTC (rev 1540)
@@ -0,0 +1,3 @@
+<stage name="Cleanup bootscripts">
+  <remove>&build_dir;/&blfs-bootscripts-directory;</remove>
+</stage>

Added: profiles/BLFS/trunk/config_standard/bootscripts_get.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/bootscripts_get.ent	2004-09-21 19:20:01 UTC (rev 1539)
+++ profiles/BLFS/trunk/config_standard/bootscripts_get.ent	2004-09-21 19:48:24 UTC (rev 1540)
@@ -0,0 +1,6 @@
+<stage name="Unpacking bootscripts">
+  <unpack>
+    <archive>&packages_dir;/&blfs-bootscripts-package;</archive>
+    <destination>&build_dir;</destination>
+  </unpack>
+</stage>




More information about the alfs-log mailing list