r2355 - in jhalfs/branches/experimental: HLFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Mar 17 11:45:20 PST 2006


Author: manuel
Date: 2006-03-17 12:45:20 -0700 (Fri, 17 Mar 2006)
New Revision: 2355

Modified:
   jhalfs/branches/experimental/HLFS/hlfs.xsl
   jhalfs/branches/experimental/HLFS/master.sh
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/config
Log:
There is no Vim-lang package in HLFS.
Removed also unexistant entities expect-lib, linux-dl, groff-patchlevel, and udev-config from the HLFS packages download code.

Modified: jhalfs/branches/experimental/HLFS/hlfs.xsl
===================================================================
--- jhalfs/branches/experimental/HLFS/hlfs.xsl	2006-03-17 15:39:20 UTC (rev 2354)
+++ jhalfs/branches/experimental/HLFS/hlfs.xsl	2006-03-17 19:45:20 UTC (rev 2355)
@@ -23,9 +23,6 @@
        3 = all chapter05 and chapter06 testsuites-->
   <xsl:param name="testsuite" select="1"/>
 
-  <!-- Install vim-lang package? -->
-  <xsl:param name="vim-lang" select="1"/>
-
   <xsl:template match="/">
     <xsl:apply-templates select="//sect1"/>
   </xsl:template>
@@ -84,9 +81,6 @@
                      @id='ch-tools-adjusting' or
                      @id='ch-system-readjusting'">
           <xsl:text>cd $PKGDIR&#xA;</xsl:text>
-          <xsl:if test="@id='ch-system-vim' and $vim-lang = '1'">
-            <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1&#xA;</xsl:text>
-          </xsl:if>
           <xsl:if test="@id='ch-tools-uclibc' or @id='ch-system-uclibc'">
              <xsl:text>pushd ../; tar -xvf gettext-&gettext-version;.*; popd; &#xA;</xsl:text>
           </xsl:if>

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-03-17 15:39:20 UTC (rev 2354)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-03-17 19:45:20 UTC (rev 2355)
@@ -46,14 +46,9 @@
     #
     VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
     case "$PKG" in
-      "expect-lib" )        continue ;; # not valid packages
-      "linux-dl" )          continue ;;
-      "groff-patchlevel" )  continue ;;
       "uClibc-patch" )      continue ;;
 
-      "tcl" )           FILE="$PKG$VRS-src.tar.bz2"             ; download $PKG $FILE ;;
-      "vim-lang" )      FILE="vim-$VRS-lang.tar.bz2"; PKG="vim" ; download $PKG $FILE ;;
-      "udev-config" )   FILE="$VRS" ; PKG="udev"                ; download $PKG $FILE ;;
+      "tcl" )   FILE="$PKG$VRS-src.tar.bz2" ; download $PKG $FILE ;;
 
       "uClibc-locale" ) FILE="$PKG-$VRS.tar.bz2" ; PKG="uClibc"
                 download $PKG $FILE

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-17 15:39:20 UTC (rev 2354)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-17 19:45:20 UTC (rev 2355)
@@ -661,7 +661,6 @@
                   --xinclude \
                   --stringparam model $MODEL \
                   --stringparam testsuite $TEST \
-                  --stringparam vim-lang $VIMLANG \
                   -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
         for i in $(find ./${PROGNAME}-commands/chapter07/*) ; do
           sed -i 's/"EOF"/EOF/g' $i ;

Modified: jhalfs/branches/experimental/common/config
===================================================================
--- jhalfs/branches/experimental/common/config	2006-03-17 15:39:20 UTC (rev 2354)
+++ jhalfs/branches/experimental/common/config	2006-03-17 19:45:20 UTC (rev 2355)
@@ -38,7 +38,7 @@
 TIMEZONE=America/Toronto
 
 #--- install the optional vim-lang package  0(no)/1(yes)
-VIMLANG=0
+VIMLANG=1
 
 #--- Language information, /etc/profile  see <locale -a> for values
 LC_ALL=$LC_ALL




More information about the alfs-log mailing list