Changeset 14eaa9f

Timestamp:

12/04/2006 01:48:48 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:

f221c2c

Parents:

5f4982d

Message:

LFS changes:
Skip creation of chapters 4 and 9 scripts.
Creating /etc/lfs-release as part af all target.
Removed hardcoded script number.

Location:

LFS

Files:

• lfs.xsl (modified) (1 diff)
• master.sh (modified) (7 diffs)

LFS/lfs.xsl

@@ -45 +45 @@
 
   <xsl:template match="sect1">
-    <xsl:if test="count(descendant::screen/userinput) &gt; 0 and
-      count(descendant::screen/userinput) &gt; count(descendant::screen[@role='nodump'])">
+    <xsl:if test="(../@id='chapter-temporary-tools' or
+                  ../@id='chapter-building-system' or
+                  ../@id='chapter-bootscripts' or
+                  ../@id='chapter-bootable') and
+                  count(descendant::screen/userinput) &gt; 0 and
+                  count(descendant::screen/userinput) &gt;
+                  count(descendant::screen[@role='nodump'])">
         <!-- The dirs names -->
       <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>

LFS/master.sh

@@ -282 +282 @@
 
 #----------------------------#
-chapter789_Makefiles() {
-#----------------------------#
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8/9 ( BOOT ) ${R_arrow}"
-
-  for file in chapter0{7,8,9}/* ; do
+chapter78_Makefiles() {
+#----------------------------#
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8 ( BOOT ) ${R_arrow}"
+
+  for file in chapter0{7,8}/* ; do
     # Keep the script file name
     this_script=`basename $file`
 
     # Grub must be configured manually.
-    # The filesystems can't be unmounted via Makefile and the user
-    # should enter the chroot environment to create the root
-    # password, edit several files and setup Grub.
-    #
+    # Handle fstab creation.
     # If no .config file is supplied, the kernel build is skipped
-    #
     case ${this_script} in
       *grub)    continue ;;
-      *reboot)  continue ;;
-      *console) continue  ;; # Use the file generated by lfs-bootscripts
       *fstab)   [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *kernel)  [[ -z ${CONFIG} ]] && continue
@@ -308 +302 @@
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
-    chapter789="$chapter789 ${this_script}"
+    chapter78="$chapter78 ${this_script}"
 
     #--------------------------------------------------------------------#
@@ -359 +353 @@
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
-  done  # for file in chapter0{7,8,9}/*
+  done  # for file in chapter0{7,8}/*
 
 }
@@ -381 +375 @@
   # Add the iterations targets, if needed
   [[ "$COMPARE" = "y" ]] && wrt_compare_targets
-  chapter789_Makefiles
+  chapter78_Makefiles
   # Add the BLFS_TOOL targets, if needed
   [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
@@ -416 +410 @@
 all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL
         @sudo make do_housekeeping
+        @sudo echo "$VERSION - jhalfs build" > \$(MOUNT_PT)/etc/lfs-release
         @\$(call echo_finished,$VERSION)
 
@@ -454 +449 @@
           sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
         fi;
-        @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/063-createfiles
+        @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
         @\$(call echo_CHROOT_request)
         @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@@ -477 +472 @@
 SUDO:      $runasroot
 CHROOT:    $chapter6
-BOOT:      $chapter789
+BOOT:      $chapter78
 BLFS_TOOL: $blfs_tool