From a9d3a9a0d4ea1a72331a90190fe777c10fa08eec Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Wed, 28 Mar 2007 12:24:52 +0000
Subject: [PATCH] adjust code to match recent HLFS book changes

---
 HLFS/hlfs.xsl  | 8 ++++++--
 HLFS/master.sh | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl
index 9dd5f81..fe3f4da 100644
--- a/HLFS/hlfs.xsl
+++ b/HLFS/hlfs.xsl
@@ -99,8 +99,7 @@
           <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:if test="(sect2[@role='installation'])">
           <xsl:text>cd $PKGDIR&#xA;</xsl:text>
           <xsl:if test="@id='ch-system-uclibc'">
              <xsl:text>pushd ../; tar -xvf gettext-&gettext-version;.*; popd; &#xA;</xsl:text>
@@ -132,9 +131,11 @@
           </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"/>
         <xsl:text>exit</xsl:text>
@@ -209,11 +210,14 @@
         <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 -->
diff --git a/HLFS/master.sh b/HLFS/master.sh
index aa0545c..b810a62 100644
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -431,6 +431,11 @@ chapter7_Makefiles() {       # Create a bootable system.. kernel, bootscripts..e
         blfs_bootscripts=$(get_package_tarball_name "blfs-bootscripts" | sed -e 's/.tar.*//' )
         echo -e "\t@echo \"\$(MOUNT_PT)\$(SRC)/$blfs_bootscripts\" >> sources-dir" >> $MKFILE.tmp
         ;;
+      *kernel)
+        name="linux"
+        pkg_tarball=$(get_package_tarball_name $name)
+        CHROOT_Unpack "$pkg_tarball"
+	;;
     esac
 
     case "${this_script}" in
@@ -453,11 +458,12 @@ chapter7_Makefiles() {       # Create a bootable system.. kernel, bootscripts..e
 cat << EOF
 	@ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
 	rm -r \$(SRC)/\$\$ROOT
-	@rm -r \`cat sources-dir\` && \\
+	@rm -rf \`cat sources-dir\` && \\
 	rm sources-dir
 EOF
 ) >> $MKFILE.tmp
        ;;
+      *kernel)       CHROOT_wrt_RemoveBuildDirs "dummy" ;;
     esac
 
     # Include a touch of the target name so make can check if it's already been made.