From 6000d5871fd560a92c3512144a2a9f91450fc2d4 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 31 Jul 2018 11:29:19 +0100 Subject: [PATCH 01/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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