##// END OF EJS Templates
,
Unknown -
r318:d4f4145692d7
parent child
Show More
@@ -191,17 +191,12 APT_INCLUDES=${APT_INCLUDES:=""}
191 191 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"
192 192
193 193 # Packages required for bootstrapping
194 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
194 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo netselect-apt"
195 195 MISSING_PACKAGES=""
196 196
197 #autoselect best apt mirror
198 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} netselect-apt"
199
200 197 # Packages installed for c/c++ build environment in chroot (keep empty)
201 198 COMPILER_PACKAGES=""
202 199
203 set +x
204
205 200 #make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go!
206 201 if [ -n "$SET_ARCH" ] ; then
207 202 echo "Setting Architecture specific settings"
@@ -299,6 +294,9 else
299 294 exit 1
300 295 fi
301 296
297 #DEBUG off
298 set +x
299
302 300 # Check if the internal wireless interface is supported by the RPi model
303 301 if [ "$ENABLE_WIRELESS" = true ] ; then
304 302 if [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ] ; then
@@ -442,8 +440,6 if [ "$(df --output=avail "${BUILDDIR}" | sed "1d")" -le "524288" ] ; then
442 440 exit 1
443 441 fi
444 442
445 set -x
446
447 443 # Call "cleanup" function on various signals and errors
448 444 trap cleanup 0 1 2 3 6
449 445
@@ -524,9 +520,11 if [ "$KERNEL_REDUCE" = true ] ; then
524 520 KERNELSRC_CONFIG=false
525 521 fi
526 522
523 set -x
524
527 525 # Execute bootstrap scripts
528 526 for SCRIPT in bootstrap.d/*.sh; do
529 head -n 3 "$SCRIPT"
527 head -n 4 "$SCRIPT"
530 528 . "$SCRIPT"
531 529 done
532 530
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant