From 65d031a68c5b4b6ad9ffdcd44a7dd69ad04440c8 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 9 Jun 2020 19:47:53 +0200
Subject: [PATCH] Remove stage 3, 4, 5

---
 stage3/00-install-packages/00-debconf     |  2 --
 stage3/00-install-packages/00-packages    | 15 --------------
 stage3/00-install-packages/00-packages-nr |  6 ------
 stage3/00-install-packages/01-run.sh      |  8 --------
 stage3/01-tweaks/00-run.sh                |  3 ---
 stage3/prerun.sh                          |  5 -----
 stage4/00-install-packages/00-debconf     |  2 --
 stage4/00-install-packages/00-packages    | 25 -----------------------
 stage4/00-install-packages/00-packages-nr |  2 --
 stage4/00-install-packages/01-packages    | 22 --------------------
 stage4/00-install-packages/02-packages    |  4 ----
 stage4/01-console-autologin/00-run.sh     |  5 -----
 stage4/02-extras/00-run.sh                |  7 -------
 stage4/03-magpi/00-run.sh                 | 15 --------------
 stage4/03-magpi/files/.gitignore          |  1 -
 stage4/04-enable-xcompmgr/00-run.sh       |  5 -----
 stage4/EXPORT_IMAGE                       |  4 ----
 stage4/EXPORT_NOOBS                       |  2 --
 stage4/prerun.sh                          |  5 -----
 stage5/00-install-extras/00-packages      | 16 ---------------
 stage5/00-install-libreoffice/00-packages |  3 ---
 stage5/EXPORT_IMAGE                       |  4 ----
 stage5/EXPORT_NOOBS                       |  2 --
 stage5/prerun.sh                          |  5 -----
 24 files changed, 168 deletions(-)
 delete mode 100644 stage3/00-install-packages/00-debconf
 delete mode 100644 stage3/00-install-packages/00-packages
 delete mode 100644 stage3/00-install-packages/00-packages-nr
 delete mode 100755 stage3/00-install-packages/01-run.sh
 delete mode 100755 stage3/01-tweaks/00-run.sh
 delete mode 100755 stage3/prerun.sh
 delete mode 100644 stage4/00-install-packages/00-debconf
 delete mode 100644 stage4/00-install-packages/00-packages
 delete mode 100644 stage4/00-install-packages/00-packages-nr
 delete mode 100644 stage4/00-install-packages/01-packages
 delete mode 100644 stage4/00-install-packages/02-packages
 delete mode 100755 stage4/01-console-autologin/00-run.sh
 delete mode 100755 stage4/02-extras/00-run.sh
 delete mode 100755 stage4/03-magpi/00-run.sh
 delete mode 100644 stage4/03-magpi/files/.gitignore
 delete mode 100755 stage4/04-enable-xcompmgr/00-run.sh
 delete mode 100644 stage4/EXPORT_IMAGE
 delete mode 100644 stage4/EXPORT_NOOBS
 delete mode 100755 stage4/prerun.sh
 delete mode 100644 stage5/00-install-extras/00-packages
 delete mode 100644 stage5/00-install-libreoffice/00-packages
 delete mode 100644 stage5/EXPORT_IMAGE
 delete mode 100644 stage5/EXPORT_NOOBS
 delete mode 100755 stage5/prerun.sh

