TODO.md

@@ -6,6 +6,7 @@
 - Timezone selection
 
 ## Misc
+- 64 bit builds
 - More security
 
 ## Things to consider

scripts/common

@@ -9,18 +9,17 @@ bootstrap(){
 
 	export http_proxy=${APT_PROXY}
 
-	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "arm64" ]; then
+	if [ "$(dpkg --print-architecture)" !=  "armhf" ] && [ "$(dpkg --print-architecture)" !=  "aarch64" ]; then
 		BOOTSTRAP_CMD=qemu-debootstrap
 	fi
 
-	BOOTSTRAP_ARGS+=(--arch arm64)
+	BOOTSTRAP_ARGS+=(--arch armhf)
-  BOOTSTRAP_ARGS+=(--include gnupg)
 	BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
-	#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
+	BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
 	BOOTSTRAP_ARGS+=("$@")
 	printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
 
-  capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
+	setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
 
 	if [ -d "$2/debootstrap" ]; then
 		rmdir "$2/debootstrap"

stage0/00-configure-apt/00-run.sh

@@ -14,7 +14,6 @@ fi
 
 on_chroot apt-key add - < files/raspberrypi.gpg.key
 on_chroot << EOF
-dpkg --add-architecture armhf
 apt-get update
 apt-get dist-upgrade -y
 EOF

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

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

stage0/prerun.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
 
 if [ ! -d "${ROOTFS_DIR}" ]; then
-  bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
+	bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
 fi

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

@@ -59,10 +59,11 @@ dtparam=audio=on
 # Memory split
 gpu_mem=128
 
-# Enable DRM VC4 V3D driver
+[pi4]
-dtoverlay=vc4-kms-v3d
+# Enable DRM VC4 V3D driver on top of the dispmanx display stack
+dtoverlay=vc4-fkms-v3d
 max_framebuffers=2
 
 [all]
 #dtoverlay=vc4-fkms-v3d
-arm_64bit=1
+

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

@@ -0,0 +1 @@
+raspi-copies-and-fills

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

@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+if [ -f "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
+   mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
+fi
+

stage2/04-octoprint/01-run.sh

@@ -6,8 +6,6 @@ install -m 644 files/nginx.conf ${ROOTFS_DIR}/etc/nginx/nginx.conf
 echo -e "listen 443;" > ${ROOTFS_DIR}/etc/nginx/listen.conf
 
 on_chroot << EOF
-# Package enables this when installed, won't start until first-time is run due to missing SSL certs
-systemctl disable nginx 
 # If OctoPrint already exists, skip this (for debugging)
 if [[ ! -f /srv/octoprint/bin/octoprint ]]; then
   cd /srv/ || exit 1

stage2/05-mjpgstreamer/00-packages

@@ -1,5 +1,5 @@
 cmake
-libjpeg-dev
+libjpeg8-dev
 v4l-utils
 libv4l-dev
 gcc

stage2/06-utils/files/first-time.sh

@@ -84,7 +84,7 @@ screen_timeout
 openssl req -x509 -nodes -days 36500 -newkey rsa:4096 -subj "/C=/ST=/L=/O=/OU=/CN=*/emailAddress=" -out /etc/ssl/certs/nginx-octoprint.crt -keyout /etc/ssl/private/nginx-octoprint.key
 
 # If OctoPrint/MJPG Streamer is running locally, ask if the user wants to change the default listening port/IP (optional)
-if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --defaultno --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
+if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
   nginx_config
 fi
 

stage3/00-install-packages/00-packages

@@ -1,4 +1,5 @@
 gstreamer1.0-x
+gstreamer1.0-omx
 gstreamer1.0-plugins-base
 gstreamer1.0-plugins-good
 gstreamer1.0-plugins-bad

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

@@ -1,11 +1,11 @@
-xserver-xorg
 xserver-xorg-video-fbdev
-xserver-xorg-video-fbturbo
+xserver-xorg
 xinit
+xserver-xorg-video-fbturbo
 menu-xdg
 zenity
 xdg-utils
 gvfs-backends
 gvfs-fuse
-gnome-themes-standard
+gnome-themes-standard-data
 gnome-icon-theme