Newport Build Completed and Ventana Build Updated

bsp/bootloader/gateworks-newport/newport.scr

@@ -0,0 +1,47 @@
+# Standard Boot-Script for booting Ubuntu
+#  - use only well-known variable names provided by U-Boot Distro boot
+#    - devnum - device number script run from (0 based int)
+#    - devtype - device type script run from (mmc|usb|scsi)
+#    - distro_bootpart - partition script run from (0 based int)
+#    - prefix - directory boot script was found in
+#    - kernel_addr_r - address to load kernel image to
+#    - ftdcontroladdr - address dtb is at
+#
+#  - assume kernel.itb on same dev:part:dir script was found in
+#  - rootfs is on the dev script was found on and the 'next' partition
+#
+
+echo "Newport Ubuntu Boot Script"
+
+# generate bootargs for rootfs based on devtype
+setexpr rootpart ${distro_bootpart} # script/kernel/root same partition
+if test "${devtype}" = "mmc"; then
+	setenv rootdev /dev/mmcblk${devnum}p${rootpart}
+else
+	# map devnum to a blkdev name (supporting up to 3 devs)
+	if test "${devnum}" = "2"; then
+		setenv rootdev /dev/sdc${rootpart}
+	elif test "${devnum}" = "1"; then
+		setenv rootdev /dev/sdb${rootpart}
+	else
+		setenv rootdev /dev/sda${rootpart}
+	fi
+fi
+setenv bootargs ${bootargs} root=${rootdev} rootwait
+
+# disable USB autosuspend (CN81xx errata)
+setenv bootargs ${bootargs} usbcore.autosuspend=-1
+
+# disable KPTI (expected chip errata)
+setenv bootargs ${bootargs} kpti=0
+
+# add console= option to bootargs, if any
+if test -n "${console}"; then
+        setenv bootargs ${bootargs} console=${console}
+fi
+echo "bootargs:${bootargs}"
+
+# load and boot kernel
+echo "Loading kernel.itb from ${devtype} ${devnum}:${distro_bootpart} ${prefix}"
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}kernel.itb
+bootm ${kernel_addr_r} - ${fdtcontroladdr}

gateworks-newport.sh

