Changeset 085435e


Ignore:
Timestamp:
09/05/2019 05:22:04 PM (5 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs-more, legacy, trunk
Children:
0336215
Parents:
91b5249
Message:

Remove the obsolete vim-lang instructions and variable, and add non-wide-
charater ncurses library

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • CHEATSHEET

    r91b5249 r085435e  
    4141         Kernel config file ($HOME/config-4.15-lfs-1)
    4242   [ ] Strip Installed Binaries/Libraries
    43    [ ] Install vim-lang package
     43   [ ] Install non-wide-character ncurses
    4444   [ ] DO NOT use/display progress_bar
    4545       TimeZone (Europe/Paris)
    … …  
    100100         Kernel config file ($HOME/config-4.15-lfs-systemd
    101101   [ ] Strip Installed Binaries/Libraries
    102    [ ] Install vim-lang package
     102   [ ] Install non-wide-character ncurses
    103103   [ ] DO NOT use/display progress_bar
    104104       TimeZone (America/Los_Angeles)
    … …  
    164164         Kernel config file ($HOME/config-4.15-clfs-systemd
    165165   [ ] Strip Installed Binaries/Libraries
    166    [ ] Install vim-lang package
     166   [ ] Install non-wide-character ncurses
    167167   [ ] DO NOT use/display progress_bar
    168168       TimeZone (Australia/Sydney)

  • CLFS/clfs.xsl

    r91b5249 r085435e  
    3131  -->
    3232  <xsl:param name="bomb-testsuite" select="n"/>
    33 
    34   <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
    35   <xsl:param name="vim-lang" select="n"/>
    3633
    3734  <!-- Time zone -->
    … …  
    114111                          not(@id='ch-system-multiarch-wrapper')">
    115112              <xsl:text>cd $PKGDIR&#xA;</xsl:text>
    116               <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
    117                 <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1&#xA;</xsl:text>
    118               </xsl:if>
    119113            </xsl:if>
    120114            <xsl:apply-templates select=".//para/userinput | .//screen"/>

  • CLFS2/clfs2.xsl

    r91b5249 r085435e  
    1313
    1414<!-- XSLT stylesheet to create shell scripts from CLFS2 books. -->
    15 
    16   <!-- Install vim-lang package? -->
    17   <xsl:param name="vim-lang" select="y"/>
    1815
    1916  <!-- Time zone -->
    … …  
    7572                          not(@id='ch-cross-tools-sysroot-wrapper')">
    7673              <xsl:text>cd $PKGDIR&#xA;</xsl:text>
    77               <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
    78                 <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1&#xA;</xsl:text>
    79               </xsl:if>
    8074            </xsl:if>
    8175            <xsl:apply-templates select=".//para/userinput | .//screen"/>

  • Config.in

    r91b5249 r085435e  
    928928    #--- End Kernel
    929929
    930     config    VIMLANG
    931         bool "Install vim-lang package"
     930    config    NCURSES5
     931        bool "Install non-wide-character ncurses"
    932932        default n
    933         depends on !BOOK_HLFS && !BOOK_CLFS3
    934         help
    935             #-- Install the optional vim-lang package
    936             #   NOTE: This option is obsolete with the 7.3 release of Vim
    937             #   which is included in all recent releases of LFS.
     933        depends on BOOK_LFS || BOOK_LFS_SYSD
     934        help
     935            #-- Install the optional non wide character ncurses5 library
    938936
    939937    config    TIMEZONE

  • LFS/lfs.xsl

    r91b5249 r085435e  
    4242  <xsl:param name="bomb-testsuite" select="'n'"/>
    4343
    44   <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
    45   <xsl:param name="vim-lang" select="'n'"/>
     44  <!-- Install non wide character ncurses 5? -->
     45  <xsl:param name="ncurses5" select="'n'"/>
    4646
    4747  <!-- Should we strip excutables and libraries? -->
    … …  
    358358                       @remap='test' and current()/../@id='ch-system-systemd'
    359359                                   ]"/>
     360    <xsl:if test="../@id='ch-system-ncurses' and $ncurses5='y'">
     361      <xsl:apply-templates select=".//screen[@role='nodump']"/>
     362    </xsl:if>
    360363  </xsl:template>
    361364

  • common/libs/func_book_parser

    r91b5249 r085435e  
    101101                 --stringparam testsuite "$TEST"           \
    102102                 --stringparam bomb-testsuite "$BOMB_TEST" \
    103                  --stringparam vim-lang "$VIMLANG"         \
    104103                 --stringparam timezone "$TIMEZONE"        \
    105104                 --stringparam page "$PAGE"                \
    … …  
    117116        xsltproc --nonet                            \
    118117                 --xinclude                         \
    119                  --stringparam vim-lang "$VIMLANG"  \
    120118                 --stringparam timezone "$TIMEZONE" \
    121119                 --stringparam page "$PAGE"         \
    … …  
    170168                 --stringparam testsuite      "$TEST"         \
    171169                 --stringparam bomb-testsuite "$BOMB_TEST"    \
    172                  --stringparam vim-lang       "$VIMLANG"      \
     170                 --stringparam ncurses5       "$NCURSES5"     \
    173171                 --stringparam strip          "$STRIP"        \
    174172                 --stringparam del-la-files   "$DEL_LA_FILES" \

  • common/libs/func_download_pkgs

    r91b5249 r085435e  
    3939  for line in `cat urls.lst`; do
    4040    IFS=$saveIFS  # Restore the system defaults
    41 
    42       # Skip some packages if they aren't needed
    43     case $line in
    44       */tree* | */gcc-testsuite* ) #unneeded now?
    45             [[ "$TEST" = "0" ]] && continue
    46           ;;
    47       */vim-*-lang* )
    48             [[ "$VIMLANG" = "0" ]] && continue
    49           ;;
    50     esac
    5141
    5242      # Locations

  • common/libs/func_validate_configs.sh

    r91b5249 r085435e  
    4242
    4343  # Build Settings by book
    44   local -r   LFS_build="$BUILD_chroot VIMLANG DEL_LA_FILES $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
    45   local -r  HLFS_build="$BUILD_chroot         $BUILD_common"
    46   local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
    47   local -r CLFS2_build="STRIP         VIMLANG $BUILD_common"
    48   local -r CLFS3_build="                      $BUILD_common"
     44  local -r   LFS_build="$BUILD_chroot NCURSES5 DEL_LA_FILES $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
     45  local -r  HLFS_build="$BUILD_chroot $BUILD_common"
     46  local -r  CLFS_build="$BUILD_chroot $BUILD_common"
     47  local -r CLFS2_build="STRIP         $BUILD_common"
     48  local -r CLFS3_build="              $BUILD_common"
    4949
    5050  # System Settings by book (only LFS for now)

  • jhalfs

    r91b5249 r085435e  
    161161STRIP=${STRIP:=n}
    162162REPORT=${REPORT:=n}
    163 VIMLANG=${VIMLANG:-n}
     163NCURSES5=${NCURSES5:-n}
    164164DEL_LA_FILES=${DEL_LA_FILES:-n}
    165165FULL_LOCALE=${FULL_LOCALE:-n}
Note: See TracChangeset for help on using the changeset viewer.