r3341 - jhalfs/trunk/HLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Wed Mar 28 05:24:53 PDT 2007


Author: georgeb
Date: 2007-03-28 06:24:52 -0600 (Wed, 28 Mar 2007)
New Revision: 3341

Modified:
   jhalfs/trunk/HLFS/hlfs.xsl
   jhalfs/trunk/HLFS/master.sh
Log:
adjust code to match recent HLFS book changes

Modified: jhalfs/trunk/HLFS/hlfs.xsl
===================================================================
--- jhalfs/trunk/HLFS/hlfs.xsl	2007-03-28 00:43:22 UTC (rev 3340)
+++ jhalfs/trunk/HLFS/hlfs.xsl	2007-03-28 12:24:52 UTC (rev 3341)
@@ -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 -->

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2007-03-28 00:43:22 UTC (rev 3340)
+++ jhalfs/trunk/HLFS/master.sh	2007-03-28 12:24:52 UTC (rev 3341)
@@ -431,6 +431,11 @@
         blfs_bootscripts=$(get_package_tarball_name "blfs-bootscripts" | sed -e 's/.tar.*//' )
         echo -e "\t at 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 @@
 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.




More information about the alfs-log mailing list