@@ -0,0 +1,462 @@
+#!/bin/bash
+# This is for the Gateworks Newport (Cavium Octeon based).
+set -e
+
+# Uncomment to activate debug
+# debug=true
+if [ "$debug" = true ]; then
+  exec > >(tee -a -i "${0%.*}.log") 2>&1
+  set -x
+fi
+
+# Architecture
+architecture=${architecture:-"arm64"}
+# Generate a random machine name to be used.
+machine=$(dbus-uuidgen)
+# Custom hostname variable
+hostname=${2:-kali}
+# Custom image file name variable - MUST NOT include .img at the end.
+imagename=${3:-kali-linux-$1-newport}
+# Suite to use, valid options are:
+# kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
+suite=${suite:-"kali-rolling"}
+# Free space rootfs in MiB
+free_space="300"
+# /boot partition in MiB
+bootsize="128"
+# Select compression, xz or none
+compress="xz"
+# Choose filesystem format to format ( ext3 or ext4 )
+fstype="ext3"
+# If you have your own preferred mirrors, set them here.
+mirror=${mirror:-"http://http.kali.org/kali"}
+# Gitlab url Kali repository
+kaligit="https://gitlab.com/kalilinux"
+# Github raw url
+githubraw="https://raw.githubusercontent.com"
+
+# Check EUID=0 you can run any binary as root.
+if [[ $EUID -ne 0 ]]; then
+  echo "This script must be run as root or have super user permissions"
+  echo "Use: sudo $0 ${1:-2.0} ${2:-kali}"
+  exit 1
+fi
+
+# Pass version number
+if [[ $# -eq 0 ]] ; then
+  echo "Please pass version number, e.g. $0 2.0, and (if you want) a hostname, default is kali"
+  exit 0
+fi
+
+# Check exist bsp directory.
+if [ ! -e "bsp" ]; then
+  echo "Error: missing bsp directory structure"
+  echo "Please clone the full repository ${kaligit}/build-scripts/kali-arm"
+  exit 255
+fi
+
+# Current directory
+current_dir="$(pwd)"
+# Base directory
+basedir=${current_dir}/gateworks-newport-"$1"
+# Working directory
+work_dir="${basedir}/kali-${architecture}"
+
+# Check directory build
+if [ -e "${basedir}" ]; then
+  echo "${basedir} directory exists, will not continue"
+  exit 1
+elif [[ ${current_dir} =~ [[:space:]] ]]; then
+  echo "The directory "\"${current_dir}"\" contains whitespace. Not supported."
+  exit 1
+else
+  echo "The basedir thinks it is: ${basedir}"
+  mkdir -p ${basedir}
+fi
+
+components="main,contrib,non-free"
+arm="kali-linux-arm ntpdate"
+base="apt-transport-https apt-utils bash-completion console-setup dialog e2fsprogs ifupdown initramfs-tools inxi isc-dhcp-server iw man-db mlocate netcat-traditional net-tools parted pciutils psmisc rfkill screen tmux u-boot-menu unrar usbutils vim wget whiptail zerofree"
+desktop="kali-desktop-xfce kali-root-login xserver-xorg-video-fbdev xfonts-terminus xinput"
+tools="kali-linux-default"
+services="apache2 atftpd can-utils i2c-tools"
+extras="alsa-utils bc bison crda bluez bluez-firmware kali-linux-core libnss-systemd libssl-dev triggerhappy"
+
+packages="${arm} ${base} ${services}"
+
+# Automatic configuration to use an http proxy, such as apt-cacher-ng.
+# You can turn off automatic settings by uncommenting apt_cacher=off.
+# apt_cacher=off
+# By default the proxy settings are local, but you can define an external proxy.
+# proxy_url="http://external.intranet.local"
+apt_cacher=${apt_cacher:-"$(lsof -i :3142|cut -d ' ' -f3 | uniq | sed '/^\s*$/d')"}
+if [ -n "$proxy_url" ]; then
+  export http_proxy=$proxy_url
+elif [ "$apt_cacher" = "apt-cacher-ng" ] ; then
+  if [ -z "$proxy_url" ]; then
+    proxy_url=${proxy_url:-"http://127.0.0.1:3142/"}
+    export http_proxy=$proxy_url
+  fi
+fi
+
+# Detect architecture
+case ${architecture} in
+  arm64)
+    qemu_bin="/usr/bin/qemu-aarch64-static"
+    lib_arch="aarch64-linux-gnu" ;;
+  armhf)
+    qemu_bin="/usr/bin/qemu-arm-static"
+    lib_arch="arm-linux-gnueabihf" ;;
+  armel)
+    qemu_bin="/usr/bin/qemu-arm-static"
+    lib_arch="arm-linux-gnueabi" ;;
+esac
+
+# create the rootfs - not much to modify here, except maybe throw in some more packages if you want.
+eatmydata debootstrap --foreign --keyring=/usr/share/keyrings/kali-archive-keyring.gpg --include=kali-archive-keyring,eatmydata \
+  --components=${components} --arch ${architecture} ${suite} ${work_dir} http://http.kali.org/kali
+
+# systemd-nspawn versión
+nspawn_ver=$(systemd-nspawn --version | awk '{if(NR==1) print $2}')
+
+# systemd-nspawn enviroment
+systemd-nspawn_exec(){
+  [[ $nspawn_ver -ge 241 ]] && extra_args="--hostname=$hostname" || true
+  [[ $nspawn_ver -ge 245 ]] && extra_args="--console=pipe --hostname=$hostname" || true
+  systemd-nspawn -q --bind-ro ${qemu_bin} $extra_args --capability=cap_setfcap -E RUNLEVEL=1,LANG=C -M ${machine} -D ${work_dir} "$@"
+}
+
+# We need to manually extract eatmydata to use it for the second stage.
+for archive in ${work_dir}/var/cache/apt/archives/*eatmydata*.deb; do
+  dpkg-deb --fsys-tarfile "$archive" > ${work_dir}/eatmydata
+  tar -xkf ${work_dir}/eatmydata -C ${work_dir}
+  rm -f ${work_dir}/eatmydata
+done
+
+# Prepare dpkg to use eatmydata
+systemd-nspawn_exec dpkg-divert --divert /usr/bin/dpkg-eatmydata --rename --add /usr/bin/dpkg
+
+cat > ${work_dir}/usr/bin/dpkg << EOF
+#!/bin/sh
+if [ -e /usr/lib/${lib_arch}/libeatmydata.so ]; then
+    [ -n "\${LD_PRELOAD}" ] && LD_PRELOAD="\$LD_PRELOAD:"
+    LD_PRELOAD="\$LD_PRELOAD\$so"
+fi
+for so in /usr/lib/${lib_arch}/libeatmydata.so; do
+    [ -n "\$LD_PRELOAD" ] && LD_PRELOAD="\$LD_PRELOAD:"
+    LD_PRELOAD="\$LD_PRELOAD\$so"
+done
+export LD_PRELOAD
+exec "\$0-eatmydata" --force-unsafe-io "\$@"
+EOF
+chmod 755 ${work_dir}/usr/bin/dpkg
+
+# debootstrap second stage
+systemd-nspawn_exec eatmydata /debootstrap/debootstrap --second-stage
+
+cat << EOF > ${work_dir}/etc/apt/sources.list
+deb ${mirror} ${suite} ${components//,/ }
+#deb-src ${mirror} ${suite} ${components//,/ }
+EOF
+
+echo "${hostname}" > ${work_dir}/etc/hostname
+
+# Set hostname
+echo "${hostname}" > ${work_dir}/etc/hostname
+
+# So X doesn't complain, we add kali to hosts
+cat << EOF > ${work_dir}/etc/hosts
+127.0.0.1       ${hostname}    localhost
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
+EOF
+
+# Disable IPv6
+cat << EOF > ${work_dir}/etc/modprobe.d/ipv6.conf
+# Don't load ipv6 by default
+alias net-pf-10 off
+EOF
+
+cat << EOF > ${work_dir}/etc/network/interfaces
+auto lo
+iface lo inet loopback
+
+auto eth0
+allow-hotplug eth0
+iface eth0 inet dhcp
+EOF
+
+# Copy directory bsp into build dir.
+cp -rp bsp ${work_dir}
+
+export MALLOC_CHECK_=0 # workaround for LP: #520465
+
+# Enable the use of http proxy in third-stage in case it is enabled.
+if [ -n "$proxy_url" ]; then
+  echo "Acquire::http { Proxy \"$proxy_url\" };" > ${work_dir}/etc/apt/apt.conf.d/66proxy
+fi
+
+# Third stage
+cat << EOF >  ${work_dir}/third-stage
+#!/bin/bash -e
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+
+apt-get -y install binutils ca-certificates console-common cryptsetup-bin git initramfs-tools less locales u-boot-tools
+
+# Create kali user with kali password... but first, we need to manually make some groups because they don't yet exist...
+# This mirrors what we have on a pre-installed VM, until the script works properly to allow end users to set up their own... user.
+# However we leave off floppy, because who a) still uses them, and b) attaches them to an SBC!?
+# And since a lot of these have serial devices of some sort, dialout is added as well.
+# scanner, lpadmin and bluetooth have to be added manually because they don't
+# yet exist in /etc/group at this point.
+groupadd -r -g 118 bluetooth
+groupadd -r -g 113 lpadmin
+groupadd -r -g 122 scanner
+groupadd -g 1000 kali
+
+useradd -m -u 1000 -g 1000 -G sudo,audio,bluetooth,cdrom,dialout,dip,lpadmin,netdev,plugdev,scanner,video,kali -s /bin/bash kali
+echo "kali:kali" | chpasswd
+
+aptops="--allow-change-held-packages -o dpkg::options::=--force-confnew -o Acquire::Retries=3"
+
+# This looks weird, but we do it twice because every so often, there's a failure to download from the mirror
+# So to workaround it, we attempt to install them twice.
+eatmydata apt-get install -y \$aptops ${packages} || eatmydata apt-get --yes --fix-broken install
+eatmydata apt-get install -y \$aptops ${packages} || eatmydata apt-get --yes --fix-broken install
+eatmydata apt-get install -y \$aptops ${desktop} ${extras} ${tools} || eatmydata apt-get --yes --fix-broken install
+eatmydata apt-get install -y \$aptops ${desktop} ${extras} ${tools} || eatmydata apt-get --yes --fix-broken install
+eatmydata apt-get install -y \$aptops --autoremove systemd-timesyncd || eatmydata apt-get --yes --fix-broken install
+eatmydata apt-get dist-upgrade -y \$aptops
+
+eatmydata apt-get --yes --allow-change-held-packages -o dpkg::options::=--force-confnew autoremove
+
+# Copy all services
+install -m644 /bsp/services/all/*.service /etc/systemd/system/
+
+# Regenerated the shared-mime-info database on the first boot
+# since it fails to do so properly in a chroot.
+systemctl enable smi-hack
+
+# Resize filesystem on first boot
+install -m644 /bsp/services/rpi/rpi-resizerootfs.service /etc/systemd/system/
+install -m755 /bsp/scripts/rpi-resizerootfs /usr/sbin/
+systemctl enable rpi-resizerootfs
+
+# Generate SSH host keys on first run
+systemctl enable regenerate_ssh_host_keys
+# Enable sshd
+systemctl enable ssh
+
+# Allow users to use NM over ssh
+install -m644 /bsp/polkit/10-NetworkManager.pkla /var/lib/polkit-1/localauthority/50-local.d
+
+cd /root
+apt download -o APT::Sandbox::User=root ca-certificates 2>/dev/null
+
+# Copy bashrc
+cp  /etc/skel/.bashrc /root/.bashrc
+
+# We replace the u-boot menu defaults here so we can make sure the build system doesn't poison it.
+# We use _EOF_ so that the third-stage script doesn't end prematurely.
+cat << '_EOF_' > /etc/default/u-boot
+U_BOOT_PARAMETERS="console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait panic=10 rw rootfstype=$fstype net.ifnames=0"
+_EOF_
+
+# Try and make the console a bit nicer
+# Set the terminus font for a bit nicer display.
+sed -i -e 's/FONTFACE=.*/FONTFACE="Terminus"/' /etc/default/console-setup
+sed -i -e 's/FONTSIZE=.*/FONTSIZE="6x12"/' /etc/default/console-setup
+
+# Fix startup time from 5 minutes to 30 secs on raise interface wlan0
+sed -i 's/^TimeoutStartSec=5min/TimeoutStartSec=30/g' "/usr/lib/systemd/system/networking.service"
+
+# Clean up dpkg.eatmydata
+rm -f /usr/bin/dpkg
+dpkg-divert --remove --rename /usr/bin/dpkg
+EOF
+
+# Run third stage
+chmod 755 ${work_dir}/third-stage
+systemd-nspawn_exec /third-stage
+
+# Clean system
+systemd-nspawn_exec << 'EOF'
+rm -f /0
+rm -rf /bsp
+fc-cache -frs
+rm -rf /tmp/*
+rm -rf /etc/*-
+rm -rf /hs_err*
+rm -rf /third-stage
+rm -rf /userland
+rm -rf /opt/vc/src
+rm -f /etc/ssh/ssh_host_*
+rm -rf /var/lib/dpkg/*-old
+rm -rf /var/lib/apt/lists/*
+rm -rf /var/cache/apt/*.bin
+rm -rf /var/cache/apt/archives/*
+rm -rf /var/cache/debconf/*.data-old
+for logs in $(find /var/log -type f); do > $logs; done
+history -c
+EOF
+
+# Define DNS server after last running systemd-nspawn.
+echo "nameserver 8.8.8.8" > ${work_dir}/etc/resolv.conf
+
+# Disable the use of http proxy in case it is enabled.
+if [ -n "$proxy_url" ]; then
+  unset http_proxy
+  rm -rf ${work_dir}/etc/apt/apt.conf.d/66proxy
+fi
+
+# Mirror & suite replacement
+if [[ ! -z "${4}" || ! -z "${5}" ]]; then
+  mirror=${4}
+  suite=${5}
+fi
+
+# Define sources.list
+cat << EOF > ${work_dir}/etc/apt/sources.list
+deb ${mirror} ${suite} ${components//,/ }
+#deb-src ${mirror} ${suite} ${components//,/ }
+EOF
+
+# Enable serial console
+echo 'T1:12345:respawn:/sbin/getty -L ttymxc1 115200 vt100' >> \
+    ${work_dir}/etc/inittab
+
+cd ${current_dir}
+
+# Do the kernel stuff...
+git clone --depth 1 -b v5.4.45-newport https://github.com/gateworks/linux-newport ${work_dir}/usr/src/kernel
+cd ${work_dir}/usr/src/kernel
+# Don't change the version because of our patches.
+touch .scmversion
+export ARCH=arm64
+export CROSS_COMPILE=aarch64-linux-gnu- 
+patch -p1 < ${current_dir}/patches/kali-wifi-injection-5.4.patch
+patch -p1 < ${current_dir}/patches/0001-wireless-carl9170-Enable-sniffer-mode-promisc-flag-t.patch
+cp ${current_dir}/kernel-configs/gateworks-newport-5.4.45.config .config
+cp ${current_dir}/kernel-configs/gateworks-newport-5.4.45.config ${work_dir}/usr/src/gateworks-newport-5.4.45.config
+#build
+make -j $(grep -c processor /proc/cpuinfo)
+# install compressed kernel in a kernel.itb
+mkimage -f auto -A arm64 -O linux -T kernel -C gzip -n "Newport Kali Kernel" -a 20080000 -e 20080000 -d arch/arm64/boot/Image.gz kernel.itb
+cp kernel.itb ${work_dir}/boot
+# install kernel modules
+make INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=${work_dir} modules_install
+make INSTALL_HDR_PATH=${work_dir}/usr headers_install
+# cryptodev-linux build/install
+git clone --depth 1 https://github.com/cryptodev-linux/cryptodev-linux ${work_dir}/usr/src/cryptodev-linux
+cd ${work_dir}/usr/src
+make -C cryptodev-linux KERNEL_DIR=${work_dir}/usr/src/kernel
+make -C cryptodev-linux KERNEL_DIR=${work_dir}/usr/src/kernel DESTDIR=${work_dir} INSTALL_MOD_PATH=${work_dir} install
+# wireguard-linux-compat build/install
+git clone --depth 1 https://git.zx2c4.com/wireguard-linux-compat ${work_dir}/usr/src/wireguard-linux-compat
+make -C ${work_dir}/usr/src/kernel M=../wireguard-linux-compat/src modules
+make -C ${work_dir}/usr/src/kernel M=../wireguard-linux-compat/src INSTALL_MOD_PATH=${work_dir} modules_install
+# cleanup
+cd ${work_dir}/usr/src/kernel
+make mrproper
+
+# U-boot script
+install -m644 ${current_dir}/bsp/bootloader/gateworks-newport/newport.scr ${work_dir}/boot/newport.scr
+mkimage -A arm64 -T script -C none -d ${work_dir}/boot/newport.scr ${work_dir}/boot/newport.scr
+
+# reboot script
+cat << EOF > ${work_dir}/lib/systemd/system-shutdown/gsc-poweroff
+#!/bin/bash
+# use GSC to power cycle the system
+echo 2 > /sys/bus/i2c/devices/0-0020/powerdown
+done
+EOF
+chmod +x ${work_dir}/lib/systemd/system-shutdown/gsc-poweroff
+
+# Calculate the space to create the image.
+root_size=$(du -s -B1 ${work_dir} --exclude=${work_dir}/boot | cut -f1)
+root_extra=$((${root_size}/1024/1000*5*1024/5))
+raw_size=$(($((${free_space}*1024))+${root_extra}))
+
+# Weird Boot Partition
+echo "Creating image file ${imagename}.img"
+wget http://dev.gateworks.com/newport/boot_firmware/firmware-newport.img -O ${current_dir}/${imagename}.img
+fallocate -l $(echo ${raw_size}Ki | numfmt --from=iec-i --to=si) ${base_dir}/${imagename}.img
+dd if=${base_dir}/${imagename}.img of=${current_dir}/${imagename}.img bs=16M seek=1
+echo ", +" | sfdisk -N 2 ${current_dir}/${imagename}.img
+
+# Set the partition variables
+loopdevice=`losetup -f --show ${current_dir}/${imagename}.img`
+device=`kpartx -va ${loopdevice} | sed 's/.*\(loop[0-9]\+\)p.*/\1/g' | head -1`
+sleep 5
+device="/dev/mapper/${device}"
+rootp=${device}p2
+
+# Create file systems
+if [[ $fstype == ext4 ]]; then
+  features="-O ^64bit,^metadata_csum"
+elif [[ $fstype == ext3 ]]; then
+  features="-O ^64bit"
+fi
+mkfs $features -t $fstype -L ROOTFS ${rootp}
+
+# Create the dirs for the partitions and mount them
+mkdir -p "${basedir}"/root
+mount ${rootp} "${basedir}"/root
+
+# Create an fstab so that we don't mount / read-only.
+UUID=$(blkid -s UUID -o value ${rootp})
+echo "UUID=$UUID /               $fstype    errors=remount-ro 0       1" >> ${work_dir}/etc/fstab
+
+echo "Rsyncing rootfs into image file"
+rsync -HPavz -q ${work_dir}/ ${basedir}/root/
+
+# Unmount partitions
+sync
+umount ${rootp}
+
+kpartx -dv ${loopdevice}
+losetup -d ${loopdevice}
+
+# Limite use cpu function
+limit_cpu (){
+  rand=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c4 ; echo) # Randowm name group
+  cgcreate -g cpu:/cpulimit-${rand} # Name of group cpulimit
+  cgset -r cpu.shares=800 cpulimit-${rand} # Max 1024
+  cgset -r cpu.cfs_quota_us=80000 cpulimit-${rand} # Max 100000
+  # Retry command
+  local n=1; local max=5; local delay=2
+  while true; do
+    cgexec -g cpu:cpulimit-${rand} "$@" && break || {
+      if [[ $n -lt $max ]]; then
+        ((n++))
+        echo -e "\e[31m Command failed. Attempt $n/$max \033[0m"
+        sleep $delay;
+      else
+        echo "The command has failed after $n attempts."
+        break
+      fi
+    }
+  done
+}
+
+if [ $compress = xz ]; then
+  if [ $(arch) == 'x86_64' ]; then
+    echo "Compressing ${imagename}.img"
+    [ $(nproc) \< 3 ] || cpu_cores=3 # cpu_cores = Number of cores to use
+#    limit_cpu pixz -p ${cpu_cores:-2} ${current_dir}/${imagename}.img # -p Nº cpu cores use
+    pixz -p ${cpu_cores:-2} ${current_dir}/${imagename}.img # -p Nº cpu cores use
+    chmod 644 ${current_dir}/${imagename}.img.xz
+  fi
+else
+  chmod 644 ${current_dir}/${imagename}.img
+fi
+
+# Clean up all the temporary build stuff and remove the directories.
+# Comment this out to keep things around if you want to see what may have gone wrong.
+echo "Removing temporary build files"
+rm -rf "${basedir}"

gateworks-ventana.sh

@@ -60,7 +60,7 @@ fi
 # Current directory
 current_dir="$(pwd)"
 # Base directory
-basedir=${current_dir}/ventana-"$1"
+basedir=${current_dir}/gateworks-ventana-"$1"
 # Working directory
 work_dir="${basedir}/kali-${architecture}"
 
@@ -117,9 +117,14 @@ fi
 eatmydata debootstrap --foreign --keyring=/usr/share/keyrings/kali-archive-keyring.gpg --include=kali-archive-keyring,eatmydata \
   --components=${components} --arch ${architecture} ${suite} ${work_dir} http://http.kali.org/kali
 
+# systemd-nspawn versión
+nspawn_ver=$(systemd-nspawn --version | awk '{if(NR==1) print $2}')
+
 # systemd-nspawn enviroment
 systemd-nspawn_exec(){
-  LANG=C systemd-nspawn -q --bind-ro ${qemu_bin} -M ${machine} -D ${work_dir} "$@"
+  [[ $nspawn_ver -ge 241 ]] && extra_args="--hostname=$hostname" || true
+  [[ $nspawn_ver -ge 245 ]] && extra_args="--console=pipe --hostname=$hostname" || true
+  systemd-nspawn -q --bind-ro ${qemu_bin} $extra_args --capability=cap_setfcap -E RUNLEVEL=1,LANG=C -M ${machine} -D ${work_dir} "$@"
 }
 
 # We need to manually extract eatmydata to use it for the second stage.
@@ -257,6 +262,11 @@ install -m644 /bsp/services/all/*.service /etc/systemd/system/
 # since it fails to do so properly in a chroot.
 systemctl enable smi-hack
 
+# Resize filesystem on first boot
+install -m644 /bsp/services/rpi/rpi-resizerootfs.service /etc/systemd/system/
+install -m755 /bsp/scripts/rpi-resizerootfs /usr/sbin/
+systemctl enable rpi-resizerootfs
+
 # Generate SSH host keys on first run
 systemctl enable regenerate_ssh_host_keys
 # Enable sshd
@@ -282,8 +292,8 @@ _EOF_
 sed -i -e 's/FONTFACE=.*/FONTFACE="Terminus"/' /etc/default/console-setup
 sed -i -e 's/FONTSIZE=.*/FONTSIZE="6x12"/' /etc/default/console-setup
 
-# Fix startup time from 5 minutes to 15 secs on raise interface wlan0
-sed -i 's/^TimeoutStartSec=5min/TimeoutStartSec=15/g' "/usr/lib/systemd/system/networking.service"
+# Fix startup time from 5 minutes to 30 secs on raise interface wlan0
+sed -i 's/^TimeoutStartSec=5min/TimeoutStartSec=30/g' "/usr/lib/systemd/system/networking.service"
 
 rm -f /usr/bin/dpkg
 EOF
