Merge branch 'master' into cleanup_package_lists

2018-10-16 10:31:24 -07:00 · 2018-10-16 10:31:24 -07:00 · 161a53aad8
parent 5265e647d8 f8b629d6c7
commit 161a53aad8
12 changed files with 43 additions and 24 deletions
--- 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
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@ -1,6 +1,31 @@
 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 RealVNC Server (6.3.1)
+  * Include libav-tools
+  * 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
+  * 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
--- a/scripts/common
+++ b/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

--- a/stage2/01-sys-tweaks/00-debconf
+++ b/stage2/01-sys-tweaks/00-debconf
@ -7,12 +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
-# 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
 # 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
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@ -40,9 +40,10 @@ raspberrypi-sys-mods
 rpi-update
 rsync
 ssh
+ssh-import-id
 strace
 sudo
 unzip
 usb-modeswitch
 usbutils
-v4l-utils
+v4l-utils
--- a/stage2/03-set-timezone/02-run.sh
+++ 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
--- 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
--- a/stage4/EXPORT_NOOBS
+++ b/stage4/EXPORT_NOOBS
--- a/stage5/00-install-mathematica/00-debconf
+++ b/stage5/00-install-mathematica/00-debconf
@ -1,2 +0,0 @@
-# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement?
-wolfram-engine  shared/accepted-wolfram-eula    boolean true
--- a/stage5/00-install-mathematica/00-packages
+++ b/stage5/00-install-mathematica/00-packages
@ -1 +0,0 @@
-wolfram-engine
--- a/stage5/EXPORT_IMAGE
+++ b/stage5/EXPORT_IMAGE
@ -1,4 +0,0 @@
-IMG_SUFFIX=""
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
--- a/stage5/prerun.sh
+++ b/stage5/prerun.sh
@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi