Raspi2-3_GenImage Commit - r581:8d963d5ee168 · Collaboration Tremplin des Sciences

Merge branch 'drtyhlpr-master' into rpifegen

vidal -

r581:8d963d5ee168

parent child

Context file:

r581:8d963d5ee168

bootstrap.d/43-videocore.sh created 644 +53 0

@@ -0,0 +1,53
	1	#
	2	# Setup videocore - Raspberry Userland
	3	#
	4
	5	# Load utility functions
	6	. ./functions.sh
	7
	8	if [ "$ENABLE_VIDEOCORE" = true ] ; then
	9	# Copy existing videocore sources into chroot directory
	10	if [ -n "$VIDEOCORESRC_DIR" ] && [ -d "$VIDEOCORESRC_DIR" ] ; then
	11	# Copy local videocore sources
	12	cp -r "${VIDEOCORESRC_DIR}" "${R}/tmp/userland"
	13	else
	14	# Create temporary directory for videocore sources
	15	temp_dir=$(as_nobody mktemp -d)
	16
	17	# Fetch videocore sources
	18	as_nobody git -C "${temp_dir}" clone "${VIDEOCORE_URL}"
	19
	20	# Copy downloaded videocore sources
	21	mv "${temp_dir}/userland" "${R}/tmp/"
	22
	23	# Set permissions of the U-Boot sources
	24	chown -R root:root "${R}/tmp/userland"
	25
	26	# Remove temporary directory for U-Boot sources
	27	rm -fr "${temp_dir}"
	28	fi
	29
	30	# Create build dir
	31	mkdir "${R}"/tmp/userland/build
	32
	33	# push us to build directory
	34	cd "${R}"/tmp/userland/build
	35
	36	if [ "$RELEASE_ARCH" = "arm64" ] ; then
	37	cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
	38	fi
	39
	40	if [ "$RELEASE_ARCH" = "armel" ] ; then
	41	cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_C_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabi-g++ -DCMAKE_ASM_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DCMAKE_SYSTEM_PROCESSOR="arm" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
	42	fi
	43
	44	if [ "$RELEASE_ARCH" = "armhf" ] ; then
	45	cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="${R}"/tmp/userland/makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
	46	fi
	47
	48	#build userland
	49	make -j "$(nproc)"
	50
	51	#back to root of scriptdir
	52	cd "${WORKDIR}"
	53	fi

files/etc/99-com.rules created 644 +33 0

@@ -0,0 +1,33
	1	SUBSYSTEM=="input", GROUP="input", MODE="0660"
	2	SUBSYSTEM=="i2c-dev", GROUP="i2c", MODE="0660"
	3	SUBSYSTEM=="spidev", GROUP="spi", MODE="0660"
	4	SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660"
	5
	6	SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
	7	SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c '\
	8	chown -R root:gpio /sys/class/gpio && chmod -R 770 /sys/class/gpio;\
	9	chown -R root:gpio /sys/devices/virtual/gpio && chmod -R 770 /sys/devices/virtual/gpio;\
	10	chown -R root:gpio /sys$devpath && chmod -R 770 /sys$devpath\
	11	'"
	12
	13	KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
	14	ALIASES=/proc/device-tree/aliases; \
	15	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
	16	echo 0;\
	17	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
	18	echo 1; \
	19	else \
	20	exit 1; \
	21	fi\
	22	'", SYMLINK+="serial%c"
	23
	24	KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
	25	ALIASES=/proc/device-tree/aliases; \
	26	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
	27	echo 0; \
	28	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
	29	echo 1; \
	30	else \
	31	exit 1; \
	32	fi \
	33	'", SYMLINK+="serial%c"

files/iptables/nftables.rules created 644 +21 0

@@ -0,0 +1,21
	1	add table ip filter
	2	add chain ip filter INPUT { type filter hook input priority 0; }
	3	add chain ip filter FORWARD { type filter hook forward priority 0; }
	4	add chain ip filter OUTPUT { type filter hook output priority 0; }
	5	add chain ip filter TCP
	6	add chain ip filter UDP
	7	add chain ip filter SSH
	8	add rule ip filter INPUT icmp type echo-request limit rate 30/minute burst 8 packets counter accept
	9	add rule ip filter INPUT icmp type echo-request counter drop
	10	add rule ip filter INPUT ct state related,established counter accept
	11	add rule ip filter INPUT iifname lo counter accept
	12	add rule ip filter INPUT ct state invalid counter drop
	13	add rule ip filter INPUT tcp dport 22 ct state new counter jump SSH
	14	# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 3 --seconds 10 -j DROP
	15	# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 20 --seconds 1800 -j DROP
	16	# -t filter -A SSH -m recent --name sshbf --set -j ACCEPT
	17	add rule ip filter INPUT ip protocol udp ct state new counter jump UDP
	18	add rule ip filter INPUT tcp flags & fin\|syn\|rst\|ack == syn ct state new counter jump TCP
	19	add rule ip filter INPUT ip protocol udp counter reject
	20	add rule ip filter INPUT ip protocol tcp counter reject with tcp reset
	21	add rule ip filter INPUT counter reject with icmp type prot-unreachable

files/iptables/nftables6.rules created 644 +24 0

@@ -0,0 +1,24
	1	add table ip6 filter
	2	add chain ip6 filter INPUT { type filter hook input priority 0; }
	3	add chain ip6 filter FORWARD { type filter hook forward priority 0; }
	4	add chain ip6 filter OUTPUT { type filter hook output priority 0; }
	5	add chain ip6 filter TCP
	6	add chain ip6 filter UDP
	7	add chain ip6 filter SSH
	8	add rule ip6 filter INPUT rt type 0 counter drop
	9	add rule ip6 filter OUTPUT rt type 0 counter drop
	10	add rule ip6 filter FORWARD rt type 0 counter drop
	11	add rule ip6 filter INPUT meta l4proto ipv6-icmp icmpv6 type echo-request limit rate 30/minute burst 8 packets counter accept
	12	add rule ip6 filter INPUT meta l4proto ipv6-icmp icmpv6 type echo-request counter drop
	13	add rule ip6 filter INPUT ct state related,established counter accept
	14	add rule ip6 filter INPUT iifname lo counter accept
	15	add rule ip6 filter INPUT ct state invalid counter drop
	16	add rule ip6 filter INPUT tcp dport 22 ct state new counter jump SSH
	17	# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 3 --seconds 10 -j DROP
	18	# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 20 --seconds 1800 -j DROP
	19	# -t filter -A SSH -m recent --name sshbf --set -j ACCEPT
	20	add rule ip6 filter INPUT meta l4proto udp ct state new counter jump UDP
	21	add rule ip6 filter INPUT tcp flags & fin\|syn\|rst\|ack == syn ct state new counter jump TCP
	22	add rule ip6 filter INPUT meta l4proto udp counter reject with icmpv6 type admin-prohibited
	23	add rule ip6 filter INPUT meta l4proto tcp counter reject with icmpv6 type admin-prohibited
	24	add rule ip6 filter INPUT counter reject with icmpv6 type admin-prohibited

files/network/wlan.network created 644 +12 0

@@ -0,0 +1,12
	1	[Match]
	2	Name=wlan0
	3
	4	[Network]
	5	DHCP=no
	6	Address=
	7	Gateway=
	8	DNS=
	9	DNS=
	10	Domains=
	11	NTP=
	12	NTP=

files/sysctl.d/83-rpi-printk.conf created 644 +1 0

	@@ -0,0 +1,1
				1	kernel.printk = 3 4 1 3 No newline at end of file

templates/rpi0buster created 644 +5 0

@@ -0,0 +1,5
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=0
	3	RELEASE=buster
	4	BUILD_KERNEL=true
	5	# ENABLE_BLUETOOTH=false

templates/rpi0stretch created 644 +5 0

@@ -0,0 +1,5
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=0
	3	RELEASE=stretch
	4	BUILD_KERNEL=true
	5	# ENABLE_BLUETOOTH=false

templates/rpi1Pbuster created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=1P
	3	RELEASE=buster
	4	BUILD_KERNEL=true

templates/rpi1Pstretch created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=1P
	3	RELEASE=stretch
	4	BUILD_KERNEL=true

templates/rpi1buster created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=3
	3	RELEASE=buster
	4	BUILD_KERNEL=true

templates/rpi1stretch created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=2
	3	RELEASE=stretch
	4	BUILD_KERNEL=true

templates/rpi2stretch created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=2
	3	RELEASE=stretch
	4	BUILD_KERNEL=true

templates/rpi3-stretch-arm64-4.14.y created 644 +15 0

@@ -0,0 +1,15
	1	# Configuration template file used by rpi23-gen-image.sh
	2	# Debian Stretch using the Arm64 for kernel compilation and Debian distribution.
	3
	4	RPI_MODEL=3
	5	RELEASE=stretch
	6	BUILD_KERNEL=true
	7	KERNEL_ARCH=arm64
	8	RELEASE_ARCH=arm64
	9	CROSS_COMPILE=aarch64-linux-gnu-
	10	QEMU_BINARY=/usr/bin/qemu-aarch64-static
	11	KERNEL_DEFCONFIG=bcmrpi3_defconfig
	12	KERNEL_BIN_IMAGE=Image
	13	KERNEL_IMAGE=kernel8.img
	14	KERNEL_BRANCH=rpi-4.14.y
	15	ENABLE_WIRELESS=true

templates/rpi3Pbuster created 644 +6 0

@@ -0,0 +1,6
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=3P
	3	RELEASE=buster
	4	BUILD_KERNEL=true
	5	# ENABLE_WIRELESS=false
	6	# ENABLE_BLUETOOTH=false

templates/rpi3Pstretch created 644 +6 0

@@ -0,0 +1,6
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=3P
	3	RELEASE=stretch
	4	BUILD_KERNEL=true
	5	# ENABLE_WIRELESS=false
	6	# ENABLE_BLUETOOTH=false

templates/rpi3buster created 644 +6 0

@@ -0,0 +1,6
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=3
	3	RELEASE=buster
	4	BUILD_KERNEL=true
	5	# ENABLE_WIRELESS=false
	6	# ENABLE_BLUETOOTH=false

templates/rpi3stretch created 644 +6 0

@@ -0,0 +1,6
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=3
	3	RELEASE=stretch
	4	BUILD_KERNEL=true
	5	# ENABLE_WIRELESS=false
	6	# ENABLE_BLUETOOTH=false

README-CN.md +6 -6

             ## 介绍
-            `rpi23-gen-image.sh` 是一个自动生成树莓派2/3系统镜像的脚本工具, 当前支持自动生成32位 armhf 架构的Debian, 发行版本`jessie`, `stretch` 和 `buster`. 树莓派3 64位镜像需要使用特定的配置参数 (```templates/rpi3-stretch-arm64-4.11.y```).
+            `rpi23-gen-image.sh` 是一个自动生成树莓派2/3系统镜像的脚本工具, 当前支持自动生成32位 armhf 架构的Debian, 发行版本`jessie`, `stretch` 和 `buster`. 树莓派3 64位镜像需要使用特定的配置参数 (```templates/rpi3-stretch-arm64-4.14.y```).
             ## 构建环境所依赖的包
             一定要安装好下列deb包, 他们是构建过程需要的核心包. 脚本会自动检查, 如果缺少,经用户确认后会自动安装.
             允许串行控制台接口. 没有连接显示器键盘的树莓派推荐打开, 此时如果网络无法连接至树莓派, 可以使用串行控制台连至系统.
             ##### `ENABLE_I2C`=false