diff --git a/stage3/00-install-packages/00-debconf b/stage3/00-install-packages/00-debconf
deleted file mode 100644
index 7dbd12e..0000000
--- a/stage3/00-install-packages/00-debconf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Adobe Flash Player. Copyright 1996-2015. Adobe Systems Incorporated. All Rights Reserved.
-rpi-chromium-mods	rpi-chromium-mods/adobe	note
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
deleted file mode 100644
index eac74ea..0000000
--- a/stage3/00-install-packages/00-packages
+++ /dev/null
@@ -1,15 +0,0 @@
-gstreamer1.0-x gstreamer1.0-omx 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
-raspberrypi-artwork
-policykit-1
-gvfs
-rfkill
-chromium-browser rpi-chromium-mods
-gldriver-test
-fonts-droid-fallback
-fonts-liberation2
-obconf
-arandr
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
deleted file mode 100644
index ffc324b..0000000
--- a/stage3/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1,6 +0,0 @@
-xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
-mousepad
-lxde lxtask menu-xdg
-zenity xdg-utils
-gvfs-backends gvfs-fuse
-lightdm gnome-themes-standard-data gnome-icon-theme
diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh
deleted file mode 100755
index d768747..0000000
--- a/stage3/00-install-packages/01-run.sh
+++ /dev/null
@@ -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
diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh
deleted file mode 100755
index 5da7c1a..0000000
--- a/stage3/01-tweaks/00-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-rm -f "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf"
diff --git a/stage3/prerun.sh b/stage3/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage3/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi
diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf
deleted file mode 100644
index 87932e2..0000000
--- a/stage4/00-install-packages/00-debconf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable realtime process priority?
-jackd2  jackd/tweak_rt_limits   boolean true
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
deleted file mode 100644
index f9f5ef4..0000000
--- a/stage4/00-install-packages/00-packages
+++ /dev/null
@@ -1,25 +0,0 @@
-python python3-pygame python-pygame python-tk
-python3 python3-tk thonny
-python3-pgzero
-python-serial python3-serial
-python-picamera python3-picamera
-debian-reference-en dillo
-raspberrypi-net-mods raspberrypi-ui-mods
-python-pip python3-pip
-python3-numpy
-pypy
-alacarte rc-gui sense-hat
-tree
-libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
-geany
-piclone
-wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio
-python-spidev python3-spidev
-python-twython python3-twython
-python-smbus python3-smbus
-python-flask python3-flask
-pprompt
-piwiz
-rp-prefapps
-ffmpeg
-vlc
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
deleted file mode 100644
index b904b80..0000000
--- a/stage4/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1,2 +0,0 @@
-pi-package
-realvnc-vnc-server
diff --git a/stage4/00-install-packages/01-packages b/stage4/00-install-packages/01-packages
deleted file mode 100644
index fdf5e73..0000000
--- a/stage4/00-install-packages/01-packages
+++ /dev/null
@@ -1,22 +0,0 @@
-python-automationhat python3-automationhat
-python-blinkt python3-blinkt
-python-cap1xxx python3-cap1xxx
-python-drumhat python3-drumhat
-python-envirophat python3-envirophat
-python-explorerhat python3-explorerhat
-python-fourletterphat python3-fourletterphat
-python-microdotphat python3-microdotphat
-python-mote python3-mote
-python-motephat python3-motephat
-python-phatbeat python3-phatbeat
-python-pianohat python3-pianohat
-python-piglow python3-piglow
-python-rainbowhat python3-rainbowhat
-python-scrollphat python3-scrollphat
-python-scrollphathd python3-scrollphathd
-python-sn3218 python3-sn3218
-python-skywriter python3-skywriter
-python-touchphat python3-touchphat
-python-buttonshim python3-buttonshim
-python-unicornhathd  python3-unicornhathd
-python-pantilthat python3-pantilthat
diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages
deleted file mode 100644
index fc43d17..0000000
--- a/stage4/00-install-packages/02-packages
+++ /dev/null
@@ -1,4 +0,0 @@
-hunspell-en-gb
-hyphen-en-gb
-wamerican
-wbritish
diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh
deleted file mode 100755
index 665dcdb..0000000
--- a/stage4/01-console-autologin/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4
-EOF
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
deleted file mode 100755
index 6a24f82..0000000
--- a/stage4/02-extras/00-run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-#Alacarte fixes
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/applications"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/desktop-directories"
diff --git a/stage4/03-magpi/00-run.sh b/stage4/03-magpi/00-run.sh
deleted file mode 100755
index b27b85f..0000000
--- a/stage4/03-magpi/00-run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-magpi_regex="MagPi[[:digit:]]*.pdf"
-magpi_loc="$(curl -s https://magpi.raspberrypi.org/latest-pdf)"
-magpi_latest="$(echo "$magpi_loc" | grep "$magpi_regex" -m 1 -o)"
-
-if [ ! -f "files/$magpi_latest" ]; then
-	find files/ -regextype grep -regex "files/$magpi_regex" -delete
-	wget "$magpi_loc" -O "files/$magpi_latest"
-fi
-
-file "files/$magpi_latest" | grep -q "PDF document"
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/MagPi"
-install -v -o 1000 -g 1000 -m 644 "files/$magpi_latest" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/MagPi/"
diff --git a/stage4/03-magpi/files/.gitignore b/stage4/03-magpi/files/.gitignore
deleted file mode 100644
index a136337..0000000
--- a/stage4/03-magpi/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pdf
diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh
deleted file mode 100755
index ad6298d..0000000
--- a/stage4/04-enable-xcompmgr/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	raspi-config nonint do_xcompmgr 0
-EOF
diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE
deleted file mode 100644
index 79ec11a..0000000
--- a/stage4/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX=""
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS
deleted file mode 100644
index 2ef6d7b..0000000
--- a/stage4/EXPORT_NOOBS
+++ /dev/null
@@ -1,2 +0,0 @@
-NOOBS_NAME="Raspbian"
-NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"
diff --git a/stage4/prerun.sh b/stage4/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage4/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi
diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages
deleted file mode 100644
index 609e718..0000000
--- a/stage5/00-install-extras/00-packages
+++ /dev/null
@@ -1,16 +0,0 @@
-mu-editor
-sonic-pi
-scratch nuscratch scratch2 scratch3
-smartsim
-
-minecraft-pi python-minecraftpi python-picraft python3-picraft
-python-sense-emu sense-emu-tools python-sense-emu-doc
-
-wolfram-engine
-claws-mail
-greenfoot-unbundled bluej
-nodered
-realvnc-vnc-viewer
-
-python-games
-code-the-classics
diff --git a/stage5/00-install-libreoffice/00-packages b/stage5/00-install-libreoffice/00-packages
deleted file mode 100644
index 148e7b9..0000000
--- a/stage5/00-install-libreoffice/00-packages
+++ /dev/null
@@ -1,3 +0,0 @@
-libreoffice-pi
-libreoffice-help-en-gb
-libreoffice-l10n-en-gb
diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE
deleted file mode 100644
index a81a844..0000000
--- a/stage5/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX="-full"
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS
deleted file mode 100644
index cb10203..0000000
--- a/stage5/EXPORT_NOOBS
+++ /dev/null
@@ -1,2 +0,0 @@
-NOOBS_NAME="Raspbian Full"
-NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"
diff --git a/stage5/prerun.sh b/stage5/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage5/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi