diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-03-29 19:09:53 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2021-04-09 13:20:11 +0200 |
commit | a14950444f22e7aaed1cce3c061c860572cf262f (patch) | |
tree | 1a41f9445d57e84551294fb11a09ac10b2bd7e1c /images | |
parent | 17dae722fbab32bd477a650b3f6b412b7dc7b20f (diff) | |
download | meta-el-nfv-access-a14950444f22e7aaed1cce3c061c860572cf262f.tar.gz |
classes: Rebase override_image_types_{ota,ostree}
- 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>
Diffstat (limited to 'images')
-rw-r--r-- | images/enea-nfv-access-host-common.inc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index b3f110a..82e9792 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc | |||
@@ -59,3 +59,13 @@ IMAGE_CMD_ostree_prepend () { | |||
59 | mv var/lib/dpkg/* usr/dpkg/lib/dpkg/ | 59 | mv var/lib/dpkg/* usr/dpkg/lib/dpkg/ |
60 | fi | 60 | fi |
61 | } | 61 | } |
62 | |||
63 | IMAGE_CMD_ota_prepend () { | ||
64 | if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then | ||
65 | # Upstream bbclass creates /boot/grub2, complement it with /boot/grub | ||
66 | # Note: /boot/grub2 is a dir with /boot/grub2/grub.cfg -> ../loader/grub.cfg symlink | ||
67 | # while /boot/grub -> loader is a symlink to also account for /boot/grub/grubenv | ||
68 | mkdir -p ${OTA_SYSROOT}/boot | ||
69 | ln -s loader ${OTA_SYSROOT}/boot/grub | ||
70 | fi | ||
71 | } | ||