@@ -373,18 +383,19 @@ cd ${work_dir}/usr/src/kernel
 # Don't change the version because of our patches.
 touch .scmversion
 export ARCH=arm
-export CROSS_COMPILE=arm-linux-gnueabihf-
+export CROSS_COMPILE=arm-linux-gnueabihf- mrproper
 patch -p1 < ${current_dir}/patches/veyron/4.19/kali-wifi-injection.patch
 patch -p1 < ${current_dir}/patches/veyron/4.19/wireless-carl9170-Enable-sniffer-mode-promisc-flag-t.patch
-cp ${current_dir}/kernel-configs/gateworks_ventana-4.20.7.config .config
-cp ${current_dir}/kernel-configs/gateworks_ventana-4.20.7.config ${work_dir}/usr/src/gateworks_ventana-4.20.7.config
+cp ${current_dir}/kernel-configs/gateworks-ventana-4.20.7.config .config
+cp ${current_dir}/kernel-configs/gateworks-ventana-4.20.7.config ${work_dir}/usr/src/gateworks-ventana-4.20.7.config
 make -j $(grep -c processor /proc/cpuinfo)
 make uImage LOADADDR=0x10008000
 make modules_install INSTALL_MOD_PATH=${work_dir}
 cp arch/arm/boot/dts/imx6*-gw*.dtb ${work_dir}/boot/
 cp arch/arm/boot/uImage ${work_dir}/boot/
