Support Pi4/ Buster

build-docker.sh

@@ -15,6 +15,7 @@ fi
 set -e
 
 if [ -f config ]; then
+	# shellcheck disable=SC1091
 	source config
 fi
 

build.sh

@@ -46,11 +46,11 @@ EOF
 			SUB_STAGE_QUILT_PATCH_DIR="$(basename "$SUB_STAGE_DIR")-pc"
 			mkdir -p "$SUB_STAGE_QUILT_PATCH_DIR"
 			ln -snf "$SUB_STAGE_QUILT_PATCH_DIR" .pc
+			quilt upgrade
 			if [ -e "${SUB_STAGE_DIR}/${i}-patches/EDIT" ]; then
 				echo "Dropping into bash to edit patches..."
 				bash
 			fi
-			quilt upgrade
 			RC=0
 			quilt push -a || RC=$?
 			case "$RC" in
@@ -203,8 +203,8 @@ if [[ ! "$FIRST_USER_NAME" =~ ^[a-z][-a-z0-9_]*$ ]]; then
 	exit 1
 fi
 
-if [[ -n "${APT_PROXY}" ]] && ! curl --silent ${APT_PROXY} >/dev/null ; then
-	echo "Could not reach APT_PROXY server:" ${APT_PROXY}
+if [[ -n "${APT_PROXY}" ]] && ! curl --silent "${APT_PROXY}" >/dev/null ; then
+	echo "Could not reach APT_PROXY server: ${APT_PROXY}"
 	exit 1
 fi
 

export-image/00-allow-rerun/00-run.sh

@@ -3,3 +3,7 @@
 if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
 	cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
 fi
+
+if [ -e "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
+	mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
+fi

export-image/04-finalise/01-run.sh

@@ -15,6 +15,14 @@ fi
 rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
 rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
 
+if [ "${USE_QEMU}" != "1" ]; then
+	if [ -e "${ROOTFS_DIR}/etc/ld.so.preload.disabled" ]; then
+		mv "${ROOTFS_DIR}/etc/ld.so.preload.disabled" "${ROOTFS_DIR}/etc/ld.so.preload"
+	fi
+fi
+
+rm -f "${ROOTFS_DIR}/etc/network/interfaces.dpkg-old"
+
 rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"
 rm -f "${ROOTFS_DIR}/etc/apt/trusted.gpg~"
 
@@ -43,24 +51,24 @@ rm -f "${ROOTFS_DIR}/etc/vnc/updateid"
 
 update_issue "$(basename "${EXPORT_DIR}")"
 install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt"
-install files/LICENSE.oracle "${ROOTFS_DIR}/boot/"
-
 
 cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
 
 
 {
-	firmware=$(zgrep "firmware as of" \
-		"$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
-		head -n1 | sed  -n 's|.* \([^ ]*\)$|\1|p')
-	printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware"
+	if [ -f "$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" ]; then
+		firmware=$(zgrep "firmware as of" \
+			"$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
+			head -n1 | sed  -n 's|.* \([^ ]*\)$|\1|p')
+		printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware"
 
-	kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")"
-	printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel"
+		kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")"
+		printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel"
 
-	uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")"
+		uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")"
+		printf "Uname string: %s\n" "$uname"
+	fi
 
-	printf "Uname string: %s\n" "$uname"
 	printf "\nPackages:\n"
 	dpkg -l --root "$ROOTFS_DIR"
 } >> "$INFO_FILE"

export-image/prerun.sh

@@ -9,11 +9,11 @@ rm -f "${IMG_FILE}"
 rm -rf "${ROOTFS_DIR}"
 mkdir -p "${ROOTFS_DIR}"
 
-BOOT_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}/boot" --block-size=1 | cut -f 1)
+BOOT_SIZE="$((256 * 1024 * 1024))"
 TOTAL_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --block-size=1 | cut -f 1)
 
 ROUND_SIZE="$((4 * 1024 * 1024))"
-ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))
+ROUNDED_ROOT_SECTOR=$(((BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))
 IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE))
 
 truncate -s "${IMG_SIZE}" "${IMG_FILE}"
@@ -23,7 +23,7 @@ n
 
 
 8192
-+$((BOOT_SIZE * 2 /512))
++$((BOOT_SIZE / 512))
 p
 t
 c

export-noobs/00-release/00-run.sh

@@ -10,17 +10,23 @@ install -v		files/release_notes.txt		"${NOOBS_DIR}/"
 
 tar -v -c -C		files/marketing			-f "${NOOBS_DIR}/marketing.tar" .
 
+BOOT_SHASUM="$(sha256sum "${NOOBS_DIR}/boot.tar.xz" | cut -f1 -d' ')"
+ROOT_SHASUM="$(sha256sum "${NOOBS_DIR}/root.tar.xz" | cut -f1 -d' ')"
+
 BOOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/boot.tar.xz"  | grep totals | cut -f 5)"
 ROOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/root.tar.xz"  | grep totals | cut -f 5)"
 
 BOOT_SIZE="$(( BOOT_SIZE / 1024 / 1024 + 1))"
 ROOT_SIZE="$(( ROOT_SIZE / 1024 / 1024 + 1))"
 
