From 99399d30fc7c80553cf50899388ff8ecb278867d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 20 Feb 2020 18:43:05 +0000 Subject: [PATCH] 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"