From 99399d30fc7c80553cf50899388ff8ecb278867d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 20 Feb 2020 18:43:05 +0000 Subject: [PATCH 01/17] aarch64 --- scripts/common | 11 ++++++----- stage0/00-configure-apt/00-run.sh | 1 + stage0/00-configure-apt/files/sources.list | 10 +++++++--- stage0/prerun.sh | 2 +- stage1/00-boot-files/files/config.txt | 5 +---- stage2/00-copies-and-fills/01-packages | 1 - stage2/00-copies-and-fills/02-run.sh | 6 ------ stage2/EXPORT_IMAGE | 4 ---- stage2/EXPORT_NOOBS | 2 -- stage3/00-install-packages/00-packages | 6 +++--- stage3/00-install-packages/00-packages-nr | 4 ++-- stage3/00-install-packages/01-run.sh | 8 -------- stage4/00-install-packages/00-packages | 4 ++-- stage4/EXPORT_NOOBS | 2 -- stage5/00-install-extras/00-packages | 10 +++++----- stage5/EXPORT_IMAGE | 4 ---- stage5/EXPORT_NOOBS | 2 -- 17 files changed, 28 insertions(+), 54 deletions(-) delete mode 100644 stage2/00-copies-and-fills/01-packages delete mode 100755 stage2/00-copies-and-fills/02-run.sh delete mode 100644 stage2/EXPORT_IMAGE delete mode 100644 stage2/EXPORT_NOOBS delete mode 100755 stage3/00-install-packages/01-run.sh delete mode 100644 stage4/EXPORT_NOOBS delete mode 100644 stage5/EXPORT_IMAGE delete mode 100644 stage5/EXPORT_NOOBS diff --git a/scripts/common b/scripts/common index e2048d9..6586052 100644 --- a/scripts/common +++ b/scripts/common @@ -7,19 +7,20 @@ bootstrap(){ local BOOTSTRAP_CMD=debootstrap local BOOTSTRAP_ARGS=() - export http_proxy=${APT_PROXY} + #export http_proxy=${APT_PROXY} - if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then + if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "arm64" ]; then BOOTSTRAP_CMD=qemu-debootstrap fi - BOOTSTRAP_ARGS+=(--arch armhf) + BOOTSTRAP_ARGS+=(--arch arm64) + 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[@]}" - setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true + capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true if [ -d "$2/debootstrap" ]; then rmdir "$2/debootstrap" diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh index d10a49f..651d154 100755 --- a/stage0/00-configure-apt/00-run.sh +++ b/stage0/00-configure-apt/00-run.sh @@ -14,6 +14,7 @@ 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 diff --git a/stage0/00-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list index 4a5dd8a..0332f89 100644 --- a/stage0/00-configure-apt/files/sources.list +++ b/stage0/00-configure-apt/files/sources.list @@ -1,3 +1,7 @@ -deb http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi -# Uncomment line below then 'apt-get update' to enable 'apt-get source' -#deb-src http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi +deb http://deb.debian.org/debian RELEASE main contrib non-free +deb http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free +deb http://deb.debian.org/debian RELEASE-updates main contrib non-free +# 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 diff --git a/stage0/prerun.sh b/stage0/prerun.sh index 3b25783..283ffd5 100755 --- a/stage0/prerun.sh +++ b/stage0/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e if [ ! -d "${ROOTFS_DIR}" ]; then - bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/ + bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/ fi diff --git a/stage1/00-boot-files/files/config.txt b/stage1/00-boot-files/files/config.txt index 548f4ac..a83e597 100644 --- a/stage1/00-boot-files/files/config.txt +++ b/stage1/00-boot-files/files/config.txt @@ -56,10 +56,7 @@ # 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 +arm_64bit=1 diff --git a/stage2/00-copies-and-fills/01-packages b/stage2/00-copies-and-fills/01-packages deleted file mode 100644 index 283c290..0000000 --- a/stage2/00-copies-and-fills/01-packages +++ /dev/null @@ -1 +0,0 @@ -raspi-copies-and-fills diff --git a/stage2/00-copies-and-fills/02-run.sh b/stage2/00-copies-and-fills/02-run.sh deleted file mode 100755 index 366ac24..0000000 --- a/stage2/00-copies-and-fills/02-run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 - diff --git a/stage2/EXPORT_IMAGE b/stage2/EXPORT_IMAGE deleted file mode 100644 index aa8f936..0000000 --- a/stage2/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="-lite" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS deleted file mode 100644 index 136cc77..0000000 --- a/stage2/EXPORT_NOOBS +++ /dev/null @@ -1,2 +0,0 @@ -NOOBS_NAME="Raspbian Lite" -NOOBS_DESCRIPTION="A port of Debian with no desktop environment" diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index eac74ea..8e7c519 100644 --- a/stage3/00-install-packages/00-packages +++ b/stage3/00-install-packages/00-packages @@ -1,13 +1,13 @@ -gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav +gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav qpdfview gtk2-engines alsa-utils desktop-base git -omxplayer +#omxplayer raspberrypi-artwork policykit-1 gvfs rfkill -chromium-browser rpi-chromium-mods +chromium rpi-chromium-mods gldriver-test fonts-droid-fallback fonts-liberation2 diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr index ffc324b..f8bff31 100644 --- a/stage3/00-install-packages/00-packages-nr +++ b/stage3/00-install-packages/00-packages-nr @@ -1,6 +1,6 @@ -xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo +xserver-xorg xinit mousepad lxde lxtask menu-xdg zenity xdg-utils gvfs-backends gvfs-fuse -lightdm gnome-themes-standard-data gnome-icon-theme +lightdm gnome-themes-standard gnome-icon-theme diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh deleted file mode 100755 index d768747..0000000 --- a/stage3/00-install-packages/01-run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF -update-alternatives --install /usr/bin/x-www-browser \ - x-www-browser /usr/bin/chromium-browser 86 -update-alternatives --install /usr/bin/gnome-www-browser \ - gnome-www-browser /usr/bin/chromium-browser 86 -EOF diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index f9f5ef4..c9bc749 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -2,7 +2,7 @@ python python3-pygame python-pygame python-tk python3 python3-tk thonny python3-pgzero python-serial python3-serial -python-picamera python3-picamera +#python-picamera python3-picamera debian-reference-en dillo raspberrypi-net-mods raspberrypi-ui-mods python-pip python3-pip @@ -22,4 +22,4 @@ pprompt piwiz rp-prefapps ffmpeg -vlc +#vlc diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS deleted file mode 100644 index 2ef6d7b..0000000 --- a/stage4/EXPORT_NOOBS +++ /dev/null @@ -1,2 +0,0 @@ -NOOBS_NAME="Raspbian" -NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop" diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index 609e718..34ba459 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -1,15 +1,15 @@ mu-editor -sonic-pi -scratch nuscratch scratch2 scratch3 +#sonic-pi +#scratch nuscratch scratch2 scratch3 smartsim -minecraft-pi python-minecraftpi python-picraft python3-picraft +#minecraft-pi python-minecraftpi python-picraft python3-picraft python-sense-emu sense-emu-tools python-sense-emu-doc -wolfram-engine +#wolfram-engine claws-mail greenfoot-unbundled bluej -nodered +#nodered realvnc-vnc-viewer python-games diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE deleted file mode 100644 index a81a844..0000000 --- a/stage5/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="-full" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS deleted file mode 100644 index cb10203..0000000 --- a/stage5/EXPORT_NOOBS +++ /dev/null @@ -1,2 +0,0 @@ -NOOBS_NAME="Raspbian Full" -NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications" From 906c587fcde8b69c24d8f895512caac9b819f454 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 26 May 2020 06:29:32 +0100 Subject: [PATCH 02/17] Package changes Install vlc Remove realvnc server Switch to Full KMS --- stage1/00-boot-files/files/config.txt | 4 ++-- stage4/00-install-packages/00-packages | 2 +- stage4/00-install-packages/00-packages-nr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stage1/00-boot-files/files/config.txt b/stage1/00-boot-files/files/config.txt index a83e597..2c72b98 100644 --- a/stage1/00-boot-files/files/config.txt +++ b/stage1/00-boot-files/files/config.txt @@ -56,7 +56,7 @@ # Enable audio (loads snd_bcm2835) dtparam=audio=on -# Enable DRM VC4 V3D driver on top of the dispmanx display stack -dtoverlay=vc4-fkms-v3d +# Enable DRM VC4 V3D driver +dtoverlay=vc4-kms-v3d max_framebuffers=2 arm_64bit=1 diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index c9bc749..5d3bffb 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -22,4 +22,4 @@ pprompt piwiz rp-prefapps ffmpeg -#vlc +vlc diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr index b904b80..38de602 100644 --- a/stage4/00-install-packages/00-packages-nr +++ b/stage4/00-install-packages/00-packages-nr @@ -1,2 +1,2 @@ pi-package -realvnc-vnc-server +#realvnc-vnc-server From d4049eeffb27a7f23abf59e9d93ae6c5e26d0b93 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 27 May 2020 17:19:25 +0100 Subject: [PATCH 03/17] fix vlc installation --- stage4/00-install-packages/00-packages | 2 +- stage4/00-install-packages/03-run.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 stage4/00-install-packages/03-run.sh diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 5d3bffb..171e430 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -22,4 +22,4 @@ pprompt piwiz rp-prefapps ffmpeg -vlc +vlc vlc-data=3.0.10-0+deb10u1 diff --git a/stage4/00-install-packages/03-run.sh b/stage4/00-install-packages/03-run.sh new file mode 100755 index 0000000..6846097 --- /dev/null +++ b/stage4/00-install-packages/03-run.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e +on_chroot < Date: Mon, 22 Jun 2020 03:52:34 +0100 Subject: [PATCH 04/17] Revert "fix vlc installation" This reverts commit f644fa284871341f89b153679339bcc233d7990f. --- stage4/00-install-packages/00-packages | 2 +- stage4/00-install-packages/03-run.sh | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100755 stage4/00-install-packages/03-run.sh diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 171e430..5d3bffb 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -22,4 +22,4 @@ pprompt piwiz rp-prefapps ffmpeg -vlc vlc-data=3.0.10-0+deb10u1 +vlc diff --git a/stage4/00-install-packages/03-run.sh b/stage4/00-install-packages/03-run.sh deleted file mode 100755 index 6846097..0000000 --- a/stage4/00-install-packages/03-run.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e -on_chroot < Date: Thu, 30 Jul 2020 15:31:16 +0100 Subject: [PATCH 05/17] Install RealVNC server --- stage4/00-install-packages/00-packages-nr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr index 38de602..b904b80 100644 --- a/stage4/00-install-packages/00-packages-nr +++ b/stage4/00-install-packages/00-packages-nr @@ -1,2 +1,2 @@ pi-package -#realvnc-vnc-server +realvnc-vnc-server From 0f41e41c8c571b01dddd22b13f7e8146d3b00c6e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 30 Jul 2020 15:32:03 +0100 Subject: [PATCH 06/17] Switch to FKMS --- stage1/00-boot-files/files/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage1/00-boot-files/files/config.txt b/stage1/00-boot-files/files/config.txt index 2c72b98..a83e597 100644 --- a/stage1/00-boot-files/files/config.txt +++ b/stage1/00-boot-files/files/config.txt @@ -56,7 +56,7 @@ # Enable audio (loads snd_bcm2835) dtparam=audio=on -# Enable DRM VC4 V3D driver -dtoverlay=vc4-kms-v3d +# Enable DRM VC4 V3D driver on top of the dispmanx display stack +dtoverlay=vc4-fkms-v3d max_framebuffers=2 arm_64bit=1 From 75123fd64e10ba16dffcc91b36eba3d89d26a91b Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 6 Aug 2020 10:29:04 +0100 Subject: [PATCH 07/17] export lite image --- stage2/EXPORT_IMAGE | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 stage2/EXPORT_IMAGE diff --git a/stage2/EXPORT_IMAGE b/stage2/EXPORT_IMAGE new file mode 100644 index 0000000..aa8f936 --- /dev/null +++ b/stage2/EXPORT_IMAGE @@ -0,0 +1,4 @@ +IMG_SUFFIX="-lite" +if [ "${USE_QEMU}" = "1" ]; then + export IMG_SUFFIX="${IMG_SUFFIX}-qemu" +fi From 88e48a8acae35ccc2476e9b6d55605df31fdb1f0 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 15 Dec 2020 13:35:23 +0000 Subject: [PATCH 08/17] Switch to KMS --- stage1/00-boot-files/files/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage1/00-boot-files/files/config.txt b/stage1/00-boot-files/files/config.txt index a83e597..a002373 100644 --- a/stage1/00-boot-files/files/config.txt +++ b/stage1/00-boot-files/files/config.txt @@ -56,7 +56,7 @@ # Enable audio (loads snd_bcm2835) dtparam=audio=on -# Enable DRM VC4 V3D driver on top of the dispmanx display stack -dtoverlay=vc4-fkms-v3d +# Enable DRM VC4 V3D drive +dtoverlay=vc4-kms-v3d max_framebuffers=2 arm_64bit=1 From 04f9b9bb5ffb932a365539823a24fbd9c12a5cef Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 31 Mar 2021 12:28:30 +0100 Subject: [PATCH 09/17] Install gpiozero in lite images --- export-noobs/00-release/files/release_notes.txt | 2 ++ stage2/01-sys-tweaks/00-packages | 2 ++ stage4/00-install-packages/00-packages | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index f7df4ca..3983c93 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,6 @@ UNRELEASED: + * Install gpiozero in lite images +2021-03-04: * Thonny upgraded to version 3.3.5 * SD Card Copier made compatible with NVMe devices; now built against GTK+3 toolkit * Composite video options removed from Raspberry Pi 4 in Raspberry Pi Configuration diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 83ec74c..a1f4b59 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -2,6 +2,8 @@ ssh less fbset sudo psmisc strace ed ncdu crda console-setup keyboard-configuration debconf-utils parted unzip build-essential manpages-dev python bash-completion gdb pkg-config python-rpi.gpio v4l-utils +python-gpiozero +python3-gpiozero avahi-daemon lua5.1 luajit diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 5d3bffb..d03d850 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -13,7 +13,7 @@ tree libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr geany piclone -wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio +wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python3-rpi.gpio python-spidev python3-spidev python-twython python3-twython python-smbus python3-smbus From 268d4c4f44f9b2b14b340e87dc226f6d40613fe4 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 6 Oct 2021 14:59:29 +0100 Subject: [PATCH 10/17] Remove debian-security bullseye/updates repo --- stage0/00-configure-apt/files/sources.list | 2 -- 1 file changed, 2 deletions(-) diff --git a/stage0/00-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list index 0332f89..1c18c60 100644 --- a/stage0/00-configure-apt/files/sources.list +++ b/stage0/00-configure-apt/files/sources.list @@ -1,7 +1,5 @@ deb http://deb.debian.org/debian RELEASE main contrib non-free -deb http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free deb http://deb.debian.org/debian RELEASE-updates main contrib non-free # 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 From 5ea223355aca8b1f5a0c6cc9d782ec58d381591c Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 26 Oct 2021 12:28:11 +0100 Subject: [PATCH 11/17] Add debian-security repo --- stage0/00-configure-apt/files/sources.list | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stage0/00-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list index 1c18c60..51290f6 100644 --- a/stage0/00-configure-apt/files/sources.list +++ b/stage0/00-configure-apt/files/sources.list @@ -1,5 +1,7 @@ deb http://deb.debian.org/debian RELEASE main contrib non-free +deb http://security.debian.org/debian-security RELEASE-security main contrib non-free deb http://deb.debian.org/debian RELEASE-updates main contrib non-free # 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://security.debian.org/debian-security RELEASE-security main contrib non-free #deb-src http://deb.debian.org/debian RELEASE-updates main contrib non-free From 45b4cc19d0fe9ccf69220ceab4aa67f47de263c9 Mon Sep 17 00:00:00 2001 From: XECDesign Date: Wed, 22 Dec 2021 15:43:06 +0000 Subject: [PATCH 12/17] Remove use of setarch for arm64 Fixes #572 --- scripts/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index 690403f..394b398 100644 --- a/scripts/common +++ b/scripts/common @@ -94,7 +94,7 @@ on_chroot() { mount --bind /sys "${ROOTFS_DIR}/sys" fi - setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@" + capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@" } export -f on_chroot From 0f7ab62ac9fbba4a53d20a46d4b1a5281425379d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 22 Dec 2021 15:55:04 +0000 Subject: [PATCH 13/17] Revert "Update chromium install" This reverts commit 69cd27944c9d81b8170e8ade5ccbb23895599ed1. --- stage3/00-install-packages/00-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index 73aa12f..c88cf4c 100644 --- a/stage3/00-install-packages/00-packages +++ b/stage3/00-install-packages/00-packages @@ -5,7 +5,7 @@ git policykit-1 gvfs rfkill -chromium-browser rpi-chromium-mods libwidevinecdm0 +chromium-browser rpi-chromium-mods gldriver-test fonts-droid-fallback fonts-liberation2 From 69cc4146c8876a1d25432f07f1aa9eda441432f1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 11 Jan 2022 11:20:35 +0000 Subject: [PATCH 14/17] Build complete set of arm64 images --- stage2/EXPORT_NOOBS | 2 ++ stage4/EXPORT_NOOBS | 2 ++ stage5/EXPORT_IMAGE | 4 ++++ stage5/EXPORT_NOOBS | 2 ++ 4 files changed, 10 insertions(+) create mode 100644 stage2/EXPORT_NOOBS create mode 100644 stage4/EXPORT_NOOBS create mode 100644 stage5/EXPORT_IMAGE create mode 100644 stage5/EXPORT_NOOBS diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS new file mode 100644 index 0000000..c1e03be --- /dev/null +++ b/stage2/EXPORT_NOOBS @@ -0,0 +1,2 @@ +NOOBS_NAME="Raspberry Pi OS Lite (64-bit)" +NOOBS_DESCRIPTION="A port of Debian with no desktop environment" diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS new file mode 100644 index 0000000..aa69e13 --- /dev/null +++ b/stage4/EXPORT_NOOBS @@ -0,0 +1,2 @@ +NOOBS_NAME="Raspberry Pi OS (64-bit)" +NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop" diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE new file mode 100644 index 0000000..a81a844 --- /dev/null +++ b/stage5/EXPORT_IMAGE @@ -0,0 +1,4 @@ +IMG_SUFFIX="-full" +if [ "${USE_QEMU}" = "1" ]; then + export IMG_SUFFIX="${IMG_SUFFIX}-qemu" +fi diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS new file mode 100644 index 0000000..b136a5e --- /dev/null +++ b/stage5/EXPORT_NOOBS @@ -0,0 +1,2 @@ +NOOBS_NAME="Raspberry Pi OS Full (64-bit)" +NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications" From 4721bfe5902e266d165800bee57499bc88eb5cd3 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 2 Feb 2022 14:32:09 +0000 Subject: [PATCH 15/17] Update os.json --- export-noobs/00-release/files/os.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/export-noobs/00-release/files/os.json b/export-noobs/00-release/files/os.json index 6cc0e36..0c174d1 100644 --- a/export-noobs/00-release/files/os.json +++ b/export-noobs/00-release/files/os.json @@ -1,18 +1,15 @@ { "description": "NOOBS_DESCRIPTION", - "feature_level": 35120124, "kernel": "KERNEL", "name": "NOOBS_NAME", "password": "raspberry", "release_date": "UNRELEASED", - "supported_hex_revisions": "2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,1040,1041,0092,0093,2082", "supported_models": [ - "Pi Model", - "Pi 2", - "Pi Zero", + "Pi Zero 2", "Pi 3", + "Pi 4", "Pi Compute Module 3", - "Pi 4" + "Pi Compute Module 4" ], "url": "http://www.raspbian.org/", "username": "pi", From 733513aa2503c9c95d38c185260d7d1ca85ce91b Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 22 Feb 2022 11:34:06 +0000 Subject: [PATCH 16/17] Enable APT_PROXY for arm64 builds Closes #598 --- scripts/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index afba00a..7151ff2 100644 --- a/scripts/common +++ b/scripts/common @@ -7,7 +7,7 @@ bootstrap(){ local BOOTSTRAP_CMD=debootstrap local BOOTSTRAP_ARGS=() - #export http_proxy=${APT_PROXY} + export http_proxy=${APT_PROXY} BOOTSTRAP_ARGS+=(--arch arm64) BOOTSTRAP_ARGS+=(--include gnupg) From ca06d62f2ef63bd00b5729e48c64a2688e46ae14 Mon Sep 17 00:00:00 2001 From: XECDesign Date: Mon, 25 Apr 2022 15:11:28 +0100 Subject: [PATCH 17/17] Docker: always use debian:bullseye for arm64 image Fixes #613 --- build-docker.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index a7f18f1..a44b33f 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -75,16 +75,7 @@ fi # Modify original build-options to allow config file to be mounted in the docker container BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')" -# Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead -case "$(uname -m)" in - x86_64|aarch64) - BASE_IMAGE=i386/debian:bullseye - ;; - *) - BASE_IMAGE=debian:bullseye - ;; -esac -${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}" +${DOCKER} build --build-arg BASE_IMAGE=debian:bullseye -t pi-gen "${DIR}" if [ "${CONTAINER_EXISTS}" != "" ]; then trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM