From 24bb01dec280f568ac59cdd1253a33a6d30ac4c4 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 5 Dec 2019 16:25:18 +0000 Subject: [PATCH 01/19] Rename HOSTNAME variable to TARGET_HOSTNAME Bash sets the HOSTNAME variable, overriding our default --- README.md | 2 +- build.sh | 2 +- stage1/02-net-tweaks/00-run.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 73d49613f6..bf681fae3d 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ The following environment variables are supported: Default system locale. - * `HOSTNAME` (Default: "raspberrypi" ) + * `TARGET_HOSTNAME` (Default: "raspberrypi" ) Setting the hostname to the specified value. diff --git a/build.sh b/build.sh index 9e78728ad4..a906e102a4 100755 --- a/build.sh +++ b/build.sh @@ -162,7 +162,7 @@ export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"} export DEPLOY_ZIP="${DEPLOY_ZIP:-1}" export LOG_FILE="${WORK_DIR}/build.log" -export HOSTNAME=${HOSTNAME:-raspberrypi} +export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi} export FIRST_USER_NAME=${FIRST_USER_NAME:-pi} export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry} diff --git a/stage1/02-net-tweaks/00-run.sh b/stage1/02-net-tweaks/00-run.sh index fc9e7638ee..4943cabf0d 100755 --- a/stage1/02-net-tweaks/00-run.sh +++ b/stage1/02-net-tweaks/00-run.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -echo "${HOSTNAME}" > "${ROOTFS_DIR}/etc/hostname" -echo "127.0.1.1 ${HOSTNAME}" >> "${ROOTFS_DIR}/etc/hosts" +echo "${TARGET_HOSTNAME}" > "${ROOTFS_DIR}/etc/hostname" +echo "127.0.1.1 ${TARGET_HOSTNAME}" >> "${ROOTFS_DIR}/etc/hosts" ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link" From 0a6624b26dd8006a75725e5379431abf1c5b0f09 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 24 Jan 2020 12:48:57 +0000 Subject: [PATCH 02/19] Update ROOT_MARGIN --- Dockerfile | 2 +- README.md | 2 +- depends | 1 + export-image/prerun.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 706a5fb5a3..35f483a3e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get -y update && \ apt-get -y install \ git vim parted \ quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \ - bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod\ + bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\ && rm -rf /var/lib/apt/lists/* COPY . /pi-gen/ diff --git a/README.md b/README.md index bf681fae3d..ec4f65cb62 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ To install the required dependencies for pi-gen you should run: ```bash apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \ -dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl +dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl bc ``` The file `depends` contains a list of tools needed. The format of this diff --git a/depends b/depends index 6238eb1eed..a86bc82123 100644 --- a/depends +++ b/depends @@ -16,3 +16,4 @@ xxd file git lsmod:kmod +bc diff --git a/export-image/prerun.sh b/export-image/prerun.sh index cecde32bed..8bbc566e06 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -18,7 +18,7 @@ ALIGN="$((4 * 1024 * 1024))" # some overhead (since actual space usage is usually rounded up to the # filesystem block size) and gives some free space on the resulting # image. -ROOT_MARGIN=$((800*1024*1024)) +ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)" BOOT_PART_START=$((ALIGN)) BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN)) From ca31aef1f74294a767ff8f6fb55e904aa21a4cf8 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 24 Jan 2020 13:09:04 +0000 Subject: [PATCH 03/19] stage5: install code-the-classics --- stage5/00-install-extras/00-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index afe5aeef57..609e718125 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -13,3 +13,4 @@ nodered realvnc-vnc-viewer python-games +code-the-classics From bdbd85892e8a80bd69366ea7f84f8ea1f2a0433f Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 27 Jan 2020 15:20:33 +0000 Subject: [PATCH 04/19] Update MagPi URL scheme --- stage4/03-magpi/00-run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stage4/03-magpi/00-run.sh b/stage4/03-magpi/00-run.sh index cc5a820817..b27b85f359 100755 --- a/stage4/03-magpi/00-run.sh +++ b/stage4/03-magpi/00-run.sh @@ -1,12 +1,12 @@ #!/bin/sh -e magpi_regex="MagPi[[:digit:]]*.pdf" -magpi_loc="https://www.raspberrypi.org/magpi-issues" -magpi_latest="$(curl "$magpi_loc/?C=M;O=D" -s | grep "$magpi_regex" -m 1 -o | head -n 1)" +magpi_loc="$(curl -s https://magpi.raspberrypi.org/latest-pdf)" +magpi_latest="$(echo "$magpi_loc" | grep "$magpi_regex" -m 1 -o)" if [ ! -f "files/$magpi_latest" ]; then find files/ -regextype grep -regex "files/$magpi_regex" -delete - wget "$magpi_loc/$magpi_latest" -O "files/$magpi_latest" + wget "$magpi_loc" -O "files/$magpi_latest" fi file "files/$magpi_latest" | grep -q "PDF document" From b4ea63c0454e12af659623d0bd34bba71e6c9f25 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 28 Jan 2020 12:43:53 +0000 Subject: [PATCH 05/19] Update persistent rkfill files --- stage2/02-net-tweaks/01-run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage2/02-net-tweaks/01-run.sh b/stage2/02-net-tweaks/01-run.sh index 63fbff71cd..092975531f 100755 --- a/stage2/02-net-tweaks/01-run.sh +++ b/stage2/02-net-tweaks/01-run.sh @@ -27,5 +27,5 @@ fi # Disable wifi on 5GHz models mkdir -p "${ROOTFS_DIR}/var/lib/systemd/rfkill/" -echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmc:wlan" -echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmc:wlan" +echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-3f300000.mmcnr:wlan" +echo 1 > "${ROOTFS_DIR}/var/lib/systemd/rfkill/platform-fe300000.mmcnr:wlan" From 306c7eba3b241c963d3fdbfd47e0bd1cf9c1a323 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 27 Jan 2020 17:48:12 +0000 Subject: [PATCH 06/19] Update release notes --- .../00-release/files/release_notes.txt | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 45e8576fc6..0235ba9fb2 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,5 +1,26 @@ UNRELEASED: - * + * Version 3.2.6 of Thonny included - significant improvements in speed, particularly when debugging + * Version 1.0.4 of Scratch 3 included - adds new "display stage" and "display sprite" blocks to SenseHAT extension, and loading of files from command line + * Version 32.0.0.314 of Flash player included + * Version 1.0.3 of NodeRED included + * Version 6.6.0 of RealVNC Server and version 6.19.923 of RealVNC Viewer included - adds support for audio + * Version 78.0.3904.108 of Chromium included + * Mesa updated to 19.3.2 for OpenGL ES 3.1 conformance + * Orca screen reader added to Recommended Software + * Code The Classics Python games added to Recommended Software + * File manager - new "places" pane added at top of sidebar to show mounted drives in simplified view; "new folder" icon added to taskbar; expanders in directory browser now correctly show state of subfolders + * Multiple monitor support improved - alignment of icons on second desktop corrected, Appearance Settings opens on correct tab when launched from context menu + * Raspberry Pi Touchscreen correctly aligned with display + * System clock synchronised before installing new packages in startup wizard and Recommended Software + * Mixer dialogs added to taskbar volume plugin; separate Audio Preferences application removed + * Raspberry Pi Configuration - separate tab added for display options; screen blanking control added + * Volume taskbar plugin and raspi-config modified to support separate ALSA devices for internal audio outputs (analogue and HDMI 1 and 2) + * Robustness improvements in volume, ejecter and battery taskbar plugins + * Movement of mouse pointer to menu button on startup now controlled by point_at_menu parameter in Global section of lxpanel configuration file + * Ctrl-Alt-Del and Ctrl-Alt-End shortcuts added to open shutdown options box + * Ctrl-Shift-Esc shortcut added to open task manager + * Linux kernel 4.19.93 + * Raspberry Pi firmware 67392a7a32bddad7f571047fccafca9eeb65d29c 2019-09-26: * rpi-eeprom included - This will automatically update the SPI EEPROM on the Raspberry Pi 4 to the latest stable version. From 87f7a59cab051d54a306a680a615170aa33bd5ca Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 3 Feb 2020 13:22:33 +0000 Subject: [PATCH 07/19] 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 0235ba9fb2..5be3a960ee 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -19,6 +19,7 @@ UNRELEASED: * Movement of mouse pointer to menu button on startup now controlled by point_at_menu parameter in Global section of lxpanel configuration file * Ctrl-Alt-Del and Ctrl-Alt-End shortcuts added to open shutdown options box * Ctrl-Shift-Esc shortcut added to open task manager + * Enabled NEON routines in OpenSSL * Linux kernel 4.19.93 * Raspberry Pi firmware 67392a7a32bddad7f571047fccafca9eeb65d29c 2019-09-26: From e577677b623b577f2a0ec7cfaffc3c27da005da3 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 5 Feb 2020 15:37:57 +0000 Subject: [PATCH 08/19] 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 5be3a960ee..6f74f5de45 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -6,6 +6,7 @@ UNRELEASED: * Version 6.6.0 of RealVNC Server and version 6.19.923 of RealVNC Viewer included - adds support for audio * Version 78.0.3904.108 of Chromium included * Mesa updated to 19.3.2 for OpenGL ES 3.1 conformance + * Pixel doubling option added in Raspberry Pi Configuration on platforms using FKMS display driver * Orca screen reader added to Recommended Software * Code The Classics Python games added to Recommended Software * File manager - new "places" pane added at top of sidebar to show mounted drives in simplified view; "new folder" icon added to taskbar; expanders in directory browser now correctly show state of subfolders From 6b72a64f020cd3143093aae5ad82accc4976f735 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 7 Feb 2020 11:19:19 +0000 Subject: [PATCH 09/19] Update release notes --- export-noobs/00-release/files/release_notes.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 6f74f5de45..11963a440b 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,6 @@ UNRELEASED: + * +2020-02-05: * Version 3.2.6 of Thonny included - significant improvements in speed, particularly when debugging * Version 1.0.4 of Scratch 3 included - adds new "display stage" and "display sprite" blocks to SenseHAT extension, and loading of files from command line * Version 32.0.0.314 of Flash player included From 6d71ac0bf9f9f2ac4f483bca598cff52cf3b7e8e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 10 Feb 2020 16:59:56 +0000 Subject: [PATCH 10/19] Update release notes --- export-noobs/00-release/files/release_notes.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 11963a440b..1ca67ec80b 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,5 +1,12 @@ UNRELEASED: - * + * Raspberry Pi Configuration - screen blanking setting disabled if Xscreensaver is installed + * Bug fix - switch to turn off VNC server in Raspberry Pi Configuration has no effect + * Bug fix - fix %20 characters in file names + * Linux kernel 4.19.97 + * Raspberry Pi firmware 2efcd0bb3848640e385c894b22551f0d32761bf8 + - gencmd: Fix measure_clock name for CLOCK_OUTPUT_108 + - mmal isp: Remote alignment requirements for RGB24 formats + - Add missing flags for VC_IMAGE_PROP_YUVUV_4K_CHROMA_ALIGN 2020-02-05: * Version 3.2.6 of Thonny included - significant improvements in speed, particularly when debugging * Version 1.0.4 of Scratch 3 included - adds new "display stage" and "display sprite" blocks to SenseHAT extension, and loading of files from command line @@ -23,8 +30,8 @@ UNRELEASED: * Ctrl-Alt-Del and Ctrl-Alt-End shortcuts added to open shutdown options box * Ctrl-Shift-Esc shortcut added to open task manager * Enabled NEON routines in OpenSSL - * Linux kernel 4.19.93 - * Raspberry Pi firmware 67392a7a32bddad7f571047fccafca9eeb65d29c + * Linux kernel 4.19.97 + * Raspberry Pi firmware 149cd7f0487e08e148efe604f8d4d359541cecf4 2019-09-26: * rpi-eeprom included - This will automatically update the SPI EEPROM on the Raspberry Pi 4 to the latest stable version. From 5f884374b6ac6e155330c58caa1fb7249b8badf1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 13 Feb 2020 15:47:46 +0000 Subject: [PATCH 11/19] Update release notes --- export-noobs/00-release/files/release_notes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 1ca67ec80b..8d7f014032 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -3,10 +3,11 @@ UNRELEASED: * Bug fix - switch to turn off VNC server in Raspberry Pi Configuration has no effect * Bug fix - fix %20 characters in file names * Linux kernel 4.19.97 - * Raspberry Pi firmware 2efcd0bb3848640e385c894b22551f0d32761bf8 + * Raspberry Pi firmware 9a34efbf2fc6a27231607ce91a7cb6bf3bdbc0c5 - gencmd: Fix measure_clock name for CLOCK_OUTPUT_108 - mmal isp: Remote alignment requirements for RGB24 formats - Add missing flags for VC_IMAGE_PROP_YUVUV_4K_CHROMA_ALIGN + - platform: Compromise on gpu overclock settings 2020-02-05: * Version 3.2.6 of Thonny included - significant improvements in speed, particularly when debugging * Version 1.0.4 of Scratch 3 included - adds new "display stage" and "display sprite" blocks to SenseHAT extension, and loading of files from command line From 38d22e976a2d6ad2ccabc2704c966f586550122c Mon Sep 17 00:00:00 2001 From: "Luigi F. Cruz" Date: Thu, 20 Feb 2020 14:18:50 -0300 Subject: [PATCH 12/19] Retry apt downloads 3 times Fixes #194 --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index a906e102a4..e012569cec 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,7 @@ EOF PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages-nr")" if [ -n "$PACKAGES" ]; then on_chroot << EOF -apt-get install --no-install-recommends -y $PACKAGES +apt-get -o APT::Acquire::Retries=3 install --no-install-recommends -y $PACKAGES EOF fi log "End ${SUB_STAGE_DIR}/${i}-packages-nr" @@ -30,7 +30,7 @@ EOF PACKAGES="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < "${i}-packages")" if [ -n "$PACKAGES" ]; then on_chroot << EOF -apt-get install -y $PACKAGES +apt-get -o APT::Acquire::Retries=3 install -y $PACKAGES EOF fi log "End ${SUB_STAGE_DIR}/${i}-packages" From 65f91b8349565f5ddb8806ccc80a48871c5b86e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Vis=C3=A9e?= Date: Thu, 20 Feb 2020 18:20:03 +0100 Subject: [PATCH 13/19] BusyBox realpath does not support -s flag, fallback to use no flags (#384) * BusyBox realpath does not support -s flag, fallback to use no flags * Fix config sourcing problem --- build-docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index 79b68d45e1..b6a9ea3d81 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -32,7 +32,7 @@ done # Ensure that the configuration file is an absolute path if test -x /usr/bin/realpath; then - CONFIG_FILE=$(realpath -s "$CONFIG_FILE") + CONFIG_FILE=$(realpath -s "$CONFIG_FILE" || realpath "$CONFIG_FILE") fi # Ensure that the confguration file is present @@ -41,7 +41,7 @@ if test -z "${CONFIG_FILE}"; then exit 1 else # shellcheck disable=SC1090 - source "${CONFIG_FILE}" + source ${CONFIG_FILE} fi CONTAINER_NAME=${CONTAINER_NAME:-pigen_work} From 8ef3f47d7f0c6fdc722b1c3161d2502c9201bcc1 Mon Sep 17 00:00:00 2001 From: Leandro Lisboa Penz Date: Thu, 20 Feb 2020 17:20:29 +0000 Subject: [PATCH 14/19] Dockerfile: use --no-install-recommends in apt-get install (#383) --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35f483a3e1..2e53149b52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,11 @@ FROM debian:buster ENV DEBIAN_FRONTEND noninteractive RUN apt-get -y update && \ - apt-get -y install \ + apt-get -y install --no-install-recommends \ git vim parted \ quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \ bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\ + binfmt-support ca-certificates \ && rm -rf /var/lib/apt/lists/* COPY . /pi-gen/ From 08fc0b9a8237c5a9926a0e9d660156a1e838d33a Mon Sep 17 00:00:00 2001 From: DragonEagle Date: Wed, 26 Feb 2020 05:36:39 -0800 Subject: [PATCH 15/19] Exposed RELEASE as a configurable variable (#391) Exposed RELEASE as a configurable variable and updated README.md. As a bonus, there is only on place to change the release name when the next release is stable now. --- README.md | 5 +++++ build.sh | 1 + export-noobs/00-release/00-run.sh | 1 + export-noobs/00-release/files/os.json | 2 +- stage0/00-configure-apt/00-run.sh | 2 ++ stage0/00-configure-apt/files/raspi.list | 4 ++-- stage0/00-configure-apt/files/sources.list | 4 ++-- stage0/prerun.sh | 2 +- 8 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ec4f65cb62..29d81667d4 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,11 @@ The following environment variables are supported: but you should use something else for a customized version. Export files in stages may add suffixes to `IMG_NAME`. + * `RELEASE` (Default: buster) + + The release version to build images against. Valid values are jessie, stretch + buster, bullseye, and testing. + * `APT_PROXY` (Default: unset) If you require the use of an apt proxy, set it here. This proxy setting diff --git a/build.sh b/build.sh index e012569cec..a8247ab040 100755 --- a/build.sh +++ b/build.sh @@ -166,6 +166,7 @@ export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi} export FIRST_USER_NAME=${FIRST_USER_NAME:-pi} export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry} +export RELEASE=${RELEASE:-buster} export WPA_ESSID export WPA_PASSWORD export WPA_COUNTRY diff --git a/export-noobs/00-release/00-run.sh b/export-noobs/00-release/00-run.sh index 1d0b12f175..18a3a5dcd6 100755 --- a/export-noobs/00-release/00-run.sh +++ b/export-noobs/00-release/00-run.sh @@ -36,6 +36,7 @@ sed "${NOOBS_DIR}/partitions.json" -i -e "s|ROOT_NOM|${ROOT_NOM}|" sed "${NOOBS_DIR}/os.json" -i -e "s|UNRELEASED|${IMG_DATE}|" sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_NAME|${NOOBS_NAME}|" sed "${NOOBS_DIR}/os.json" -i -e "s|NOOBS_DESCRIPTION|${NOOBS_DESCRIPTION}|" +sed "${NOOBS_DIR}/os.json" -i -e "s|RELEASE|${RELEASE}|" sed "${NOOBS_DIR}/release_notes.txt" -i -e "s|UNRELEASED|${IMG_DATE}|" diff --git a/export-noobs/00-release/files/os.json b/export-noobs/00-release/files/os.json index afa9f9a8fc..e231238be6 100644 --- a/export-noobs/00-release/files/os.json +++ b/export-noobs/00-release/files/os.json @@ -16,5 +16,5 @@ ], "url": "http://www.raspbian.org/", "username": "pi", - "version": "buster" + "version": "RELEASE" } diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh index 9d21ffba2b..d10a49f174 100755 --- a/stage0/00-configure-apt/00-run.sh +++ b/stage0/00-configure-apt/00-run.sh @@ -2,6 +2,8 @@ install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/" install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/" +sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list" +sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.list" if [ -n "$APT_PROXY" ]; then install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" diff --git a/stage0/00-configure-apt/files/raspi.list b/stage0/00-configure-apt/files/raspi.list index 122287e1d5..41c5a70755 100644 --- a/stage0/00-configure-apt/files/raspi.list +++ b/stage0/00-configure-apt/files/raspi.list @@ -1,3 +1,3 @@ -deb http://archive.raspberrypi.org/debian/ buster main +deb http://archive.raspberrypi.org/debian/ RELEASE main # Uncomment line below then 'apt-get update' to enable 'apt-get source' -#deb-src http://archive.raspberrypi.org/debian/ buster main +#deb-src http://archive.raspberrypi.org/debian/ RELEASE main diff --git a/stage0/00-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list index 61820ac04e..4a5dd8a9fd 100644 --- a/stage0/00-configure-apt/files/sources.list +++ b/stage0/00-configure-apt/files/sources.list @@ -1,3 +1,3 @@ -deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi +deb http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi # Uncomment line below then 'apt-get update' to enable 'apt-get source' -#deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi +#deb-src http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi diff --git a/stage0/prerun.sh b/stage0/prerun.sh index 9ce3e0227f..3b257836b8 100755 --- a/stage0/prerun.sh +++ b/stage0/prerun.sh @@ -1,5 +1,5 @@ #!/bin/bash -e if [ ! -d "${ROOTFS_DIR}" ]; then - bootstrap buster "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/ + bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/ fi From b9bb59c237b79d65d507feaf36865152c437a67e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 13 May 2020 13:09:03 +0100 Subject: [PATCH 16/19] Bookshelf PDF download --- stage4/03-bookshelf/00-run.sh | 15 +++++++++++++++ .../{03-magpi => 03-bookshelf}/files/.gitignore | 0 stage4/03-magpi/00-run.sh | 15 --------------- 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100755 stage4/03-bookshelf/00-run.sh rename stage4/{03-magpi => 03-bookshelf}/files/.gitignore (100%) delete mode 100755 stage4/03-magpi/00-run.sh diff --git a/stage4/03-bookshelf/00-run.sh b/stage4/03-bookshelf/00-run.sh new file mode 100755 index 0000000000..5bd9885ddd --- /dev/null +++ b/stage4/03-bookshelf/00-run.sh @@ -0,0 +1,15 @@ +#!/bin/sh -e + +BOOKSHELF_URL="https://magpi.raspberrypi.org/bookshelf.xml" +GUIDE_URL="$(curl -s "$BOOKSHELF_URL" | awk -F '[<>]' "/Raspberry Pi Beginner's Guide v3<\/TITLE>/ {f=1; next} f==1 && /PDF/ {print \$3; exit}")" +OUTPUT="$(basename "$GUIDE_URL" | cut -f1 -d'?')" + +if [ ! -f "files/$OUTPUT" ]; then + rm files/*.pdf -f + curl -s "$GUIDE_URL" -o "files/$OUTPUT" +fi + +file "files/$OUTPUT" | grep -q "PDF document" + +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf" +install -v -o 1000 -g 1000 -m 644 "files/$OUTPUT" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf/" diff --git a/stage4/03-magpi/files/.gitignore b/stage4/03-bookshelf/files/.gitignore similarity index 100% rename from stage4/03-magpi/files/.gitignore rename to stage4/03-bookshelf/files/.gitignore diff --git a/stage4/03-magpi/00-run.sh b/stage4/03-magpi/00-run.sh deleted file mode 100755 index b27b85f359..0000000000 --- a/stage4/03-magpi/00-run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e - -magpi_regex="MagPi[[:digit:]]*.pdf" -magpi_loc="$(curl -s https://magpi.raspberrypi.org/latest-pdf)" -magpi_latest="$(echo "$magpi_loc" | grep "$magpi_regex" -m 1 -o)" - -if [ ! -f "files/$magpi_latest" ]; then - find files/ -regextype grep -regex "files/$magpi_regex" -delete - wget "$magpi_loc" -O "files/$magpi_latest" -fi - -file "files/$magpi_latest" | grep -q "PDF document" - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/MagPi" -install -v -o 1000 -g 1000 -m 644 "files/$magpi_latest" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/MagPi/" From 825107f04027269db77426046f5085475b1ea22f Mon Sep 17 00:00:00 2001 From: Serge Schneider <serge@raspberrypi.org> Date: Wed, 13 May 2020 13:51:36 +0100 Subject: [PATCH 17/19] Update release notes --- .../00-release/files/release_notes.txt | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index 8d7f014032..bac8091964 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,38 @@ UNRELEASED: + * Added Bookshelf application + * Added Raspberry Pi Diagnostics application + * Added magnifier plugin to taskbar - needs magnifier application installed from Recommended Software to enable + * Added Magnifier application to Recommended Software + * Added marketing questionnaire as initial Chromium tab + * Version 0.25 of Scratch 2 included - uses external application to access IMU on SenseHAT + * Version 1.0.5 of Scratch 3 included - uses external application to access IMU on SenseHAT + * Version 32.0.0.371 of Flash player included + * Version 1.0.6 of Node-RED included + * Version 6.7.1 of VNC Server included + * Version 6.20.113 of VNC Client included + * Internal audio outputs enabled as separate ALSA devices + * MagPi preinstall removed and replaced with Beginner’s Guide + * MagPi weblink removed from main menu + * Chromium made default application for PDF files + * Common icon loading code for lxpanel plugins used + * Italian translations added + * Initial move of mouse pointer to menu button disabled + * Padding at left of menu button removed + * Focus behaviour changed so that focus moves to desktop if no windows are opened - improves reliability of Orca screen reader + * Bug fix - focus bug in volume plugin + * Bug fix - keyboard repeat interval bug in Mouse & Keyboard Settings + * Bug fix - battery detection bug in battery plugin + * Bug fix - spurious active areas on taskbar when plugins are hidden + * Bug fix - occasional crash in file manager on file selection + * Disk ID is now regenerated on first boot + * Updated udev rules + - Remove unused argon rule + - Add vcsm-cma to video group + - Add pwm to gpio group + * i2cprobe: More flexible I2C/SPI alias mapping + * Raspberry Pi firmware 21e1fe3477ffb708a5736ed61a924fd650031136 + * Linux kernel 4.19.118 +2020-02-13: * Raspberry Pi Configuration - screen blanking setting disabled if Xscreensaver is installed * Bug fix - switch to turn off VNC server in Raspberry Pi Configuration has no effect * Bug fix - fix %20 characters in file names From f663d4c6d124258362b955580e4f2b91dce0ddc8 Mon Sep 17 00:00:00 2001 From: Serge Schneider <serge@raspberrypi.com> Date: Mon, 22 Jun 2020 03:54:38 +0100 Subject: [PATCH 18/19] Add new changelog entry --- export-noobs/00-release/files/release_notes.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index bac8091964..bde0861e8a 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,6 @@ UNRELEASED: + * +2020-05-27 * Added Bookshelf application * Added Raspberry Pi Diagnostics application * Added magnifier plugin to taskbar - needs magnifier application installed from Recommended Software to enable From 9a3a10bf1019ebb2d59053564dc6b90068bad27d Mon Sep 17 00:00:00 2001 From: Serge Schneider <serge@raspberrypi.com> Date: Mon, 22 Jun 2020 05:33:42 +0100 Subject: [PATCH 19/19] stage2: install raspinfo --- stage2/01-sys-tweaks/00-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 16b9350f36..83ec74ce53 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -28,3 +28,4 @@ vl805fw ntfs-3g pciutils rpi-eeprom +raspinfo