From 580595398d36da3cde87046b3b03b9c2c3831249 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 26 Apr 2021 14:04:04 +0200 Subject: OSTree /boot dir: Remove unused artifacts OSTree handles the contents of /boot separately from the rest of the filesystem, see [1]. By default, upstream yocto rootfs generation stores the following artifacts in /boot: - kernel-image (bzImage) as /boot/bzImage-...; - multiple packages that deploy grub.cfg, grubenv and EFI binaries: * dpkg -S /boot/efi/EFI/BOOT shim, seloader, ovmf-pkcs7-efi, grub-efi, grub-bootconf, efitools However, none of these are ever used in Enea Edge, due to the way our initial installation and subsequent upgrade work: * live image building copies the kernel image from yocto deploy dir, EFI binaries from rootfs /boot (this patch changes this to also copy from the yocto deploy dir "bootloader" dir for uniformity) to the root of the hddimg image; * Enea Edge Installer (via utils.sh) creates the ESP partition and copies all artifacts from hddimg to ESP under /EFI/BOOT [2]; * (currently) subsequent upgrades do _not_ update the contents of the ESP /EFI/BOOT directory after initial installation; * subsequent upgrades copy the kernel and ostree-initramfs from OSTree rootfs (from /usr/lib/modules where ostree-kernel package resides) to the ESP for SELoader validation; This flow leaves unused (duplicate) artifacts in the following path: /ostree/boot.x/poky//0/boot/ While the kernel-image package can be omitted from installation, since ostree-kernel package already installs the same binaries in /usr/lib/modules (where OSTree will look for it), the rest of the packages (shim, seloader etc.) also install other files to the rootfs (e.g. CLI tools) and/or are used by the live image (hddimg) build process as sources when copying said artifacts to the hddimg image; so we can't simply skip installing them inside the rootfs. Also, we want non-SOTA artifacts (e.g. rootfs.ext4) to still contain these artifacts. So the only sensible solution to avoiding confusion and removing unused artifacts from OSTree images is to remove them right before creating the OSTree image. While at it, add some ENEA-specific comment markers to our prepend/ append fragments to make them stand out. [1] https://github.com/ostreedev/ostree/blob/v2020.8/docs/\ atomic-upgrades.md#the-ostreeboot-directory [2] http://sestogerrit02/cgit/linux/meta-enea-virtualization.git/tree/ recipes-enea/nfv-installer/nfv-installer/utils.sh?h=rocko#n230 Change-Id: I470c1c3d19f301cae4b8fbe184aa2906d4a25ddf Signed-off-by: Alexandru Avadanii --- images/enea-nfv-access-host-common.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'images') diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index 8d1a5ff..a8c984f 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc @@ -30,12 +30,15 @@ AUTO_SYSLINUXMENU_x86-64 = "0" # If building with sota enabled, build the otaimg before the hddimg, because # the hddimg needs it as a base image python __anonymous() { + ## ENEA_start ## if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): d.appendVarFlag("do_bootimg", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) + ## ENEA_end ## } # Append OSTree specific parameters to the kernel command line before creating the live image python do_bootimg_prepend () { + ## ENEA_start ## if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): ostree_osname = d.getVar('OSTREE_OSNAME') checksum = bb.utils.sha256_file(d.getVar('DEPLOY_DIR_IMAGE') + "/" + d.getVar('OSTREE_KERNEL')) @@ -44,18 +47,32 @@ python do_bootimg_prepend () { ostree_params = " ostree=/ostree/boot.1/" + ostree_osname + "/" + checksum + "/0" d.setVar("APPEND", d.getVar("APPEND") + ostree_params) + ## ENEA_end ## } # Before building the OSTree image, move DPKG data to /usr/dpkg, because # OSTree does not preserve the contents of /var IMAGE_CMD_ostree_prepend () { + ## ENEA_start ## + # Note: We do configure DPKG admindir at build time, but we can't do the same for APT since + # yocto hardcodes /var/lib/dpkg paths in various places in OE-core, which we can't override, + # so instead we move the contents to their expected location here and configure apt at runtime + # via a configuration fragment to use the new location. mkdir -p usr/dpkg/lib/dpkg if [ "$(ls -A var/lib/dpkg)" ]; then mv var/lib/dpkg/* usr/dpkg/lib/dpkg/ fi + # In Enea Edge, the EFI binaries (shim, seloader etc.) are copied from the yocto deploy dir to + # the installation image (hddimg) - see "classes/override_live-vm-common.inc" in this repo; + # and during Enea Edge installation (via utils.sh) from hddimg to the destination disk. + # Files installed by the package manager end up under OSTree /boot hardlink tree, but are + # never actually used. To avoid confusion and save some resources, clean them up. + rm -rf boot/* + ## ENEA_end ## } IMAGE_CMD_ota_prepend () { + ## ENEA_start ## if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then # Upstream bbclass creates /boot/grub2, complement it with /boot/grub # Note: /boot/grub2 is a dir with /boot/grub2/grub.cfg -> ../loader/grub.cfg symlink @@ -63,4 +80,5 @@ IMAGE_CMD_ota_prepend () { mkdir -p ${OTA_SYSROOT}/boot ln -s loader ${OTA_SYSROOT}/boot/grub fi + ## ENEA_end ## } -- cgit v1.2.3-54-g00ecf