Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.1.0: Roll up #38

Merged
merged 17 commits into from
Sep 12, 2024
Merged

v1.1.0: Roll up #38

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
58b827f
Expand DEMO_MODE to cover all fastboot commands
tdewey-rpi Sep 5, 2024
87d3676
postinst: Shellcheck fixes
tdewey-rpi Sep 5, 2024
c12207a
copyright: Put the correct license in place
tdewey-rpi Sep 5, 2024
1728aa3
postinst: Formatting
tdewey-rpi Sep 5, 2024
fa06dd7
SECURITY: Supporting 1.0.3, prune .1, .2
tdewey-rpi Sep 5, 2024
365b093
debian/changes: 1.0.3
tdewey-rpi Sep 5, 2024
73fee1a
provisioner: Shellcheck fixes
tdewey-rpi Sep 11, 2024
d2c23e5
Remove 2711 recovery.bin
tdewey-rpi Sep 11, 2024
88382a7
keywriter: Shellcheck fixes
tdewey-rpi Sep 11, 2024
9333518
keywriter: 2712 support
tdewey-rpi Sep 11, 2024
31578d2
keywriter: Only print metadata in real runs
tdewey-rpi Sep 11, 2024
eff8515
provisioner: 2712 support
tdewey-rpi Sep 11, 2024
d67111b
check_pidevice_generation: Support 5.
tdewey-rpi Sep 11, 2024
c19a5fc
debian/install: Remove included recovery.bin
tdewey-rpi Sep 11, 2024
e759495
v1.1.0
tdewey-rpi Sep 11, 2024
8a0e428
debian/control: Use September EEPROM releases for 2711, 2712
tdewey-rpi Sep 12, 2024
ff5c903
keywriter: Remove extraneous log line
tdewey-rpi Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions device-provisioner/provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fi

announce_start "Finding/generating fastboot image"

case ${RPI_DEVICE_FAMILY} in
case "${RPI_DEVICE_FAMILY}" in
4)
# Raspberry Pi 4-class devices do not use signed bootcode files, so just copy the file into the relevant place.
cp /usr/share/rpiboot/mass-storage-gadget64/bootfiles.bin "${RPI_SB_WORKDIR}/bootfiles.bin"
Expand Down Expand Up @@ -308,11 +308,13 @@ if [[ -z $(check_file_is_expected "${RPI_SB_WORKDIR}"/bootfs-temporary.img "img"
announce_start "Initramfs modification"

augment_initramfs() {
# shellcheck disable=SC2155
local initramfs_compressed_file=$(check_file_is_expected "$1" "")
# shellcheck disable=SC2086
mkdir -p "${TMP_DIR}"/initramfs ${DEBUG}
# shellcheck disable=SC2086
zstd --rm -f -d "${initramfs_compressed_file}" -o "${TMP_DIR}"/initramfs.cpio ${DEBUG}
# shellcheck disable=SC2155
local ROOTFS_MOUNT=$(realpath "${TMP_DIR}"/rpi-rootfs-img-mount)
pushd "${TMP_DIR}"/initramfs
# shellcheck disable=SC2086
Expand Down Expand Up @@ -371,9 +373,9 @@ if [[ -z $(check_file_is_expected "${RPI_SB_WORKDIR}"/bootfs-temporary.img "img"
4)
echo 'initramfs initramfs8' >> "${TMP_DIR}"/rpi-boot-img-mount/config.txt
;;
# 5)
# echo 'initramfs initramfs_2712' >> "${TMP_DIR}"/rpi-boot-img-mount/config.txt
# ;;
5)
echo 'initramfs initramfs_2712' >> "${TMP_DIR}"/rpi-boot-img-mount/config.txt
tdewey-rpi marked this conversation as resolved.
Show resolved Hide resolved
;;
esac

announce_stop "config.txt modification"
Expand Down