Re: Re: Preliminary image for Raspberry Pi 4
Hi Lucas,
Thanks so much for your work on this! I took your older raspi_4.yaml
and made it auto-generated, and just updated it now as well for the 5.6
boot fix. You can see that commit here:
https://salsa.debian.org/dilinger/image-specs/-/commit/462abf1d43ca3c9037f9fc8a3a36674082dc2d0a
That's now in my rpi4 branch, which I had previously requested that
Gunnar merge. The MR fixed a minor bug and prepped the Makefile for
adding and removing platforms. The merge request is here:
https://salsa.debian.org/raspi-team/image-specs/-/merge_requests/9
Since the raspi_4.yaml is autogenerated, I've included a diff below
showing the difference between yours and mine. The main differences are
that I dropped experimental, I'm using the signed kernel images and
linux-image-arm64 from unstable, and the image size is 1.5gb instead of
2.5gb (not including stable + unstable images shrinks the size a bit).
--- /tmp/raspi_4.yaml 2020-05-10 22:09:56.793793902 -0400
+++ raspi_4.yaml 2020-05-10 22:24:23.383962780 -0400
@@ -2,7 +2,7 @@
steps:
- mkimg: "{{ output }}"
- size: 2500M
+ size: 1500M
- mklabel: msdos
device: "{{ output }}"
@@ -56,13 +56,9 @@
# Backports are _not_ enabled by default.
# Enable them by uncommenting the following line:
# deb http://deb.debian.org/debian buster-backports main contrib
non-free
- # unstable and experimental are used to fetch specific packages
using APT pinning
- deb http://deb.debian.org/debian unstable main contrib non-free
- deb http://deb.debian.org/debian experimental main contrib
non-free
-
+ deb http://deb.debian.org/debian/ unstable main contrib non-free
# raspi 4 needs the latest kernel (5.5 or higher) and raspi-firmware
newer than buster's
unless: rootfs_unpacked
-# Setup apt pinning
- chroot: /
shell: |
echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf
@@ -77,9 +73,8 @@
- wireless-tools
- wpasupplicant
- raspi3-firmware/unstable
- - linux-image-arm64
+ - linux-image-arm64/unstable
- firmware-brcm80211
- - linux-image-5.6.0-1-arm64-unsigned/unstable
tag: /
unless: rootfs_unpacked
@@ -116,14 +111,7 @@
# Copy the relevant device tree files to the boot partition
- chroot: /
shell: |
- install -m 644 -o root -g root
/usr/lib/linux-image-5.6.0-1-arm64/broadcom/bcm*rpi*.dtb /boot/firmware/
-
- # Do not set cma=. See
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951744#10
- - chroot: /
- shell: |
- sed -i 's/cma=$CMA //' /etc/kernel/postinst.d/z50-raspi-firmware
- sed -i 's/cma=64M //' /boot/firmware/cmdline.txt
-
+ install -m 644 -o root -g root
/usr/lib/linux-image-*-arm64/broadcom/bcm*rpi*.dtb /boot/firmware/
# Clean up archive cache (likely not useful) and lists (likely
outdated) to
# reduce image size by several hundred megabytes.
@@ -138,6 +126,8 @@
shell: |
ls -aR /boot
sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/'
/boot/firmware/cmdline.txt
+ sed -i 's/cma=64M //' /boot/firmware/cmdline.txt
+ sed -i 's/cma=$CMA //' /etc/kernel/postinst.d/z50-raspi-firmware
# TODO(https://github.com/larswirzenius/vmdb2/issues/24): remove
once vmdb
# clears /etc/resolv.conf on its own.
Reply to: