Skip to content

bcm2711: don't skip deploying firmware if on Debian #8240

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bcm2711: don't skip deploying firmware if on Debian #8240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
041dd75
bcm2711: don't skip deploying firmware if on Debian
rpardini Apr 22, 2025
5f7ac81
bcm2711: bump raspfw version to a6827c1b30eabf41d53b3fa5e87d6ff8c0f28ae6
rpardini Apr 22, 2025
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
9 changes: 2 additions & 7 deletions config/sources/families/bcm2711.conf
View file
Original file line number Diff line number Diff line change
@@ -77,7 +77,6 @@ function post_family_tweaks_bsp__add_hooks_to_move_kernel_initrd_and_dtb() {
# By default, kernel post-install scripts use filenames starting with "z50-".
# However, Debian's 'raspi-firmware' package already uses this naming, which can cause conflicts.
# To avoid this, we rename our script to /etc/kernel/postinst.d/z51-raspi-firmware
# and include a runtime check for the distribution name.
# This prevents issues on Debian where the conflict exists, while Ubuntu is unaffected.
display_alert "Setting up z51-raspi-firmware" "bcm2711 - from ${RASPI_FIRMWARE_DIR}" "info"
run_host_command_logged cat <<- z51-raspi-firmware > "${destination}"/etc/kernel/postinst.d/z51-raspi-firmware
@@ -88,10 +87,6 @@ function post_family_tweaks_bsp__add_hooks_to_move_kernel_initrd_and_dtb() {
# section capable of copying files, but Ubuntu relies on flash-kernel
[[ -d ${RASPI_FIRMWARE_DIR} ]] || exit 0

if grep -q '^ID=debian' /etc/os-release; then
exit 0
fi

# Play nice when run under debconf.
exec </dev/null >&2

@@ -119,7 +114,7 @@ function post_family_tweaks_bsp__add_hooks_to_move_kernel_initrd_and_dtb() {
target=/boot/firmware
dtb_dir=/usr/lib/linux-image-$abi/

# The kernel image can be named either "Image" (standardized for ARM platforms)
# The kernel image can be named either "Image" (standardized for ARM platforms)
# or "vmlinuz-${abi}" (default naming convention for Linux kernels). We need
# too support both conventions.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick "to support" not "too support"

can you add a commit to this effect if this is still an active PR?

if [[ -f /boot/Image ]]; then
@@ -219,7 +214,7 @@ function post_family_tweaks_bsp__rpi_firmware_in_bsp() {
fi

display_alert "Using in-BSP firmware files for" "bcm2711::${BOARD}" "info"
declare firmware_commit_sha1="9cafcd85f8aed1ec0c0f609b98af591fae367ba2" # Keep this inside this file, so hashing detect changes and bumps the version of the bsp package
declare firmware_commit_sha1="a6827c1b30eabf41d53b3fa5e87d6ff8c0f28ae6" # Keep this inside this file, so hashing detect changes and bumps the version of the bsp package

declare destdir="${destination}/usr/lib/armbian-firmware-raspi"
run_host_command_logged mkdir -p "${destdir}"