fix: resolve grub-pc / grub-efi-amd64 "held broken packages" conflict
The edition package lists installed BOTH grub-pc and grub-efi-amd64 (+ shim-signed). Those provide the same bootloader role and conflict in apt, so every rootfs build failed with "unable to correct problems, you have held broken packages". A rootfs now carries exactly ONE bootloader, chosen by the BOOT variable (mirroring the existing --boot bios|efi deploy option): - versions.mk / common.sh: BOOT := bios (bios -> grub-pc, efi -> grub-efi-amd64 + shim-signed + mokutil), exported via the Makefile. - build-rootfs.sh validates BOOT early and injects the matching boot packages into the apt install; the static package lists no longer contain any grub package. - deploy-disk.sh / build-image.sh / install.sh default --boot from the same BOOT variable, so a rootfs and the artifact deployed from it can never disagree (BOOT=efi make image-cloud produces a UEFI image). - mokutil is now installed explicitly in the efi flavour (it was not pulled in because we install with --no-install-recommends). - docs updated (building.md knob + rationale, secureboot.md note).
This commit is contained in:
@@ -20,6 +20,9 @@ set -euo pipefail
|
||||
: "${KERNEL_PACKAGE:=linux-image-amd64}"
|
||||
: "${KERNEL_VERSION:=6.12}"
|
||||
|
||||
# Boot flavour (mirrors versions.mk): bios → grub-pc, efi → grub-efi-amd64.
|
||||
: "${BOOT:=bios}"
|
||||
|
||||
# Toolchain policy for image builds:
|
||||
# auto (default) install the Arcline tools if build/debs/*.deb exist,
|
||||
# otherwise build without them (with a warning)
|
||||
|
||||
Reference in New Issue
Block a user