| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: I3dbb828abdc877f343ee2cc1d86cfa714593f918
|
| |
| |
| |
| |
| |
| |
| | |
Change name into Enea Edge for build output files
Change-Id: I760411db66617f6eabc2041db42be24fc3633c33
Signed-off-by: Catalin Iova <Catalin.Iova@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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/<poky hash>/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 <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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 <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| | |
Depends-on: I658c86f562743a50e5c078899e133e279b96027b
Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <adrian.calianu@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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 <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| | |
since it is building from kernel source tree
Change-Id: Iaaed6e3cb6d55b4f1db398def68344cc6d7de575
Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
|
| |
| |
| |
| |
| |
| | |
This reverts commit 9eceb046982de3da1921d97cedf4a3393e875d9a.
Change-Id: I9f9eb70af6d6548f25f16f1031ba43bf298cb9e2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- qemucross-wrapper was added during the gatesgarth rebase as a
workaround and is not currently needed;
- grub-efi-native was added during the initial SOTA grub integration
and is no longer needed (fixed by adding the correct DEPENDS in the
grub-efi recipe);
Change-Id: Ib415fcd80dbcbccb6e25068abd1c5a6bbad3a460
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| | |
This reverts commit 8a666dac9fce6e073c34768e3b8a80eaaedfd887.
Change-Id: I96ea9fc565974bd66a252e178a0615e1b4bc0e9e
|
| |
| |
| |
| |
| |
| |
| |
| | |
Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>
Change-Id: I8892684cf302edaca98f50448d424432545df8de
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These were added to all images inheriting sota.bbclass.
We don't use them, so spare some unexpected dependencies by removing
them.
[1] https://github.com/advancedtelematic/meta-updater/commit/3bb86635
Change-Id: I01334024b70c161d1614bf2e7296cd3f7146ee13
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
While at it, replace some hardcoded p7b extenstions with ${SB_FILE_EXT}
and vmlinuz references with the appropiate variable (upstream no longer
renames bzImage to vmlinuz in ISO root after [1]).
[1] https://git.yoctoproject.org/cgit.cgi/poky/commit/?id=b6e36c01977
Change-Id: I5ce414a2f281ff2f1aeb0e26f35608cd8750855d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- override_image_types_ostree.inc is no longer required;
- override_image_types_ota.inc is mostly superseded by upstream, except
the creation of /boot/grub as a symlink to /boot/loader
(note that /boot/grub2 is a real dir with /boot/grub2/grub.cfg being
a symlink to /boot/loader/grub.cfg - it would be quite
complicated to override the whole IMAGE_CMD_ota just to keep
symlinking the parent dir instead of grub.cfg directly); /boot/grub
should be a symlink so that /boot/grub/grubenv also points to
/boot/loader/grubenv); fold its contents into
enea-nfv-access-host-common.inc as it doesn't override a class anymore
Note: Previously, OSTree did not follow symlinks, so the symlink
/boot/grub2/grub.cfg was being overwritten with a real file,
this is no longer an issue.
Change-Id: I38ec2b3a791ef7068b97caa49010eee62b7f4aee
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
While at it, remove one obsoleted workaround from do_image_otaimg:
grub:do_populate_sysroot was removed from do_image_otaimg
(do_image_ota_ext4) deps in [1].
[1] https://github.com/advancedtelematic/meta-updater/commit/850801c
Change-Id: I45f77010aa9cd62dec2e37b278539dc4d28605c5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Adding IMG_FSTYPES += "hddimg" must be done before inheriting core-image
(in enea-image-common.inc) to avoid parsing errors.
Further, override_grub-efi_secureboot.inc overrides some functions
brought in by adding hddimg image type, so adding it after the include
would render the override useless.
Change-Id: Id87fc69c5dd5d0de953fbe014f639d382c3714e8
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|/
|
|
|
|
|
|
| |
This is an initial commit, containing quick fixes and hacks to allow
building the images. All these issues will be re-evaluated and fixed
properly in their own commits.
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|
|
|
|
|
|
| |
this was disabled from kernel source tree
Change-Id: I82ff784dae6d34de19966b61f194944dba2adbe9
Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- initramfs: remove run-postinsts package, it has no purpose as there is
no package manager inside the initramfs;
- rootfs: remove run-postinsts if the package manager is DPKG/APT, since
it duplicates the existing dpkg-configure.service installed by the
dpkg recipe;
- rootfs: cleanup DPKG backup file 'status-old', it contains information
about packages before the final installation stages of the rootfs
build process (completely irrelevant for the end user), saves >500kB;
Change-Id: I6bd257d56805a3dfee4478c88977942e9f210afc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
|
| |
Change-Id: I916fc13c7979e4ab9077ec3e43b67b3a5320b74c
Signed-off-by: Catalin Iova <Catalin.Iova@enea.com>
|
|
|
|
|
| |
Change-Id: I2a103bd73f5daaea8357ff2c5094dc2dd7fdf193
Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>
|
|
|
|
|
|
|
| |
Skip menus and boot default selection (installer initramfs) immediately
Change-Id: I4c7acb2291663e3648f4cb13f7c238cb9c31c4d2
Signed-off-by: Martin Borg <martin.borg@enea.com>
|
|
|
|
|
|
| |
to the installer
Change-Id: I170f961cc9d6bc257fa159481a24d9689c4b4a49
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
override_image_types_ostree.inc - do_image_ostree task:
-add dirs, cleandirs flags, to avoid mktemp, rm, cd, and to
also remove at clean
-add subimages, imgsuffix flags, to use automatic link creation
-create image in IMGDEPLOYDIR, instead of DEPLOY_DIR_IMAGE
to use the automatic deploy and clean mechanism (also helps
in cleaning old images)
override_image_types_ota.inc - do_image_otaimg task:
-add dirs, cleandirs flags, to avoid mktemp, rm, cd, and to
also remove at clean
-avoid untar-ing the ostree image, and use OSTREE_ROOTFS
-create image in IMGDEPLOYDIR, instead of DEPLOY_DIR_IMAGE
to use the automatic deploy and clean mechanism
Move OSTREE_REPO to "${WORKDIR}/ostree-repo", instead of
DEPLOY_DIR_IMAGE, this repo is needed for otaimg creation
sota_xeon-d.bbclass sota_atom-c3000.bbclass:
-set ROOTFS_sota to IMGDEPLOYDIR insted of DEPLOY_DIR_IMAGE,
as this is where the otaimg is now created; also use IMAGE_LINK_NAME
istead of IMAGE_NAME, to have the correct reference to the image,
even if the image was built in a previous run (IMAGE_NAME differs
in this case)
Change-Id: I44e87311d1819b80d34f924630d09e429d411d41
Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
|
|
|
|
|
|
|
| |
ostree is not dependant on the aktualizr packages
Change-Id: Ib2118bac710fa4106b1c4f4ee65e2baf58bdbaa8
Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
|
|
|
|
|
|
|
| |
This is where ostree dpkg is now expecting the files to be
Change-Id: Ifdb7d86f9a72b3a5bb59814439643fecc1aa78c1
Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
|
|
|
|
|
|
|
|
|
| |
Split the class override into generic changes and Secure Boot specific
(efi_populate). This allows us to override the secureboot parts only if the
efi-secure-boot distro feature is enabled.
Change-Id: I68ab1a9eae2ffceecd057506ef493b4388ff5343
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This will allow us to override variables depending on this
distro feature more easily.
Make Secure Boot related changes apply only efi-secure-boot distro
feature is enabled. This will avoid any errors when building without the
feature enabled.
Change-Id: If07256977a647386cd43c5940357a0dedc95f95d
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|
|
|
|
|
|
|
| |
Override the class to install the kernel and initramfs signature files
into the ostree image.
Change-Id: I3cd9d1b0dcb2519802443d9a959a3b35e8a9a823
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|
|
|
|
| |
Change-Id: I09c9b0bad8e85e75fb1510ff374540fad3c3b5d1
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|
|
|
|
|
|
|
| |
From syslinux doc:
”A timeout of zero will disable the timeout completely.”
Change-Id: Ic71ed27ee1d2f9fecf2e9fab983848b65f569f04
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
|
|
|
|
|
|
| |
rename enea-nfv-access-edgelink-netconf to enea-nfv-access
Change-Id: Ia55a1e0b4b3581f77633e1a30235687a50c278c5
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A forced build of do_image_ostree task results in error due to
/var/lib/dpkg folder being empty after it was moved out in previous
builds.
| mv: cannot stat
'/data/fb/addu/nfv-rocko/poky/build-xeond-sb/tmp/work/xeon_d-enea-linux/enea-nfv-access-edgelink-netconf/1.0-r0/rootfs/var/lib/dpkg/*':
No such file or directory
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_image_ostree
Change-Id: Ia61278eeabec9062e57cc508348be2efcf7599e1
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
|
|
|
|
|
| |
Change-Id: Ifc322d78f4ef8634b16635fd0e8b008f6a56473c
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
|
|
|
|
| |
Change-Id: Ic063f096643ad52556b84f97f230b5fbf776f4f0
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|
|
|
|
| |
Change-Id: I7b9fad743da343bc73c0ad11374faa944e5b3627
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|
|
|
|
| |
Change-Id: Ibadaa8052fcae85f5860a095ea127e69ee421a76
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|
|
|
|
| |
Change-Id: I3ccdcd42ba9d1c718ed7d8266c5272e98394f9bc
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|
|
|
|
| |
Change-Id: I90ebfc33309181fcfd2c5f331ceb4f5ba53e60e2
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|
|
|
|
| |
Change-Id: I9275a7a3a7ebf5f7f3a8c1384d8eade98cd8043c
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|\ |
|
| |
| |
| |
| |
| | |
Change-Id: I9b82298fce155d695256d8302c5dfd96cabc0c8f
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|\ \ |
|
| |/
| |
| |
| |
| | |
Change-Id: I2639a39eb0595c3e5f10bcbc82d387ee1e224cbf
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|/
|
|
|
| |
Change-Id: I244a945b95d498b0d46364ab39705102c5fad659
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
|
|
|
|
|
|
|
|
|
| |
Add utilities required to manage GRUB environment
block. Utilities are useful for GRUB failover
mechanism.
Change-Id: I4cb6b6cfc773c575004a454bdc39483392f5d8fb
Signed-off-by: Bogdan Pricope <Bogdan.Pricope@enea.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add override_grub-efi.inc to override "build_efi_cfg" function
from grub-efi.bbclass, in order to add GRUB_GRAPHICS variable
for grub menuentry specific parameters.
Set "console=tty0" for graphic console options for grub
and syslinux, and also "console=ttyS0" for serial.
Change-Id: If338d9f7e1b82fc91a026ef48ae30647c1049f8b
Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
|