aarch64
This commit is contained in:
parent
825107f040
commit
c64b84cbac
|
@ -7,19 +7,20 @@ bootstrap(){
|
||||||
local BOOTSTRAP_CMD=debootstrap
|
local BOOTSTRAP_CMD=debootstrap
|
||||||
local BOOTSTRAP_ARGS=()
|
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
|
BOOTSTRAP_CMD=qemu-debootstrap
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BOOTSTRAP_ARGS+=(--arch armhf)
|
BOOTSTRAP_ARGS+=(--arch arm64)
|
||||||
|
BOOTSTRAP_ARGS+=(--include gnupg)
|
||||||
BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
|
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+=("$@")
|
BOOTSTRAP_ARGS+=("$@")
|
||||||
printf -v BOOTSTRAP_STR '%q ' "${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
|
if [ -d "$2/debootstrap" ]; then
|
||||||
rmdir "$2/debootstrap"
|
rmdir "$2/debootstrap"
|
||||||
|
|
|
@ -14,6 +14,7 @@ fi
|
||||||
|
|
||||||
on_chroot apt-key add - < files/raspberrypi.gpg.key
|
on_chroot apt-key add - < files/raspberrypi.gpg.key
|
||||||
on_chroot << EOF
|
on_chroot << EOF
|
||||||
|
dpkg --add-architecture armhf
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get dist-upgrade -y
|
apt-get dist-upgrade -y
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
deb http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi
|
deb http://deb.debian.org/debian RELEASE main contrib non-free
|
||||||
# Uncomment line below then 'apt-get update' to enable 'apt-get source'
|
deb http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
|
||||||
#deb-src http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi
|
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
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
|
|
||||||
if [ ! -d "${ROOTFS_DIR}" ]; then
|
if [ ! -d "${ROOTFS_DIR}" ]; then
|
||||||
bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
|
bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -56,10 +56,7 @@
|
||||||
# Enable audio (loads snd_bcm2835)
|
# Enable audio (loads snd_bcm2835)
|
||||||
dtparam=audio=on
|
dtparam=audio=on
|
||||||
|
|
||||||
[pi4]
|
|
||||||
# Enable DRM VC4 V3D driver on top of the dispmanx display stack
|
# Enable DRM VC4 V3D driver on top of the dispmanx display stack
|
||||||
dtoverlay=vc4-fkms-v3d
|
dtoverlay=vc4-fkms-v3d
|
||||||
max_framebuffers=2
|
max_framebuffers=2
|
||||||
|
arm_64bit=1
|
||||||
[all]
|
|
||||||
#dtoverlay=vc4-fkms-v3d
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
raspi-copies-and-fills
|
|
|
@ -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
|
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
IMG_SUFFIX="-lite"
|
|
||||||
if [ "${USE_QEMU}" = "1" ]; then
|
|
||||||
export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
|
|
||||||
fi
|
|
|
@ -1,2 +0,0 @@
|
||||||
NOOBS_NAME="Raspbian Lite"
|
|
||||||
NOOBS_DESCRIPTION="A port of Debian with no desktop environment"
|
|
|
@ -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
|
qpdfview gtk2-engines alsa-utils
|
||||||
desktop-base
|
desktop-base
|
||||||
git
|
git
|
||||||
omxplayer
|
#omxplayer
|
||||||
raspberrypi-artwork
|
raspberrypi-artwork
|
||||||
policykit-1
|
policykit-1
|
||||||
gvfs
|
gvfs
|
||||||
rfkill
|
rfkill
|
||||||
chromium-browser rpi-chromium-mods
|
chromium rpi-chromium-mods
|
||||||
gldriver-test
|
gldriver-test
|
||||||
fonts-droid-fallback
|
fonts-droid-fallback
|
||||||
fonts-liberation2
|
fonts-liberation2
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
|
xserver-xorg xinit
|
||||||
mousepad
|
mousepad
|
||||||
lxde lxtask menu-xdg
|
lxde lxtask menu-xdg
|
||||||
zenity xdg-utils
|
zenity xdg-utils
|
||||||
gvfs-backends gvfs-fuse
|
gvfs-backends gvfs-fuse
|
||||||
lightdm gnome-themes-standard-data gnome-icon-theme
|
lightdm gnome-themes-standard gnome-icon-theme
|
||||||
|
|
|
@ -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
|
|
|
@ -2,7 +2,7 @@ python python3-pygame python-pygame python-tk
|
||||||
python3 python3-tk thonny
|
python3 python3-tk thonny
|
||||||
python3-pgzero
|
python3-pgzero
|
||||||
python-serial python3-serial
|
python-serial python3-serial
|
||||||
python-picamera python3-picamera
|
#python-picamera python3-picamera
|
||||||
debian-reference-en dillo
|
debian-reference-en dillo
|
||||||
raspberrypi-net-mods raspberrypi-ui-mods
|
raspberrypi-net-mods raspberrypi-ui-mods
|
||||||
python-pip python3-pip
|
python-pip python3-pip
|
||||||
|
@ -22,4 +22,4 @@ pprompt
|
||||||
piwiz
|
piwiz
|
||||||
rp-prefapps
|
rp-prefapps
|
||||||
ffmpeg
|
ffmpeg
|
||||||
vlc
|
#vlc
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
NOOBS_NAME="Raspbian"
|
|
||||||
NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"
|
|
|
@ -1,15 +1,15 @@
|
||||||
mu-editor
|
mu-editor
|
||||||
sonic-pi
|
#sonic-pi
|
||||||
scratch nuscratch scratch2 scratch3
|
#scratch nuscratch scratch2 scratch3
|
||||||
smartsim
|
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
|
python-sense-emu sense-emu-tools python-sense-emu-doc
|
||||||
|
|
||||||
wolfram-engine
|
#wolfram-engine
|
||||||
claws-mail
|
claws-mail
|
||||||
greenfoot-unbundled bluej
|
greenfoot-unbundled bluej
|
||||||
nodered
|
#nodered
|
||||||
realvnc-vnc-viewer
|
realvnc-vnc-viewer
|
||||||
|
|
||||||
python-games
|
python-games
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
IMG_SUFFIX="-full"
|
|
||||||
if [ "${USE_QEMU}" = "1" ]; then
|
|
||||||
export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
|
|
||||||
fi
|
|
|
@ -1,2 +0,0 @@
|
||||||
NOOBS_NAME="Raspbian Full"
|
|
||||||
NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"
|
|
Loading…
Reference in New Issue
Block a user