-            允许树莓派2/3的 I2C 接口. 请对照 [树莓派2/3 引脚示意图](http://elinux.org/RPi_Low-level_peripherals) 正确连接 GPIO 引脚.
+            允许树莓派2/3的 I2C 接口. 请对照 [树莓派2/3 引脚示意图](https://elinux.org/RPi_Low-level_peripherals) 正确连接 GPIO 引脚.
             ##### `ENABLE_SPI`=false
-            允许树莓派2/3的 SPI 接口. 请对照 [树莓派2/3 引脚示意图](http://elinux.org/RPi_Low-level_peripherals) 正确连接 GPIO 引脚.
+            允许树莓派2/3的 SPI 接口. 请对照 [树莓派2/3 引脚示意图](https://elinux.org/RPi_Low-level_peripherals) 正确连接 GPIO 引脚.
             ##### `ENABLE_IPV6`=true
             允许 IPv6 . 通过 systemd-networkd 配置管理网络接口.
             卸载包、删除文件以减小体积 详情查看 `REDUCE_*` 参数.
             ##### `ENABLE_UBOOT`=false
-            使用 [U-Boot 引导器](http://git.denx.de/?p=u-boot.git;a=summary) 替代树莓派2/3 默认的第二阶段引导器(bootcode.bin).  U-Boot 可以通过网络使用 BOOTP/TFTP 协议引导镜像文件.
+            使用 [U-Boot 引导器](https://git.denx.de/?p=u-boot.git;a=summary) 替代树莓派2/3 默认的第二阶段引导器(bootcode.bin).  U-Boot 可以通过网络使用 BOOTP/TFTP 协议引导镜像文件.
             ##### `UBOOTSRC_DIR`=""
-            存放已下载 [U-Boot 引导器源文件](http://git.denx.de/?p=u-boot.git;a=summary) 的目录(`u-boot`).
+            存放已下载 [U-Boot 引导器源文件](https://git.denx.de/?p=u-boot.git;a=summary) 的目录(`u-boot`).
             ##### `ENABLE_FBTURBO`=false
             安装并且允许 [硬件加速的 Xorg 显卡驱动](https://github.com/ssvb/xf86-video-fbturbo) `fbturbo`. 当前仅支持窗口的移动和滚动的硬件加速.
             * [Debian 交叉工具链 Wiki](https://wiki.debian.org/CrossToolchains)
             * [Github上的树莓派官方固件](https://github.com/raspberrypi/firmware)
             * [Github上的树莓派官方内核](https://github.com/raspberrypi/linux)
-            * [U-BOOT git 仓库](http://git.denx.de/?p=u-boot.git;a=summary)
+            * [U-BOOT git 仓库](https://git.denx.de/?p=u-boot.git;a=summary)
             * [Xorg DDX fbturbo驱动](https://github.com/ssvb/xf86-video-fbturbo)
             * [树莓派3无线接口固件](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm)
             * [Collabora 树莓派2预编译内核](https://repositories.collabora.co.uk/debian/)

README.md +100 -52

             # rpi23-gen-image
             ## Introduction
+            `rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for all Raspberry Pi computers. The script at this time supports the bootstrapping of the Debian (armhf/armel) releases `stretch` and `buster`. Raspberry Pi 0/1/2/3 images are generated for 32-bit mode only. Raspberry Pi 3 supports 64-bit images that can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.14.y```).
-            `rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2) and Raspberry Pi 3 (RPi3) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie`, `stretch` and `buster`. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 64-bit images can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.11.y```).
             ## Build dependencies
               ```debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo```
-            It is recommended to configure the `rpi23-gen-image.sh` script to build and install the latest Raspberry Pi Linux kernel. For the RPi3 this is mandatory. Kernel compilation and linking will be performed on the build system using an ARM (armhf) cross-compiler toolchain.
+            It is recommended to configure the `rpi23-gen-image.sh` script to build and install the latest Raspberry Pi Linux kernel. For the Raspberry 3 this is mandatory. Kernel compilation and linking will be performed on the build system using an ARM (armhf/armel) cross-compiler toolchain.
-            The script has been tested using the default `crossbuild-essential-armhf` toolchain meta package on Debian Linux `jessie` and `stretch` build systems. Please check the [Debian CrossToolchains Wiki](https://wiki.debian.org/CrossToolchains) for further information.
+            The script has been tested using the default `crossbuild-essential-armhf` and `crossbuild-essential-armel` toolchain meta packages on Debian Linux `stretch` build systems. Please check the [Debian CrossToolchains Wiki](https://wiki.debian.org/CrossToolchains) for further information.
-            If a Debian Linux `jessie` build system is used it will be required to add the [Debian Cross-toolchains repository](http://emdebian.org/tools/debian/) first:
-            ```
-            echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources.list.d/crosstools.list
-            sudo -u nobody wget -O - http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
-            dpkg --add-architecture armhf
-            apt-get update
-            ```
             ## Command-line parameters
             The script accepts certain command-line parameters to enable or disable specific OS features, services and configuration settings. These parameters are passed to the `rpi23-gen-image.sh` script via (simple) shell-variables. Unlike environment shell-variables (simple) shell-variables are defined at the beginning of the command-line call of the `rpi23-gen-image.sh` script.
             Set Debian packages server address. Choose a server from the list of Debian worldwide [mirror sites](https://www.debian.org/mirror/list). Using a nearby server will probably speed-up all required downloads within the bootstrapping process.
             ##### `APT_PROXY`=""
-            Set Proxy server address. Using a local Proxy-Cache like `apt-cacher-ng` will speed-up the bootstrapping process because all required Debian packages will only be downloaded from the Debian mirror site once.
+            Set Proxy server address. Using a local Proxy-Cache like `apt-cacher-ng` will speed-up the bootstrapping process because all required Debian packages will only be downloaded from the Debian mirror site once. If `apt-cacher-ng` is running on default `http://127.0.0.1:3142` it is autodetected and you don't need to set this.
             ##### `APT_INCLUDES`=""
-            A comma separated list of additional packages to be installed by debootstrap during bootstrapping.
+            A comma-separated list of additional packages to be installed by debootstrap during bootstrapping.
             ##### `APT_INCLUDES_LATE`=""
-            A comma separated list of additional packages to be installed by apt after bootstrapping and after APT sources are set up.  This is useful for packages with pre-depends, which debootstrap do not handle well.
+            A comma-separated list of additional packages to be installed by apt after bootstrapping and after APT sources are set up.  This is useful for packages with pre-depends, which debootstrap do not handle well.
             ---
             #### General system settings:
+            ##### `SET_ARCH`=32
+            Set Architecture to default 32bit. If you want to compile 64-bit (RPI3 or RPI3+) set it to `64`. This option will set every needed cross-compiler or board specific option for a successful build.
             ##### `RPI_MODEL`=2
-            Specifiy the target Raspberry Pi hardware model. The script at this time supports the Raspberry Pi models `2` and `3`. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` is used.
+            Specify the target Raspberry Pi hardware model. The script at this time supports the following Raspberry Pi models:
+            - `0`  = Raspberry Pi 0 and Raspberry Pi 0 W
+            - `1`  = Raspberry Pi 1 model A and B
+            - `1P` = Raspberry Pi 1 model B+ and A+
+            - `2`  = Raspberry Pi 2 model B
+            - `3`  = Raspberry Pi 3 model B
+            - `3P` = Raspberry Pi 3 model B+
-            ##### `RELEASE`="jessie"
+            ##### `RELEASE`="buster"
-            Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases "jessie", "stretch" and "buster". `BUILD_KERNEL`=true will automatically be set if the Debian releases `stretch` or `buster` are used.
+            Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases `stretch` and `buster`.
             ##### `RELEASE_ARCH`="armhf"
             Set the desired Debian release architecture.
             ##### `HOSTNAME`="rpi$RPI_MODEL-$RELEASE"
-            Set system host name. It's recommended that the host name is unique in the corresponding subnet.
+            Set system hostname. It's recommended that the hostname is unique in the corresponding subnet.
             ##### `PASSWORD`="raspberry"
             Set system `root` password. It's **STRONGLY** recommended that you choose a custom password.
             ##### `EXPANDROOT`=true
             Expand the root partition and filesystem automatically on first boot.
+            ##### `ENABLE_QEMU`=false
+            Generate kernel (`vexpress_defconfig`), file system image (`qcow2`) and DTB files that can be used for QEMU full system emulation (`vexpress-A15`). The output files are stored in the `$(pwd)/images/qemu` directory. You can find more information about running the generated image in the QEMU section of this readme file.
             ---
             #### Keyboard settings:
             ---
             #### Networking settings (DHCP):
-            This parameter is used to set up networking auto configuration in `/etc/systemd/network/eth.network`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.`
+            This parameter is used to set up networking auto-configuration in `/etc/systemd/network/eth.network`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.`
             ##### `ENABLE_DHCP`=true
             Set the system to use DHCP. This requires an DHCP server.
             Set the IP address for the second DNS server.
             ##### `NET_DNS_DOMAINS`=""
-            Set the default DNS search domains to use for non fully qualified host names.
+            Set the default DNS search domains to use for non fully qualified hostnames.
             ##### `NET_NTP_1`=""
             Set the IP address for the first NTP server.
             #### Basic system features:
             ##### `ENABLE_CONSOLE`=true
-            Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi2/3. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system.
+            Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi2/3. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system. On RPI `0` `3` `3P` the CPU speed is locked at lowest speed.
+            ##### `ENABLE_PRINTK`=false
+            Enables printing kernel messages to konsole. printk is `3 4 1 3` as in raspbian.
+            ##### `ENABLE_BLUETOOTH`=false
+            Enable onboard Bluetooth interface on the RPi0/3/3P. See: [Configuring the GPIO serial port on Raspbian jessie and stretch](https://spellfoundry.com/2016/05/29/configuring-gpio-serial-port-raspbian-jessie-including-pi-3/).
+            ##### `ENABLE_MINIUART_OVERLAY`=false
+            Enable Bluetooth to use this. Adds overlay to swap UART0 with UART1. Enabling (slower) Bluetooth and full speed serial console. - RPI `0` `3` `3P` have a fast `hardware UART0` (ttyAMA0) and a `mini UART1` (ttyS0)! RPI `1` `1P` `2` only have a `hardware UART0`. `UART0` is considered better, because is faster and more stable than `mini UART1`. By default the Bluetooth modem is mapped to the `hardware UART0` and `mini UART` is used for console. The `mini UART` is a problem for the serial console, because its baudrate depends on the CPU frequency, which is changing on runtime. Resulting in a volatile baudrate and thus in an unusable serial console.
+            ##### `ENABLE_TURBO`=false
+            Enable Turbo mode. This setting locks cpu at the highest frequency. As setting ENABLE_CONSOLE=true locks RPI to lowest CPU speed, this is can be used additionally to lock cpu hat max speed. Need a good power supply and probably cooling for the Raspberry PI.
             ##### `ENABLE_I2C`=false
-            Enable I2C interface on the RPi2/3. Please check the [RPi2/3 pinout diagrams](http://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
+            Enable I2C interface on the RPi 0/1/2/3. Please check the [RPi 0/1/2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
             ##### `ENABLE_SPI`=false
-            Enable SPI interface on the RPi2/3. Please check the [RPi2/3 pinout diagrams](http://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
+            Enable SPI interface on the RPi 0/1/2/3. Please check the [RPi 0/1/2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
             ##### `ENABLE_IPV6`=true
             Enable IPv6 support. The network interface configuration is managed via systemd-networkd.
             Allow the installation of non-free Debian packages that do not comply with the DFSG. This is required to install closed-source firmware binary blobs.
             ##### `ENABLE_WIRELESS`=false
-            Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
+            Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
             ##### `ENABLE_RSYSLOG`=true
-            If set to false, disable and uninstall rsyslog (so logs will be available only
+            If set to false, disable and uninstall rsyslog (so logs will be available only in journal files)
-            in journal files)
             ##### `ENABLE_SOUND`=true
             Enable sound hardware and install Advanced Linux Sound Architecture.
             ##### `ENABLE_HWRANDOM`=true
-            Enable Hardware Random Number Generator. Strong random numbers are important for most network based communications that use encryption. It's recommended to be enabled.
+            Enable Hardware Random Number Generator. Strong random numbers are important for most network-based communications that use encryption. It's recommended to be enabled.
             ##### `ENABLE_MINGPU`=false
             Minimize the amount of shared memory reserved for the GPU. It doesn't seem to be possible to fully disable the GPU.
             Install Xorg open-source X Window System.
             ##### `ENABLE_WM`=""
-            Install a user defined window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_WM` is used. The `rpi23-gen-image.sh` script has been tested with the following list of window managers: `blackbox`, `openbox`, `fluxbox`, `jwm`, `dwm`, `xfce4`, `awesome`.
+            Install a user-defined window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_WM` is used. The `rpi23-gen-image.sh` script has been tested with the following list of window managers: `blackbox`, `openbox`, `fluxbox`, `jwm`, `dwm`, `xfce4`, `awesome`.
+            ##### `ENABLE_SYSVINIT`=false
+            Support for halt,init,poweroff,reboot,runlevel,shutdown,telinit commands
             ---
             Reduce the disk space usage by deleting packages and files. See `REDUCE_*` parameters for detailed information.
             ##### `ENABLE_UBOOT`=false
-            Replace the default RPi2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](http://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol.
+            Replace the default RPi 0/1/2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](https://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol.
             ##### `UBOOTSRC_DIR`=""
-            Path to a directory (`u-boot`) of [U-Boot bootloader sources](http://git.denx.de/?p=u-boot.git;a=summary) that will be copied, configured, build and installed inside the chroot.
+            Path to a directory (`u-boot`) of [U-Boot bootloader sources](https://git.denx.de/?p=u-boot.git;a=summary) that will be copied, configured, build and installed inside the chroot.
             ##### `ENABLE_FBTURBO`=false
             Install and enable the [hardware accelerated Xorg video driver](https://github.com/ssvb/xf86-video-fbturbo) `fbturbo`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling.
             ##### `FBTURBOSRC_DIR`=""
             Path to a directory (`xf86-video-fbturbo`) of [hardware accelerated Xorg video driver sources](https://github.com/ssvb/xf86-video-fbturbo) that will be copied, configured, build and installed inside the chroot.
+            ##### `ENABLE_VIDEOCORE`=false
+            Install and enable the [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) `vcgencmd`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling.
+            ##### `VIDEOCORESRC_DIR`=""
+            Path to a directory (`userland`) of [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) that will be copied, configured, build and installed inside the chroot.
             ##### `ENABLE_IPTABLES`=false
             Enable iptables IPv4/IPv6 firewall. Simplified ruleset: Allow all outgoing connections. Block all incoming connections except to OpenSSH service.
             ##### `ENABLE_USER`=true
-            Create non-root user with password `USER_PASSWORD`=raspberry. Unless overridden with `USER_NAME`=user, username will be `pi`.
+            Create non-root user with password `USER_PASSWORD`=raspberry. Unless overridden with `USER_NAME`=user, the username will be `pi`.
             ##### `USER_NAME`=pi
             Non-root user to create.  Ignored if `ENABLE_USER`=false
             Create an initramfs that that will be loaded during the Linux startup process. `ENABLE_INITRAMFS` will automatically get enabled if `ENABLE_CRYPTFS`=true. This parameter will be ignored if `BUILD_KERNEL`=false.
             ##### `ENABLE_IFNAMES`=true
-            Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names. This parameter is only supported if the Debian releases `stretch` or `buster` are used.
+            Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names.
             ##### `DISABLE_UNDERVOLT_WARNINGS`=
             Disable RPi2/3 under-voltage warnings and overlays. Setting the parameter to `1` will disable the warning overlay. Setting it to `2` will additionally allow RPi2/3 turbo mode when low-voltage is present.
             #### SSH settings:
             ##### `SSH_ENABLE_ROOT`=false
-            Enable password root login via SSH. This may be a security risk with default password, use only in trusted environments. `ENABLE_ROOT` must be set to `true`.
+            Enable password-based root login via SSH. This may be a security risk with the default password set, use only in trusted environments. `ENABLE_ROOT` must be set to `true`.
             ##### `SSH_DISABLE_PASSWORD_AUTH`=false
-            Disable password based SSH authentication. Only public key based SSH (v2) authentication will be supported.
+            Disable password-based SSH authentication. Only public key based SSH (v2) authentication will be supported.
             ##### `SSH_LIMIT_USERS`=false
             Limit the users that are allowed to login via SSH. Only allow user `USER_NAME`=pi and root if `SSH_ENABLE_ROOT`=true to login. This parameter will be ignored if `dropbear` SSH is used (`REDUCE_SSHD`=true).
             ---
             #### Kernel compilation:
-            ##### `BUILD_KERNEL`=false
+            ##### `BUILD_KERNEL`=true
-            Build and install the latest RPi2/3 Linux kernel. Currently only the default RPi2/3 kernel configuration is used. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` is used.
+            Build and install the latest RPi 0/1/2/3 Linux kernel. Currently only the default RPi 0/1/2/3 kernel configuration is used.
             ##### `CROSS_COMPILE`="arm-linux-gnueabihf-"
-            This sets the cross compile enviornment for the compiler.
+            This sets the cross-compile environment for the compiler.
             ##### `KERNEL_ARCH`="arm"
             This sets the kernel architecture for the compiler.
             Sets the default config for kernel compiling. If not set, `KERNEL_DEFCONFIG` will be set to "bcmrpi3\_defconfig" automatically if building for arm64.
             ##### `KERNEL_REDUCE`=false
-            Reduce the size of the generated kernel by removing unwanted device, network and filesystem drivers (experimental).
+            Reduce the size of the generated kernel by removing unwanted devices, network and filesystem drivers (experimental).
             ##### `KERNEL_THREADS`=1
             Number of parallel kernel building threads. If the parameter is left untouched the script will automatically determine the number of CPU cores to set the number of parallel threads to speed the kernel compilation.
             ##### `KERNEL_HEADERS`=true
-            Install kernel headers with built kernel.
+            Install kernel headers with the built kernel.
             ##### `KERNEL_MENUCONFIG`=false
             Start `make menuconfig` interactive menu-driven kernel configuration. The script will continue after `make menuconfig` was terminated.
+            ##### `KERNEL_OLDDEFCONFIG`=false
+            Run `make olddefconfig` to automatically set all new kernel configuration options to their recommended default values.
+            ##### `KERNEL_CCACHE`=false
+            Compile the kernel using ccache. This speeds up kernel recompilation by caching previous compilations and detecting when the same compilation is being done again.
             ##### `KERNEL_REMOVESRC`=true
             Remove all kernel sources from the generated OS image after it was built and installed.
             | `10-bootstrap.sh` | Debootstrap basic system |
             | `11-apt.sh` | Setup APT repositories |
             | `12-locale.sh` | Setup Locales and keyboard settings |
-            | `13-kernel.sh` | Build and install RPi2/3 Kernel |
+            | `13-kernel.sh` | Build and install RPi 0/1/2/3 Kernel |
             | `14-fstab.sh` | Setup fstab and initramfs |
-            | `15-rpi-config.sh` | Setup RPi2/3 config and cmdline |
+            | `15-rpi-config.sh` | Setup RPi 0/1/2/3 config and cmdline |
             | `20-networking.sh` | Setup Networking |
             | `21-firewall.sh` | Setup Firewall |
             | `30-security.sh` | Setup Users and Security settings |
             | `32-sshd.sh` | Setup SSH and public keys |
             | `41-uboot.sh` | Build and Setup U-Boot |
             | `42-fbturbo.sh` | Build and Setup fbturbo Xorg driver |
+            | `43-videocore.sh` | Build and Setup videocore libraries |
             | `50-firstboot.sh` | First boot actions |
             | `99-reduce.sh` | Reduce the disk space usage |
             | Directory | Description |
             | --- | --- |
             | `apt` | APT management configuration files |
-            | `boot` | Boot and RPi2/3 configuration files |
+            | `boot` | Boot and RPi 0/1/2/3 configuration files |
             | `dpkg` | Package Manager configuration |
             | `etc` | Configuration files and rc scripts |
             | `firstboot` | Scripts that get executed on first boot  |
             ```
             ## Flashing the image file
-            After the image file was successfully created by the `rpi23-gen-image.sh` script it can be copied to the microSD card that will be used by the RPi2/3 computer. This can be performed by using the tools `bmaptool` or `dd`. Using `bmaptool` will probably speed-up the copy process because `bmaptool` copies more wisely than `dd`.
+            After the image file was successfully created by the `rpi23-gen-image.sh` script it can be copied to the microSD card that will be used by the RPi 0/1/2/3 computer. This can be performed by using the tools `bmaptool` or `dd`. Using `bmaptool` will probably speed-up the copy process because `bmaptool` copies more wisely than `dd`.
             ##### Flashing examples:
             ```shell
-            bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie.img /dev/mmcblk0
+            bmaptool copy ./images/buster/2017-01-23-rpi3-buster.img /dev/mmcblk0
-            dd bs=4M if=./images/jessie/2017-01-23-rpi3-jessie.img of=/dev/mmcblk0
+            dd bs=4M if=./images/buster/2017-01-23-rpi3-buster.img of=/dev/mmcblk0
             ```
             If you have set `ENABLE_SPLITFS`, copy the `-frmw` image on the microSD card, then the `-root` one on the USB drive:
             ```shell
-            bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-frmw.img /dev/mmcblk0
+            bmaptool copy ./images/buster/2017-01-23-rpi3-buster-frmw.img /dev/mmcblk0
-            bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-root.img /dev/sdc
+            bmaptool copy ./images/buster/2017-01-23-rpi3-buster-root.img /dev/sdc
+            ```
+            ## QEMU emulation
+            Start QEMU full system emulation:
+            ```shell
+            qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -kernel kernel7.img -no-reboot -dtb vexpress-v2p-ca15_a7.dtb -sd ${IMAGE_NAME}.qcow2 -append "root=/dev/mmcblk0p2 rw rootfstype=ext4 console=tty1"
+            ```
+            Start QEMU full system emulation and output to console:
+            ```shell
+            qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -kernel kernel7.img -no-reboot -dtb vexpress-v2p-ca15_a7.dtb -sd ${IMAGE_NAME}.qcow2 -append "root=/dev/mmcblk0p2 rw rootfstype=ext4 console=ttyAMA0,115200 init=/bin/systemd" -serial stdio
+            ```
+            Start QEMU full system emulation with SMP and output to console:
+            ```shell
+            qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -smp cpus=2,maxcpus=2 -kernel kernel7.img -no-reboot -dtb vexpress-v2p-ca15_a7.dtb -sd ${IMAGE_NAME}.qcow2 -append "root=/dev/mmcblk0p2 rw rootfstype=ext4 console=ttyAMA0,115200 init=/bin/systemd" -serial stdio
+            ```
+            Start QEMU full system emulation with cryptfs, initramfs and output to console:
+            ```shell
+            qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -kernel kernel7.img -no-reboot -dtb vexpress-v2p-ca15_a7.dtb -sd ${IMAGE_NAME}.qcow2 -initrd "initramfs-${KERNEL_VERSION}" -append "root=/dev/mapper/secure cryptdevice=/dev/mmcblk0p2:secure rw rootfstype=ext4 console=ttyAMA0,115200 init=/bin/systemd" -serial stdio
             ```
-            ## Weekly image builds
-            The image files are provided by JRWR'S I/O PORT and are built once a Sunday at midnight UTC!
-            * [Debian Stretch Raspberry Pi2/3 Weekly Image Builds](https://jrwr.io/doku.php?id=projects:debianpi)
             ## External links and references
             * [Debian worldwide mirror sites](https://www.debian.org/mirror/list)
             * [Debian CrossToolchains Wiki](https://wiki.debian.org/CrossToolchains)
             * [Official Raspberry Pi Firmware on github](https://github.com/raspberrypi/firmware)
             * [Official Raspberry Pi Kernel on github](https://github.com/raspberrypi/linux)
-            * [U-BOOT git repository](http://git.denx.de/?p=u-boot.git;a=summary)
+            * [U-BOOT git repository](https://git.denx.de/?p=u-boot.git;a=summary)
             * [Xorg DDX driver fbturbo](https://github.com/ssvb/xf86-video-fbturbo)
             * [RPi3 Wireless interface firmware](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm)
             * [Collabora RPi2 Kernel precompiled](https://repositories.collabora.co.uk/debian/)

bootstrap.d/10-bootstrap.sh +1 -7

             VARIANT=""
             COMPONENTS="main"
-            EXCLUDES=""
             # Use non-free Debian packages if needed
             if [ "$ENABLE_NONFREE" = true ] ; then
               VARIANT="--variant=minbase"
             fi
-            # Exclude packages if required by Debian release
-            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-              EXCLUDES="--exclude=init,systemd-sysv"
-            fi
             # Base debootstrap (unpack only)
-            http_proxy=${APT_PROXY} debootstrap ${EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
+            http_proxy=${APT_PROXY} debootstrap ${APT_EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
             # Copy qemu emulator binary to chroot
             install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"

bootstrap.d/11-apt.sh +6 -29

@@ -11,46 +11,23 if [ -z "$APT_PROXY" ] ; then
11	sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"	11	sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
12	fi	12	fi
13		13
14	if [ "$BUILD_KERNEL" = false ] ; then
15	# Install APT pinning configuration for flash-kernel package
16	install_readonly files/apt/flash-kernel "${ETC_DIR}/apt/preferences.d/flash-kernel"
17
18	# Install APT sources.list
19	install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
20	echo "deb ${COLLABORA_URL} ${RELEASE} rpi2" >> "${ETC_DIR}/apt/sources.list"
21
22	# Upgrade collabora package index and install collabora keyring
23	chroot_exec apt-get -qq -y update
24	# Removed --allow-unauthenticated as suggested after modification on _apt privileges
25	chroot_exec apt-get -qq -y install collabora-obs-archive-keyring
26	else # BUILD_KERNEL=true
27	# Install APT sources.list
28	install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
29
30	# Use specified APT server and release
31	sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
32	sed -i "s/ jessie/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
33	fi
34
35	# Allow the installation of non-free Debian packages
36	if [ "$ENABLE_NONFREE" = true ] ; then
37	sed -i "s/ contrib/ contrib non-free/" "${ETC_DIR}/apt/sources.list"
38	fi
39
40	# Upgrade package index and update all installed packages and changed dependencies	14	# Upgrade package index and update all installed packages and changed dependencies
41	chroot_exec apt-get -qq -y update	15	chroot_exec apt-get -qq -y update
42	chroot_exec apt-get -qq -y -u dist-upgrade	16	chroot_exec apt-get -qq -y -u dist-upgrade
43		17
		18	# Install additional packages
44	if [ "$APT_INCLUDES_LATE" ] ; then	19	if [ "$APT_INCLUDES_LATE" ] ; then
45	chroot_exec apt-get -qq -y install $(echo $APT_INCLUDES_LATE \|tr , ' ')	20	chroot_exec apt-get -qq -y install "$(echo "$APT_INCLUDES_LATE" \|tr , ' ')"
46	fi	21	fi
47		22
		23	# Install Debian custom packages
48	if [ -d packages ] ; then	24	if [ -d packages ] ; then
49	for package in packages/*.deb ; do	25	for package in packages/*.deb ; do
50	cp $package ${R}/tmp	26	cp "$package" "${R}"/tmp
51	chroot_exec dpkg --unpack /tmp/$(basename $package)	27	chroot_exec dpkg --unpack /tmp/"$(basename "$package")"
52	done	28	done
53	fi	29	fi
		30
54	chroot_exec apt-get -qq -y -f install	31	chroot_exec apt-get -qq -y -f install
55		32
56	chroot_exec apt-get -qq -y check	33	chroot_exec apt-get -qq -y check

bootstrap.d/12-locale.sh +2 -2

             . ./functions.sh
             # Install and setup timezone
-            echo ${TIMEZONE} > "${ETC_DIR}/timezone"
+            echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
             chroot_exec dpkg-reconfigure -f noninteractive tzdata
             # Install and setup default locale and keyboard configuration
-            if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then
+            if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then
               # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug
               # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957
               # ... so we have to set locales manually

bootstrap.d/13-kernel.sh +96 -26

             # Fetch and build latest raspberry kernel
             if [ "$BUILD_KERNEL" = true ] ; then
               # Setup source directory
-              mkdir -p "${R}/usr/src/linux"
+              mkdir -p "${KERNEL_DIR}"
               # Copy existing kernel sources into chroot directory
               if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
                 # Copy kernel sources and include hidden files
-                cp -r "${KERNELSRC_DIR}/". "${R}/usr/src/linux"
+                cp -r "${KERNELSRC_DIR}/". "${KERNEL_DIR}"
                 # Clean the kernel sources
                 if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
                 # Fetch current RPi2/3 kernel sources
                 if [ -z "${KERNEL_BRANCH}" ] ; then
-                  as_nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
+                  as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                 else
-                  as_nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
+                  as_nobody -H git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
-               fi
+                fi
                 # Copy downloaded kernel sources
-                cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/"
+                cp -r "${temp_dir}/linux/"* "${KERNEL_DIR}"
                 # Remove temporary directory for kernel sources
                 rm -fr "${temp_dir}"
                   # Load default raspberry kernel configuration
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
-                  if [ ! -z "$KERNELSRC_USRCONFIG" ] ; then
+                  # Set kernel configuration parameters to enable qemu emulation
-                    cp $KERNELSRC_USRCONFIG ${KERNEL_DIR}/.config
+                  if [ "$ENABLE_QEMU" = true ] ; then
+                    echo "CONFIG_FHANDLE=y" >> "${KERNEL_DIR}"/.config
+                    echo "CONFIG_LBDAF=y" >> "${KERNEL_DIR}"/.config
+                    if [ "$ENABLE_CRYPTFS" = true ] ; then
+                      {
+                        echo "CONFIG_EMBEDDED=y"
+                        echo "CONFIG_EXPERT=y"
+                        echo "CONFIG_DAX=y"
+                        echo "CONFIG_MD=y"
+                        echo "CONFIG_BLK_DEV_MD=y"
+                        echo "CONFIG_MD_AUTODETECT=y"
+                        echo "CONFIG_BLK_DEV_DM=y"
+                        echo "CONFIG_BLK_DEV_DM_BUILTIN=y"
+                        echo "CONFIG_DM_CRYPT=y"
+                        echo "CONFIG_CRYPTO_BLKCIPHER=y"
+                        echo "CONFIG_CRYPTO_CBC=y"
+                        echo "CONFIG_CRYPTO_XTS=y"
+                        echo "CONFIG_CRYPTO_SHA512=y"
+                        echo "CONFIG_CRYPTO_MANAGER=y"
+                      } >> "${KERNEL_DIR}"/.config
+                    fi
+                  fi
+                  # Copy custom kernel configuration file
+                  if [ -n "$KERNELSRC_USRCONFIG" ] ; then
+                    cp "$KERNELSRC_USRCONFIG" "${KERNEL_DIR}"/.config
+                  fi
+                  # Set kernel configuration parameters to their default values
+                  if [ "$KERNEL_OLDDEFCONFIG" = true ] ; then
+                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" olddefconfig
                   fi
                   # Start menu-driven kernel configuration (interactive)
                   fi
                 fi
-                # Cross compile kernel and modules
+                # Use ccache to cross compile the kernel
-                make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_BIN_IMAGE}" modules dtbs
+                if [ "$KERNEL_CCACHE" = true ] ; then
+                  cc="ccache ${CROSS_COMPILE}gcc"
+                else
+                  cc="${CROSS_COMPILE}gcc"
+                fi
+                # Cross compile kernel and dtbs
+                make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" "${KERNEL_BIN_IMAGE}" dtbs
+                # Cross compile kernel modules
+                if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+                  make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" modules
+                fi
               fi
               # Check if kernel compilation was successful
               # Install kernel modules
               if [ "$ENABLE_REDUCE" = true ] ; then
-                make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=../../.. modules_install
+                if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+                  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=../../.. modules_install
+                fi
               else
-                make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_PATH=../../.. modules_install
+                if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+                  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_PATH=../../.. modules_install
+                fi
                 # Install kernel firmware
-                if [ $(cat ./Makefile | grep "^firmware_install:") ] ; then
+                if grep -q "^firmware_install:" "${KERNEL_DIR}/Makefile" ; then
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_FW_PATH=../../../lib firmware_install
                 fi
               fi
               mkdir "${BOOT_DIR}"
               # Get kernel release version
-              KERNEL_VERSION=`cat "${KERNEL_DIR}/include/config/kernel.release"`
+              KERNEL_VERSION=$(cat "${KERNEL_DIR}/include/config/kernel.release")
               # Copy kernel configuration file to the boot directory
               install_readonly "${KERNEL_DIR}/.config" "${R}/boot/config-${KERNEL_VERSION}"
-              # Copy dts and dtb device tree sources and binaries
+              # Prepare device tree directory
               mkdir "${BOOT_DIR}/overlays"
               # Ensure the proper .dtb is located
               if [ "$KERNEL_ARCH" = "arm" ] ; then
-                install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/"*.dtb "${BOOT_DIR}/"
+                for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/"*.dtb ; do
+                  if [ -f "${dtb}" ] ; then
+                    install_readonly "${dtb}" "${BOOT_DIR}/"
+                  fi
+                done
               else
-                install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/broadcom/"*.dtb "${BOOT_DIR}/"
+                for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/broadcom/"*.dtb ; do
+                  if [ -f "${dtb}" ] ; then
+                    install_readonly "${dtb}" "${BOOT_DIR}/"
+                  fi
+                done
               fi
-              install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/"*.dtb* "${BOOT_DIR}/overlays/"
+              # Copy compiled dtb device tree files
-              install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" "${BOOT_DIR}/overlays/README"
+              if [ -d "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays" ] ; then
+                for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/"*.dtb ; do
+                  if [ -f "${dtb}" ] ; then
+                    install_readonly "${dtb}" "${BOOT_DIR}/overlays/"
+                  fi
+                done
+                if [ -f "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" ] ; then
+                  install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" "${BOOT_DIR}/overlays/README"
+                fi
+              fi
               if [ "$ENABLE_UBOOT" = false ] ; then
                 # Convert and copy kernel image to the boot directory
               if [ "$KERNEL_REMOVESRC" = true ] ; then
                 rm -fr "${KERNEL_DIR}"
               else
-                make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
+                # Prepare compiled kernel modules
+                if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+                  if grep -q "^modules_prepare:" "${KERNEL_DIR}/Makefile" ; then
+                    make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
+                  fi
-                # Create symlinks for kernel modules
+                  # Create symlinks for kernel modules
-                chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/build"
+                  chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/build"
-                chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/source"
+                  chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/source"
+                fi
               fi
             else # BUILD_KERNEL=false
               chroot_exec apt-get -qq -y install flash-kernel
               # Check if kernel installation was successful
-              VMLINUZ="$(ls -1 ${R}/boot/vmlinuz-* | sort | tail -n 1)"
+              VMLINUZ="$(ls -1 "${R}"/boot/vmlinuz-* | sort | tail -n 1)"
               if [ -z "$VMLINUZ" ] ; then
                 echo "error: kernel installation failed! (/boot/vmlinuz-* not found)"
                 cleanup

bootstrap.d/14-fstab.sh +5 -2

               # Add encrypted partition to crypttab and fstab
               install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
-              echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks" >> "${ETC_DIR}/crypttab"
+              echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 # Add usb/sda disk to crypttab
                 # Disable SSHD inside initramfs
                 printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
+                # Add cryptsetup modules to initramfs
+                printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
                 # Dummy mapping required by mkinitramfs
-                echo "0 1 crypt $(echo ${CRYPTFS_CIPHER} | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
+                echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
                 # Generate initramfs with encrypted root partition support
                 chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"

bootstrap.d/15-rpi-config.sh +114 -36

@@ -8,13 +8,13
8	if [ "$BUILD_KERNEL" = true ] ; then	8	if [ "$BUILD_KERNEL" = true ] ; then
9	if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then	9	if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
10	# Install boot binaries from local directory	10	# Install boot binaries from local directory
11	cp ${RPI_FIRMWARE_DIR}/boot/bootcode.bin ${BOOT_DIR}/bootcode.bin	11	cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
12	cp ${RPI_FIRMWARE_DIR}/boot/fixup.dat ${BOOT_DIR}/fixup.dat	12	cp "${RPI_FIRMWARE_DIR}"/boot/fixup.dat "${BOOT_DIR}"/fixup.dat
13	cp ${RPI_FIRMWARE_DIR}/boot/fixup_cd.dat ${BOOT_DIR}/fixup_cd.dat	13	cp "${RPI_FIRMWARE_DIR}"/boot/fixup_cd.dat "${BOOT_DIR}"/fixup_cd.dat
14	cp ${RPI_FIRMWARE_DIR}/boot/fixup_x.dat ${BOOT_DIR}/fixup_x.dat	14	cp "${RPI_FIRMWARE_DIR}"/boot/fixup_x.dat "${BOOT_DIR}"/fixup_x.dat
15	cp ${RPI_FIRMWARE_DIR}/boot/start.elf ${BOOT_DIR}/start.elf	15	cp "${RPI_FIRMWARE_DIR}"/boot/start.elf "${BOOT_DIR}"/start.elf
16	cp ${RPI_FIRMWARE_DIR}/boot/start_cd.elf ${BOOT_DIR}/start_cd.elf	16	cp "${RPI_FIRMWARE_DIR}"/boot/start_cd.elf "${BOOT_DIR}"/start_cd.elf
17	cp ${RPI_FIRMWARE_DIR}/boot/start_x.elf ${BOOT_DIR}/start_x.elf	17	cp "${RPI_FIRMWARE_DIR}"/boot/start_x.elf "${BOOT_DIR}"/start_x.elf
18	else	18	else
19	# Create temporary directory for boot binaries	19	# Create temporary directory for boot binaries
20	temp_dir=$(as_nobody mktemp -d)	20	temp_dir=$(as_nobody mktemp -d)
@@ -42,23 +42,114 fi
42		42
43	# Setup firmware boot cmdline	43	# Setup firmware boot cmdline
44	if [ "$ENABLE_SPLITFS" = true ] ; then	44	if [ "$ENABLE_SPLITFS" = true ] ; then
45	CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"	45	CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
46	else	46	else
47	CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"	47	CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
48	fi	48	fi
49		49
50	# Add encrypted root partition to cmdline.txt	50	# Add encrypted root partition to cmdline.txt
51	if [ "$ENABLE_CRYPTFS" = true ] ; then	51	if [ "$ENABLE_CRYPTFS" = true ] ; then
52	if [ "$ENABLE_SPLITFS" = true ] ; then	52	if [ "$ENABLE_SPLITFS" = true ] ; then
53	CMDLINE=$(echo ${CMDLINE} \| sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")	53	CMDLINE=$(echo "${CMDLINE}" \| sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")
54	else	54	else
55	CMDLINE=$(echo ${CMDLINE} \| sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")	55	CMDLINE=$(echo "${CMDLINE}" \| sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")
56	fi	56	fi
57	fi	57	fi
58		58
59	# Add serial console support	59	#locks cpu at max frequency
		60	if [ "$ENABLE_TURBO" = true ] ; then
		61	echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"
		62	fi
		63
		64	if [ "$ENABLE_PRINTK" = true ] ; then
		65	install_readonly files/sysctl.d/83-rpi-printk.conf "${ETC_DIR}/sysctl.d/83-rpi-printk.conf"
		66	fi
		67
		68	# Install udev rule for serial alias
		69	install_readonly files/etc/99-com.rules "${LIB_DIR}/udev/rules.d/99-com.rules"
		70
		71	if [ "$RPI_MODEL" = 0 ] \|\| [ "$RPI_MODEL" = 3 ] \|\| [ "$RPI_MODEL" = 3P ] ; then
		72
		73	# RPI0,3,3P Use default ttyS0 (mini-UART)as serial interface
		74	SET_SERIAL="ttyS0"
		75
		76	# Bluetooth enabled
		77	if [ "$ENABLE_BLUETOOTH" = true ] ; then
		78	# Create temporary directory for Bluetooth sources
		79	temp_dir=$(as_nobody mktemp -d)
		80
		81	# Fetch Bluetooth sources
		82	as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
		83
		84	# Copy downloaded sources
		85	mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
		86
		87	# Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
		88	as_nobody wget -q -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
		89	as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
		90
		91	# Set permissions
		92	chown -R root:root "${R}/tmp/pi-bluetooth"
		93
		94	# Install tools
		95	install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
		96	install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
		97
		98	# Install bluetooth udev rule
		99	install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
		100
		101	# Install Firmware Flash file and apropiate licence
		102	mkdir -p "$BLUETOOTH_FIRMWARE_DIR"
		103	install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
		104	install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
		105	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
		106	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
		107
		108	# Remove temporary directory
		109	rm -fr "${temp_dir}"
		110
		111	# Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Slow Bluetooth and slow cpu. Use /dev/ttyS0 instead of /dev/ttyAMA0
		112	if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
		113	SET_SERIAL="ttyAMA0"
		114
		115	# set overlay to swap ttyAMA0 and ttyS0
		116	echo "dtoverlay=pi3-miniuart-bt" >> "${BOOT_DIR}/config.txt"
		117
		118	# if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
		119	if [ "$ENABLE_TURBO" = false ] ; then
		120	echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
		121	fi
		122
		123	# Activate services
		124	chroot_exec systemctl enable pi-bluetooth.hciuart.service
		125	#chroot_exec systemctl enable pi-bluetooth.bthelper@.service
		126	else
		127	chroot_exec systemctl enable pi-bluetooth.hciuart.service
		128	#chroot_exec systemctl enable pi-bluetooth.bthelper@.service
		129	fi
		130
		131	else # if ENABLE_BLUETOOTH = false
		132	# set overlay to disable bluetooth
		133	echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
		134	fi # ENABLE_BLUETOOTH end
		135
		136	else
		137	# RPI1,1P,2 Use default ttyAMA0 (full UART) as serial interface
		138	SET_SERIAL="ttyAMA0"
		139	fi
		140
		141	# may need sudo systemctl disable hciuart
60	if [ "$ENABLE_CONSOLE" = true ] ; then	142	if [ "$ENABLE_CONSOLE" = true ] ; then
61	CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"	143	echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
		144	# add string to cmdline
		145	CMDLINE="${CMDLINE} console=serial0,115200"
		146
		147	# Enable serial console systemd style
		148	chroot_exec systemctl enable serial-getty\@"$SET_SERIAL".service
		149	else
		150	echo "enable_uart=0" >> "${BOOT_DIR}/config.txt"
		151	# disable serial console systemd style
		152	chroot_exec systemctl disable serial-getty\@"$SET_SERIAL".service
62	fi	153	fi
63		154
64	# Remove IPv6 networking support	155	# Remove IPv6 networking support
@@ -73,11 +164,6 else
73	CMDLINE="${CMDLINE} net.ifnames=1"	164	CMDLINE="${CMDLINE} net.ifnames=1"
74	fi	165	fi
75		166
76	# Set init to systemd if required by Debian release
77	if [ "$RELEASE" = "stretch" ] \|\| [ "$RELEASE" = "buster" ] ; then
78	CMDLINE="${CMDLINE} init=/bin/systemd"
79	fi
80
81	# Install firmware boot cmdline	167	# Install firmware boot cmdline
82	echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"	168	echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"
83		169
@@ -94,30 +180,22 if [ "$ENABLE_INITRAMFS" = true ] ; then
94	echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"	180	echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
95	fi	181	fi
96		182
97	# Disable RPi3 Bluetooth and restore ttyAMA0 serial device
98	if [ "$RPI_MODEL" = 3 ] ; then
99	if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
100	echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
101	echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
102	fi
103	fi
104
105	# Create firmware configuration and cmdline symlinks	183	# Create firmware configuration and cmdline symlinks
106	ln -sf firmware/config.txt "${R}/boot/config.txt"	184	ln -sf firmware/config.txt "${R}/boot/config.txt"
107	ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"	185	ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"
108		186
109	# Install and setup kernel modules to load at boot	187	# Install and setup kernel modules to load at boot
110	mkdir -p "${R}~~/lib~~/modules-load.d/"	188	mkdir -p "${LIB_DIR}/modules-load.d/"
111	install_readonly files/modules/rpi2.conf "${R}~~/lib~~/modules-load.d/rpi2.conf"	189	install_readonly files/modules/rpi2.conf "${LIB_DIR}/modules-load.d/rpi2.conf"
112		190
113	# Load hardware random module at boot	191	# Load hardware random module at boot
114	if [ "$ENABLE_HWRANDOM" = true ] && [ "$BUILD_KERNEL" = false ] ; then	192	if [ "$ENABLE_HWRANDOM" = true ] && [ "$BUILD_KERNEL" = false ] ; then
115	sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${R}~~/lib~~/modules-load.d/rpi2.conf"	193	sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${LIB_DIR}/modules-load.d/rpi2.conf"
116	fi	194	fi
117		195
118	# Load sound module at boot	196	# Load sound module at boot
119	if [ "$ENABLE_SOUND" = true ] ; then	197	if [ "$ENABLE_SOUND" = true ] ; then
120	sed -i "s/^# snd_bcm2835/snd_bcm2835/" "${R}~~/lib~~/modules-load.d/rpi2.conf"	198	sed -i "s/^# snd_bcm2835/snd_bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
121	else	199	else
122	echo "dtparam=audio=off" >> "${BOOT_DIR}/config.txt"	200	echo "dtparam=audio=off" >> "${BOOT_DIR}/config.txt"
123	fi	201	fi
@@ -125,21 +203,21 fi
125	# Enable I2C interface	203	# Enable I2C interface
126	if [ "$ENABLE_I2C" = true ] ; then	204	if [ "$ENABLE_I2C" = true ] ; then
127	echo "dtparam=i2c_arm=on" >> "${BOOT_DIR}/config.txt"	205	echo "dtparam=i2c_arm=on" >> "${BOOT_DIR}/config.txt"
128	sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${R}~~/lib~~/modules-load.d/rpi2.conf"	206	sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${LIB_DIR}/modules-load.d/rpi2.conf"
129	sed -i "s/^# i2c-dev/i2c-dev/" "${R}~~/lib~~/modules-load.d/rpi2.conf"	207	sed -i "s/^# i2c-dev/i2c-dev/" "${LIB_DIR}/modules-load.d/rpi2.conf"
130	fi	208	fi
131		209
132	# Enable SPI interface	210	# Enable SPI interface
133	if [ "$ENABLE_SPI" = true ] ; then	211	if [ "$ENABLE_SPI" = true ] ; then
134	echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt"	212	echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt"
135	echo "spi-bcm2708" >> "${R}~~/lib~~/modules-load.d/rpi2.conf"	213	echo "spi-bcm2708" >> "${LIB_DIR}/modules-load.d/rpi2.conf"
136	if [ "$RPI_MODEL" = 3 ] ; then	214	if [ "$RPI_MODEL" = 3 ] \|\| [ "$RPI_MODEL" = 3P ]; then
137	sed -i "s/spi-bcm2708/spi-bcm2835/" "${R}~~/lib~~/modules-load.d/rpi2.conf"	215	sed -i "s/spi-bcm2708/spi-bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
138	fi	216	fi
139	fi	217	fi
140		218
141	# Disable RPi2/3 under-voltage warnings	219	# Disable RPi2/3 under-voltage warnings
142	if [ ~~! -z~~ "$DISABLE_UNDERVOLT_WARNINGS" ] ; then	220	if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
143	echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"	221	echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"
144	fi	222	fi
145		223

bootstrap.d/20-networking.sh +45 -20

             # Install and setup hostname
             install_readonly files/network/hostname "${ETC_DIR}/hostname"
-            sed -i "s/^rpi2-jessie/${HOSTNAME}/" "${ETC_DIR}/hostname"
+            sed -i "s/^RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hostname"
             # Install and setup hosts
             install_readonly files/network/hosts "${ETC_DIR}/hosts"
-            sed -i "s/rpi2-jessie/${HOSTNAME}/" "${ETC_DIR}/hosts"
+            sed -i "s/RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hosts"
             # Setup hostname entry with static IP
             if [ "$NET_ADDRESS" != "" ] ; then
             # Install configuration for interface eth0
             install_readonly files/network/eth.network "${ETC_DIR}/systemd/network/eth.network"
+            # Install configuration for interface wl*
+            install_readonly files/network/wlan.network "${ETC_DIR}/systemd/network/wlan.network"
+            #always with dhcp since wpa_supplicant integration is missing
+            sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" "${ETC_DIR}/systemd/network/wlan.network"
             if [ "$ENABLE_DHCP" = true ] ; then
               # Enable DHCP configuration for interface eth0
               sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" "${ETC_DIR}/systemd/network/eth.network"
               # Set DHCP configuration to IPv4 only
               if [ "$ENABLE_IPV6" = false ] ; then
                 sed -i "s/DHCP=.*/DHCP=v4/" "${ETC_DIR}/systemd/network/eth.network"
             # Remove empty settings from network configuration
             sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/eth.network"
+            # Remove empty settings from wlan configuration
+            sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/wlan.network"
             # Move systemd network configuration if required by Debian release
-            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+            mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
-              mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
+            # If WLAN is enabled copy wlan configuration too
-              rm -fr "${ETC_DIR}/systemd/network"
+            if [ "$ENABLE_WIRELESS" = true ] ; then
+              mv -v "${ETC_DIR}/systemd/network/wlan.network" "${LIB_DIR}/systemd/network/11-wlan.network"
             fi
+            rm -fr "${ETC_DIR}/systemd/network"
             # Enable systemd-networkd service
             chroot_exec systemctl enable systemd-networkd
             fi
             # Enable time sync
-            if [ "NET_NTP_1" != "" ] ; then
+            if [ "$NET_NTP_1" != "" ] ; then
               chroot_exec systemctl enable systemd-timesyncd.service
             fi
             # Download the firmware binary blob required to use the RPi3 wireless interface
             if [ "$ENABLE_WIRELESS" = true ] ; then
-              if [ ! -d ${WLAN_FIRMWARE_DIR} ] ; then
+              if [ ! -d "${WLAN_FIRMWARE_DIR}" ] ; then
-                mkdir -p ${WLAN_FIRMWARE_DIR}
+                mkdir -p "${WLAN_FIRMWARE_DIR}"
               fi
               # Create temporary directory for firmware binary blob
               temp_dir=$(as_nobody mktemp -d)
-              # Fetch firmware binary blob
+              # Fetch firmware binary blob for RPI3B+
-              as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
+              if [ "$RPI_MODEL" = 3P ] ; then
-              as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
+                # Fetch firmware binary blob for RPi3P
+                as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
-              # Move downloaded firmware binary blob
+                as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
-              mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+                as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
+            	# Move downloaded firmware binary blob
+            	mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
+            	# Set permissions of the firmware binary blob
+            	chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+                chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
+                # Fetch firmware binary blob for RPi3
+                as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
+                as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
+            	# Move downloaded firmware binary blob
+            	mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+            	# Set permissions of the firmware binary blob
+            	chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+                chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+              fi
               # Remove temporary directory for firmware binary blob
               rm -fr "${temp_dir}"
-              # Set permissions of the firmware binary blob
-              chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
-              chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
             fi

bootstrap.d/21-firewall.sh +5 -1

             if [ "$ENABLE_IPTABLES" = true ] ; then
               # Create iptables configuration directory
               mkdir -p "${ETC_DIR}/iptables"
+              # make sure iptables-legacy is the used alternatives
+              #iptables-save and -restore are slaves of iptables and thus are set accordingly
+              chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
               # Install iptables systemd service
               install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"

bootstrap.d/30-security.sh +4 -4

             . ./functions.sh
             # Generate crypt(3) password string
-            ENCRYPTED_PASSWORD=`mkpasswd -m sha-512 "${PASSWORD}"`
+            ENCRYPTED_PASSWORD=$(mkpasswd -m sha-512 "${PASSWORD}")
-            ENCRYPTED_USER_PASSWORD=`mkpasswd -m sha-512 "${USER_PASSWORD}"`
+            ENCRYPTED_USER_PASSWORD=$(mkpasswd -m sha-512 "${USER_PASSWORD}")
             # Setup default user
             if [ "$ENABLE_USER" = true ] ; then
-              chroot_exec adduser --gecos $USER_NAME --add_extra_groups --disabled-password $USER_NAME
+              chroot_exec adduser --gecos "$USER_NAME" --add_extra_groups --disabled-password "$USER_NAME"
-              chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" $USER_NAME
+              chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" "$USER_NAME"
             fi
             # Setup root password or not

bootstrap.d/32-sshd.sh +6 -6

                 fi
                 # Add SSH (v2) public key for user root
-                if [ ! -z "$SSH_ROOT_PUB_KEY" ] ; then
+                if [ -n "$SSH_ROOT_PUB_KEY" ] ; then
                   # Create root SSH config directory
                   mkdir -p "${R}/root/.ssh"
               if [ "$ENABLE_USER" = true ] ; then
                 # Add SSH (v2) public key for user $USER_NAME
-                if [ ! -z "$SSH_USER_PUB_KEY" ] ; then
+                if [ -n "$SSH_USER_PUB_KEY" ] ; then
                   # Create $USER_NAME SSH config directory
                   mkdir -p "${R}/home/${USER_NAME}/.ssh"
                   # Set permissions of $USER_NAME SSH config directory
                   chroot_exec chmod 700 "/home/${USER_NAME}/.ssh"
-                  chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh"
+                  chroot_exec chown "${USER_NAME}":"${USER_NAME}" "/home/${USER_NAME}/.ssh"
                   # Add SSH (v2) public key(s) to authorized_keys file
                   cat "$SSH_USER_PUB_KEY" >> "${R}/home/${USER_NAME}/.ssh/authorized_keys"
                   # Set permissions of $USER_NAME SSH config directory
                   chroot_exec chmod 600 "/home/${USER_NAME}/.ssh/authorized_keys"
-                  chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh/authorized_keys"
+                  chroot_exec chown "${USER_NAME}":"${USER_NAME}" "/home/${USER_NAME}/.ssh/authorized_keys"
                   if [ "$ENABLE_REDUCE" = false ] || [ "$REDUCE_SSHD" = false ] ; then
                     # Allow SSH public key authentication
                   allowed_users="${allowed_users} ${USER_NAME}"
                 fi
-                if [ ! -z "$allowed_users" ] ; then
+                if [ -n "$allowed_users" ] ; then
                   echo "AllowUsers ${allowed_users}" >> "${ETC_DIR}/ssh/sshd_config"
                 fi
               fi
               if [ "$ENABLE_REDUCE" = true ] && [ "$REDUCE_SSHD" = true ] ; then
                 sed "s|^DROPBEAR_EXTRA_ARGS=.*|DROPBEAR_EXTRA_ARGS=\"${DROPBEAR_ARGS}\"|g" "${ETC_DIR}/default/dropbear"
               fi
-            fi
+            fi
  No newline at end of file

bootstrap.d/41-uboot.sh +22 -5

               fi
               # Build and install U-Boot inside chroot
-              chroot_exec make -j${KERNEL_THREADS} -C /tmp/u-boot/ ${UBOOT_CONFIG} all
+              chroot_exec make -j"${KERNEL_THREADS}" -C /tmp/u-boot/ "${UBOOT_CONFIG}" all
               # Copy compiled bootloader binary and set config.txt to load it
               install_exec "${R}/tmp/u-boot/tools/mkimage" "${R}/usr/sbin/mkimage"
               # Install and setup U-Boot command file
               install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage"
-              printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
+              printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
               if [ "$ENABLE_INITRAMFS" = true ] ; then
                 # Convert generated initramfs for U-Boot using mkimage
                 rm -f "${BOOT_DIR}/initramfs-${KERNEL_VERSION}"
                 # Configure U-Boot to load generated initramfs
-                printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
+                printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
                 printf "\nbootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
               else # ENABLE_INITRAMFS=false
                 # Remove initramfs from U-Boot mkfile
                 fi
               fi
+              if [ "$SET_ARCH" = 64 ] ; then
+                echo "Setting up config.txt to boot 64bit uboot"
+                {
+                  printf "\n# 64bit-mode"
+                  printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md"
+                  printf "\narm_64bit=1"
+                } >> "${BOOT_DIR}/config.txt"
+                #in 64bit uboot booti is used instead of bootz [like in KERNEL_BIN_IMAGE=zImage (armv7)|| Image(armv8)]
+                sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage"
+              fi
               # Set mkfile to use the correct dtb file
-              sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage"
+              sed -i "s|bcm2709-rpi-2-b.dtb|${DTB_FILE}|" "${BOOT_DIR}/uboot.mkimage"
+              # Set mkfile to use the correct mach id
+              if [ "$ENABLE_QEMU" = true ] ; then
+                sed -i "s/^\(setenv machid \).*/\10x000008e0/" "${BOOT_DIR}/uboot.mkimage"
+              fi
               # Set mkfile to use kernel image
-              sed -i "s/^\(fatload mmc 0:1 \${kernel_addr_r} \).*/\1${KERNEL_IMAGE}/" "${BOOT_DIR}/uboot.mkimage"
+              sed -i "s|kernel7.img|${KERNEL_IMAGE}|" "${BOOT_DIR}/uboot.mkimage"
               # Remove all leading blank lines
               sed -i "/./,\$!d" "${BOOT_DIR}/uboot.mkimage"

bootstrap.d/42-fbturbo.sh +1 -5

               fi
               # Install Xorg build dependencies
-              if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+              chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-                chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-              elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-                chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-              fi
               # Build and install fbturbo driver inside chroot
               chroot_exec /bin/bash -x <<'EOF'

bootstrap.d/99-reduce.sh +5 -14

               # Remove all doc files
               if [ "$REDUCE_DOC" = true ] ; then
-                find "${R}/usr/share/doc" -depth -type f ! -name copyright | xargs rm || true
+                find "${R}/usr/share/doc" -depth -type f ! -name copyright -print0 | xargs -0 rm || true
-                find "${R}/usr/share/doc" -empty | xargs rmdir || true
+                find "${R}/usr/share/doc" -empty -print0 | xargs -0 rmdir || true
               fi
               # Remove all man pages and info files
               # Remove all locale translation files
               if [ "$REDUCE_LOCALE" = true ] ; then
-                find "${R}/usr/share/locale" -mindepth 1 -maxdepth 1 ! -name 'en' | xargs rm -r
+                find "${R}/usr/share/locale" -mindepth 1 -maxdepth 1 ! -name 'en' -print0 | xargs -0 rm -r
               fi
               # Remove hwdb PCI device classes (experimental)
               # Replace bash shell by dash shell (experimental)
               if [ "$REDUCE_BASH" = true ] ; then
-                if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+                # Purge bash and update alternatives
-                  echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
+                echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
-                else
-                  echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --force-yes bash
-                fi
                 chroot_exec update-alternatives --install /bin/bash bash /bin/dash 100
               fi
                 chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data
               fi
-              # Re-install tools for managing kernel modules
-              if [ "$RELEASE" = "jessie" ] ; then
-                chroot_exec apt-get -qq -y install module-init-tools
-              fi
               # Remove GPU kernels
               if [ "$ENABLE_MINGPU" = true ] ; then
                 rm -f "${BOOT_DIR}/start.elf"

files/boot/uboot.mkimage +1 0

             saveenv
             # Load the existing Linux kernel into RAM
+            mmc dev 0
             fatload mmc 0:1 ${kernel_addr_r} kernel7.img
             fatload mmc 0:1 ${fdt_addr_r} ${dtbfile}
             fatload mmc 0:1 ${ramdisk_addr_r} ${initramfs}

files/initramfs/expand_encrypted_rootfs +15 -4

               return 1
             fi
+            # Get the current last sector of the root partition
+            PART_END=$(parted /dev/${ROOT_DEV} -ms unit s p | grep "^${PART_NUM}" | cut -f 3 -d: | sed 's/[^0-9]//g')
+            if [ -z "$PART_END" ] ; then
+              log_warning_msg "${ROOT_DEV} unable to get last sector of the partition"
+              return 1
+            fi
             # Get the possible last sector for the root partition
             PART_LAST=$(fdisk -l /dev/${ROOT_DEV} | grep '^Disk.*sectors' | awk '{ print $7 - 1 }')
             if [ -z "$PART_LAST" ] ; then
-              log_warning_msg "${ROOT_DEV} unable to get last sector of the partition"
+              log_warning_msg "${ROOT_DEV} unable to get last possible sector of the partition"
               return 1
             fi
             ### Since rc.local is run with "sh -e", let's add "|| true" to prevent premature exit
-            fdisk /dev/${ROOT_DEV} 2> /dev/null <<EOF2 || true
+            if [ $PART_END != $PART_LAST ] ; then
+              fdisk /dev/${ROOT_DEV} 2> /dev/null <<EOF2 || true
             p
             d
             $PART_NUM
             w
             EOF2
-            partprobe
+              partprobe
-            log_success_msg "Root partition successfully resized."
+              log_success_msg "Root partition successfully resized."
+            else
+              log_success_msg "Root partition already resized."
+            fi

files/iptables/ip6tables.service +1 -1

             [Service]
             Type=oneshot
-            ExecStart=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+            ExecStart=/sbin/ip6tables-restore -w 5 /etc/iptables/ip6tables.rules
             ExecReload=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
             ExecStop=/etc/iptables/flush-ip6tables.sh
             RemainAfterExit=yes

files/iptables/iptables.service +1 -1

             [Service]
             Type=oneshot
-            ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules
+            ExecStart=/sbin/iptables-restore -w 5 /etc/iptables/iptables.rules
             ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules
             ExecStop=/etc/iptables/flush-iptables.sh
             RemainAfterExit=yes

files/network/hostname +1 -1

	@@ -1,1 +1,1
	1	rpi2-jessie		1	RaspberryPI

files/network/hosts +1 -1

 .0.0.1       localhost
-.0.1.1       rpi2-jessie
+.0.1.1       RaspberryPI
             ::1             localhost ip6-localhost ip6-loopback
             ff02::1         ip6-allnodes

functions.sh +8 -12

             chroot_exec() {
               # Exec command in chroot
-              LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot ${R} $*
+              LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot "${R}" "$@"
             }
             as_nobody() {
               # Exec command as user nobody
-              sudo -E -u nobody LANG=C LC_ALL=C $*
+              sudo -E -u nobody LANG=C LC_ALL=C "$@"
             }
             install_readonly() {
               # Install file with user read-only permissions
-              install -o root -g root -m 644 $*
+              install -o root -g root -m 644 "$@"
             }
             install_exec() {
               # Install file with root exec permissions
-              install -o root -g root -m 744 $*
+              install -o root -g root -m 744 "$@"
             }
             use_template () {
               # Install c/c++ build environment inside the chroot
               if [ -z "${COMPILER_PACKAGES}" ] ; then
                 COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
+            	# Install COMPILER_PACKAGES in chroot
-                if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+                chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install "${COMPILER_PACKAGES}"
-                  chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-                elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-                  chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
-                fi
               fi
             }
             chroot_remove_cc() {
               # Remove c/c++ build environment from the chroot
-              if [ ! -z "${COMPILER_PACKAGES}" ] ; then
+              if [ -n "${COMPILER_PACKAGES}" ] ; then
-                chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
+                chroot_exec apt-get -qq -y --auto-remove purge "${COMPILER_PACKAGES}"
                 COMPILER_PACKAGES=""
               fi
             }

rpi23-gen-image.sh +267 -117

             #!/bin/sh
             ########################################################################
             # rpi23-gen-image.sh					       2015-2017
             #
-            # Advanced Debian "jessie", "stretch" and "buster" bootstrap script for RPi2/3
+            # Advanced Debian "stretch" and "buster" bootstrap script for Raspberry Pi
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             . ./functions.sh
             # Load parameters from configuration template file
-            if [ ! -z "$CONFIG_TEMPLATE" ] ; then
+            if [ -n "$CONFIG_TEMPLATE" ] ; then
               use_template
             fi
             # Introduce settings
             set -e
-            echo -n -e "\n#\n# RPi2/3 Bootstrap Settings\n#\n"
+            echo -n -e "\n#\n# RPi 0/1/2/3 Bootstrap Settings\n#\n"
             set -x
             # Raspberry Pi model configuration
             RPI_MODEL=${RPI_MODEL:=2}
-            RPI2_DTB_FILE=${RPI2_DTB_FILE:=bcm2709-rpi-2-b.dtb}
-            RPI2_UBOOT_CONFIG=${RPI2_UBOOT_CONFIG:=rpi_2_defconfig}
-            RPI3_DTB_FILE=${RPI3_DTB_FILE:=bcm2710-rpi-3-b.dtb}
-            RPI3_UBOOT_CONFIG=${RPI3_UBOOT_CONFIG:=rpi_3_32b_defconfig}
             # Debian release
-            RELEASE=${RELEASE:=jessie}
+            RELEASE=${RELEASE:=buster}
-            KERNEL_ARCH=${KERNEL_ARCH:=arm}
-            RELEASE_ARCH=${RELEASE_ARCH:=armhf}
+            # Kernel Branch
-            CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
-            COLLABORA_KERNEL=${COLLABORA_KERNEL:=3.18.0-trunk-rpi2}
-            if [ "$KERNEL_ARCH" = "arm64" ] ; then
-              KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
-              KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
-            else
-              KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
-              KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
-            fi
-            if [ "$RELEASE_ARCH" = "arm64" ] ; then
-              QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
-            else
-              QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
-            fi
             KERNEL_BRANCH=${KERNEL_BRANCH:=""}
             # URLs
             WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
             COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
             FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
-            UBOOT_URL=${UBOOT_URL:=git://git.denx.de/u-boot.git}
+            UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
+            VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}
+            BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git}
             # Build directories
-            BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
+            WORKDIR=$(pwd)
+            BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}}
             BUILDDIR="${BASEDIR}/build"
-            # Prepare date string for default image file name
-            DATE="$(date +%Y-%m-%d)"
-            if [ -z "$KERNEL_BRANCH" ] ; then
-              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
-            else
-              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
-            fi
             # Chroot directories
             R="${BUILDDIR}/chroot"
             ETC_DIR="${R}/etc"
             LIB_DIR="${R}/lib"
             BOOT_DIR="${R}/boot/firmware"
             KERNEL_DIR="${R}/usr/src/linux"
-            WLAN_FIRMWARE_DIR="${R}/lib/firmware/brcm"
+            WLAN_FIRMWARE_DIR="${LIB_DIR}/firmware/brcm"
+            BLUETOOTH_FIRMWARE_DIR="${ETC_DIR}/firmware/bt"
             # Firmware directory: Blank if download from github
             RPI_FIRMWARE_DIR=${RPI_FIRMWARE_DIR:=""}
             # General settings
+            SET_ARCH=${SET_ARCH:=32}
             HOSTNAME=${HOSTNAME:=rpi${RPI_MODEL}-${RELEASE}}
             PASSWORD=${PASSWORD:=raspberry}
             USER_PASSWORD=${USER_PASSWORD:=raspberry}
             APT_SERVER=${APT_SERVER:="ftp.debian.org"}
             # Feature settings
+            ENABLE_PRINTK=${ENABLE_PRINTK:=false}
+            ENABLE_BLUETOOTH=${ENABLE_BLUETOOTH:=false}
+            ENABLE_MINIUART_OVERLAY=${ENABLE_MINIUART_OVERLAY:=false}
             ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
             ENABLE_I2C=${ENABLE_I2C:=false}
             ENABLE_SPI=${ENABLE_SPI:=false}
             ENABLE_USER=${ENABLE_USER:=true}
             USER_NAME=${USER_NAME:="pi"}
             ENABLE_ROOT=${ENABLE_ROOT:=false}
+            ENABLE_QEMU=${ENABLE_QEMU:=false}
+            ENABLE_SYSVINIT=${ENABLE_SYSVINIT:=false}
             # SSH settings
             SSH_ENABLE_ROOT=${SSH_ENABLE_ROOT:=false}
             ENABLE_UBOOT=${ENABLE_UBOOT:=false}
             UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
             ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
+            ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=false}
+            VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
             FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
             ENABLE_HARDNET=${ENABLE_HARDNET:=false}
             ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
             DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS:=}
             # Kernel compilation settings
-            BUILD_KERNEL=${BUILD_KERNEL:=false}
+            BUILD_KERNEL=${BUILD_KERNEL:=true}
             KERNEL_REDUCE=${KERNEL_REDUCE:=false}
             KERNEL_THREADS=${KERNEL_THREADS:=1}
             KERNEL_HEADERS=${KERNEL_HEADERS:=true}
             KERNEL_MENUCONFIG=${KERNEL_MENUCONFIG:=false}
             KERNEL_REMOVESRC=${KERNEL_REMOVESRC:=true}
-            if [ "$KERNEL_ARCH" = "arm64" ] ; then
+            KERNEL_OLDDEFCONFIG=${KERNEL_OLDDEFCONFIG:=false}
-              KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
+            KERNEL_CCACHE=${KERNEL_CCACHE:=false}
-            else
-              KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
-            fi
             # Kernel compilation from source directory settings
             KERNELSRC_DIR=${KERNELSRC_DIR:=""}
             CRYPTFS_CIPHER=${CRYPTFS_CIPHER:="aes-xts-plain64:sha512"}
             CRYPTFS_XTSKEYSIZE=${CRYPTFS_XTSKEYSIZE:=512}
-            # Stop the Crypto Wars
-            DISABLE_FBI=${DISABLE_FBI:=false}
             # Chroot scripts directory
             CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
             # Packages required in the chroot build environment
             APT_INCLUDES=${APT_INCLUDES:=""}
-            APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+            APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd"
+            # Packages to exclude from chroot build environment
+            APT_EXCLUDES=${APT_EXCLUDES:=""}
             # Packages required for bootstrapping
             REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
             set +x
-            # Set Raspberry Pi model specific configuration
+            #Check if apt-cacher-ng has port 3142 open and set APT_PROXY
-            if [ "$RPI_MODEL" = 2 ] ; then
+            APT_CACHER_RUNNING=$(lsof -i :3142 | grep apt-cacher-ng |  cut -d ' ' -f3 | uniq)
-              DTB_FILE=${RPI2_DTB_FILE}
+            if [ -n "${APT_CACHER_RUNNING}" ] ; then
-              UBOOT_CONFIG=${RPI2_UBOOT_CONFIG}
+              APT_PROXY=http://127.0.0.1:3142/
-            elif [ "$RPI_MODEL" = 3 ] ; then
+            fi
-              DTB_FILE=${RPI3_DTB_FILE}
-              UBOOT_CONFIG=${RPI3_UBOOT_CONFIG}
+            # Setup architecture specific settings
-              BUILD_KERNEL=true
+            if [ -n "$SET_ARCH" ] ; then
+              # 64-bit configuration
+              if [ "$SET_ARCH" = 64 ] ; then
+                # General 64-bit depended settings
+                QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
+                KERNEL_ARCH=${KERNEL_ARCH:=arm64}
+                KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
+                # Raspberry Pi model specific settings
+                if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
+                  KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
+                  RELEASE_ARCH=${RELEASE_ARCH:=arm64}
+                  KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
+                  CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
+                else
+                  echo "error: Only Raspberry PI 3 and 3B+ support 64-bit"
+                  exit 1
+                fi
+              fi
+              # 32-bit configuration
+              if [ "$SET_ARCH" = 32 ] ; then
+                # General 32-bit dependend settings
+                QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
+                KERNEL_ARCH=${KERNEL_ARCH:=arm}
+                KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
+                # Raspberry Pi model specific settings
+                if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
+                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
+                  KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
+                  RELEASE_ARCH=${RELEASE_ARCH:=armel}
+                  KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
+                  CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
+                fi
+                # Raspberry Pi model specific settings
+                if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
+                  KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
+                  RELEASE_ARCH=${RELEASE_ARCH:=armhf}
+                  KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
+                  CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
+                fi
+              fi
+            #SET_ARCH not set
             else
-              echo "error: Raspberry Pi model ${RPI_MODEL} is not supported!"
+              echo "error: Please set '32' or '64' as value for SET_ARCH"
               exit 1
             fi
+            # Device specific configuration and U-Boot configuration
+            case "$RPI_MODEL" in
+)
+                DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+                ;;
+)
+                DTB_FILE=${DTB_FILE:=bcm2708-rpi-b.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+                ;;
+P)
+                DTB_FILE=${DTB_FILE:=bcm2708-rpi-b-plus.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+                ;;
+)
+                DTB_FILE=${DTB_FILE:=bcm2709-rpi-2-b.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_2_defconfig}
+                ;;
+)
+                DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
+                ;;
+P)
+                DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
+                UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
+                ;;
+              *)
+                echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
+                exit 1
+                ;;
+            esac
+            # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
+            if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+              # Include bluetooth packages on supported boards
+              if [ "$ENABLE_BLUETOOTH" = true ] && [ "$ENABLE_CONSOLE" = false ]; then
+                APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
+              fi
+            else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+              # Check if the internal wireless interface is not supported by the RPi model
+              if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_BLUETOOTH" = true ]; then
+                echo "error: The selected Raspberry Pi model has no integrated interface for wireless or bluetooth"
+                exit 1
+              fi
+            fi
-            # Check if the internal wireless interface is supported by the RPi model
+            # Prepare date string for default image file name
-            if [ "$ENABLE_WIRELESS" = true ] && [ "$RPI_MODEL" != 3 ] ; then
+            DATE="$(date +%Y-%m-%d)"
-              echo "error: The selected Raspberry Pi model has no internal wireless interface"
+            if [ -z "$KERNEL_BRANCH" ] ; then
-              exit 1
+              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+            else
+              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
             fi
             # Check if DISABLE_UNDERVOLT_WARNINGS parameter value is supported
-            if [ ! -z "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
+            if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
               if [ "$DISABLE_UNDERVOLT_WARNINGS" != 1 ] && [ "$DISABLE_UNDERVOLT_WARNINGS" != 2 ] ; then
                 echo "error: DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS} is not supported"
                 exit 1
               fi
             fi
-            # Build RPi2/3 Linux kernel if required by Debian release
+            # Add cmake to compile videocore sources
-            if [ "$RELEASE" = "stretch" ]  || [ "$RELEASE" = "buster" ] ; then
+            if [ "$ENABLE_VIDEOCORE" = true ] ; then
-              BUILD_KERNEL=true
+              REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cmake"
-            fi
-            # Add packages required for kernel cross compilation
-            if [ "$BUILD_KERNEL" = true ] ; then
-              if [ "$KERNEL_ARCH" = "arm" ] ; then
-                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
-              else
-                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
-              fi
             fi
             # Add libncurses5 to enable kernel menuconfig
             if [ "$KERNEL_MENUCONFIG" = true ] ; then
-              REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libncurses5-dev"
+              REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libncurses-dev"
             fi
-            # Stop the Crypto Wars
+            # Add ccache compiler cache for (faster) kernel cross (re)compilation
-            if [ "$DISABLE_FBI" = true ] ; then
+            if [ "$KERNEL_CCACHE" = true ] ; then
-              ENABLE_CRYPTFS=true
+              REQUIRED_PACKAGES="${REQUIRED_PACKAGES} ccache"
             fi
             # Add cryptsetup package to enable filesystem encryption
             if [ "$ENABLE_CRYPTFS" = true ]  && [ "$BUILD_KERNEL" = true ] ; then
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup"
-              APT_INCLUDES="${APT_INCLUDES},cryptsetup"
+              APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup"
               if [ -z "$CRYPTFS_PASSWORD" ] ; then
                 echo "error: no password defined (CRYPTFS_PASSWORD)!"
             # Add device-tree-compiler required for building the U-Boot bootloader
             if [ "$ENABLE_UBOOT" = true ] ; then
-              APT_INCLUDES="${APT_INCLUDES},device-tree-compiler"
+              APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
+            fi
+            if [ "$ENABLE_BLUETOOTH" = true ] ; then
+              if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+                if [ "$ENABLE_CONSOLE" = false ] ; then
+            	  APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
+            	fi
+              fi
             fi
             # Check if root SSH (v2) public key file exists
-            if [ ! -z "$SSH_ROOT_PUB_KEY" ] ; then
+            if [ -n "$SSH_ROOT_PUB_KEY" ] ; then
               if [ ! -f "$SSH_ROOT_PUB_KEY" ] ; then
                 echo "error: '$SSH_ROOT_PUB_KEY' specified SSH public key file not found (SSH_ROOT_PUB_KEY)!"
                 exit 1
             fi
             # Check if $USER_NAME SSH (v2) public key file exists
-            if [ ! -z "$SSH_USER_PUB_KEY" ] ; then
+            if [ -n "$SSH_USER_PUB_KEY" ] ; then
               if [ ! -f "$SSH_USER_PUB_KEY" ] ; then
                 echo "error: '$SSH_USER_PUB_KEY' specified SSH public key file not found (SSH_USER_PUB_KEY)!"
                 exit 1
             # Check if all required packages are installed on the build system
             for package in $REQUIRED_PACKAGES ; do
-              if [ "`dpkg-query -W -f='${Status}' $package`" != "install ok installed" ] ; then
+              if [ "$(dpkg-query -W -f='${Status}' "$package")" != "install ok installed" ] ; then
                 MISSING_PACKAGES="${MISSING_PACKAGES} $package"
               fi
             done
               echo "the following packages needed by this script are not installed:"
               echo "$MISSING_PACKAGES"
-              echo -n "\ndo you want to install the missing packages right now? [y/n] "
+              printf "\ndo you want to install the missing packages right now? [y/n] "
-              read confirm
+              read -r confirm
               [ "$confirm" != "y" ] && exit 1
               # Make sure all missing required packages are installed
-              apt-get -qq -y install ${MISSING_PACKAGES}
+              apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
             fi
             # Check if ./bootstrap.d directory exists
               exit 1
             fi
+            # Check if specified VIDEOCORESRC_DIR directory exists
+            if [ -n "$VIDEOCORESRC_DIR" ] && [ ! -d "$VIDEOCORESRC_DIR" ] ; then
+              echo "error: '${VIDEOCORESRC_DIR}' specified directory not found (VIDEOCORESRC_DIR)!"
+              exit 1
+            fi
             # Check if specified FBTURBOSRC_DIR directory exists
             if [ -n "$FBTURBOSRC_DIR" ] && [ ! -d "$FBTURBOSRC_DIR" ] ; then
               echo "error: '${FBTURBOSRC_DIR}' specified directory not found (FBTURBOSRC_DIR)!"
             mkdir -p "${R}"
             # Check if build directory has enough of free disk space >512MB
-            if [ "$(df --output=avail ${BUILDDIR} | sed "1d")" -le "524288" ] ; then
+            if [ "$(df --output=avail "${BUILDDIR}" | sed "1d")" -le "524288" ] ; then
               echo "error: ${BUILDDIR} not enough space left to generate the output image!"
               exit 1
             fi
               APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools,ifupdown"
             fi
-            # Add required locales packages
-            if [ "$DEFLOCAL" != "en_US.UTF-8" ] ; then
-              APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"
-            fi
             # Add parted package, required to get partprobe utility
             if [ "$EXPANDROOT" = true ] ; then
               APT_INCLUDES="${APT_INCLUDES},parted"
             # Add iptables IPv4/IPv6 package
             if [ "$ENABLE_IPTABLES" = true ] ; then
-              APT_INCLUDES="${APT_INCLUDES},iptables"
+              APT_INCLUDES="${APT_INCLUDES},iptables,iptables-persistent"
             fi
             # Add openssh server package
               # Add dropbear package instead of openssh-server
               if [ "$REDUCE_SSHD" = true ] ; then
-                APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/openssh-server/dropbear/")"
+                APT_INCLUDES="$(echo "${APT_INCLUDES}" | sed "s/openssh-server/dropbear/")"
               fi
             fi
-            if [ "$RELEASE" != "jessie" ] ; then
+            # Configure systemd-sysv exclude to make halt/reboot/shutdown scripts available
-              APT_INCLUDES="${APT_INCLUDES},libnss-systemd"
+            if [ "$ENABLE_SYSVINIT" = false ] ; then
+              APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv"
+            fi
+            # Check if kernel is getting compiled
+            if [ "$BUILD_KERNEL" = false ] ; then
+              echo "Downloading precompiled kernel"
+              echo "error: not configured"
+              exit 1;
+            # BUILD_KERNEL=true
+            else
+              echo "No precompiled kernel repositories were added"
             fi
             # Configure kernel sources if no KERNELSRC_DIR
               KERNELSRC_CONFIG=false
             fi
+            # Configure qemu compatible kernel
+            if [ "$ENABLE_QEMU" = true ] ; then
+              DTB_FILE=vexpress-v2p-ca15_a7.dtb
+              UBOOT_CONFIG=vexpress_ca15_tc2_defconfig
+              KERNEL_DEFCONFIG="vexpress_defconfig"
+              if [ "$KERNEL_MENUCONFIG" = false ] ; then
+                KERNEL_OLDDEFCONFIG=true
+              fi
+            fi
             # Execute bootstrap scripts
             for SCRIPT in bootstrap.d/*.sh; do
               head -n 3 "$SCRIPT"
             # Remove c/c++ build environment from the chroot
             chroot_remove_cc
-            # Remove apt-utils
-            if [ "$RELEASE" = "jessie" ] ; then
-              chroot_exec apt-get purge -qq -y --force-yes apt-utils
-            fi
             # Generate required machine-id
             MACHINE_ID=$(dbus-uuidgen)
             echo -n "${MACHINE_ID}" > "${R}/var/lib/dbus/machine-id"
             rm -f "${R}/vmlinuz"
             rm -f "${R}${QEMU_BINARY}"
+            if [ "$ENABLE_QEMU" = true ] ; then
+              # Setup QEMU directory
+              mkdir "${BASEDIR}/qemu"
+              # Copy kernel image to QEMU directory
+              install_readonly "${BOOT_DIR}/${KERNEL_IMAGE}" "${BASEDIR}/qemu/${KERNEL_IMAGE}"
+              # Copy kernel config to QEMU directory
+              install_readonly "${R}/boot/config-${KERNEL_VERSION}" "${BASEDIR}/qemu/config-${KERNEL_VERSION}"
+              # Copy kernel dtbs to QEMU directory
+              for dtb in "${BOOT_DIR}/"*.dtb ; do
+                if [ -f "${dtb}" ] ; then
+                  install_readonly "${dtb}" "${BASEDIR}/qemu/"
+                fi
+              done
+              # Copy kernel overlays to QEMU directory
+              if [ -d "${BOOT_DIR}/overlays" ] ; then
+                # Setup overlays dtbs directory
+                mkdir "${BASEDIR}/qemu/overlays"
+                for dtb in "${BOOT_DIR}/overlays/"*.dtb ; do
+                  if [ -f "${dtb}" ] ; then
+                    install_readonly "${dtb}" "${BASEDIR}/qemu/overlays/"
+                  fi
+                done
+              fi
+              # Copy u-boot files to QEMU directory
+              if [ "$ENABLE_UBOOT" = true ] ; then
+                if [ -f "${BOOT_DIR}/u-boot.bin" ] ; then
+                  install_readonly "${BOOT_DIR}/u-boot.bin" "${BASEDIR}/qemu/u-boot.bin"
+                fi
+                if [ -f "${BOOT_DIR}/uboot.mkimage" ] ; then
+                  install_readonly "${BOOT_DIR}/uboot.mkimage" "${BASEDIR}/qemu/uboot.mkimage"
+                fi
+                if [ -f "${BOOT_DIR}/boot.scr" ] ; then
+                  install_readonly "${BOOT_DIR}/boot.scr" "${BASEDIR}/qemu/boot.scr"
+                fi
+              fi
+              # Copy initramfs to QEMU directory
+              if [ -f "${BOOT_DIR}/initramfs-${KERNEL_VERSION}" ] ; then
+                install_readonly "${BOOT_DIR}/initramfs-${KERNEL_VERSION}" "${BASEDIR}/qemu/initramfs-${KERNEL_VERSION}"
+              fi
+            fi
             # Calculate size of the chroot directory in KB
-            CHROOT_SIZE=$(expr `du -s "${R}" | awk '{ print $1 }'`)
+            CHROOT_SIZE=$(expr "$(du -s "${R}" | awk '{ print $1 }')")
             # Calculate the amount of needed 512 Byte sectors
             TABLE_SECTORS=$(expr 1 \* 1024 \* 1024 \/ 512)
             FRMW_SECTORS=$(expr 64 \* 1024 \* 1024 \/ 512)
-            ROOT_OFFSET=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS})
+            ROOT_OFFSET=$(expr "${TABLE_SECTORS}" + "${FRMW_SECTORS}")
             # The root partition is EXT4
             # This means more space than the actual used space of the chroot is used.
             # As overhead for journaling and reserved blocks 35% are added.
-            ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 35) \* 1024 \/ 512)
+            ROOT_SECTORS=$(expr "$(expr "${CHROOT_SIZE}" + "${CHROOT_SIZE}" \/ 100 \* 35)" \* 1024 \/ 512)
             # Calculate required image size in 512 Byte sectors
-            IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS})
+            IMAGE_SECTORS=$(expr "${TABLE_SECTORS}" + "${FRMW_SECTORS}" + "${ROOT_SECTORS}")
             # Prepare image file
             if [ "$ENABLE_SPLITFS" = true ] ; then
-              dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count=${TABLE_SECTORS}
+              dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count="${TABLE_SECTORS}"
-              dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count=0 seek=${FRMW_SECTORS}
+              dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count=0 seek="${FRMW_SECTORS}"
-              dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=${TABLE_SECTORS}
+              dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count="${TABLE_SECTORS}"
-              dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek=${ROOT_SECTORS}
+              dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek="${ROOT_SECTORS}"
               # Write firmware/boot partition tables
               sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null <<EOM
             EOM
               # Setup temporary loop devices
-              FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show $IMAGE_NAME-frmw.img)"
+              FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME"-frmw.img)"
-              ROOT_LOOP="$(losetup -o 1M -f --show $IMAGE_NAME-root.img)"
+              ROOT_LOOP="$(losetup -o 1M -f --show "$IMAGE_NAME"-root.img)"
             else # ENABLE_SPLITFS=false
-              dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=${TABLE_SECTORS}
+              dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count="${TABLE_SECTORS}"
-              dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek=${IMAGE_SECTORS}
+              dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek="${IMAGE_SECTORS}"
               # Write partition table
               sfdisk -q -L -uS -f "$IMAGE_NAME.img" 2> /dev/null <<EOM
             EOM
               # Setup temporary loop devices
-              FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show $IMAGE_NAME.img)"
+              FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME".img)"
-              ROOT_LOOP="$(losetup -o 65M -f --show $IMAGE_NAME.img)"
+              ROOT_LOOP="$(losetup -o 65M -f --show "$IMAGE_NAME".img)"
             fi
             if [ "$ENABLE_CRYPTFS" = true ] ; then
               ROOT_LOOP="/dev/mapper/${CRYPTFS_MAPPING}"
               # Wipe encrypted partition (encryption cipher is used for randomness)
-              dd if=/dev/zero of="${ROOT_LOOP}" bs=512 count=$(blockdev --getsz "${ROOT_LOOP}")
+              dd if=/dev/zero of="${ROOT_LOOP}" bs=512 count="$(blockdev --getsz "${ROOT_LOOP}")"
             fi
             # Build filesystems
               bmaptool create -o "$IMAGE_NAME-root.bmap" "$IMAGE_NAME-root.img"
               # Image was successfully created
-              echo "$IMAGE_NAME-frmw.img ($(expr \( ${TABLE_SECTORS} + ${FRMW_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              echo "$IMAGE_NAME-frmw.img ($(expr \( "${TABLE_SECTORS}" + "${FRMW_SECTORS}" \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
-              echo "$IMAGE_NAME-root.img ($(expr \( ${TABLE_SECTORS} + ${ROOT_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              echo "$IMAGE_NAME-root.img ($(expr \( "${TABLE_SECTORS}" + "${ROOT_SECTORS}" \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
             else
               # Create block map file for "bmaptool"
               bmaptool create -o "$IMAGE_NAME.bmap" "$IMAGE_NAME.img"
               # Image was successfully created
-              echo "$IMAGE_NAME.img ($(expr \( ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              echo "$IMAGE_NAME.img ($(expr \( "${TABLE_SECTORS}" + "${FRMW_SECTORS}" + "${ROOT_SECTORS}" \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+              # Create qemu qcow2 image
+              if [ "$ENABLE_QEMU" = true ] ; then
+                QEMU_IMAGE=${QEMU_IMAGE:=${BASEDIR}/qemu/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+                QEMU_SIZE=16G
+                qemu-img convert -f raw -O qcow2 "$IMAGE_NAME".img "$QEMU_IMAGE".qcow2
+                qemu-img resize "$QEMU_IMAGE".qcow2 $QEMU_SIZE
+                echo "$QEMU_IMAGE.qcow2 ($QEMU_SIZE)" ": successfully created"
+              fi
             fi

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages