Update release notes

Move python-games to Raspbian Full and install as a Debian package.

README.md

@@ -13,7 +13,7 @@ To install the required dependencies for pi-gen you should run:
 
 ```bash
 apt-get install quilt parted realpath qemu-user-static debootstrap zerofree pxz zip \
-dosfstools bsdtar libcap2-bin grep rsync xz-utils file git
+dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl
 ```
 
 The file `depends` contains a list of tools needed.  The format of this

export-noobs/00-release/00-run.sh

@@ -13,8 +13,8 @@ tar -v -c -C		files/marketing			-f "${NOOBS_DIR}/marketing.tar" .
 BOOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/boot.tar.xz"  | grep totals | cut -f 5)"
 ROOT_SIZE="$(xz --robot -l "${NOOBS_DIR}/root.tar.xz"  | grep totals | cut -f 5)"
 
-BOOT_SIZE="$(( BOOT_SIZE / 1000000 + 1))"
-ROOT_SIZE="$(( ROOT_SIZE / 1000000 + 1))"
+BOOT_SIZE="$(( BOOT_SIZE / 1024 / 1024 + 1))"
+ROOT_SIZE="$(( ROOT_SIZE / 1024 / 1024 + 1))"
 
 BOOT_NOM="$(( BOOT_SIZE * 3 ))"
 ROOT_NOM="$(( ROOT_SIZE + 400 ))"

export-noobs/00-release/files/release_notes.txt

@@ -1,4 +1,28 @@
 UNRELEASED:
+  *
+2018-11-13:
+  * Two versions of image created - "base" image has no optional software packages included; "full" image has all optional packages
+    - Removed from "base" image - LibreOffice, Thonny, Scratch, Scratch 2, Sonic Pi, Minecraft, Python Games, SmartSim, SenseHAT Emulator
+    - Added to "full" image - Mathematica, BlueJ, Greenfoot, Node-RED, Claws Mail, VNC Viewer
+  * Python Games and SmartSim added to Recommended Software
+  * VLC media player with VideoCore hardware acceleration included in image
+  * Version 3.0.5 of Thonny included
+  * Modifications to LXDE components to enable local configuration to override global configuration correctly
+  * Modifications to Appearance Settings to support above configuration changes
+  * Modifications to various initial config defaults and relevant package to support above configuration changes
+  * Selecting default option in Appearance Settings now deletes relevant local configuration files
+  * PiX theme modified so that all changes made in Appearance Settings are in override files rather than in theme files
+  * Design of scrollbar buttons changed
+  * Image Viewer moved into Graphics category on main menu
+  * Recommended Software now installs LibreOffice language support files if needed, and suggests reboot if needed
+  * Latest version of Pepper Flash plugin included
+  * Chromium h264ify plugin permissions set correctly by default
+  * Corrections to various MIME types so that files open in sensible default applications
+  * Set default timezone to 'Europe/London'
+  * Linux kernel 4.14.79
+  * Raspberry Pi firmware 12e0bf86e08d6067372bc0a45d7e8a10d3113210
+2018-10-09:
+  * Raspberry Pi 3A+ support
   * In startup wizard, assign keyboard to country as per Debian installer recommendations
   * In startup wizard, add option to use US keyboard in preference to country-specific option
   * In startup wizard, show IP address on first page
@@ -19,7 +43,6 @@ UNRELEASED:
   * Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file
   * Various other small bug fixes, tweaks and changes to text
   * Make dhcpcd work with 3G devices
-  * Set default timezone to 'Europe/London'
   * Add hw acceleration to ffmpeg
   * Improved WiFi-BT coexistence parameters
   * Run fake-hwclock before systemd-fsck-root

scripts/common

