Changeset 1f1d6a1

Timestamp:

10/14/2005 08:24:22 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

50408d5

Parents:

3e67a77

Message:

Removed harcoded build order numbers.
Thanks to Alexander E. Patrakov for pointing the issue
and David Fix for their suggestion about how to fix it.

File:

• jhalfs (modified) (16 diffs)

jhalfs

@@ -455 +455 @@
 
     # Dump the path to the Binutils or TCL sources directory.
-    if [ "$i" = "027-binutils-pass1" -o "$i" = "032-tcl" -o "$i" = "036-binutils-pass2" ] ; then
+    if [ ${i:4:8} = "binutils" -o ${i:4:3} = "tcl" ] ; then
 (
     cat << EOF
@@ -463 +463 @@
 
     # For the Adjusting phase we must to cd to the binutils-build directory.
-    elif [ "$i" = "031-adjusting" ] ; then
+    elif [ ${i:4:9} = "adjusting" ] ; then
 (
     cat << EOF
@@ -472 +472 @@
 
     # For the Expect build we need to set the TCLPATH envar.
-    elif [ "$i" = "033-expect" ] ; then
+    elif [ ${i:4:6} = "expect" ] ; then
 (
     cat << EOF
@@ -503 +503 @@
     # For Binutils and TCL the sources must be retained some time.
     if [ "$vrs" != "" ] ; then
-      if [ "$i" != "027-binutils-pass1" ] && [ "$i" != "032-tcl" ] && [ "$i" != "036-binutils-pass2" ] ; then
+      if [ ${i:4:8} != "binutils" ] && [ ${i:4:3} != "tcl" ] ; then
 (
     cat << EOF
@@ -517 +517 @@
 
     # Remove the Binutils pass 1 sources after a successful Adjusting phase.
-    if [ "$i" = "031-adjusting" ] ; then
+    if [ ${i:4:9} = "adjusting" ] ; then
 (
     cat << EOF
@@ -528 +528 @@
 
     # Remove the TCL sources after a successful Expect build.
-    if [ "$i" = "033-expect" ] ; then
+    if [ ${i:4:6} = "expect" ] ; then
 (
     cat << EOF
@@ -565 +565 @@
     # Grab the name of the target
     name=`echo $i | sed -e 's@[0-9]\{3\}-@@'`
-
-    # Set the dependency for the first target.
-    if [ -z $PREV ] ; then PREV=055-stripping ; fi
 
     # Drop in the name of the target on a new line, and the previous target
@@ -598 +595 @@
 
     # For the Re-Adjusting phase we must to cd to the binutils-build directory.
-    if [ "$i" = "067-readjusting" ] ; then
+    if [ ${i:4:11} = "readjusting" ] ; then
 (
     cat << EOF
@@ -608 +605 @@
 
     # For Glibc we need to set TIMEZONE envar.
-    if [ "$i" = "066-glibc" ] ; then
+    if [ ${i:4:5} = "glibc" ] ; then
 (
     cat << EOF
@@ -618 +615 @@
 
     # For Groff we need to set PAGE envar.
-    if [ "$i" = "082-groff" ] ; then
+    if [ ${i:4:5} = "groff" ] ; then
 (
     cat << EOF
@@ -629 +626 @@
     # In the mount of kernel filesystems we need to set LFS 
     # and not to use chroot.
-    if [ "$i" = "057-kernfs" ] ; then
+    if [ ${i:4:6} = "kernfs" ] ; then
 (
     cat << EOF
@@ -664 +661 @@
 
     # Remove the Binutils pass 2 sources after a successful Re-Adjusting phase.
-    if [ "$i" = "067-readjusting" ] ; then
+    if [ ${i:4:11} = "readjusting" ] ; then
 (
     cat << EOF
@@ -711 +708 @@
     chapter789="$chapter789 $i"
 
-    # Set the dependency for the first target.
-    if [ -z $PREV ] ; then PREV=116-strippingagain ; fi
-
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
@@ -725 +719 @@
 
     # Find the the bootscripts and kernel package names
-    if [ "$i" = "119-bootscripts" -o "$i" = "132-kernel" ] ; then
-      if [ "$i" = "119-bootscripts" ] ; then
+    if [ ${i:4:11} = "bootscripts" -o ${i:4:6} = "kernel" ] ; then
+      if [ ${i:4:11} = "bootscripts" ] ; then
         vrs=`grep "^lfs-bootscripts-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
         FILE="lfs-bootscripts-$vrs.tar.bz2"
-      elif [ "$i" = "132-kernel" ] ; then
+      elif [ ${i:4:6} = "kernel" ] ; then
         vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
         FILE="linux-$vrs.tar.bz2"
@@ -744 +738 @@
     
     # Put in place the kernel .config file
-    if [ "$i" = "132-kernel" ] ; then
+    if [ ${i:4:6} = "kernel" ] ; then
 (
     cat << EOF
@@ -762 +756 @@
 
     # Remove the build directory except if the package build fails.
-    if [ "$i" = "119-bootscripts" -o "$i" = "132-kernel" ] ; then
+    if [ ${i:4:11} = "bootscripts" -o ${i:4:6} = "kernel" ] ; then
 (
     cat << EOF