Changeset 4d15d7f for HLFS

Timestamp:

12/09/2006 07:22:38 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

d4ef791

Parents:

02c88a6

Message:

HLFS: Added support for 2.4-branch.

Location:

HLFS

Files:

• hlfs.xsl (modified) (4 diffs)
• master.sh (modified) (4 diffs)

HLFS/hlfs.xsl

@@ -97 +97 @@
           </xsl:if>
 
-          <!-- NEW toolchain format, from inside ./sources dir unpack binutils and gcc -->
+          <!-- SVN toolchain format, from inside ./sources dir unpack binutils and gcc -->
           <xsl:if test="@id='ch-tools-embryo-toolchain' or
                         @id='ch-tools-cocoon-toolchain' or
@@ -112 +112 @@
             <xsl:text>tar -xvf gcc-testsuite-&gcc-version;.*; &#xA;</xsl:text>
           </xsl:if>
-          <!-- END new toolchain format -->
+          <!-- 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 -->
 
           <xsl:if test="@id='bootable-bootscripts'">
@@ -167 +176 @@
                 contains(string(),'sysctl')
                 and $grsecurity_host ='n'"/>
+      <!-- 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 $LC_ALL and $LANG for /etc/profile -->
       <xsl:when test="ancestor::sect1[@id='bootable-profile'] and
@@ -234 +250 @@
         </xsl:choose>
       </xsl:when>
-      <!-- Fixing butterfly toolchain and other packages test suites run -->
+      <!-- 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']
+          <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'">

HLFS/master.sh

@@ -191 +191 @@
 
     # Grab the name of the target
-    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
+    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's@-pass[0-9]\{1\}@@'`
 
     # Adjust 'name'
@@ -221 +221 @@
     LUSER_wrt_target "$this_script" "$PREV"
     # Find the version of the command files, if it corresponds with the building of
-    # a specific package
-    pkg_tarball=$(get_package_tarball_name $name)
+    # a specific package. Fix GCC tarball name for 2.4-branch.
+    case $name in
+      gcc ) pkg_tarball=$(get_package_tarball_name gcc-core) ;;
+        * ) pkg_tarball=$(get_package_tarball_name $name) ;;
+    esac
     # If $pkg_tarball isn't empty, we've got a package...
     if [ "$pkg_tarball" != "" ] ; then
@@ -307 +310 @@
 
     # Find the version of the command files, if it corresponds with the building of
-    # a specific package
-    pkg_tarball=$(get_package_tarball_name $name)
+    # a specific package. Fix GCC tarball name for 2.4-branch.
+    case $name in
+      gcc ) pkg_tarball=$(get_package_tarball_name gcc-core) ;;
+        * ) pkg_tarball=$(get_package_tarball_name $name) ;;
+    esac
 
     if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then
@@ -350 +356 @@
       # If the testsuites must be run, initialize the log file
       # butterfly-toolchain tests are enabled in 'process_tookchain' function
+      # 2.4-branch toolchain is ernabled here.
       case $name in
-        glibc ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
-          ;;
-            * ) [[ "$TEST" > "1" ]]  && CHROOT_wrt_test_log "${this_script}"
-          ;;
+        glibc | gcc | binutils)
+            [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" ;;
+        * ) [[ "$TEST" > "1" ]]  && CHROOT_wrt_test_log "${this_script}" ;;
       esac
       # If using optimizations, write the instructions