Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-09 18:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Ensure that grub/shim package installs do not install recommends for minimized ubuntu-cpc image builds (LP: #2037075)

Browse Source 
minimized cloud image policy, introduced in version 23.10.16, is to not install recommends for any package
installs during build. This is to keep the image as small as possible. This also extends to
the grub related packages.

This solves the problems detailed in LP: #2037075 and aligns other arches more with amd64 install of
grub/shim packages for both minimized and non minimized ubuntu-cpc cloud image builds.
This commit is contained in:
Philip Roche 2023-09-26 17:28:25 +01:00
parent 94ea97758d
commit 1a884c1427
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (23.10.47) UNRELEASED; urgency=medium
* fix: Ensure that grub/shim package installs do not install recommends for
minimized ubuntu-cpc image builds (LP: #2037075)
-- Phil Roche <phil.roche@canonical.com> Fri, 22 Sep 2023 11:59:10 +0100
livecd-rootfs (23.10.46) UNRELEASED; urgency=medium
[ Simon Poirier ]

16
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -106,25 +106,33 @@ install_grub() {
chroot mountpoint apt-get -y update
package_install_recommends_option=""
# minimized cloud image policy, introduced in version 23.10.16, is to not install recommends for any package
# installs during build. This is to keep the image as small as possible. This also extends to
# the grub related packages.
if [ "${SUBPROJECT:-}" = minimized ]; then
package_install_recommends_option="--no-install-recommends"
fi
# UEFI GRUB modules are meant to be used equally by Secure Boot and
# non-Secure Boot systems. If you need an extra module not already
# provided or run into "Secure Boot policy forbids loading X" problems,
# please file a bug against grub2 to include the affected module.
case $ARCH in
arm64)
chroot mountpoint apt-get -qqy install --no-install-recommends shim-signed grub-efi-arm64-signed
chroot mountpoint apt-get -qqy install ${package_install_recommends_option} shim-signed grub-efi-arm64-signed
efi_target=arm64-efi
;;
armhf)
chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm grub-efi-arm-bin
chroot mountpoint apt-get -qqy install ${package_install_recommends_option} grub-efi-arm grub-efi-arm-bin
efi_target=arm-efi
;;
amd64)
chroot mountpoint apt-get install -qqy grub-pc shim-signed
chroot mountpoint apt-get install -qqy ${package_install_recommends_option} grub-pc shim-signed
efi_target=x86_64-efi
;;
riscv64)
chroot mountpoint apt-get install -qqy u-boot-menu grub-efi-riscv64
chroot mountpoint apt-get install -qqy ${package_install_recommends_option} u-boot-menu grub-efi-riscv64
efi_target=riscv64-efi
chroot mountpoint u-boot-update