diff --git a/CHEATSHEET b/CHEATSHEET
index 4dcd768..46ea5f5 100644
--- a/CHEATSHEET
+++ b/CHEATSHEET
@@ -40,7 +40,7 @@ Build Settings --->
[*] 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 Settings --->
[*] 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 Settings --->
[*] 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)
diff --git a/CLFS/clfs.xsl b/CLFS/clfs.xsl
index f34b4d8..df1fe5d 100644
--- a/CLFS/clfs.xsl
+++ b/CLFS/clfs.xsl
@@ -31,9 +31,6 @@
-->
-
-
-
@@ -113,9 +110,6 @@
cd $PKGDIR
-
- tar -xvf ../vim-&vim-version;-lang.* --strip-components=1
-
diff --git a/CLFS2/clfs2.xsl b/CLFS2/clfs2.xsl
index 83b4f53..c809c9c 100644
--- a/CLFS2/clfs2.xsl
+++ b/CLFS2/clfs2.xsl
@@ -13,9 +13,6 @@
-
-
-
@@ -74,9 +71,6 @@
cd $PKGDIR
-
- tar -xvf ../vim-&vim-version;-lang.* --strip-components=1
-
exit
diff --git a/Config.in b/Config.in
index baa6cb3..493be4b 100644
--- a/Config.in
+++ b/Config.in
@@ -927,14 +927,12 @@ menu "System configuration"
# 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"
diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 322f24f..95fc128 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -41,8 +41,8 @@
-->
-
-
+
+
@@ -357,6 +357,9 @@ fi
@remap='test' and current()/../@id='ch-tools-dejagnu' or
@remap='test' and current()/../@id='ch-system-systemd'
]"/>
+
+
+
diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index 63ba9e1..96686b6 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -100,7 +100,6 @@ extract_commands() { #
--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 @@ extract_commands() { #
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 @@ extract_commands() { #
--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" \
diff --git a/common/libs/func_download_pkgs b/common/libs/func_download_pkgs
index 1e10e0f..041a947 100644
--- a/common/libs/func_download_pkgs
+++ b/common/libs/func_download_pkgs
@@ -39,16 +39,6 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
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
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index 50d8647..34f6150 100644
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@@ -41,11 +41,11 @@ inline_doc
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"
diff --git a/jhalfs b/jhalfs
index 8334e9a..38dd8b5 100755
--- a/jhalfs
+++ b/jhalfs
@@ -160,7 +160,7 @@ WRAP_INSTALL=${WRAP_INSTALL:-n}
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}