@@ -18,7 +18,10 @@ bootstrap(){
 	capsh --drop=cap_setfcap -- "${BOOTSTRAP_CMD}" --components=main,contrib,non-free \
 		--arch armhf \
 		--keyring "${STAGE_DIR}/files/raspberrypi.gpg" \
-		"$1" "$2" "$3" || rmdir "$2/debootstrap"
+		"$1" "$2" "$3" || true
+	if [ -d "$2/debootstrap" ]; then
+		rmdir "$2/debootstrap"
+	fi
 }
 export -f bootstrap
 
@@ -85,7 +88,7 @@ on_chroot() {
 		mount --bind /sys "${ROOTFS_DIR}/sys"
 	fi
 
-	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- "$@"
+	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
 }
 export -f on_chroot
 

stage2/01-sys-tweaks/00-debconf

@@ -7,8 +7,6 @@ console-setup   console-setup/codeset47 select  Guess optimal character set
 # Font for the console:
 # Choices: Fixed, Goha, GohaClassic, Terminus, TerminusBold, TerminusBoldVGA, VGA, Do not change the boot/kernel font, Let the system select a suitable font
 console-setup   console-setup/fontface47        select  Do not change the boot/kernel font
-tzdata	tzdata/Areas	select	Europe
-tzdata	tzdata/Zones/Europe	select	London
 # Key to function as AltGr:
 # Choices: The default for the keyboard layout, No AltGr key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Alt, Left Logo key, Keypad Enter key, Both Logo keys, Both Alt keys
 keyboard-configuration	keyboard-configuration/altgr	select	The default for the keyboard layout

stage2/03-set-timezone/02-run.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+echo "Europe/London" > "${ROOTFS_DIR}/etc/timezone"
+rm "${ROOTFS_DIR}/etc/localtime"
+
+on_chroot << EOF
+dpkg-reconfigure -f noninteractive tzdata
+EOF

stage2/EXPORT_NOOBS

@@ -1,2 +1,2 @@
 NOOBS_NAME="Raspbian Lite"
-NOOBS_DESCRIPTION="A port of Debian Stretch for the Raspberry Pi (minimal version)"
+NOOBS_DESCRIPTION="A port of Debian with no desktop environment"

stage4/00-install-packages/00-packages

@@ -1,21 +1,16 @@
 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
+debian-reference-en dillo
 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
@@ -25,10 +20,8 @@ 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
+vlc

stage4/00-install-packages/00-packages-nr

@@ -1,4 +1,3 @@
-libreoffice-pi
 timidity
 pi-package
 realvnc-vnc-server

stage4/00-install-packages/02-packages

@@ -1,6 +1,4 @@
 hunspell-en-gb
 hyphen-en-gb
-libreoffice-help-en-gb
-libreoffice-l10n-en-gb
 wamerican
 wbritish

stage4/02-extras/00-run.sh

@@ -1,23 +1,5 @@
 #!/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"

stage4/02-extras/files/.gitignore

@@ -1,2 +0,0 @@
-python_games.hash
-python_games.tar.gz

stage4/EXPORT_NOOBS

@@ -1,2 +1,2 @@
 NOOBS_NAME="Raspbian"
-NOOBS_DESCRIPTION="A port of Debian Stretch for the Raspberry Pi (full desktop version)"
+NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"

stage5/00-install-extras/00-packages

@@ -0,0 +1,15 @@
+python3-thonny
+sonic-pi
+scratch nuscratch scratch2
+smartsim
+
+minecraft-pi python-minecraftpi
+python-sense-emu sense-emu-tools python-sense-emu-doc
+
+wolfram-engine
+claws-mail
+greenfoot bluej
+nodered
+realvnc-vnc-viewer
+
+python-games

stage5/00-install-libreoffice/00-packages

@@ -0,0 +1,3 @@
+libreoffice-pi
+libreoffice-help-en-gb
+libreoffice-l10n-en-gb

stage5/EXPORT_IMAGE

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

stage5/EXPORT_NOOBS

@@ -0,0 +1,2 @@
+NOOBS_NAME="Raspbian Full"
+NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"

stage5/prerun.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi