##// END OF EJS Templates
always include locales ...
Unknown -
r374:e02b3a1b7b3b
parent child
Show More
@@ -247,7 +247,7 CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
247 247
248 248 # Packages required in the chroot build environment
249 249 APT_INCLUDES=${APT_INCLUDES:=""}
250 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
250 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"
251 251
252 252 #Packages to exclude from chroot build environment
253 253 APT_EXCLUDES=${APT_EXCLUDES:=""}
@@ -266,6 +266,10 if [ "$ENABLE_SYSVINIT" = false ] ; then
266 266 APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv"
267 267 fi
268 268
269 #Check if apt-cacher-ng has its default port open on and set APT_PROXY
270 if [ -n "$(lsof -i :3142)" ] ; then
271 HTTP_PROXY=http://127.0.0.1:3142/
272
269 273 # Set Raspberry Pi model specific configuration
270 274 if [ "$RPI_MODEL" = 0 ] ; then
271 275 DTB_FILE=${RPI0_DTB_FILE}
@@ -358,7 +362,7 fi
358 362
359 363 # Add device-tree-compiler required for building the U-Boot bootloader
360 364 if [ "$ENABLE_UBOOT" = true ] ; then
361 APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex"
365 APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
362 366 fi
363 367
364 368 # Check if root SSH (v2) public key file exists
@@ -470,11 +474,6 if [ "$ENABLE_MINBASE" = true ] ; then
470 474 APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools,ifupdown"
471 475 fi
472 476
473 # Add required locales packages
474 if [ "$DEFLOCAL" != "en_US.UTF-8" ] || ([ -n XKB_MODEL ] || [ -n XKB_LAYOUT ] || [ -n XKB_VARIANT ] || [ -n XKB_OPTIONS ]); then
475 APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"
476 fi
477
478 477 # Add parted package, required to get partprobe utility
479 478 if [ "$EXPANDROOT" = true ] ; then
480 479 APT_INCLUDES="${APT_INCLUDES},parted"
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant