From 6000d5871fd560a92c3512144a2a9f91450fc2d4 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 31 Jul 2018 11:29:19 +0100 Subject: [PATCH 01/18] stage2: accept Mathematica EULA here instead of stage5 --- .../03-accept-mathematica-eula}/00-debconf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {stage5/00-install-mathematica => stage2/03-accept-mathematica-eula}/00-debconf (100%) diff --git a/stage5/00-install-mathematica/00-debconf b/stage2/03-accept-mathematica-eula/00-debconf similarity index 100% rename from stage5/00-install-mathematica/00-debconf rename to stage2/03-accept-mathematica-eula/00-debconf From 37da6846ddddd979364eec2e3d4b2e60d72cbd42 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 10 Sep 2018 10:11:40 +0100 Subject: [PATCH 02/18] stage2: Set default timezone to 'London' --- stage2/01-sys-tweaks/00-debconf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf index 41e9435..35839c3 100644 --- a/stage2/01-sys-tweaks/00-debconf +++ b/stage2/01-sys-tweaks/00-debconf @@ -7,12 +7,8 @@ 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 -# Geographic area: -# Choices: Africa, America, Antarctica, Australia, Arctic Ocean, Asia, Atlantic Ocean, Europe, Indian Ocean, Pacific Ocean, System V timezones, US, None of the above -tzdata tzdata/Areas select Etc -# Time zone: -# Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu -tzdata tzdata/Zones/Etc select UTC +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 From 11339341114b6386070d08f1f8974f73dca90a9e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 24 Sep 2018 12:03:19 +0100 Subject: [PATCH 03/18] export-noobs: keep 'quiet' in cmdline.txt --- export-noobs/00-release/files/partition_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export-noobs/00-release/files/partition_setup.sh b/export-noobs/00-release/files/partition_setup.sh index 81cef4d..f4bc961 100644 --- a/export-noobs/00-release/files/partition_setup.sh +++ b/export-noobs/00-release/files/partition_setup.sh @@ -29,7 +29,7 @@ if [ -f /settings/wpa_supplicant.conf ]; then fi if ! grep -q resize /proc/cmdline; then - sed -i 's| quiet init=/usr/lib/raspi-config/init_resize.sh||' /tmp/1/cmdline.txt + sed -i 's| init=/usr/lib/raspi-config/init_resize.sh||;s| quiet||2g' /tmp/1/cmdline.txt fi umount /tmp/1 From 42279ee7b583261ef6463101d6f25b3f3cd42be7 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 11 Sep 2018 10:34:48 +0100 Subject: [PATCH 04/18] Update release notes --- .../00-release/files/release_notes.txt | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 398bb25..f27e16d 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,6 +1,30 @@ UNRELEASED: - * Add libav-tools - * Add English localisation packages + * 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 + * In startup wizard, check for existing wifi network connection and show it if there is one + * In startup wizard, install language support packages for LibreOffice and other applications + * In startup wizard, improve operation with keyboard only and no mouse + * Password change in Raspberry Pi Configuration and startup wizard now works properly if passwords contain shell characters + * Battery indicator plugin modified to cope with Pi-top hardware monitor crashing + * Networking plugin hides wifi password characters by default + * In Scratch 2 GPIO plugin, set pin from dropdown list rather than free text + * In Scratch 2 SenseHAT plugin, swap x and y axis values for LED array + * Include latest Adobe Flash player (31.0.0.108) + * Include latest Mathematica (11.3.0.0) + * Include latest RealVNC Server (6.3.1) + * Include libav-tools + * Merge in latest third-party code for Bluetooth ALSA interface + * 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 + * Raspberry Pi PoE HAT support + * Linux kernel 4.14.71 + * Raspberry Pi firmware 5b49caa17e91d0e64024380119ad739bb201c674 2018-06-27: * New first-boot configuration wizard added * Recommended Software installer added From 59cd0a3d9c8f90c560b887b2c3497c047637502d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 4 Oct 2018 15:41:31 +0100 Subject: [PATCH 05/18] stage2: add ssh-import-id --- export-noobs/00-release/files/release_notes.txt | 1 + stage2/01-sys-tweaks/00-packages | 1 + 2 files changed, 2 insertions(+) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index f27e16d..f2a9fd6 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -14,6 +14,7 @@ UNRELEASED: * Include latest Mathematica (11.3.0.0) * Include latest RealVNC Server (6.3.1) * Include libav-tools + * Incllude ssh-import-id * Merge in latest third-party code for Bluetooth ALSA interface * Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file * Various other small bug fixes, tweaks and changes to text diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index f792f37..f058ffb 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -22,3 +22,4 @@ rsync htop man-db policykit-1 +ssh-import-id From 7b40fd11bc13d6496bb6bd1bc02f946b7e0ac7cb Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 9 Oct 2018 12:32:37 +0100 Subject: [PATCH 06/18] Remove Mathematica --- export-noobs/00-release/files/release_notes.txt | 4 ++-- stage4/EXPORT_IMAGE | 2 +- {stage5 => stage4}/EXPORT_NOOBS | 0 stage5/00-install-mathematica/00-packages | 1 - stage5/EXPORT_IMAGE | 4 ---- stage5/prerun.sh | 5 ----- 6 files changed, 3 insertions(+), 13 deletions(-) rename {stage5 => stage4}/EXPORT_NOOBS (100%) delete mode 100644 stage5/00-install-mathematica/00-packages delete mode 100644 stage5/EXPORT_IMAGE delete mode 100755 stage5/prerun.sh diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index f2a9fd6..dcaf7dd 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -11,10 +11,10 @@ UNRELEASED: * In Scratch 2 GPIO plugin, set pin from dropdown list rather than free text * In Scratch 2 SenseHAT plugin, swap x and y axis values for LED array * Include latest Adobe Flash player (31.0.0.108) - * Include latest Mathematica (11.3.0.0) * Include latest RealVNC Server (6.3.1) * Include libav-tools - * Incllude ssh-import-id + * Include ssh-import-id + * Removed Mathematica * Merge in latest third-party code for Bluetooth ALSA interface * Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file * Various other small bug fixes, tweaks and changes to text diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE index 1f1bd4f..79ec11a 100644 --- a/stage4/EXPORT_IMAGE +++ b/stage4/EXPORT_IMAGE @@ -1,4 +1,4 @@ -IMG_SUFFIX="-4GB" +IMG_SUFFIX="" if [ "${USE_QEMU}" = "1" ]; then export IMG_SUFFIX="${IMG_SUFFIX}-qemu" fi diff --git a/stage5/EXPORT_NOOBS b/stage4/EXPORT_NOOBS similarity index 100% rename from stage5/EXPORT_NOOBS rename to stage4/EXPORT_NOOBS diff --git a/stage5/00-install-mathematica/00-packages b/stage5/00-install-mathematica/00-packages deleted file mode 100644 index fa9ba94..0000000 --- a/stage5/00-install-mathematica/00-packages +++ /dev/null @@ -1 +0,0 @@ -wolfram-engine diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE deleted file mode 100644 index 79ec11a..0000000 --- a/stage5/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/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 From 378a2bdfa756fb05166c7b75735d4037288169ef Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 11 Oct 2018 16:20:18 +0100 Subject: [PATCH 07/18] stage2: remove left-over debconf file --- stage2/03-accept-mathematica-eula/00-debconf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 stage2/03-accept-mathematica-eula/00-debconf diff --git a/stage2/03-accept-mathematica-eula/00-debconf b/stage2/03-accept-mathematica-eula/00-debconf deleted file mode 100644 index d9743fe..0000000 --- a/stage2/03-accept-mathematica-eula/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement? -wolfram-engine shared/accepted-wolfram-eula boolean true From 7ccf8185b39062afe399f2bdd2b327f5f4460327 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 11 Oct 2018 16:29:31 +0100 Subject: [PATCH 08/18] Remove /debootstrap --- scripts/common | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index efd867e..f3b5950 100644 --- a/scripts/common +++ b/scripts/common @@ -18,7 +18,8 @@ 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 + rmdir "$2/debootstrap" } export -f bootstrap From 33e94c46f32fb2e9b1f7106d7a790f074815dfd1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 11 Oct 2018 16:39:39 +0100 Subject: [PATCH 09/18] stage2: set timezone properly --- stage2/01-sys-tweaks/00-debconf | 2 -- stage2/03-set-timezone/02-run.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100755 stage2/03-set-timezone/02-run.sh diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf index 35839c3..96aa9b0 100644 --- a/stage2/01-sys-tweaks/00-debconf +++ b/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 diff --git a/stage2/03-set-timezone/02-run.sh b/stage2/03-set-timezone/02-run.sh new file mode 100755 index 0000000..67cbfd3 --- /dev/null +++ b/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 From f8b629d6c7a3aec33edb3e0a60231e431eeaa8b7 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 15 Oct 2018 09:12:13 +0100 Subject: [PATCH 10/18] Check /debootstrap exists before trying to remove --- scripts/common | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index f3b5950..ad095b8 100644 --- a/scripts/common +++ b/scripts/common @@ -19,7 +19,9 @@ bootstrap(){ --arch armhf \ --keyring "${STAGE_DIR}/files/raspberrypi.gpg" \ "$1" "$2" "$3" || true - rmdir "$2/debootstrap" + if [ -d "$2/debootstrap" ]; then + rmdir "$2/debootstrap" + fi } export -f bootstrap From c9b658ecd666e6c7f140f5f8179323ca1f6b70e9 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 21 Oct 2018 00:19:16 +0200 Subject: [PATCH 11/18] Add curl to apt-get script in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8b9e2b..65c5046 100755 --- a/README.md +++ b/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 From 4fc1423fdff262f1ca8e5f4a0ba706b5ff35f428 Mon Sep 17 00:00:00 2001 From: Tomas Cerskus Date: Wed, 7 Nov 2018 19:41:35 +0000 Subject: [PATCH 12/18] scripts: do not ignore errors inside on_chroot calls --- scripts/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index ad095b8..bdddead 100644 --- a/scripts/common +++ b/scripts/common @@ -88,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 From cbe273b8508177dc2da40739adac0ad8375c3654 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 17 Oct 2018 13:56:22 +0100 Subject: [PATCH 13/18] Add extra packages back and create a 4GB image --- export-noobs/00-release/files/release_notes.txt | 3 ++- stage2/03-accept-mathematica-eula/00-debconf | 2 ++ stage2/EXPORT_NOOBS | 2 +- stage4/00-install-packages/00-packages | 10 +--------- stage4/00-install-packages/00-packages-nr | 1 - stage4/00-install-packages/02-packages | 2 -- stage4/EXPORT_NOOBS | 2 +- stage5/00-install-extras/00-packages | 13 +++++++++++++ stage5/00-install-libreoffice/00-packages-nr | 1 + stage5/00-install-libreoffice/01-packages | 3 +++ stage5/EXPORT_IMAGE | 4 ++++ stage5/EXPORT_NOOBS | 2 ++ stage5/prerun.sh | 5 +++++ 13 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 stage2/03-accept-mathematica-eula/00-debconf create mode 100644 stage5/00-install-extras/00-packages create mode 100644 stage5/00-install-libreoffice/00-packages-nr create mode 100644 stage5/00-install-libreoffice/01-packages create mode 100644 stage5/EXPORT_IMAGE create mode 100644 stage5/EXPORT_NOOBS create mode 100755 stage5/prerun.sh diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index dcaf7dd..49ab0a0 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,6 @@ UNRELEASED: + * Add all extra packages back - Mathematica, BlueJ, Greenfoot, NodeRED, Claws Mail and VNC Viewer +2018-10-09: * 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 +21,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 diff --git a/stage2/03-accept-mathematica-eula/00-debconf b/stage2/03-accept-mathematica-eula/00-debconf new file mode 100644 index 0000000..d9743fe --- /dev/null +++ b/stage2/03-accept-mathematica-eula/00-debconf @@ -0,0 +1,2 @@ +# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement? +wolfram-engine shared/accepted-wolfram-eula boolean true diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS index b741334..136cc77 100644 --- a/stage2/EXPORT_NOOBS +++ b/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" diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 5e18228..898dff8 100644 --- a/stage4/00-install-packages/00-packages +++ b/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,7 @@ 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 index 32472bb..9e19f6c 100644 --- a/stage4/00-install-packages/00-packages-nr +++ b/stage4/00-install-packages/00-packages-nr @@ -1,4 +1,3 @@ -libreoffice-pi timidity pi-package realvnc-vnc-server diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages index 6b03f87..fc43d17 100644 --- a/stage4/00-install-packages/02-packages +++ b/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 diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS index 4823501..2ef6d7b 100644 --- a/stage4/EXPORT_NOOBS +++ b/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" diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages new file mode 100644 index 0000000..a79d71e --- /dev/null +++ b/stage5/00-install-extras/00-packages @@ -0,0 +1,13 @@ +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 diff --git a/stage5/00-install-libreoffice/00-packages-nr b/stage5/00-install-libreoffice/00-packages-nr new file mode 100644 index 0000000..0249e8e --- /dev/null +++ b/stage5/00-install-libreoffice/00-packages-nr @@ -0,0 +1 @@ +libreoffice-pi diff --git a/stage5/00-install-libreoffice/01-packages b/stage5/00-install-libreoffice/01-packages new file mode 100644 index 0000000..5d1e076 --- /dev/null +++ b/stage5/00-install-libreoffice/01-packages @@ -0,0 +1,3 @@ +libreoffice-sdbc-hsqldb +libreoffice-help-en-gb +libreoffice-l10n-en-gb diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE new file mode 100644 index 0000000..a81a844 --- /dev/null +++ b/stage5/EXPORT_IMAGE @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..cb10203 --- /dev/null +++ b/stage5/EXPORT_NOOBS @@ -0,0 +1,2 @@ +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 new file mode 100755 index 0000000..9acd13c --- /dev/null +++ b/stage5/prerun.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e + +if [ ! -d "${ROOTFS_DIR}" ]; then + copy_previous +fi From 6ffcafe1b8018a60a9d417cf8154248ca5b967cd Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 17 Oct 2018 14:13:50 +0100 Subject: [PATCH 14/18] Update release notes --- export-noobs/00-release/files/release_notes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 49ab0a0..8137e34 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,5 @@ UNRELEASED: + * Set default timezone to 'Europe/London' * Add all extra packages back - Mathematica, BlueJ, Greenfoot, NodeRED, Claws Mail and VNC Viewer 2018-10-09: * In startup wizard, assign keyboard to country as per Debian installer recommendations From 181218ea9d10d907c8f195d94f56272676acae2c Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 29 Oct 2018 11:31:54 +0000 Subject: [PATCH 15/18] Install libreoffice with all recommended packages Move python-games to Raspbian Full and install as a Debian package. --- .../00-release/files/release_notes.txt | 2 ++ stage4/02-extras/00-run.sh | 18 ------------------ stage4/02-extras/files/.gitignore | 2 -- stage5/00-install-extras/00-packages | 2 ++ .../{01-packages => 00-packages} | 2 +- stage5/00-install-libreoffice/00-packages-nr | 1 - 6 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 stage4/02-extras/files/.gitignore rename stage5/00-install-libreoffice/{01-packages => 00-packages} (65%) delete mode 100644 stage5/00-install-libreoffice/00-packages-nr diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 8137e34..fe247be 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,6 +1,8 @@ UNRELEASED: * Set default timezone to 'Europe/London' * Add all extra packages back - Mathematica, BlueJ, Greenfoot, NodeRED, Claws Mail and VNC Viewer + * Remove python-games from the cutdown Raspbian image. + * Instal Libreoffice with with all recommended packages 2018-10-09: * 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 diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh index 08c6c1e..bd24ad8 100755 --- a/stage4/02-extras/00-run.sh +++ b/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" 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/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index a79d71e..23e682c 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -11,3 +11,5 @@ claws-mail greenfoot bluej nodered realvnc-vnc-viewer + +python-games diff --git a/stage5/00-install-libreoffice/01-packages b/stage5/00-install-libreoffice/00-packages similarity index 65% rename from stage5/00-install-libreoffice/01-packages rename to stage5/00-install-libreoffice/00-packages index 5d1e076..148e7b9 100644 --- a/stage5/00-install-libreoffice/01-packages +++ b/stage5/00-install-libreoffice/00-packages @@ -1,3 +1,3 @@ -libreoffice-sdbc-hsqldb +libreoffice-pi libreoffice-help-en-gb libreoffice-l10n-en-gb diff --git a/stage5/00-install-libreoffice/00-packages-nr b/stage5/00-install-libreoffice/00-packages-nr deleted file mode 100644 index 0249e8e..0000000 --- a/stage5/00-install-libreoffice/00-packages-nr +++ /dev/null @@ -1 +0,0 @@ -libreoffice-pi From 0f7e3dec0518ac8f9cde0649b55a46ebf26a289b Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 30 Oct 2018 13:07:28 +0000 Subject: [PATCH 16/18] export-noobs: fix units --- export-noobs/00-release/00-run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/export-noobs/00-release/00-run.sh b/export-noobs/00-release/00-run.sh index 5874944..85ee454 100755 --- a/export-noobs/00-release/00-run.sh +++ b/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 ))" From 7e0c786c641ba15990b5662f092c106beed40c9f Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 6 Nov 2018 15:56:42 +0000 Subject: [PATCH 17/18] stage4: add vlc --- stage4/00-install-packages/00-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 898dff8..b0fcf1b 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -24,3 +24,4 @@ pprompt piwiz rp-prefapps libav-tools +vlc From 980bdb961bb72bd130f68fb2141a6cc095d1251d Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 14 Nov 2018 15:27:58 +0000 Subject: [PATCH 18/18] Update release notes --- .../00-release/files/release_notes.txt | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index fe247be..3a71c1e 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,9 +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' - * Add all extra packages back - Mathematica, BlueJ, Greenfoot, NodeRED, Claws Mail and VNC Viewer - * Remove python-games from the cutdown Raspbian image. - * Instal Libreoffice with with all recommended packages + * 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