Changeset 3d75bc2 for HLFS/hlfs.xsl

Timestamp:

06/18/2007 09:00:29 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

a4af9217

Parents:

31eb678

Message:

HLFS: XSL clean-up,
fixed Glibc commads when the testsuite is not run,
and export CONFIG_SITE from inside adjusting script
instead of exporting target and ldso from inside
settingenvironment target.

File:

• HLFS/hlfs.xsl (modified) (7 diffs)

HLFS/hlfs.xsl

@@ -111 +111 @@
              <xsl:text>pushd ../; tar -xvf gettext-&gettext-version;.*; popd; &#xA;</xsl:text>
           </xsl:if>
-
           <!-- SVN toolchain format, from inside ./sources dir unpack binutils and gcc -->
           <xsl:if test="@id='ch-tools-embryo-toolchain' or
@@ -128 +127 @@
           </xsl:if>
           <!-- END SVN toolchain format -->
-
-          <!-- 2.4-branch toolchain -->
-          <xsl:if test="@id='ch-tools-gcc-pass2' or @id='ch-system-gcc'">
-             <xsl:text>pushd ../; tar -xvf gcc-g++-&gcc-version;.*; popd; &#xA;</xsl:text>
-          </xsl:if>
-          <xsl:if test="@id='ch-system-gcc' and $testsuite != '0'">
-            <xsl:text>pushd ../; tar -xvf gcc-testsuite-&gcc-version;.*; popd; &#xA;</xsl:text>
-          </xsl:if>
-          <!-- END 2.4-branch toolchain -->
-
-<!-- temporary
-          <xsl:if test="@id='bootable-bootscripts'">
-             <xsl:text>pushd ../; tar -xvf blfs-bootscripts-&blfs-bootscripts-version;.* ; popd; &#xA;</xsl:text>
-          </xsl:if>
--->
         </xsl:if>
         <xsl:apply-templates select=".//para/userinput | .//screen"/>
@@ -184 +168 @@
   <xsl:template match="userinput" mode="screen">
     <xsl:choose>
-      <!-- Estandarized package formats -->
-      <xsl:when test="contains(string(),'tar.gz')">
-        <xsl:value-of select="substring-before(string(),'tar.gz')"/>
-        <xsl:text>tar.*</xsl:text>
-        <xsl:value-of select="substring-after(string(),'tar.gz')"/>
-        <xsl:text>&#xA;</xsl:text>
-      </xsl:when>
       <!-- grsecurity kernel in the host? -->
       <xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and
                 contains(string(),'sysctl')
                 and $grsecurity_host ='n'"/>
-      <!-- We need to have /dev/console and /dev/null availables before
-           entering to the chroot -->
-      <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
-                contains(string(),'600 /dev/console')"/>
-      <!-- Fix MAKEDEV installation in 2.4-branch -->
-      <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
-                contains(string(),'bzcat MAKEDEV')">
-        <xsl:text>bzcat /sources/</xsl:text>
-        <xsl:value-of select="substring-after(string(),'bzcat ')"/>
-        <xsl:text>&#xA;</xsl:text>
-      </xsl:when>
       <!-- Setting $LANG for /etc/profile -->
       <xsl:when test="ancestor::sect1[@id='bootable-profile'] and
@@ -215 +181 @@
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
-      <!-- Fixing bootscripts installation -->
-
-<!-- temporary
-      <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
-                string() = 'make install'">
-        <xsl:text>make install&#xA;</xsl:text>
-        <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;&#xA;</xsl:text>
-      </xsl:when>
--->
-      <!-- Compile the keymap into the kernel has been dissabled -->
-      <xsl:when test="contains(string(),'defkeymap')"/>
       <!-- Copying the kernel config file -->
       <xsl:when test="string() = 'make mrproper'">
@@ -233 +188 @@
       <!-- No interactive commands are needed if the .config file is the proper one -->
       <xsl:when test="string() = 'make menuconfig'"/>
+      <!-- For uClibc we need to set CONFIG_SITE -->
+      <xsl:when test="contains(string(),'CONFIG_SITE')">
+        <xsl:value-of select="substring-before(string(),'export')"/>
+        <xsl:text>echo "export</xsl:text>
+        <xsl:value-of select="substring-after(string(),'export')"/>
+        <xsl:text>" &gt;&gt; ~/.bashrc&#xA;</xsl:text>
+      </xsl:when>
       <!-- For uClibc we need to cd to the Gettext package -->
       <xsl:when test="contains(string(),'cd gettext-runtime/')">
@@ -273 +235 @@
         </xsl:choose>
       </xsl:when>
-      <!-- Fixing butterfly and 2.4-branch toolchain plus other packages test suites run -->
-      <xsl:when test="string() = 'make -k check'
-                      or string() = 'make check'
-                      or string() = 'make tests'">
-        <xsl:choose>
-          <xsl:when test="((ancestor::sect1[@id='ch-system-butterfly-toolchain']
-                          or ancestor::sect1[@id='ch-system-gcc'] or
-                          ancestor::sect1[@id='ch-system-binutils'])
-                          and $testsuite != '0') or
-                          $testsuite = '2' or $testsuite = '3'">
+      <!-- Fixing butterfly toolchain test suite run -->
+      <xsl:when test="ancestor::sect1[@id='ch-system-butterfly-toolchain']
+                      and string() = 'make -k check'">
+        <xsl:choose>
+          <xsl:when test="$testsuite != '0'">
             <xsl:choose>
               <xsl:when test="$bomb-testsuite = 'n'">
@@ -300 +257 @@
       </xsl:when>
       <!-- Fixing Glbc test suite  -->
+      <xsl:when test="contains(string(),'rm -v configparms') and
+                      contains(string(),'-fno-stack-protector')">
+        <xsl:choose>
+          <xsl:when test="$testsuite != '0'">
+            <xsl:apply-templates/>
+            <xsl:text>&#xA;</xsl:text>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:when>
       <xsl:when test="contains(string(),'glibc-check-log')">
         <xsl:choose>