Hibbian
/
Raspi-image-spec
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rename-partition-tags' into 'master' 

Replace 'path' tags with 'tag-X'

See merge request raspi-team/image-specs!61
This commit is contained in:
Diederik de Haas 2022-11-04 12:51:38 +00:00
parent 189a145e0e 55246ca61a
commit 758b72391c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
raspi_master.yaml
View File

@ -13,35 +13,35 @@ steps:
device: "{{ output }}" device: "{{ output }}"
start: 4MiB start: 4MiB
end: 512MiB end: 512MiB
tag: /boot tag: tag-firmware
- mkpart: primary - mkpart: primary
device: "{{ output }}" device: "{{ output }}"
start: 512MiB start: 512MiB
end: 100% end: 100%
tag: / tag: tag-root
- kpartx: "{{ output }}" - kpartx: "{{ output }}"
- mkfs: vfat - mkfs: vfat
partition: /boot partition: tag-firmware
label: RASPIFIRM label: RASPIFIRM
- mkfs: ext4 - mkfs: ext4
partition: / partition: tag-root
label: RASPIROOT label: RASPIROOT
- mount: / - mount: tag-root
- mount: /boot - mount: tag-firmware
mount-on: / mount-on: tag-root
dirname: '/boot/firmware' dirname: '/boot/firmware'
- unpack-rootfs: / - unpack-rootfs: tag-root
- qemu-debootstrap: __RELEASE__ - qemu-debootstrap: __RELEASE__
mirror: http://deb.debian.org/debian mirror: http://deb.debian.org/debian
target: / target: tag-root
arch: __ARCH__ arch: __ARCH__
components: components:
- main - main
@ -80,10 +80,10 @@ steps:
- __LINUX_IMAGE__ - __LINUX_IMAGE__
- __RASPI_FIRMWARE__ - __RASPI_FIRMWARE__
- __WIRELESS_FIRMWARE__ - __WIRELESS_FIRMWARE__
tag: / tag: tag-root
unless: rootfs_unpacked unless: rootfs_unpacked
- cache-rootfs: / - cache-rootfs: tag-root
unless: rootfs_unpacked unless: rootfs_unpacked
- shell: | - shell: |
@ -117,16 +117,16 @@ steps:
rm -f "${ROOT?}"/etc/ssh/ssh_host_*_key* rm -f "${ROOT?}"/etc/ssh/ssh_host_*_key*
__EXTRA_ROOT_SHELL_CMDS__ __EXTRA_ROOT_SHELL_CMDS__
root-fs: / root-fs: tag-root
# Copy the relevant device tree files to the boot partition # Copy the relevant device tree files to the boot partition
- chroot: / - chroot: tag-root
shell: | shell: |
install -m 644 -o root -g root __DTB__ /boot/firmware/ install -m 644 -o root -g root __DTB__ /boot/firmware/
# Clean up archive cache (likely not useful) and lists (likely outdated) to # Clean up archive cache (likely not useful) and lists (likely outdated) to
# reduce image size by several hundred megabytes. # reduce image size by several hundred megabytes.
- chroot: / - chroot: tag-root
shell: | shell: |
apt-get clean apt-get clean
rm -rf /var/lib/apt/lists rm -rf /var/lib/apt/lists
@ -138,7 +138,7 @@ steps:
# These changes will be overwritten after the hardware is probed # These changes will be overwritten after the hardware is probed
# after dpkg reconfigures raspi-firmware (upon first boot), so make # after dpkg reconfigures raspi-firmware (upon first boot), so make
# sure we don't lose label-based booting. # sure we don't lose label-based booting.
- chroot: / - chroot: tag-root
shell: | shell: |
sed -i 's/root=/console=__SERIAL_CONSOLE__ root=/' /boot/firmware/cmdline.txt sed -i 's/root=/console=__SERIAL_CONSOLE__ root=/' /boot/firmware/cmdline.txt
sed -i 's#root=/dev/mmcblk0p2#root=LABEL=RASPIROOT#' /boot/firmware/cmdline.txt sed -i 's#root=/dev/mmcblk0p2#root=LABEL=RASPIROOT#' /boot/firmware/cmdline.txt
@ -150,7 +150,7 @@ steps:
# clears /etc/resolv.conf on its own. # clears /etc/resolv.conf on its own.
- shell: | - shell: |
rm "${ROOT?}/etc/resolv.conf" rm "${ROOT?}/etc/resolv.conf"
root-fs: / root-fs: tag-root
# Clear /etc/machine-id and /var/lib/dbus/machine-id, as both should # Clear /etc/machine-id and /var/lib/dbus/machine-id, as both should
# be auto-generated upon first boot. From the manpage # be auto-generated upon first boot. From the manpage
@ -163,12 +163,12 @@ steps:
# Note this will also trigger ConditionFirstBoot=yes for systemd. # Note this will also trigger ConditionFirstBoot=yes for systemd.
# On Buster, /etc/machine-id should be an emtpy file, not an absent file # On Buster, /etc/machine-id should be an emtpy file, not an absent file
# On Bullseye, /etc/machine-id should not exist in an image # On Bullseye, /etc/machine-id should not exist in an image
- chroot: / - chroot: tag-root
shell: | shell: |
rm -f /etc/machine-id /var/lib/dbus/machine-id rm -f /etc/machine-id /var/lib/dbus/machine-id
__TOUCH_MACHINE_ID__ __TOUCH_MACHINE_ID__
# Create /etc/raspi-image-id to know, from what commit the image was built # Create /etc/raspi-image-id to know, from what commit the image was built
- chroot: / - chroot: tag-root
shell: | shell: |
echo "image based on revision: __GITCOMMIT__ and build on __BUILDTIME__ (UTC)" > "/etc/raspi-image-id" echo "image based on revision: __GITCOMMIT__ and build on __BUILDTIME__ (UTC)" > "/etc/raspi-image-id"