From a204f295b989710070868670b4c8cc831fb59a4f Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 21 Dec 2018 22:27:03 -0800
Subject: [PATCH] Remove stage3 and stage4 (#8)

---
 stage3/00-install-packages/00-debconf     |  2 --
 stage3/00-install-packages/00-packages    | 14 ----------
 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    | 34 -----------------------
 stage4/00-install-packages/00-packages-nr |  4 ---
 stage4/00-install-packages/01-packages    | 22 ---------------
 stage4/00-install-packages/02-packages    |  6 ----
 stage4/01-console-autologin/00-run.sh     |  4 ---
 stage4/02-extras/00-run.sh                | 25 -----------------
 stage4/02-extras/files/.gitignore         |  2 --
 stage4/03-magpi/00-run.sh                 | 16 -----------
 stage4/03-magpi/files/.gitignore          |  1 -
 stage4/EXPORT_IMAGE                       |  4 ---
 stage4/EXPORT_NOOBS                       |  2 --
 stage4/prerun.sh                          |  5 ----
 19 files changed, 165 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 100644 stage4/02-extras/files/.gitignore
 delete mode 100755 stage4/03-magpi/00-run.sh
 delete mode 100644 stage4/03-magpi/files/.gitignore
 delete mode 100644 stage4/EXPORT_IMAGE
 delete mode 100644 stage4/EXPORT_NOOBS
 delete mode 100755 stage4/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 61c652f..0000000
--- a/stage3/00-install-packages/00-packages
+++ /dev/null
@@ -1,14 +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
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
deleted file mode 100644
index 3915e3a..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
-epiphany-browser
-lxde lxtask menu-xdg gksu
-netsurf-gtk 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 5e18228..0000000
--- a/stage4/00-install-packages/00-packages
+++ /dev/null
@@ -1,34 +0,0 @@
-java-common oracle-java8-jdk
-libreoffice-sdbc-hsqldb
-sonic-pi
-python idle python3-pygame python-pygame python-tk
-python3 idle3 python3-tk
-python3-pgzero
-python-serial python3-serial
-python-picamera python3-picamera
-debian-reference-en dillo x2x
-raspberrypi-net-mods raspberrypi-ui-mods
-smartsim
-python-pip python3-pip
-python3-numpy
-pypy
-minecraft-pi python-minecraftpi
-alacarte rc-gui sense-hat
-tree
-scratch nuscratch
-libgl1-mesa-dri libgles1-mesa 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
-python-picraft python3-picraft
-python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
-pprompt
-scratch2
-python3-thonny
-piwiz
-rp-prefapps
-libav-tools
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
deleted file mode 100644
index 32472bb..0000000
--- a/stage4/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1,4 +0,0 @@
-libreoffice-pi
-timidity
-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 6b03f87..0000000
--- a/stage4/00-install-packages/02-packages
+++ /dev/null
@@ -1,6 +0,0 @@
-hunspell-en-gb
-hyphen-en-gb
-libreoffice-help-en-gb
-libreoffice-l10n-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 2189bef..0000000
--- a/stage4/01-console-autologin/00-run.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash -e
-
-ln -sf /etc/systemd/system/autologin@.service \
-	"${ROOTFS_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service"
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
deleted file mode 100755
index 08c6c1e..0000000
--- a/stage4/02-extras/00-run.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-
-HASH="$(wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \")"
-
-if [ -f files/python_games.hash ]; then
-	HASH_LOCAL="$(cat files/python_games.hash)"
-fi
-
-if [ ! -e files/python_games.tar.gz ] || [ "$HASH" != "$HASH_LOCAL"  ]; then
-	wget "https://github.com/KenT2/python-games/tarball/master" -O files/python_games.tar.gz
-	echo "$HASH" > files/python_games.hash
-fi
-
-ln -sf pip3 "${ROOTFS_DIR}/usr/bin/pip-3.2"
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/python_games"
-tar xvf files/python_games.tar.gz -C "${ROOTFS_DIR}/home/pi/python_games" --strip-components=1
-chown 1000:1000 "${ROOTFS_DIR}/home/pi/python_games" -Rv
-chmod +x "${ROOTFS_DIR}/home/pi/python_games/launcher.sh"
-
-#Alacarte fixes
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/applications"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/desktop-directories"
diff --git a/stage4/02-extras/files/.gitignore b/stage4/02-extras/files/.gitignore
deleted file mode 100644
index 589d776..0000000
--- a/stage4/02-extras/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-python_games.hash
-python_games.tar.gz
diff --git a/stage4/03-magpi/00-run.sh b/stage4/03-magpi/00-run.sh
deleted file mode 100755
index da00ecc..0000000
--- a/stage4/03-magpi/00-run.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-magpi_regex="MagPi[[:digit:]]*.pdf"
-magpi_loc="https://www.raspberrypi.org/magpi-issues"
-magpi_latest="$(curl "$magpi_loc/?C=M;O=D" -s | grep "$magpi_regex" -m 1 -o | head -n 1)"
-
-if [ ! -f "files/$magpi_latest" ]; then
-	find files/ -regextype grep -regex "files/$magpi_regex" -delete
-	wget "$magpi_loc/$magpi_latest" -O "files/$magpi_latest"
-fi
-
-file "files/$magpi_latest" | grep -q "PDF document"
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/MagPi"
-install -v -o 1000 -g 1000 -m 644 "files/$magpi_latest" "${ROOTFS_DIR}/home/pi/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/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 4823501..0000000
--- a/stage4/EXPORT_NOOBS
+++ /dev/null
@@ -1,2 +0,0 @@
-NOOBS_NAME="Raspbian"
-NOOBS_DESCRIPTION="A port of Debian Stretch for the Raspberry Pi (full desktop version)"
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