Skip to content

Commit

Permalink
aarch64
Browse files Browse the repository at this point in the history
  • Loading branch information
XECDesign committed Jul 30, 2020
1 parent 9a3a10b commit 99399d3
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 54 deletions.
11 changes: 6 additions & 5 deletions scripts/common
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions stage0/00-configure-apt/00-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 7 additions & 3 deletions stage0/00-configure-apt/files/sources.list
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion stage0/prerun.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions stage1/00-boot-files/files/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion stage2/00-copies-and-fills/01-packages

This file was deleted.

6 changes: 0 additions & 6 deletions stage2/00-copies-and-fills/02-run.sh

This file was deleted.

4 changes: 0 additions & 4 deletions stage2/EXPORT_IMAGE

This file was deleted.

2 changes: 0 additions & 2 deletions stage2/EXPORT_NOOBS

This file was deleted.

6 changes: 3 additions & 3 deletions stage3/00-install-packages/00-packages
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions stage3/00-install-packages/00-packages-nr
Original file line number Diff line number Diff line change
@@ -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
8 changes: 0 additions & 8 deletions stage3/00-install-packages/01-run.sh

This file was deleted.

4 changes: 2 additions & 2 deletions stage4/00-install-packages/00-packages
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,4 +22,4 @@ pprompt
piwiz
rp-prefapps
ffmpeg
vlc
#vlc
2 changes: 0 additions & 2 deletions stage4/EXPORT_NOOBS

This file was deleted.

10 changes: 5 additions & 5 deletions stage5/00-install-extras/00-packages
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions stage5/EXPORT_IMAGE

This file was deleted.

2 changes: 0 additions & 2 deletions stage5/EXPORT_NOOBS

This file was deleted.

0 comments on commit 99399d3

Please sign in to comment.