-BOOT_NOM="$(( BOOT_SIZE * 3 ))"
+BOOT_NOM="256"
 ROOT_NOM="$(( ROOT_SIZE + 400 ))"
 
 mv "${NOOBS_DIR}/OS.png" "${NOOBS_DIR}/${NOOBS_NAME// /_}.png"
 
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SHASUM|${BOOT_SHASUM}|"
+sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SHASUM|${ROOT_SHASUM}|"
+
 sed "${NOOBS_DIR}/partitions.json" -i -e "s|BOOT_SIZE|${BOOT_SIZE}|"
 sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_SIZE|${ROOT_SIZE}|"
 

export-noobs/00-release/files/os.json

@@ -1,7 +1,7 @@
 {
     "description": "NOOBS_DESCRIPTION",
     "feature_level": 35120124,
-    "kernel": "4.14",
+    "kernel": "4.19",
     "name": "NOOBS_NAME",
     "password": "raspberry",
     "release_date": "UNRELEASED",
@@ -11,9 +11,10 @@
         "Pi 2",
         "Pi Zero",
         "Pi 3",
-        "Pi Compute Module 3"
+        "Pi Compute Module 3",
+        "Pi 4"
     ],
     "url": "http://www.raspbian.org/",
     "username": "pi",
-    "version": "stretch"
+    "version": "buster"
 }

export-noobs/00-release/files/partition_setup.sh

@@ -33,7 +33,12 @@ if [ -z "$restore" ]; then
   fi
 
   if ! grep -q resize /proc/cmdline; then
-    sed -i 's| init=/usr/lib/raspi-config/init_resize.sh||;s| quiet||2g' /tmp/1/cmdline.txt
+    if ! grep -q splash /tmp/1/cmdline.txt; then
+      sed -i "s| quiet||g" /tmp/1/cmdline.txt
+    fi
+    sed -i 's| init=/usr/lib/raspi-config/init_resize.sh||' /tmp/1/cmdline.txt
+  else
+    sed -i '1 s|.*|& sdhci.debug_quirks2=4|' /tmp/1/cmdline.txt
   fi
 fi
 

export-noobs/00-release/files/partitions.json

@@ -6,15 +6,17 @@
             "mkfs_options": "-F 32",
             "partition_size_nominal": BOOT_NOM,
             "uncompressed_tarball_size": BOOT_SIZE,
-            "want_maximised": false
+            "want_maximised": false,
+            "sha256sum": "BOOT_SHASUM"
         },
         {
             "filesystem_type": "ext4",
             "label": "root",
             "mkfs_options": "-O ^huge_file",
             "partition_size_nominal": ROOT_NOM,
             "uncompressed_tarball_size": ROOT_SIZE,
-            "want_maximised": true
+            "want_maximised": true,
+            "sha256sum": "ROOT_SHASUM"
         }
     ]
 }

export-noobs/00-release/files/release_notes.txt

@@ -1,4 +1,34 @@
 UNRELEASED:
+  *
+2019-06-20:
+  * Based on Debian Buster
+  * Support for Raspberry Pi 4 hardware
+  * FKMS OpenGL desktop graphics driver and xcompmgr compositing window manager used when running on Raspberry Pi 4
+  * Screen Configuration application added for use with FKMS driver
+  * Raspberry Pi 4 video output options added to Raspberry Pi Configuration
+  * Uses new PiXflat UI theme for GTK and Openbox
+  * CPU activity gauge plugin no longer shown on taskbar by default
+  * CPU temperature gauge plugin added (not shown by default)
+  * USB ejecter and Bluetooth taskbar icons hidden when not appropriate
+  * Version 74.0.3729.157 of Chromium web browser included
+  * Version 32.0.0.207 of Flash player included
+  * IDLE Python IDE removed
+  * Wolfram Mathematica removed temporarily due to incompatibility with Buster
+  * Display of package sizes removed from Recommended Software
+  * Appearance Settings modified to support independent settings for two monitors
+  * Oracle Java 7 and 8 replaced with OpenJDK 11
+  * Miscellaneous small bug fixes
+  * On-board 5GHz WiFi blocked by rfkill by default
+    The block is removed when taking one of the following actions:
+    - Selecting a locale in the first run wizard
+    - Setting the WiFi country in the Raspberry Pi Configuration tool or the Network Settings applet
+    - Setting the WiFi country in raspi-config
+    - Providing a wpa_supplicant.conf file through the boot partition
+    - Running 'rfkill unblock wifi'
+  * Boot partition size set to 256M
+  * Linux kernel 4.19.50
+  * Raspberry Pi firmware 88ca9081f5e51cdedd16d5dbc85ed12a25123201
+2019-04-08:
   * Chromium browser updated to version 72
   * VLC media player updated to version 3.0.6
   * RealVNC Server updated to version 6.4.0

scripts/common

@@ -9,7 +9,7 @@ bootstrap(){
 
 	export http_proxy=${APT_PROXY}
 
-	if [ "$(dpkg --print-architecture)" !=  "armhf" ]; then
+	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "aarch64" ]; then
 		BOOTSTRAP_CMD=qemu-debootstrap
 	fi
 
@@ -18,7 +18,7 @@ bootstrap(){
 	BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
 	BOOTSTRAP_ARGS+=("$@")
 
-	capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" "${BOOTSTRAP_ARGS[@]}" || true
+	setarch linux32 capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" "${BOOTSTRAP_ARGS[@]}" || true
 
 	if [ -d "$2/debootstrap" ]; then
 		rmdir "$2/debootstrap"
@@ -89,7 +89,7 @@ on_chroot() {
 		mount --bind /sys "${ROOTFS_DIR}/sys"
 	fi
 
-	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
+	setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
 }
 export -f on_chroot
 

stage0/00-configure-apt/files/raspi.list

@@ -1,3 +1,3 @@
-deb http://archive.raspberrypi.org/debian/ buster main ui staging
+deb http://archive.raspberrypi.org/debian/ buster main
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://archive.raspberrypi.org/debian/ stretch main ui
+#deb-src http://archive.raspberrypi.org/debian/ buster main

stage0/00-configure-apt/files/sources.list

@@ -1,3 +1,3 @@
 deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi
+#deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi

stage1/00-boot-files/files/config.txt

@@ -54,3 +54,11 @@
 
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
+
+[pi4]
+# Enable DRM VC4 V3D driver on top of the dispmanx display stack
+dtoverlay=vc4-fkms-v3d
+max_framebuffers=2
+
+[all]
+#dtoverlay=vc4-fkms-v3d

stage2/00-copies-and-fills/01-packages

@@ -1,2 +1,2 @@
 # leave out- performance unclear
-# raspi-copies-and-fills
+raspi-copies-and-fills

stage2/00-copies-and-fills/02-run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"

stage2/02-net-tweaks/01-run.sh

@@ -15,3 +15,8 @@ on_chroot <<EOF
 wpa_passphrase "${WPA_ESSID}" "${WPA_PASSWORD}" >> "/etc/wpa_supplicant/wpa_supplicant.conf"
 EOF
 fi
+
+# Disable wifi on 5GHz models
+mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/"
+echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmc:wlan"
+echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmc:wlan"

stage3/00-install-packages/00-packages

@@ -12,3 +12,4 @@ gldriver-test
 fonts-droid-fallback
 fonts-liberation2
 obconf
+arandr

stage3/00-install-packages/00-packages-nr

@@ -1,6 +1,6 @@
 xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
 epiphany-browser
-lxde lxtask menu-xdg gksu
-netsurf-gtk zenity xdg-utils
+lxde lxtask menu-xdg
+zenity xdg-utils
 gvfs-backends gvfs-fuse
 lightdm gnome-themes-standard-data gnome-icon-theme

stage4/00-install-packages/00-packages

@@ -1,6 +1,5 @@
-java-common oracle-java8-jdk
-python idle python3-pygame python-pygame python-tk
-python3 idle3 python3-tk
+python python3-pygame python-pygame python-tk
+python3 python3-tk python3-thonny
 python3-pgzero
 python-serial python3-serial
 python-picamera python3-picamera
@@ -11,7 +10,7 @@ python3-numpy
 pypy
 alacarte rc-gui sense-hat
 tree
-libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr
+libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
 geany
 piclone
 wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio
@@ -23,5 +22,5 @@ python-picraft python3-picraft
 pprompt
 piwiz
 rp-prefapps
-libav-tools
+ffmpeg
 vlc

stage4/00-install-packages/00-packages-nr

@@ -1,3 +1,2 @@
-timidity
 pi-package
 realvnc-vnc-server

stage4/01-console-autologin/00-run.sh

@@ -1,4 +1,5 @@
 #!/bin/bash -e
 
-ln -sf /etc/systemd/system/autologin@.service \
-	"${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service"
+on_chroot << EOF
+	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4
+EOF

stage4/04-enable-xcompmgr/00-run.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+	raspi-config nonint do_xcompmgr 0
+EOF

stage5/00-install-extras/00-packages

@@ -1,14 +1,13 @@
-python3-thonny
+mu-editor
 sonic-pi
 scratch nuscratch scratch2
 smartsim
 
 minecraft-pi python-minecraftpi
 python-sense-emu sense-emu-tools python-sense-emu-doc
 
-wolfram-engine
 claws-mail
-greenfoot bluej
+greenfoot-unbundled bluej
 nodered
 realvnc-vnc-viewer