Skip to content

Make image_build.py more portable #1019

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
nmattia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make image_build.py more portable #1019

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
23 changes: 16 additions & 7 deletions image_builder/image_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
"raspios_lite_armhf-2024-03-15/"
"2024-03-15-raspios-bookworm-armhf-lite.img.xz")

# to update pishrink.sh, grab the latest rev from here:
# https://github.com/Drewsif/PiShrink/commits/master/
PISHRINK_REV = "3f3ba6a0b2208aafc774e8d1d30d9d25e3c7c4ff"

DATA_FILE = "data.json"
COMPRESSED_IMAGE_NAME = "source_image.img.xz"
SOURCE_IMAGE_NAME = "source_image.img"
Expand All @@ -52,11 +56,11 @@

RPI_EMULATOR_COMMAND = (
"qemu-system-aarch64 "
"-nographic "
"-machine raspi3b "
"-cpu cortex-a72 "
"-m 1G "
"-smp 4 "
"-serial stdio "
f"-dtb {DTB_NAME} "
f"-kernel {KERNEL_NAME} "
"-drive file=./{image_name},format=raw,if=sd "
Expand Down Expand Up @@ -107,10 +111,15 @@ def run_emulator(command):
print("Waiting for the emulator to boot")

success = False
for _ in range(EMULATOR_CONNECT_RETRIES):
for i in range(EMULATOR_CONNECT_RETRIES):
print("attempting to connect to emulator (%d/%d)" % (i+1,EMULATOR_CONNECT_RETRIES))
if not emulator_thread.is_alive():
raise RuntimeError("The emulator thread has died")

try:
run_over_ssh("echo Connected to the emulator")
except subprocess.CalledProcessError:
print("could not connect to emulator (yet), sleeping 1s") # note: this might take over a minute
sleep(1)
continue
else:
Expand Down Expand Up @@ -195,7 +204,7 @@ def mount_image(image_name, expand=False):
if expand:
print(f"Resizing {image_name}")
run_command(f"parted {loop_device} resizepart 2 100%")
run_command(f"e2fsck -f {loop_device}p2")
run_command(f"e2fsck -y -f {loop_device}p2")
run_command(f"resize2fs {loop_device}p2")

ensure_directory(BOOTFS_MOUNT)
Expand Down Expand Up @@ -272,8 +281,7 @@ def build_image():
check_binary("pishrink.sh")
except Exception: # pylint: disable=broad-except
print("pishrink is not installed, downloading")
run_command("wget https://raw.githubusercontent.com/"
"Drewsif/PiShrink/master/pishrink.sh")
run_command("curl -SLO https://raw.githubusercontent.com/Drewsif/PiShrink/%s/pishrink.sh" % PISHRINK_REV)
run_command("chmod +x pishrink.sh")

# --- Get source image ---
Expand Down Expand Up @@ -336,7 +344,7 @@ def build_image():

print("Run the initrd generating emulator")
emulator_thread = run_emulator(emulator_command)
print("Generating vmlinuz and initrd")
print("Generating vmlinuz and initrd, this may take a few minutes")
run_over_ssh(f"sudo dpkg -i /{KERNEL_FILE_NAME}")
run_over_ssh("sudo poweroff", check=False)
print("Waiting for the initrd generating emulator to shut down")
Expand Down Expand Up @@ -452,7 +460,8 @@ def build_image():
emulator_thread.join(timeout=EMULATOR_SHUTDOWN_TIMEOUT)

print("Shrinking image")
run_command(f"pishrink.sh -p {IMAGE_NAME} {SHRUNK_IMAGE_NAME} ")
# -n: don't check for new pishrink updates
run_command(f"./pishrink.sh -n {IMAGE_NAME} {SHRUNK_IMAGE_NAME} ")

shrunk_loop = mount_image(SHRUNK_IMAGE_NAME)

Expand Down