Merge branch 'master' into arm64

export lite image
2020-08-24 17:06:36 +01:00 · 2020-08-24 15:49:08 +01:00 · 2020-08-06 10:29:04 +01:00 · 2020-07-30 15:32:03 +01:00 · 2020-07-30 15:31:16 +01:00 · 2020-07-30 15:29:40 +01:00
16 changed files with 27 additions and 49 deletions
--- 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"
--- 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
--- 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
--- 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
--- 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
--- a/stage2/00-copies-and-fills/01-packages
+++ b/stage2/00-copies-and-fills/01-packages
@ -1 +0,0 @@
-raspi-copies-and-fills
--- a/stage2/00-copies-and-fills/02-run.sh
+++ b/stage2/00-copies-and-fills/02-run.sh
@ -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
-
--- a/stage2/EXPORT_NOOBS
+++ b/stage2/EXPORT_NOOBS
@ -1,2 +0,0 @@
-NOOBS_NAME="Raspberry Pi OS Lite (32-bit)"
-NOOBS_DESCRIPTION="A port of Debian with no desktop environment"
--- 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
--- 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
--- a/stage3/00-install-packages/01-run.sh
+++ b/stage3/00-install-packages/01-run.sh
@ -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
--- 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
--- a/stage4/EXPORT_NOOBS
+++ b/stage4/EXPORT_NOOBS
@ -1,2 +0,0 @@
-NOOBS_NAME="Raspberry Pi OS (32-bit)"
-NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"
--- 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
--- a/stage5/EXPORT_IMAGE
+++ b/stage5/EXPORT_IMAGE
@ -1,4 +0,0 @@
-IMG_SUFFIX="-full"
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
--- a/stage5/EXPORT_NOOBS
+++ b/stage5/EXPORT_NOOBS
@ -1,2 +0,0 @@
-NOOBS_NAME="Raspberry Pi OS Full (32-bit)"
-NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"
Author	SHA1	Message	Date
Serge Schneider	d3553f5ec4	Merge branch 'master' into arm64	2020-08-24 17:06:36 +01:00
Serge Schneider	0cab554f7d	Merge branch 'master' into arm64	2020-08-24 15:49:08 +01:00
Serge Schneider	75123fd64e	export lite image	2020-08-06 10:29:04 +01:00
Serge Schneider	0f41e41c8c	Switch to FKMS	2020-07-30 15:32:03 +01:00
Serge Schneider	a58e722bee	Install RealVNC server	2020-07-30 15:31:16 +01:00
Serge Schneider	c640efa6e1	Revert "fix vlc installation" This reverts commit `f644fa2848`.	2020-07-30 15:29:40 +01:00
Serge Schneider	d4049eeffb	fix vlc installation	2020-07-30 15:29:40 +01:00
Serge Schneider	906c587fcd	Package changes Install vlc Remove realvnc server Switch to Full KMS	2020-07-30 15:29:40 +01:00
Serge Schneider	99399d30fc	aarch64	2020-07-30 15:29:40 +01:00