Author: pierre
Date: Thu Sep 5 10:22:04 2019
New Revision: 4122
Log:
Remove the obsolete vim-lang instructions and variable, and add non-wide-
charater ncurses library
Modified:
jhalfs/trunk/CHEATSHEET
jhalfs/trunk/CLFS/clfs.xsl
jhalfs/trunk/CLFS2/clfs2.xsl
jhalfs/trunk/Config.in
jhalfs/trunk/LFS/lfs.xsl
jhalfs/trunk/common/libs/func_book_parser
jhalfs/trunk/common/libs/func_download_pkgs
jhalfs/trunk/common/libs/func_validate_configs.sh
jhalfs/trunk/jhalfs
Modified: jhalfs/trunk/CHEATSHEET
==============================================================================
--- jhalfs/trunk/CHEATSHEET Sun Sep 1 14:00:48 2019 (r4121)
+++ jhalfs/trunk/CHEATSHEET Thu Sep 5 10:22:04 2019 (r4122)
@@ -40,7 +40,7 @@
[*] Build the kernel
Kernel config file ($HOME/config-4.15-lfs-1)
[ ] Strip Installed Binaries/Libraries
- [ ] Install vim-lang package
+ [ ] Install non-wide-character ncurses
[ ] DO NOT use/display progress_bar
TimeZone (Europe/Paris)
Language (fr_FR.UTF-8)
@@ -99,7 +99,7 @@
[*] Build the kernel
Kernel config file ($HOME/config-4.15-lfs-systemd
[ ] Strip Installed Binaries/Libraries
- [ ] Install vim-lang package
+ [ ] Install non-wide-character ncurses
[ ] DO NOT use/display progress_bar
TimeZone (America/Los_Angeles)
Language (en_US.UTF-8)
@@ -163,7 +163,7 @@
[*] Build the kernel
Kernel config file ($HOME/config-4.15-clfs-systemd
[ ] Strip Installed Binaries/Libraries
- [ ] Install vim-lang package
+ [ ] Install non-wide-character ncurses
[ ] DO NOT use/display progress_bar
TimeZone (Australia/Sydney)
Language (en_AU.UTF-8)
Modified: jhalfs/trunk/CLFS/clfs.xsl
==============================================================================
--- jhalfs/trunk/CLFS/clfs.xsl Sun Sep 1 14:00:48 2019 (r4121)
+++ jhalfs/trunk/CLFS/clfs.xsl Thu Sep 5 10:22:04 2019 (r4122)
@@ -31,9 +31,6 @@
-->
<xsl:param name="bomb-testsuite" select="n"/>
- <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
- <xsl:param name="vim-lang" select="n"/>
-
<!-- Time zone -->
<xsl:param name="timezone" select="GMT"/>
@@ -113,9 +110,6 @@
<xsl:if test="sect2[@role='installation'] and
not(@id='ch-system-multiarch-wrapper')">
<xsl:text>cd $PKGDIR
</xsl:text>
- <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
- <xsl:text>tar -xvf ../vim-&vim-version;-lang.*
--strip-components=1
</xsl:text>
- </xsl:if>
</xsl:if>
<xsl:apply-templates select=".//para/userinput | .//screen"/>
<xsl:if test="not(@id='ch-chroot-chroot')">
Modified: jhalfs/trunk/CLFS2/clfs2.xsl
==============================================================================
--- jhalfs/trunk/CLFS2/clfs2.xsl Sun Sep 1 14:00:48 2019 (r4121)
+++ jhalfs/trunk/CLFS2/clfs2.xsl Thu Sep 5 10:22:04 2019 (r4122)
@@ -13,9 +13,6 @@
<!-- XSLT stylesheet to create shell scripts from CLFS2 books. -->
- <!-- Install vim-lang package? -->
- <xsl:param name="vim-lang" select="y"/>
-
<!-- Time zone -->
<xsl:param name="timezone" select="GMT"/>
@@ -74,9 +71,6 @@
<xsl:if test="sect2[@role='installation'] and
not(@id='ch-cross-tools-sysroot-wrapper')">
<xsl:text>cd $PKGDIR
</xsl:text>
- <xsl:if test="@id='ch-system-vim' and $vim-lang = 'y'">
- <xsl:text>tar -xvf ../vim-&vim-version;-lang.*
--strip-components=1
</xsl:text>
- </xsl:if>
</xsl:if>
<xsl:apply-templates select=".//para/userinput | .//screen"/>
<xsl:text>exit</xsl:text>
Modified: jhalfs/trunk/Config.in
==============================================================================
--- jhalfs/trunk/Config.in Sun Sep 1 14:00:48 2019 (r4121)
+++ jhalfs/trunk/Config.in Thu Sep 5 10:22:04 2019 (r4122)
@@ -927,14 +927,12 @@
# and renamed 'kernel-config'
#--- End Kernel
- config VIMLANG
- bool "Install vim-lang package"
+ config NCURSES5
+ bool "Install non-wide-character ncurses"
default n
- depends on !BOOK_HLFS && !BOOK_CLFS3
+ depends on BOOK_LFS || BOOK_LFS_SYSD
help
- #-- Install the optional vim-lang package
- # NOTE: This option is obsolete with the 7.3 release of Vim
- # which is included in all recent releases of LFS.
+ #-- Install the optional non wide character ncurses5 library
config TIMEZONE
string "TimeZone"
Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl Sun Sep 1 14:00:48 2019 (r4121)
+++ jhalfs/trunk/LFS/lfs.xsl Thu Sep 5 10:22:04 2019 (r4122)
@@ -41,8 +41,8 @@
-->
<xsl:param name="bomb-testsuite" select="'n'"/>
- <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
- <xsl:param name="vim-lang" select="'n'"/>
+ <!-- Install non wide character ncurses 5? -->
+ <xsl:param name="ncurses5" select="'n'"/>
<!-- Should we strip excutables and libraries? -->
<xsl:param name='strip' select="'n'"/>
@@ -357,6 +357,9 @@
@remap='test' and current()/../@id='ch-tools-dejagnu' or
@remap='test' and current()/../@id='ch-system-systemd'
]"/>
+ <xsl:if test="../@id='ch-system-ncurses' and $ncurses5='y'">
+ <xsl:apply-templates select=".//screen[@role='nodump']"/>
+ </xsl:if>
</xsl:template>
<xsl:template match="sect1" mode="pkgmngt">
Modified: jhalfs/trunk/common/libs/func_book_parser
==============================================================================
--- jhalfs/trunk/common/libs/func_book_parser Sun Sep 1 14:00:48 2019
(r4121)
+++ jhalfs/trunk/common/libs/func_book_parser Thu Sep 5 10:22:04 2019
(r4122)
@@ -100,7 +100,6 @@
--stringparam method "$METHOD" \
--stringparam testsuite "$TEST" \
--stringparam bomb-testsuite "$BOMB_TEST" \
- --stringparam vim-lang "$VIMLANG" \
--stringparam timezone "$TIMEZONE" \
--stringparam page "$PAGE" \
--stringparam lang "$LANG" \
@@ -116,7 +115,6 @@
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \
--xinclude \
- --stringparam vim-lang "$VIMLANG" \
--stringparam timezone "$TIMEZONE" \
--stringparam page "$PAGE" \
--stringparam lang "$LANG" \
@@ -169,7 +167,7 @@
--stringparam revision "$INITSYS" \
--stringparam testsuite "$TEST" \
--stringparam bomb-testsuite "$BOMB_TEST" \
- --stringparam vim-lang "$VIMLANG" \
+ --stringparam ncurses5 "$NCURSES5" \
--stringparam strip "$STRIP" \
--stringparam del-la-files "$DEL_LA_FILES" \
--stringparam full-locale "$FULL_LOCALE" \
Modified: jhalfs/trunk/common/libs/func_download_pkgs
==============================================================================
--- jhalfs/trunk/common/libs/func_download_pkgs Sun Sep 1 14:00:48 2019
(r4121)
+++ jhalfs/trunk/common/libs/func_download_pkgs Thu Sep 5 10:22:04 2019
(r4122)
@@ -39,16 +39,6 @@
for line in `cat urls.lst`; do
IFS=$saveIFS # Restore the system defaults
- # Skip some packages if they aren't needed
- case $line in
- */tree* | */gcc-testsuite* ) #unneeded now?
- [[ "$TEST" = "0" ]] && continue
- ;;
- */vim-*-lang* )
- [[ "$VIMLANG" = "0" ]] && continue
- ;;
- esac
-
# Locations
URL1=`echo $line | cut -d" " -f2` # Preferred URL
URL2=`echo $line | cut -d" " -f1` # Fallback Upstream URL
Modified: jhalfs/trunk/common/libs/func_validate_configs.sh
==============================================================================
--- jhalfs/trunk/common/libs/func_validate_configs.sh Sun Sep 1 14:00:48
2019 (r4121)
+++ jhalfs/trunk/common/libs/func_validate_configs.sh Thu Sep 5 10:22:04
2019 (r4122)
@@ -41,11 +41,11 @@
local -r CLFS3_book="$BOOK_common $BOOK_clfsX PLATFORM
MIPS_LEVEL"
# Build Settings by book
- local -r LFS_build="$BUILD_chroot VIMLANG DEL_LA_FILES $BUILD_common
PKGMNGT FULL_LOCALE WRAP_INSTALL"
- local -r HLFS_build="$BUILD_chroot $BUILD_common"
- local -r CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
- local -r CLFS2_build="STRIP VIMLANG $BUILD_common"
- local -r CLFS3_build=" $BUILD_common"
+ local -r LFS_build="$BUILD_chroot NCURSES5 DEL_LA_FILES $BUILD_common
PKGMNGT FULL_LOCALE WRAP_INSTALL"
+ local -r HLFS_build="$BUILD_chroot $BUILD_common"
+ local -r CLFS_build="$BUILD_chroot $BUILD_common"
+ local -r CLFS2_build="STRIP $BUILD_common"
+ local -r CLFS3_build=" $BUILD_common"
# System Settings by book (only LFS for now)
local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST
DOMAIN DNS1 DNS2 FONT KEYMAP LOCAL LOG_LEVEL"
Modified: jhalfs/trunk/jhalfs
==============================================================================
--- jhalfs/trunk/jhalfs Sun Sep 1 14:00:48 2019 (r4121)
+++ jhalfs/trunk/jhalfs Thu Sep 5 10:22:04 2019 (r4122)
@@ -160,7 +160,7 @@
BOMB_TEST=${BOMB_TEST:-n}
STRIP=${STRIP:=n}
REPORT=${REPORT:=n}
-VIMLANG=${VIMLANG:-n}
+NCURSES5=${NCURSES5:-n}
DEL_LA_FILES=${DEL_LA_FILES:-n}
FULL_LOCALE=${FULL_LOCALE:-n}
GRSECURITY_HOST=${GRSECURITY_HOST:-n}
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
