Merge branch 'arm64' into move-to-arm64
Fayaaz Ahmed
commit
376463da89
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
# Enable DRM VC4 V3D driver
|
||||
dtoverlay=vc4-kms-v3d
|
||||
max_framebuffers=2
|
||||
|
||||
[all]
|
||||
#dtoverlay=vc4-fkms-v3d
|
||||
arm_64bit=1
|
||||
|
|
|
|||
|
|
@ -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,8 +0,0 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
install -m 644 files/blokas.list ${ROOTFS_DIR}/etc/apt/sources.list.d/
|
||||
|
||||
on_chroot apt-key add - < files/blokas.gpg.key
|
||||
on_chroot << EOF
|
||||
apt-get update
|
||||
EOF
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1
|
||||
|
||||
mQENBFnGbQoBCACgy7jiYrM+ks27KP3dKYd1AatJuHJvk9bWAxJVfZWth3F8Casf
|
||||
8JC1T8z8h3c1Eoo1ZKZNuPAp41a21N5/PsIvS22r3qKKNHW/Sd4vl3/cpjrnONw1
|
||||
rchqZbKws5gnLoYre/dPXKC35inK9YTFlzGLKo23OQS+q7QoMk39/HoOIzrysZRp
|
||||
QJ/Vl9sT3mktPs57Wkx20kZw0QDovm1hDqJuxe3OqujA+KpsCj8uELGT1GT25dFB
|
||||
J7N84XxU4sRjNox5TfL3Z9Q1i2oKeVIKstUYCNeHvfqGYoMwnQJ4U0YKWgVn0AwB
|
||||
ZaDwnZAruXvXRcmWB28PV9J3nw3gp0VbcYN1ABEBAAG0JVZpbG5pYXVzIEJsb2th
|
||||
cyBVQUIgPGhlbGxvQGJsb2thcy5pbz6JATgEEwECACIFAlnGbQoCGwMGCwkIBwMC
|
||||
BhUIAgkKCwQWAgMBAh4BAheAAAoJEDeAgJj1YJCKQL8H/1YZxhUXk4WUnWJSdVZW
|
||||
GvXwu9e5DvtX3OC3ETONVzwS7LN3hN+N7GqJ8d6FEKMPWeTiAXjAkOjMHAyvsfLv
|
||||
+1CLoCMh615BAUUhT6VKWnlgL5coYTH+A0RVhMRrecD0P3YllqCrkhYzseZxd79/
|
||||
jGyMJgmGkNW5YzzWGZTYjTQvknvHEtjsaQBJm8/Twojb+oB8NAJGTWRwXW/ngSBL
|
||||
hqHJUjICw10pH1x9xTlEl+t4FE3ewzVWuJgK1yeIcA7kOUWVyZIHNXjcG/V7QkfK
|
||||
JiWKPfLp8qD90nnMfOc+GUf84nb8zHvqTSI1hm0Y6wqHw1swnYs8/bJPV91t4Gml
|
||||
cQG5AQ0EWcZtCgEIAM8UPjVyDQZooeV5lvONnpXEfKgx8jjes1Ruv7cFGnBd5VKu
|
||||
jXUh0z/aAMDH0HBcKBvrYUUkKQSZcGobKhMkXbblmpSShGcjPnxp2big5/B92AAX
|
||||
NqXb7JlJ7WKBQ3B2ZKh7tgUYx9s3lSiwND9xFBEUE8HCc6z9VmoJHuknY9Ro0SBm
|
||||
yZRszJMOtRAFJDJIa1W1wsj682v2wpYDXy5PDzA6ktdxKBeDmcLeKJ7mwxoNi9qf
|
||||
CnGhSUppsXfBDbRj2iRbF4uJkdoyqrMNxomzLt+Rbhpy4BuezzrSnpUJoz/p3ug9
|
||||
mSgsq9A+OjyXhWuu8wL3HXPqK61v+EWte5h2Y68AEQEAAYkBHwQYAQIACQUCWcZt
|
||||
CgIbDAAKCRA3gICY9WCQilF5B/0dDFntmFQFbMn/9g71UUFIp844K5oVOUKb4/B+
|
||||
pj8KzABkx9Tdhyc32a02iLPP8kNiU2x1QbPPACl8YCYZUfPJ7zFQKd5J4m4Fawdq
|
||||
OoGD9DyGsC5d4K52E9F1fDCFPRloUjgsQQPYcDcvrgYwxbX1YSlRZzpqvFt3RFqH
|
||||
NS7T1aMKvmqV/9iiASH/CMvzyApDPdQsxjPutCaMzANAefqjC4VQtikef4CVZ+mN
|
||||
SYPC4xhoPIx0XMOkKw+sXKQRE8zLGPaggxFQC++7T6YDOyGs3co+M93RgYLV9xI8
|
||||
60OKbyUQt+HJx8s+7Yw4lXYaLZqJ0e7tDW4WQxqqVc9fm7Vm
|
||||
=7IOz
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
|
@ -1 +0,0 @@
|
|||
deb http://apt.blokas.io/ rpi main
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
xserver-xorg xinit
|
||||
mousepad
|
||||
lxde lxtask menu-xdg
|
||||
zenity xdg-utils
|
||||
gvfs-backends gvfs-fuse
|
||||
lightdm gnome-themes-standard gnome-icon-theme
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
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
|
||||
raspberrypi-artwork
|
||||
|
|
@ -8,7 +8,6 @@ rfkill
|
|||
gldriver-test
|
||||
fonts-droid-fallback
|
||||
fonts-liberation2
|
||||
obconf
|
||||
arandr
|
||||
usbmount
|
||||
mixxx
|
||||
mixxx
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo xserver-xorg-legacy xscreensaver
|
||||
xdg-utils gvfs-backends gvfs-fuse
|
||||
lightdm xterm i3 i3status
|
||||
liblo7 liblo-dev libasound-dev libjack-jackd2-dev
|
||||
liblo7 liblo-dev libasound-dev libjack-jackd2-dev
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
raspberrypi-kernel-rt
|
||||
|
||||
Loading…
Reference in New Issue