linux/meta-el-nfv-access.git/images, branch feature_CPDX-3562

Merge branch 'develop'

2021-06-28T10:11:18+00:00

Change-Id: I3dbb828abdc877f343ee2cc1d86cfa714593f918

OSTree /boot dir: Remove unused artifacts

2021-05-27T07:45:38+00:00

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

host image: drop rootfs.wic image artifact

2021-05-26T07:34:12+00:00

meta-intel and meta-updater both add "wic" to IMAGE_FSTYPES. However, it is not correctly configured for Enea Edge and it is not used, so let's just remove it. This also removes some build time tasks, e.g. building systemd-boot and their corresponding (unused) artifacts (systemd-bootx64.efi, linuxx64.stub.efi) from the deploy dir. Change-Id: Ib8e477bb7461708b6b7c74726a04a120b80d06d9 Signed-off-by: Alexandru Avadanii

initramfs: Cleanup upstream scripts, dependencies

2021-05-26T07:32:37+00:00

- do not install initramfs-module-* scripts that we won't use, e.g. initramfs-module-install, initramfs-module-install-efi; this removes their unused dependencies (e.g. grub-pc, parted), making the initramfs smaller; Depends-on: I6ce592a609650f0528314c14e6a0a2a4984ba864 Change-Id: I59143aad9ae80ad4a9a7fcbfc066d4783bcf4f2a Signed-off-by: Alexandru Avadanii

distro conf: require sota.conf.inc for atom, xeon

2021-05-26T07:27:23+00:00

Depends-on: I658c86f562743a50e5c078899e133e279b96027b Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e Signed-off-by: Alexandru Avadanii

grub: Fix duplicate/unused grubx64.efi, cleanup

2021-05-26T07:23:27+00:00

1. EFI_PREFIX: Fix duplicate grubx64.efi binaries by aligning paths: * by default, upstream meta-oe and meta-secure-core both install grubx64.efi, but in different locations (/boot/EFI/BOOT vs /boot/efi/EFI/BOOT) unless we explicitely override some vars to align the 2 paths; use the old behavior (/boot/efi/EFI/BOOT), as meta-secure-core has multiple recipes that reference it, while meta-oe allows changing the path via a single var override; * note that in an OSTree deployment, these paths don't even exist on target, we explicity install grubx64.efi during Enea Edge installation by copying grubx64.efi from /EFI/BOOT in hddimg; 2. live-vm-common: use ${EFI_FILES_PATH} instead of hardcoding it; 3. core-image-minimal-initramfs, enea-nfv-access: Blacklist grub-common-extras package on x86-64 machines if OSTree is used; Depends-On: I703b53fd09c5ed75731375414f3e711ec3dadc3e Change-Id: I3735bc004ece62f94172108f2e7ed4596942deea Signed-off-by: Alexandru Avadanii

enea-nfv-access-vnf: cloud-init-systemd package not found

2021-05-25T12:06:46+00:00

removed cloud-init-systemd package from VNF image since the content of this package is included now in cloud-init package. /usr/lib/systemd folder which supposed to be part of cloud-init-systemd is copied in cloud-init package(by default poky copy /usr/lib in ${PN}). So it result an empty folder which is not used to create cloud-init-systemd package anymore. Change-Id: I49a592f4a076df34f1d845a219d185b14722f80e Signed-off-by: Adrian Calianu

installer: grub: merge serial/gfx boot entries

2021-05-21T15:17:02+00:00

- drop our class override that basically reverted the boot menu entry order and used to make serial the first (default) boot entry instead of graphical; - unset GRUB_GFXSERIAL that creates 2 boot entries instead of one; - extend APPEND to contain both tty0 (graphical) and ttyS0 (serial): * ttyS0 is last, so it has priority for selection as /dev/console; Change-Id: I9be029bfea00d9aca61527046fedbe30e7ec58c2 Signed-off-by: Alexandru Avadanii

core-image-minimal-initramfs: remove ixgbe

2021-05-14T14:50:57+00:00

since it is building from kernel source tree Change-Id: Iaaed6e3cb6d55b4f1db398def68344cc6d7de575 Signed-off-by: Adrian Calianu

Add element-vcpe to enea-nfv-access image

2021-05-12T06:33:36+00:00

This reverts commit 9eceb046982de3da1921d97cedf4a3393e875d9a. Change-Id: I9f9eb70af6d6548f25f16f1031ba43bf298cb9e2