r3437 - in jhalfs/branches/2.3.x: . BLFS/libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Aug 6 11:30:06 PDT 2007


Author: manuel
Date: 2007-08-06 12:30:06 -0600 (Mon, 06 Aug 2007)
New Revision: 3437

Modified:
   jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl
   jhalfs/branches/2.3.x/README.BLFS
Log:
Merged r3436 from trunk.

Modified: jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl
===================================================================
--- jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl	2007-08-06 18:28:09 UTC (rev 3436)
+++ jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl	2007-08-06 18:30:06 UTC (rev 3437)
@@ -184,7 +184,7 @@
         <xsl:apply-templates select=".//screen" mode="sect-ver"/>
         <xsl:text>mkdir -p ${section}&#xA;cd ${section}&#xA;</xsl:text>
         <xsl:apply-templates select="../sect2[@role='package']/itemizedlist/listitem/para" mode="xorg7-patch"/>
-        <xsl:text>for line in $(grep -v '^#' ../${sect-ver}.wget) ; do
+        <xsl:text>for line in $(grep -v '^#' ../${sect_ver}.wget) ; do
   if [[ ! -f ${line} ]] ; then
     if [[ -f $SRC_ARCHIVE/Xorg/${section}/${line} ]] ; then
       cp $SRC_ARCHIVE/Xorg/${section}/${line} ${line}
@@ -200,23 +200,23 @@
     fi
   fi
 done
-md5sum -c ../${sect-ver}.md5
-cp ../${sect-ver}.wget ../${sect-ver}.wget.orig
-cp ../${sect-ver}.md5 ../${sect-ver}.md5.orig&#xA;</xsl:text>
+md5sum -c ../${sect_ver}.md5
+cp ../${sect_ver}.wget ../${sect_ver}.wget.orig
+cp ../${sect_ver}.md5 ../${sect_ver}.md5.orig&#xA;</xsl:text>
       </xsl:when>
       <xsl:when test="@role = 'installation'">
-        <xsl:text>for package in $(grep -v '^#' ../${sect-ver}.wget) ; do
+        <xsl:text>for package in $(grep -v '^#' ../${sect_ver}.wget) ; do
   packagedir=$(echo $package | sed 's/.tar.bz2//')
   tar -xf ${package}
   cd ${packagedir}&#xA;</xsl:text>
         <xsl:apply-templates select=".//screen | .//para/command"/>
         <xsl:text>  cd ..
   rm -rf ${packagedir}
-  sed -i "/${package}/d" ../${sect-ver}.wget
-  sed -i "/${package}/d" ../${sect-ver}.md5
+  sed -i "/${package}/d" ../${sect_ver}.wget
+  sed -i "/${package}/d" ../${sect_ver}.md5
 done
-mv ../${sect-ver}.wget.orig ../${sect-ver}.wget
-mv ../${sect-ver}.md5.orig ../${sect-ver}.md5&#xA;</xsl:text>
+mv ../${sect_ver}.wget.orig ../${sect_ver}.wget
+mv ../${sect_ver}.md5.orig ../${sect_ver}.md5&#xA;</xsl:text>
         <xsl:if test="$sudo = 'y'">
           <xsl:text>sudo /sbin/</xsl:text>
         </xsl:if>
@@ -460,7 +460,7 @@
   <xsl:template match="screen" mode="sect-ver">
     <xsl:text>section=</xsl:text>
     <xsl:value-of select="substring-before(substring-after(string(),'mkdir '),' &')"/>
-    <xsl:text>&#xA;sect-ver=</xsl:text>
+    <xsl:text>&#xA;sect_ver=</xsl:text>
     <xsl:value-of select="substring-before(substring-after(string(),'-c ../'),'.md5')"/>
     <xsl:text>&#xA;</xsl:text>
   </xsl:template>

Modified: jhalfs/branches/2.3.x/README.BLFS
===================================================================
--- jhalfs/branches/2.3.x/README.BLFS	2007-08-06 18:28:09 UTC (rev 3436)
+++ jhalfs/branches/2.3.x/README.BLFS	2007-08-06 18:30:06 UTC (rev 3437)
@@ -184,13 +184,17 @@
    4.4  PDL, Perl modules, and Glib-Bindings.
 
         The generated scripts for these packages are broken and can not
-     be fixed. You must replace them with your own scripts or install the
-     packages by hand.
+     be fixed. You must rename it as the sub-package to be installed and
+     edit it to use the proper commads for that sub-package.
 
-   4.4  GCC, JDK, Sane, and KDE-multimedia
+        You may need to create additional scripts for these sub-package
+     dependencies, if any.
 
+   4.4  GCC, JDK, Sane, and KDE-multimedia, freetype2, MesaLib and others
+
         On the pages for these packages, the BLFS book actually has instructions
-     to install two packages. You must edit the scripts to fix this.
+     to download and install two or more packages. You must edit the scripts to
+     fix this.
 
         We will try to fix some of them, but this may not be possible.
 
@@ -207,6 +211,9 @@
      the scripts to be sure that the most current individual packages are
      used. Thus don't reuse previouly existing ones.
 
+       In the script for xorg7-font, be sure to move the fonts directories
+     symlinks creation to after the "for ... done" loop.
+
    4.6  PATCHES
 
         By default, all required patches will be downloaded from the NET.




More information about the alfs-log mailing list