+# cleanup
+cd ${work_dir}/usr/src/kernel
 make mrproper
-cd ${current_dir}
 
 # Pull in imx6 smda/vpu firmware for vpu.
 mkdir -p ${work_dir}/lib/firmware/vpu
@@ -398,7 +409,7 @@ wget 'https://github.com/armbian/firmware/blob/master/imx/sdma/sdma-imx6q.bin?ra
 # Not using extlinux.conf just yet...
 # Ensure we don't have root=/dev/sda3 in the extlinux.conf which comes from running u-boot-menu in a cross chroot.
 #sed -i -e 's/append.*/append root=\/dev\/mmcblk0p1 rootfstype=$fstype video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 console=ttymxc0,115200n8 console=tty1 consoleblank=0 rw rootwait/g' ${work_dir}/boot/extlinux/extlinux.conf
-install -m644 ${current_dir}/bsp/bootloader/ventana/6x_bootscript-ventana.script ${work_dir}/boot/6x_bootscript-ventana.script
+install -m644 ${current_dir}/bsp/bootloader/gateworks-ventana/6x_bootscript-ventana.script ${work_dir}/boot/6x_bootscript-ventana.script
 mkimage -A arm -T script -C none -d ${work_dir}/boot/6x_bootscript-ventana.script ${work_dir}/boot/6x_bootscript-ventana
 
 # Calculate the space to create the image.
