r3249 - in jhalfs/trunk: CLFS CLFS2 CLFS3 HLFS LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Dec 4 04:49:37 PST 2006


Author: manuel
Date: 2006-12-04 05:49:35 -0700 (Mon, 04 Dec 2006)
New Revision: 3249

Modified:
   jhalfs/trunk/CLFS/clfs.xsl
   jhalfs/trunk/CLFS2/clfs2.xsl
   jhalfs/trunk/CLFS3/clfs3.xsl
   jhalfs/trunk/HLFS/hlfs.xsl
   jhalfs/trunk/LFS/lfs.xsl
Log:
Simplified sha-bang addition.
We are creating the /bin/bash symlink before entering to the chroot jail.

Modified: jhalfs/trunk/CLFS/clfs.xsl
===================================================================
--- jhalfs/trunk/CLFS/clfs.xsl	2006-12-04 11:49:51 UTC (rev 3248)
+++ jhalfs/trunk/CLFS/clfs.xsl	2006-12-04 12:49:35 UTC (rev 3249)
@@ -86,17 +86,11 @@
           </xsl:variable>
             <!-- Creating dirs and files -->
           <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-            <xsl:choose>
-              <xsl:when test="../@id='chapter-chroot'">
-                <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-              </xsl:when>
-              <xsl:when test="@id='ch-system-stripping'">
-                <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>#!/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
+            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+            <xsl:if test="not(@id='ch-system-stripping')">
+              <xsl:text>set -e</xsl:text>
+            </xsl:if>
+            <xsl:text>&#xA;</xsl:text>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
               <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">

Modified: jhalfs/trunk/CLFS2/clfs2.xsl
===================================================================
--- jhalfs/trunk/CLFS2/clfs2.xsl	2006-12-04 11:49:51 UTC (rev 3248)
+++ jhalfs/trunk/CLFS2/clfs2.xsl	2006-12-04 12:49:35 UTC (rev 3249)
@@ -68,8 +68,9 @@
           <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
             <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
             <xsl:if test="not(@id='ch-system-stripping')">
-              <xsl:text>set -e&#xA;&#xA;</xsl:text>
+              <xsl:text>set -e&#xA;</xsl:text>
             </xsl:if>
+            <xsl:text>&#xA;</xsl:text>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
               <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">

Modified: jhalfs/trunk/CLFS3/clfs3.xsl
===================================================================
--- jhalfs/trunk/CLFS3/clfs3.xsl	2006-12-04 11:49:51 UTC (rev 3248)
+++ jhalfs/trunk/CLFS3/clfs3.xsl	2006-12-04 12:49:35 UTC (rev 3249)
@@ -68,8 +68,9 @@
           <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
             <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
             <xsl:if test="not(@id='ch-system-stripping')">
-              <xsl:text>set -e&#xA;&#xA;</xsl:text>
+              <xsl:text>set -e&#xA;</xsl:text>
             </xsl:if>
+            <xsl:text>&#xA;</xsl:text>
             <xsl:if test="sect2[@role='installation']">
               <xsl:text>cd $PKGDIR&#xA;</xsl:text>
             </xsl:if>

Modified: jhalfs/trunk/HLFS/hlfs.xsl
===================================================================
--- jhalfs/trunk/HLFS/hlfs.xsl	2006-12-04 11:49:51 UTC (rev 3248)
+++ jhalfs/trunk/HLFS/hlfs.xsl	2006-12-04 12:49:35 UTC (rev 3249)
@@ -83,20 +83,12 @@
       </xsl:variable>
         <!-- Creating dirs and files -->
       <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-        <xsl:choose>
-          <xsl:when test="@id='ch-system-changingowner' or
-                    @id='ch-system-creatingdirs' or
-                    @id='ch-system-createfiles'">
-            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:when test="@id='ch-tools-stripping' or
-                    @id='ch-system-strippingagain'">
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+        <xsl:if test="not(@id='ch-tools-stripping') and
+                      not(@id='ch-system-strippingagain')">
+          <xsl:text>set -e&#xA;</xsl:text>
+        </xsl:if>
+        <xsl:text>&#xA;</xsl:text>
         <xsl:if test="(sect2[@role='installation'] and
                            not(@id='bootable-kernel'))">
           <xsl:text>cd $PKGDIR&#xA;</xsl:text>

Modified: jhalfs/trunk/LFS/lfs.xsl
===================================================================
--- jhalfs/trunk/LFS/lfs.xsl	2006-12-04 11:49:51 UTC (rev 3248)
+++ jhalfs/trunk/LFS/lfs.xsl	2006-12-04 12:49:35 UTC (rev 3249)
@@ -74,20 +74,12 @@
       </xsl:variable>
         <!-- Creating dirs and files -->
       <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-        <xsl:choose>
-          <xsl:when test="@id='ch-system-changingowner' or
-                    @id='ch-system-creatingdirs' or
-                    @id='ch-system-createfiles'">
-            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:when test="@id='ch-tools-stripping' or
-                    @id='ch-system-strippingagain'">
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>#!/bin/bash&#xA;set +h&#xA;set -e&#xA;&#xA;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+        <xsl:if test="not(@id='ch-tools-stripping') and
+                      not(@id='ch-system-strippingagain')">
+          <xsl:text>set -e&#xA;</xsl:text>
+        </xsl:if>
+        <xsl:text>&#xA;</xsl:text>
         <xsl:if test="sect2[@role='installation']">
           <xsl:text>cd $PKGDIR&#xA;</xsl:text>
           <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">




More information about the alfs-log mailing list