Skip to content

eib_image: Build generic RPi image for RPi devices #196

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

Merged
dsd merged 1 commit into from
Dec 2, 2025
Merged

eib_image: Build generic RPi image for RPi devices #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions config/platform/rpi4.ini
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions stages/eib_image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ create_image() {

# Raspberry Pi's GPU starts the boot process by loading bootloader blobs
# from the first partition which must be VFAT.
if [ "${EIB_PLATFORM:0:3}" == "rpi" ]; then
if [ "${EIB_PLATFORM}" == "rpi" ]; then
# BOOT Partition using EFI System type for RPi firmware
echo "size=512MiB, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
fi
Expand Down Expand Up @@ -239,7 +239,7 @@ create_image() {
rootfs_attrs+=("GUID:55")
fi

if [[ "${EIB_PLATFORM:0:3}" == "rpi" ]]; then
if [[ "${EIB_PLATFORM}" == "rpi" ]]; then
# Make u-boot find the bootable partition which is rootfs for Raspberry Pi
rootfs_attrs+=("LegacyBIOSBootable")
fi
Expand Down Expand Up @@ -282,7 +282,7 @@ create_image() {
*)
# On ARM disable 64bit ext4 option
ext4_opts="dir_index,^huge_file,^64bit"
if [ "${EIB_PLATFORM:0:3}" == "rpi" ]; then
if [ "${EIB_PLATFORM}" == "rpi" ]; then
boot_loop=${img_loop}p1
root_loop=${img_loop}p2
else
Expand Down Expand Up @@ -336,7 +336,7 @@ EOF
"${ROOT}"/boot/boot.scr

case "${EIB_PLATFORM}" in
rpi4)
rpi)
mkfs.vfat ${boot_loop}

# Copy Raspberry Pi's bootloader & device tree blobs
Expand Down
8 changes: 4 additions & 4 deletions tests/test_image_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_series(make_builder, branch, expected):

@pytest.mark.parametrize('arch,platform,expected', [
('amd64', None, 'amd64'),
('arm64', 'rpi4', 'rpi4'),
('arm64', 'rpi', 'rpi'),
('arm64', None, 'arm64'),
('i386', 'i386', 'i386'),
('i386', None, 'i386'),
Expand Down Expand Up @@ -99,15 +99,15 @@ def test_bad_arch(make_builder):
'eos-amd64-amd64-es',
'eos-amd64-amd64-fr',
'eos-amd64-amd64-pt_BR',
'eos-arm64-rpi4-base',
'eos-arm64-rpi4-en',
'eos-arm64-rpi-base',
'eos-arm64-rpi-en',
'eos-arm64-pinebookpro-base',
'eos-arm64-pinebookpro-en',
'eosinstaller-amd64-amd64-base',
]
CUSTOM_TARGETS = [
'eoscustom-amd64-amd64-base',
'eoscustom-arm64-rpi4-base',
'eoscustom-arm64-rpi-base',
]
TEST_VARIANTS = []
for target in RELEASE_TARGETS + CUSTOM_TARGETS:
Expand Down