From 5f980c14dafb466e1d71e0b6e7487aa522ade9f9 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 24 Mar 2021 11:58:07 +0100 Subject: Upgrade to gatesgarth 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 --- classes/sota_atom-c3000.bbclass | 2 +- classes/sota_xeon-d.bbclass | 2 +- conf/distro/eneanfvaccess.conf | 2 +- conf/template.atom-c3000/bblayers.conf.sample | 1 + conf/template.atom-c3000/local.conf.sample | 2 ++ conf/template.xeon-d/bblayers.conf.sample | 1 + conf/template.xeon-d/local.conf.sample | 2 ++ images/enea-nfv-access-common.inc | 4 ++-- images/enea-nfv-access-host-common.inc | 12 ++++++++---- images/enea-nfv-access.bb | 1 - 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/classes/sota_atom-c3000.bbclass b/classes/sota_atom-c3000.bbclass index dff4294..cb44af4 100644 --- a/classes/sota_atom-c3000.bbclass +++ b/classes/sota_atom-c3000.bbclass @@ -7,7 +7,7 @@ WKS_FILE_sota = "efiimage-sota.wks" OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" # Set .otaimg to be used as source for generating hddimg -ROOTFS_sota = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.otaimg" +ROOTFS_sota = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ota-ext4" # OSTree initrd needs 'ramdisk_size' and 'rw' parameters in order to boot OSTREE_KERNEL_ARGS ?= "rw" diff --git a/classes/sota_xeon-d.bbclass b/classes/sota_xeon-d.bbclass index dff4294..cb44af4 100644 --- a/classes/sota_xeon-d.bbclass +++ b/classes/sota_xeon-d.bbclass @@ -7,7 +7,7 @@ WKS_FILE_sota = "efiimage-sota.wks" OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" # Set .otaimg to be used as source for generating hddimg -ROOTFS_sota = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.otaimg" +ROOTFS_sota = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ota-ext4" # OSTree initrd needs 'ramdisk_size' and 'rw' parameters in order to boot OSTREE_KERNEL_ARGS ?= "rw" diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index ae26b2d..c31363d 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -8,7 +8,7 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" INHERIT += "distrooverrides" -DISTRO_FEATURES_append = " odm efi-secure-boot" +DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge" DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" diff --git a/conf/template.atom-c3000/bblayers.conf.sample b/conf/template.atom-c3000/bblayers.conf.sample index 71c77cc..f5d25ce 100644 --- a/conf/template.atom-c3000/bblayers.conf.sample +++ b/conf/template.atom-c3000/bblayers.conf.sample @@ -28,4 +28,5 @@ BBLAYERS ?= " \ ##OEROOT##/meta-secure-core/meta-signing-key \ ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ ##OEROOT##/meta-enea-user-keys \ + ##OEROOT##/meta-python2 \ " diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index b015f43..374cace 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -273,3 +273,5 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +IMAGE_INSTALL += "dpdk" diff --git a/conf/template.xeon-d/bblayers.conf.sample b/conf/template.xeon-d/bblayers.conf.sample index 71c77cc..f5d25ce 100644 --- a/conf/template.xeon-d/bblayers.conf.sample +++ b/conf/template.xeon-d/bblayers.conf.sample @@ -28,4 +28,5 @@ BBLAYERS ?= " \ ##OEROOT##/meta-secure-core/meta-signing-key \ ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ ##OEROOT##/meta-enea-user-keys \ + ##OEROOT##/meta-python2 \ " diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 5cfebf5..fd14580 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -274,3 +274,5 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +IMAGE_INSTALL += "dpdk" diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 5472056..a10e2e2 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc @@ -18,9 +18,9 @@ rootfs_postinstall_dpkg_cleanup () { } ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" -IMAGE_FSTYPES = "ext4 ext4.gz tar.gz" +IMAGE_FSTYPES += "ext4 ext4.gz tar.gz" # Add ostree specific image types if sota support is set -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'otaimg wic', ' ', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ota-ext4 wic', ' ', d)}" SOTA_CLIENT = "" SOTA_CLIENT_PROV = "" diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index 1cde827..c0cd896 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc @@ -3,8 +3,6 @@ REQUIRE_FILES = " \ classes/override_grub-efi.inc \ " REQUIRE_FILES_append_df-efi-secure-boot = " \ - classes/override_image_types_ostree.inc \ - classes/override_image_types_ota.inc \ classes/override_grub-efi_secureboot.inc \ images/secure-boot.inc \ " @@ -16,6 +14,12 @@ IMAGE_INSTALL += " \ packagegroup-enea-virtualization-4gusb-modems \ " +#This should not be needed, it's a hack. Without it it complains hddimg is not recognize +#See image.bbclass +13. +#inherit image-live + +IMAGE_FSTYPES += "hddimg" + # Set labels for GRUB and SYSLINUX LABELS_LIVE = "installer live-boot" @@ -30,13 +34,13 @@ AUTO_SYSLINUXMENU_x86-64 = "0" # grub-efi-native is needed in recipe-sysroot-native to generate the initial # configuration file for grub -DEPENDS_append += " grub-efi-native" +DEPENDS_append += " grub-efi-native qemuwrapper-cross" # If building with sota enabled, build the otaimg before the hddimg, because # the hddimg needs it as a base image python __anonymous() { if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): - d.appendVarFlag("do_bootimg", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True)) + d.appendVarFlag("do_bootimg", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) } # Append OSTree specific parameters to the kernel command line before creating the live image diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb index 9311992..08239ae 100644 --- a/images/enea-nfv-access.bb +++ b/images/enea-nfv-access.bb @@ -3,5 +3,4 @@ DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM require images/enea-nfv-access-host-common.inc IMAGE_INSTALL += " \ - element-vcpe \ " -- cgit v1.2.3-54-g00ecf