Merge branch 'fix-qemu-raspi' into 'master'

Draft: Fix raspi_qemu build See merge request redox-os/redox!1660
Merge branch 'timmydo/dockerfqdn' into 'master'
2026-07-03 18:18:44 +08:00 · 2025-10-26 15:53:59 +00:00 · 2025-10-26 09:19:39 -06:00 · 2025-10-25 21:28:28 -07:00 · 2025-10-21 20:47:09 +02:00
2 changed files with 5 additions and 3 deletions
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@ -364,5 +364,7 @@ qemu_nvme_extra: qemu-deps
 #additional steps for $(DISK) are required!!!
 qemu_raspi: qemu-deps
 	$(QEMU) -M raspi3b -smp 4,cores=1 \
-		-kernel $(FIRMWARE) \
-		-serial stdio -display none
+ 		-kernel $(QEMU_KERNEL) \
+		-serial stdio -display none \
+	        -sd build/aarch64/minimal/harddrive.img \
+
--- a/podman/redox-base-containerfile
+++ b/podman/redox-base-containerfile
@ -1,6 +1,6 @@
 # Configuration file to install the recipe dependencies inside the Podman container

-FROM debian:trixie
+FROM docker.io/library/debian:trixie

 # _UID_ must be replaced with the user's uid on host
 # podman root is mapped to your user id on host during build,
Author	SHA1	Message	Date
IC	3f6d7cf742	Merge branch 'fix-qemu-raspi' into 'master' Draft: Fix raspi_qemu build See merge request redox-os/redox!1660	2025-10-26 15:53:59 +00:00
Jeremy Soller	a60e18dafb	Merge branch 'timmydo/dockerfqdn' into 'master' Update podman base container image reference to use fully qualified domain name See merge request redox-os/redox!1663	2025-10-26 09:19:39 -06:00
Timmy Douglas	f72faa0829	Update podman base container image reference to use fully qualified domain name	2025-10-25 21:28:28 -07:00
H4K1	fc0092c149	Fix raspi_qemu build, related to https://gitlab.redox-os.org/redox-os/redox/-/issues/1730	2025-10-21 20:47:09 +02:00