diff --git a/export-image/prerun.sh b/export-image/prerun.sh index fad7f80..145d61e 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -70,12 +70,12 @@ if [ "${NO_PRERUN_QCOW2}" = "0" ]; then echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH" ROOT_FEATURES="^huge_file" - for FEATURE in metadata_csum 64bit; do + for FEATURE in 64bit; do if grep -q "$FEATURE" /etc/mke2fs.conf; then ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES" fi done - mkdosfs -n boot -F 32 -v "$BOOT_DEV" > /dev/null + mkdosfs -n boot -F 32 -s 4 -v "$BOOT_DEV" > /dev/null mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4 diff --git a/export-noobs/00-release/files/partitions.json b/export-noobs/00-release/files/partitions.json index 3d06017..8ca103d 100644 --- a/export-noobs/00-release/files/partitions.json +++ b/export-noobs/00-release/files/partitions.json @@ -3,7 +3,7 @@ { "filesystem_type": "FAT", "label": "boot", - "mkfs_options": "-F 32", + "mkfs_options": "-F 32 -s 4", "partition_size_nominal": BOOT_NOM, "uncompressed_tarball_size": BOOT_SIZE, "want_maximised": false, diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 331d8d9..ba3c466 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,5 +1,31 @@ UNRELEASED: - * + * lxpanel - new main menu plugin with text search + * lxpanel - new separate audio input plugin with microphone volume and input select + * lxpanel - keyboard shortcuts to open wifi and bluetooth plugins added + * lxpanel - now shown with short delay after startup and between each + * rc_gui - only allows valid hostnames to be set + * piwiz - no longer allows "root" as a user name + * gtk3 - menus can now be resized after being drawn + * raspi-config - option to switch between dhcpcd and Network Manager added + * lxpanel - new network plugin compatible with Network Manager added + * piwiz - compatibility with Network Manager added + * Bug fix - 100% CPU usage in file manager when desktop item unmounted + * Bug fix - window manager was preventing switching between international keyboard layouts + * Bug fix - system tray redrawing made more robust + * Bug fix - translations not being shown in various lxpanel plugins + * Bug fix - updater plugin failing on x86 images + * Bug fix - force power on for Bluetooth hardware when unblocked with rfkill + * Bug fix - message boxes in rc_gui not centred correctly + * Bug fix - switching sessions between Wayland and X11 made more robust + * Bug fix - switching of ALSA devices in raspi-config made compatible with third-party devices + * Install NetworkManager (disabled) + * Install OpenJDK 17 rather than OpenJDK 11 on full images + * Install picamera2 + * Format the root partition with the metadata_csum option + * Format the boot partition with 4 sectors per cluster for a slight performance boost + * Remove 'flush' mount option from the boot partition + * Raspberry Pi firmware 48cd70fe84432c5d050637b61e4b7b9c831c98bf + * Linux kernel 5.15.61 2022-04-04: * Default "pi” user has been removed; the first-boot wizard enforces the creation of a new user account * rename-user script added to allow existing users to be renamed by temporarily rebooting to cut-down first-boot wizard diff --git a/scripts/qcow2_handling b/scripts/qcow2_handling index 6b2a56b..66708e7 100644 --- a/scripts/qcow2_handling +++ b/scripts/qcow2_handling @@ -109,8 +109,8 @@ load_qimage() { EOF sync kpartx -as $NBD_DEV - mkdosfs -n boot -F 32 -v $MAP_BOOT_DEV - mkfs.ext4 -L rootfs -O "^huge_file,^metadata_csum,^64bit" $MAP_ROOT_DEV + mkdosfs -n boot -F 32 -s 4 -v $MAP_BOOT_DEV + mkfs.ext4 -L rootfs -O "^huge_file,^64bit" $MAP_ROOT_DEV sync else if [ ! -f "${WORK_DIR}/image-${PREV_STAGE}.qcow2" ]; then diff --git a/stage1/01-sys-tweaks/files/fstab b/stage1/01-sys-tweaks/files/fstab index 2159c1c..f16e3fb 100644 --- a/stage1/01-sys-tweaks/files/fstab +++ b/stage1/01-sys-tweaks/files/fstab @@ -1,3 +1,3 @@ proc /proc proc defaults 0 0 -BOOTDEV /boot vfat defaults,flush 0 2 +BOOTDEV /boot vfat defaults 0 2 ROOTDEV / ext4 defaults,noatime 0 1 diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 7656f03..a2c3207 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -32,3 +32,4 @@ rpi-eeprom raspinfo udisks2 unzip zip p7zip-full +file diff --git a/stage2/01-sys-tweaks/00-packages-nr b/stage2/01-sys-tweaks/00-packages-nr index 6bdb600..453ada8 100644 --- a/stage2/01-sys-tweaks/00-packages-nr +++ b/stage2/01-sys-tweaks/00-packages-nr @@ -1,3 +1,4 @@ cifs-utils libcamera-apps-lite mkvtoolnix +python3-picamera2 diff --git a/stage2/01-sys-tweaks/00-patches/07-resize-init.diff b/stage2/01-sys-tweaks/00-patches/07-resize-init.diff index cb160ae..dfc01d4 100644 --- a/stage2/01-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/01-sys-tweaks/00-patches/07-resize-init.diff @@ -2,4 +2,4 @@ +++ stage2/rootfs/boot/cmdline.txt @@ -1 +1 @@ -console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait -+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh ++console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet init=/usr/lib/raspberrypi-sys-mods/firstboot diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index bb3e11a..294a0ec 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -57,6 +57,10 @@ for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi done EOF +if [ -f "${ROOTFS_DIR}/etc/sudoers.d/010_pi-nopasswd" ]; then + sed -i "s/^pi /$FIRST_USER_NAME /" "${ROOTFS_DIR}/etc/sudoers.d/010_pi-nopasswd" +fi + on_chroot << EOF setupcon --force --save-only -v EOF diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages index cc4a68e..f0125f6 100644 --- a/stage2/02-net-tweaks/00-packages +++ b/stage2/02-net-tweaks/00-packages @@ -1,4 +1,5 @@ wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek raspberrypi-net-mods dhcpcd5 +network-manager net-tools diff --git a/stage2/02-net-tweaks/01-run.sh b/stage2/02-net-tweaks/01-run.sh index 837e861..3b06c05 100755 --- a/stage2/02-net-tweaks/01-run.sh +++ b/stage2/02-net-tweaks/01-run.sh @@ -5,10 +5,13 @@ install -v -m 600 files/wpa_supplicant.conf "${ROOTFS_DIR}/etc/wpa_supplicant/" on_chroot << EOF SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_wait 0 + SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_netconf 1 EOF if [ -v WPA_COUNTRY ]; then - echo "country=${WPA_COUNTRY}" >> "${ROOTFS_DIR}/etc/wpa_supplicant/wpa_supplicant.conf" + on_chroot <<- EOF + SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wifi_country "${WPA_COUNTRY}" + EOF fi if [ -v WPA_ESSID ] && [ -v WPA_PASSWORD ]; then diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index c88cf4c..6a12086 100644 --- a/stage3/00-install-packages/00-packages +++ b/stage3/00-install-packages/00-packages @@ -13,3 +13,5 @@ obconf arandr libcamera-tools libcamera-apps +python3-pyqt5 +python3-opengl diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh new file mode 100755 index 0000000..f4c6727 --- /dev/null +++ b/stage3/00-install-packages/01-run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e + +on_chroot << EOF + apt-mark auto python3-pyqt5 python3-opengl +EOF diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index d137955..894b68c 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -7,7 +7,7 @@ python3-sense-emu sense-emu-tools python-sense-emu-doc #wolfram-engine claws-mail -greenfoot-unbundled bluej +greenfoot-unbundled bluej-unbundled #nodered realvnc-vnc-viewer diff --git a/stage5/00-install-libreoffice/00-packages b/stage5/00-install-libreoffice/00-packages index 148e7b9..dc1b8d7 100644 --- a/stage5/00-install-libreoffice/00-packages +++ b/stage5/00-install-libreoffice/00-packages @@ -1,3 +1,3 @@ -libreoffice-pi +libreoffice-pi openjdk-11-jre- libreoffice-help-en-gb libreoffice-l10n-en-gb