Compare commits

...

9 Commits

Author SHA1 Message Date
  Serge Schneider d3553f5ec4 Merge branch 'master' into arm64 1 year ago
  Serge Schneider 0cab554f7d Merge branch 'master' into arm64 1 year ago
  Serge Schneider 75123fd64e export lite image 1 year ago
  Serge Schneider 0f41e41c8c Switch to FKMS 1 year ago
  Serge Schneider a58e722bee Install RealVNC server 1 year ago
  Serge Schneider c640efa6e1 Revert "fix vlc installation" 1 year ago
  Serge Schneider d4049eeffb fix vlc installation 1 year ago
  Serge Schneider 906c587fcd Package changes 1 year ago
  Serge Schneider 99399d30fc aarch64 1 year ago
16 changed files with 27 additions and 49 deletions
Split View
  1. +6
    -5
      scripts/common
  2. +1
    -0
      stage0/00-configure-apt/00-run.sh
  3. +7
    -3
      stage0/00-configure-apt/files/sources.list
  4. +1
    -1
      stage0/prerun.sh
  5. +1
    -4
      stage1/00-boot-files/files/config.txt
  6. +0
    -1
      stage2/00-copies-and-fills/01-packages
  7. +0
    -6
      stage2/00-copies-and-fills/02-run.sh
  8. +0
    -2
      stage2/EXPORT_NOOBS
  9. +3
    -3
      stage3/00-install-packages/00-packages
  10. +2
    -2
      stage3/00-install-packages/00-packages-nr
  11. +0
    -8
      stage3/00-install-packages/01-run.sh
  12. +1
    -1
      stage4/00-install-packages/00-packages
  13. +0
    -2
      stage4/EXPORT_NOOBS
  14. +5
    -5
      stage5/00-install-extras/00-packages
  15. +0
    -4
      stage5/EXPORT_IMAGE
  16. +0
    -2
      stage5/EXPORT_NOOBS

+ 6
- 5
scripts/common View File

@ -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+=("[email protected]")
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"

+ 1
- 0
stage0/00-configure-apt/00-run.sh View File

@ -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

+ 7
- 3
stage0/00-configure-apt/files/sources.list View File

@ -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
- 1
stage0/prerun.sh View File

@ -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

+ 1
- 4
stage1/00-boot-files/files/config.txt View File

@ -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

+ 0
- 1
stage2/00-copies-and-fills/01-packages View File

@ -1 +0,0 @@
raspi-copies-and-fills

+ 0
- 6
stage2/00-copies-and-fills/02-run.sh View File

@ -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

+ 0
- 2
stage2/EXPORT_NOOBS View File

@ -1,2 +0,0 @@
NOOBS_NAME="Raspberry Pi OS Lite (32-bit)"
NOOBS_DESCRIPTION="A port of Debian with no desktop environment"

+ 3
- 3
stage3/00-install-packages/00-packages View File

@ -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

+ 2
- 2
stage3/00-install-packages/00-packages-nr View File

@ -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

+ 0
- 8
stage3/00-install-packages/01-run.sh View File

@ -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

+ 1
- 1
stage4/00-install-packages/00-packages View File

@ -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

+ 0
- 2
stage4/EXPORT_NOOBS View File

@ -1,2 +0,0 @@
NOOBS_NAME="Raspberry Pi OS (32-bit)"
NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"

+ 5
- 5
stage5/00-install-extras/00-packages View File

@ -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

+ 0
- 4
stage5/EXPORT_IMAGE View File

@ -1,4 +0,0 @@
IMG_SUFFIX="-full"
if [ "${USE_QEMU}" = "1" ]; then
export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
fi

+ 0
- 2
stage5/EXPORT_NOOBS View File

@ -1,2 +0,0 @@
NOOBS_NAME="Raspberry Pi OS Full (32-bit)"
NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"

Loading…
Cancel
Save