@@ -419,6 +430,7 @@ sleep 5
 device="/dev/mapper/${device}"
 rootp=${device}p1
 
+# Create file systems
 if [[ $fstype == ext4 ]]; then
   features="-O ^64bit,^metadata_csum"
 elif [[ $fstype == ext3 ]]; then
@@ -451,18 +463,6 @@ rsync -HPavz -q ${work_dir}/ ${basedir}/root/
 sync
 umount ${rootp}
 
-# We need an older cross compiler for compiling u-boot so check out the 4.7
-# cross compiler.
-#git clone https://github.com/offensive-security/gcc-arm-linux-gnueabihf-4.7
-
-#git clone https://github.com/Gateworks/u-boot-imx6.git
-#cd "${basedir}"/u-boot-imx6
-#make CROSS_COMPILE="${basedir}"/gcc-arm-linux-gnueabihf-4.7/bin/arm-linux-gnueabihf- gwventana_defconfig
-#make CROSS_COMPILE="${basedir}"/gcc-arm-linux-gnueabihf-4.7/bin/arm-linux-gnueabihf-
-
-#dd if=SPL of=${loopdevice} bs=1K seek=1
-#dd if=u-boot.img of=${loopdevice} bs=1K seek=42
-
 kpartx -dv ${loopdevice}
 losetup -d ${loopdevice}