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 --- 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 ++ 5 files changed, 7 insertions(+), 1 deletion(-) (limited to 'conf') 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" -- cgit v1.2.3-54-g00ecf From e79eac4f77fd48cc93a8e7417732cf2034a14ee5 Mon Sep 17 00:00:00 2001 From: Matei Valeanu Date: Tue, 20 Apr 2021 15:17:15 +0200 Subject: conf: Update default distro version to 2.5.0 Change-Id: I2cd5cc806e9264151897124b2dae42752f102afb Signed-off-by: Matei Valeanu --- conf/distro/eneanfvaccess.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index ae26b2d..1b6c693 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -1,7 +1,7 @@ require conf/distro/enea.conf DISTRO_NAME = "Enea NFV Access" -DISTRO_VERSION_MAJOR ??= "2.4" +DISTRO_VERSION_MAJOR ??= "2.5" DISTRO_VERSION_MINOR ??= ".0" DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" -- cgit v1.2.3-54-g00ecf From 511186d28fb9d6e6ec851cd5e3a1e0a62d937b9d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 19 Apr 2021 09:05:24 +0200 Subject: conf/local.conf: Drop 'dpdk' from IMAGE_INSTALL This was added as a workaround during the gatesgarth rebase and is no longer needed. Signed-off-by: Alexandru Avadanii Change-Id: I627c75b77d1fc2ec4fb6de9c45ac3712cce7966f --- conf/template.atom-c3000/local.conf.sample | 2 -- conf/template.xeon-d/local.conf.sample | 2 -- 2 files changed, 4 deletions(-) (limited to 'conf') diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index 374cace..b015f43 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -273,5 +273,3 @@ 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/local.conf.sample b/conf/template.xeon-d/local.conf.sample index fd14580..5cfebf5 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -274,5 +274,3 @@ 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" -- cgit v1.2.3-54-g00ecf From 82e1dd381f46548e65dac1b3341c44f8bbbed1c4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 5 May 2021 09:30:15 +0200 Subject: layer.conf: LAYERSERIES_COMPAT: add gatesgarth Signed-off-by: Alexandru Avadanii Change-Id: I0de2153af16f32309afd96402366ab0bb3edbf85 --- conf/layer.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/layer.conf b/conf/layer.conf index 7fec7c8..bd9ac81 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,3 +11,4 @@ BBFILE_COLLECTIONS += "el-nfv-access" BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/" BBFILE_PRIORITY_el-nfv-access = "7" LAYERDEPENDS_el-nfv-access = "nfv-access-common enea-virtualization" +LAYERSERIES_COMPAT_el-nfv-access = "gatesgarth" -- cgit v1.2.3-54-g00ecf From 8ebb8350582b45f776614f2158f4c08343e0bb8e Mon Sep 17 00:00:00 2001 From: Catalin Iova Date: Wed, 28 Apr 2021 09:40:22 +0200 Subject: images: Change name to Enea Edge Change name into Enea Edge for build output files Change-Id: I760411db66617f6eabc2041db42be24fc3633c33 Signed-off-by: Catalin Iova --- conf/distro/eneanfvaccess.conf | 2 +- conf/template.atom-c3000-debug/conf-notes.txt | 2 +- conf/template.atom-c3000/conf-notes.txt | 2 +- conf/template.qemux86-64-esdk/conf-notes.txt | 2 +- conf/template.qemux86-64/conf-notes.txt | 2 +- conf/template.xeon-d-debug/conf-notes.txt | 2 +- conf/template.xeon-d/conf-notes.txt | 2 +- images/enea-edge-common.inc | 26 ++++++++++ images/enea-edge-host-common.inc | 69 +++++++++++++++++++++++++++ images/enea-edge-runtime-debug.bb | 9 ++++ images/enea-edge-runtime-esdk.bb | 7 +++ images/enea-edge-runtime-sdk.bb | 11 +++++ images/enea-edge-runtime.bb | 7 +++ images/enea-edge-vnf.bb | 16 +++++++ images/enea-nfv-access-common.inc | 26 ---------- images/enea-nfv-access-debug.bb | 9 ---- images/enea-nfv-access-esdk.bb | 7 --- images/enea-nfv-access-host-common.inc | 69 --------------------------- images/enea-nfv-access-sdk.bb | 11 ----- images/enea-nfv-access-vnf.bb | 16 ------- images/enea-nfv-access.bb | 7 --- 21 files changed, 152 insertions(+), 152 deletions(-) create mode 100644 images/enea-edge-common.inc create mode 100644 images/enea-edge-host-common.inc create mode 100644 images/enea-edge-runtime-debug.bb create mode 100644 images/enea-edge-runtime-esdk.bb create mode 100644 images/enea-edge-runtime-sdk.bb create mode 100644 images/enea-edge-runtime.bb create mode 100644 images/enea-edge-vnf.bb delete mode 100644 images/enea-nfv-access-common.inc delete mode 100644 images/enea-nfv-access-debug.bb delete mode 100644 images/enea-nfv-access-esdk.bb delete mode 100644 images/enea-nfv-access-host-common.inc delete mode 100644 images/enea-nfv-access-sdk.bb delete mode 100644 images/enea-nfv-access-vnf.bb delete mode 100644 images/enea-nfv-access.bb (limited to 'conf') diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 1b6c693..ed7383e 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -1,6 +1,6 @@ require conf/distro/enea.conf -DISTRO_NAME = "Enea NFV Access" +DISTRO_NAME = "Enea Edge Runtime" DISTRO_VERSION_MAJOR ??= "2.5" DISTRO_VERSION_MINOR ??= ".0" DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" diff --git a/conf/template.atom-c3000-debug/conf-notes.txt b/conf/template.atom-c3000-debug/conf-notes.txt index 1c1c026..d4da82b 100644 --- a/conf/template.atom-c3000-debug/conf-notes.txt +++ b/conf/template.atom-c3000-debug/conf-notes.txt @@ -1,2 +1,2 @@ Common targets are: - enea-nfv-access-debug + enea-edge-runtime-debug diff --git a/conf/template.atom-c3000/conf-notes.txt b/conf/template.atom-c3000/conf-notes.txt index ebd6162..580c5c9 100644 --- a/conf/template.atom-c3000/conf-notes.txt +++ b/conf/template.atom-c3000/conf-notes.txt @@ -1,2 +1,2 @@ Common targets are: - enea-nfv-access + enea-edge-runtime diff --git a/conf/template.qemux86-64-esdk/conf-notes.txt b/conf/template.qemux86-64-esdk/conf-notes.txt index e939ec6..14d7575 100644 --- a/conf/template.qemux86-64-esdk/conf-notes.txt +++ b/conf/template.qemux86-64-esdk/conf-notes.txt @@ -1,2 +1,2 @@ Common targets are: - enea-nfv-access-esdk + enea-edge-runtime-esdk diff --git a/conf/template.qemux86-64/conf-notes.txt b/conf/template.qemux86-64/conf-notes.txt index e55e538..2b65747 100644 --- a/conf/template.qemux86-64/conf-notes.txt +++ b/conf/template.qemux86-64/conf-notes.txt @@ -1,2 +1,2 @@ Common targets are: - enea-nfv-access-vnf + enea-edge-vnf diff --git a/conf/template.xeon-d-debug/conf-notes.txt b/conf/template.xeon-d-debug/conf-notes.txt index 1c1c026..d4da82b 100644 --- a/conf/template.xeon-d-debug/conf-notes.txt +++ b/conf/template.xeon-d-debug/conf-notes.txt @@ -1,2 +1,2 @@ Common targets are: - enea-nfv-access-debug + enea-edge-runtime-debug diff --git a/conf/template.xeon-d/conf-notes.txt b/conf/template.xeon-d/conf-notes.txt index ebd6162..580c5c9 100644 --- a/conf/template.xeon-d/conf-notes.txt +++ b/conf/template.xeon-d/conf-notes.txt @@ -1,2 +1,2 @@ Common targets are: - enea-nfv-access + enea-edge-runtime diff --git a/images/enea-edge-common.inc b/images/enea-edge-common.inc new file mode 100644 index 0000000..5472056 --- /dev/null +++ b/images/enea-edge-common.inc @@ -0,0 +1,26 @@ +require images/enea-image-common.inc + +IMAGE_FEATURES += "ssh-server-openssh" + +IMAGE_INSTALL += " \ + packagegroup-enea-virtualization \ + kernel-modules \ + " + +# run-postinsts duplicates dpkg-configure if package_deb is used +PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" + +# After installing packages inside the rootfs, remove backup DPKG status file +rootfs_postinstall_dpkg_cleanup () { + if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then + rm -f ${IMAGE_ROOTFS}/var/lib/dpkg/status-old + fi +} +ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" + +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)}" +SOTA_CLIENT = "" +SOTA_CLIENT_PROV = "" diff --git a/images/enea-edge-host-common.inc b/images/enea-edge-host-common.inc new file mode 100644 index 0000000..6d446a0 --- /dev/null +++ b/images/enea-edge-host-common.inc @@ -0,0 +1,69 @@ +REQUIRE_FILES = " \ + images/enea-edge-common.inc \ + 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 \ + " + +require ${REQUIRE_FILES} + +IMAGE_INSTALL += " \ + packagegroup-enea-virtualization-host \ + packagegroup-enea-virtualization-4gusb-modems \ + " + +# Set labels for GRUB and SYSLINUX +LABELS_LIVE = "installer live-boot" + +GRUB_GFXSERIAL_x86-64 = "1" +# Append default parameters for x86-64 targets +APPEND_x86-64 = "quiet" +SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200" + +# Skip menu and boot installer immediately +GRUB_TIMEOUT_x86-64 = "0" +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" + +# 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)) +} + +# Append OSTree specific parameters to the kernel command line before creating the live image +python do_bootimg_prepend () { + 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')) + + # The boot tree is identified through a sha256 checksum over the kernel binary + ostree_params = " ostree=/ostree/boot.1/" + ostree_osname + "/" + checksum + "/0" + + d.setVar("APPEND", d.getVar("APPEND") + ostree_params) +} + +# Get rid of GRUB dependencies added by ostree. See: +# https://git.enea.com/cgit/linux/meta-updater.git/tree/classes/image_types_ota.bbclass#n45 +python __anonymous () { + d.delVarFlag("do_image_otaimg", "depends") + d.setVarFlag("do_image_otaimg", "depends", "e2fsprogs-native:do_populate_sysroot") +} + +# Before building the OSTree image, move DPKG data to /usr/dpkg, because +# OSTree does not preserve the contents of /var +IMAGE_CMD_ostree_prepend () { + + install -d ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg + if [ "$(ls -A ${IMAGE_ROOTFS}/var/lib/dpkg)" ]; then + mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg/ + fi +} diff --git a/images/enea-edge-runtime-debug.bb b/images/enea-edge-runtime-debug.bb new file mode 100644 index 0000000..4736f24 --- /dev/null +++ b/images/enea-edge-runtime-debug.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations" + +require images/enea-edge-host-common.inc + +IMAGE_INSTALL += " \ + element-vcpe \ + gdbserver \ + oprofile \ + " diff --git a/images/enea-edge-runtime-esdk.bb b/images/enea-edge-runtime-esdk.bb new file mode 100644 index 0000000..d424ef6 --- /dev/null +++ b/images/enea-edge-runtime-esdk.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Image for building the ESDK for the Host side" + +require images/enea-image-common.inc + +IMAGE_FEATURES += "ssh-server-openssh" + +IMAGE_FEATURES += "dbg-pkgs dev-pkgs" diff --git a/images/enea-edge-runtime-sdk.bb b/images/enea-edge-runtime-sdk.bb new file mode 100644 index 0000000..c6a15b4 --- /dev/null +++ b/images/enea-edge-runtime-sdk.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Image for building the SDK for the host side of the Enea Edge Runtime with ODM customizations" + +require images/enea-edge-host-common.inc + +IMAGE_INSTALL += " \ + element-odm-sdk \ + " + +TOOLCHAIN_TARGET_TASK_append = " kernel-devsrc" + +IMAGE_FEATURES += "dbg-pkgs dev-pkgs" diff --git a/images/enea-edge-runtime.bb b/images/enea-edge-runtime.bb new file mode 100644 index 0000000..5071619 --- /dev/null +++ b/images/enea-edge-runtime.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations" + +require images/enea-edge-host-common.inc + +IMAGE_INSTALL += " \ + element-vcpe \ + " diff --git a/images/enea-edge-vnf.bb b/images/enea-edge-vnf.bb new file mode 100644 index 0000000..9351160 --- /dev/null +++ b/images/enea-edge-vnf.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "VNF image of the Enea Edge Runtime, includes kernel, rootfs and boot parameters" + +require images/enea-edge-common.inc + +IMAGE_FSTYPES += "wic.qcow2" +WKS_FILE = "enea-edge-vnf-qemux86-64.wks" + +CLOUDINITPKGS = "cloud-init util-linux-blkid" +CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}" + +IMAGE_INSTALL += " \ + packagegroup-enea-virtualization-guest \ + nfv-init \ + iperf3 \ + ${CLOUDINITPKGS} \ + " diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc deleted file mode 100644 index 5472056..0000000 --- a/images/enea-nfv-access-common.inc +++ /dev/null @@ -1,26 +0,0 @@ -require images/enea-image-common.inc - -IMAGE_FEATURES += "ssh-server-openssh" - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization \ - kernel-modules \ - " - -# run-postinsts duplicates dpkg-configure if package_deb is used -PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" - -# After installing packages inside the rootfs, remove backup DPKG status file -rootfs_postinstall_dpkg_cleanup () { - if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then - rm -f ${IMAGE_ROOTFS}/var/lib/dpkg/status-old - fi -} -ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" - -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)}" -SOTA_CLIENT = "" -SOTA_CLIENT_PROV = "" diff --git a/images/enea-nfv-access-debug.bb b/images/enea-nfv-access-debug.bb deleted file mode 100644 index 63a2322..0000000 --- a/images/enea-nfv-access-debug.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations" - -require images/enea-nfv-access-host-common.inc - -IMAGE_INSTALL += " \ - element-vcpe \ - gdbserver \ - oprofile \ - " diff --git a/images/enea-nfv-access-esdk.bb b/images/enea-nfv-access-esdk.bb deleted file mode 100644 index d424ef6..0000000 --- a/images/enea-nfv-access-esdk.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Image for building the ESDK for the Host side" - -require images/enea-image-common.inc - -IMAGE_FEATURES += "ssh-server-openssh" - -IMAGE_FEATURES += "dbg-pkgs dev-pkgs" diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc deleted file mode 100644 index 1cde827..0000000 --- a/images/enea-nfv-access-host-common.inc +++ /dev/null @@ -1,69 +0,0 @@ -REQUIRE_FILES = " \ - images/enea-nfv-access-common.inc \ - 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 \ - " - -require ${REQUIRE_FILES} - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-host \ - packagegroup-enea-virtualization-4gusb-modems \ - " - -# Set labels for GRUB and SYSLINUX -LABELS_LIVE = "installer live-boot" - -GRUB_GFXSERIAL_x86-64 = "1" -# Append default parameters for x86-64 targets -APPEND_x86-64 = "quiet" -SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200" - -# Skip menu and boot installer immediately -GRUB_TIMEOUT_x86-64 = "0" -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" - -# 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)) -} - -# Append OSTree specific parameters to the kernel command line before creating the live image -python do_bootimg_prepend () { - 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')) - - # The boot tree is identified through a sha256 checksum over the kernel binary - ostree_params = " ostree=/ostree/boot.1/" + ostree_osname + "/" + checksum + "/0" - - d.setVar("APPEND", d.getVar("APPEND") + ostree_params) -} - -# Get rid of GRUB dependencies added by ostree. See: -# https://git.enea.com/cgit/linux/meta-updater.git/tree/classes/image_types_ota.bbclass#n45 -python __anonymous () { - d.delVarFlag("do_image_otaimg", "depends") - d.setVarFlag("do_image_otaimg", "depends", "e2fsprogs-native:do_populate_sysroot") -} - -# Before building the OSTree image, move DPKG data to /usr/dpkg, because -# OSTree does not preserve the contents of /var -IMAGE_CMD_ostree_prepend () { - - install -d ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg - if [ "$(ls -A ${IMAGE_ROOTFS}/var/lib/dpkg)" ]; then - mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg/ - fi -} diff --git a/images/enea-nfv-access-sdk.bb b/images/enea-nfv-access-sdk.bb deleted file mode 100644 index a957add..0000000 --- a/images/enea-nfv-access-sdk.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Image for building the SDK for the host side of the Enea NFV Access Platform with ODM customizations" - -require images/enea-nfv-access-host-common.inc - -IMAGE_INSTALL += " \ - element-odm-sdk \ - " - -TOOLCHAIN_TARGET_TASK_append = " kernel-devsrc" - -IMAGE_FEATURES += "dbg-pkgs dev-pkgs" diff --git a/images/enea-nfv-access-vnf.bb b/images/enea-nfv-access-vnf.bb deleted file mode 100644 index a3902c2..0000000 --- a/images/enea-nfv-access-vnf.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "VNF image of the Enea NFV Access Platform, includes kernel, rootfs and boot parameters" - -require images/enea-nfv-access-common.inc - -IMAGE_FSTYPES += "wic.qcow2" -WKS_FILE = "enea-nfv-access-vnf-qemux86-64.wks" - -CLOUDINITPKGS = "cloud-init util-linux-blkid" -CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}" - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-guest \ - nfv-init \ - iperf3 \ - ${CLOUDINITPKGS} \ - " diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb deleted file mode 100644 index 9311992..0000000 --- a/images/enea-nfv-access.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations" - -require images/enea-nfv-access-host-common.inc - -IMAGE_INSTALL += " \ - element-vcpe \ - " -- cgit v1.2.3-54-g00ecf From 20e1f95b49cb2dfb321b770b260b0d82d49fe699 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 26 Apr 2021 14:03:43 +0200 Subject: grub: Fix duplicate/unused grubx64.efi, cleanup 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 --- classes/override_live-vm-common.inc | 2 +- conf/distro/eneanfvaccess.conf | 2 ++ images/core-image-minimal-initramfs.bbappend | 2 ++ images/enea-nfv-access-common.inc | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/classes/override_live-vm-common.inc b/classes/override_live-vm-common.inc index dc8e076..6fabbf0 100644 --- a/classes/override_live-vm-common.inc +++ b/classes/override_live-vm-common.inc @@ -15,7 +15,7 @@ efi_populate_common() { ## ENEA_start ## # Install EFI binaries - install -m 0644 ${IMAGE_ROOTFS}/boot/efi${EFIDIR}/*.* ${DEST}${EFIDIR} + install -m 0644 ${IMAGE_ROOTFS}${EFI_FILES_PATH}/*.* ${DEST}${EFIDIR} # Install kernel and initramfs sig install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} ${DEST}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index c31363d..2c81393 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -15,6 +15,8 @@ PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" +# Override ESP mount path set by meta/conf/image-uefi.conf to align with meta-secure-core paths +EFI_PREFIX_df-efi-secure-boot = "/boot/efi" SBFOLDER = "bootloader" HOSTTOOLS_append = " scp" diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend index 5512158..013463a 100644 --- a/images/core-image-minimal-initramfs.bbappend +++ b/images/core-image-minimal-initramfs.bbappend @@ -7,6 +7,8 @@ PACKAGE_INSTALL_append_sota = " ostree-switchroot" # run-postinsts does not belong in the minimal initramfs PACKAGE_INSTALL_remove = "run-postinsts" +PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras" + create_enea_symlink() { # enea image used in bare metal installation cd ${DEPLOY_DIR_IMAGE} diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index df93026..2a7a8c6 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc @@ -10,6 +10,8 @@ IMAGE_INSTALL += " \ # run-postinsts duplicates dpkg-configure if package_deb is used PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" +PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras" + # After installing packages inside the rootfs, remove backup DPKG status file rootfs_postinstall_dpkg_cleanup () { if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then -- cgit v1.2.3-54-g00ecf From bee43bc3d4896603e4cb1839f5a4e8c30c771e5c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 27 Apr 2021 08:53:16 +0200 Subject: distro conf: require sota.conf.inc for atom, xeon Depends-on: I658c86f562743a50e5c078899e133e279b96027b Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e Signed-off-by: Alexandru Avadanii --- conf/distro/eneanfvaccess.conf | 3 +++ conf/template.atom-c3000-debug/local.conf.sample | 11 +---------- conf/template.atom-c3000/local.conf.sample | 11 +---------- conf/template.xeon-d-debug/local.conf.sample | 11 +---------- conf/template.xeon-d/local.conf.sample | 11 +---------- images/enea-nfv-access-common.inc | 18 +++++++++++------- 6 files changed, 18 insertions(+), 47 deletions(-) (limited to 'conf') diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 2c81393..3dcec36 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -7,6 +7,9 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" +# OSTree integration +require ${@bb.utils.contains('SOTA_MACHINE', '${MACHINE}', 'conf/distro/sota.conf.inc', '', d)} + INHERIT += "distrooverrides" DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge" DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index 60e8955..b96bf48 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample @@ -155,6 +155,7 @@ EXTRA_IMAGE_FEATURES = " \ # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -241,16 +242,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index b015f43..c6cbdba 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -152,6 +152,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -238,16 +239,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index 6474a37..4be1706 100644 --- a/conf/template.xeon-d-debug/local.conf.sample +++ b/conf/template.xeon-d-debug/local.conf.sample @@ -156,6 +156,7 @@ EXTRA_IMAGE_FEATURES = " \ # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -242,16 +243,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 5cfebf5..a1a874d 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -153,6 +153,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -239,16 +240,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 2a7a8c6..b174064 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc @@ -22,15 +22,19 @@ ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" 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', 'ota-ext4 wic', ' ', d)}" -SOTA_CLIENT = "" -SOTA_CLIENT_PROV = "" - -# Remove aktualizr from the image, we don't use it and creates odd dependencies, e.g. +# Remove aktualizr packages from the image, we don't use it and creates odd dependencies, e.g. # it creates a systemd unit that depends on network-online.target, which leads to enabling # NetworkManager-wait-online.service, delaying boot up. -IMAGE_INSTALL_remove = " \ +SOTA_CLIENT_PROV = "" +IMAGE_INSTALL_remove_sota = " \ aktualizr \ aktualizr-info \ " + +# We currently don't use automatic push/sign/check to a backend server, so skip running useless +# OSTree tasks during image build. +IMAGE_FSTYPES_remove_sota = " \ + ostreepush \ + garagesign \ + garagecheck \ + " -- cgit v1.2.3-54-g00ecf From 10dfa22f6f20453dc15f801d098b693dac38265e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 25 May 2021 11:52:46 +0200 Subject: qemux86-64: bblayers: Drop meta-cloud-services meta-cloud-services/meta-openstack was used for its cloud-init recipe, which has meanwhile been moved to meta-virtualization. Change-Id: I05561cf7611a5a4de3d3a076b9c3ee0e3feea173 Signed-off-by: Alexandru Avadanii --- conf/template.qemux86-64/bblayers.conf.sample | 2 -- 1 file changed, 2 deletions(-) (limited to 'conf') diff --git a/conf/template.qemux86-64/bblayers.conf.sample b/conf/template.qemux86-64/bblayers.conf.sample index ea5510a..214386c 100644 --- a/conf/template.qemux86-64/bblayers.conf.sample +++ b/conf/template.qemux86-64/bblayers.conf.sample @@ -21,6 +21,4 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-filesystems \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-cloud-services \ - ##OEROOT##/meta-cloud-services/meta-openstack \ " -- cgit v1.2.3-54-g00ecf From bb55303af0e7e1b3f24c8fd2f38f7d5028676400 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Mon, 14 Jun 2021 19:31:20 +0200 Subject: layer: compatible with hardknott Change-Id: Iccc5c24fe95e0f0a3cad70b9c400902787d45476 Signed-off-by: Adrian Calianu --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/layer.conf b/conf/layer.conf index bd9ac81..db496a4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,4 +11,4 @@ BBFILE_COLLECTIONS += "el-nfv-access" BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/" BBFILE_PRIORITY_el-nfv-access = "7" LAYERDEPENDS_el-nfv-access = "nfv-access-common enea-virtualization" -LAYERSERIES_COMPAT_el-nfv-access = "gatesgarth" +LAYERSERIES_COMPAT_el-nfv-access = "hardknott" -- cgit v1.2.3-54-g00ecf From b0b7aa09e307af9678a94bdf27a310a326b9034b Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 15 Jun 2021 15:02:11 +0200 Subject: [tmp] allow python2 support for element-vcpe Temporary solution until we upgrade vcpe to python3 and remove python2 support! python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes" Change-Id: If20d79fb4051633a941c368f71443ae9bf10ad6a Signed-off-by: Adrian Calianu --- conf/template.atom-c3000-debug/local.conf.sample | 3 +++ conf/template.atom-c3000/local.conf.sample | 3 +++ conf/template.xeon-d-debug/local.conf.sample | 3 +++ conf/template.xeon-d/local.conf.sample | 3 +++ 4 files changed, 12 insertions(+) (limited to 'conf') diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index b96bf48..b5e3f8c 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample @@ -267,3 +267,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index c6cbdba..558e110 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -264,3 +264,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index 4be1706..e80ee61 100644 --- a/conf/template.xeon-d-debug/local.conf.sample +++ b/conf/template.xeon-d-debug/local.conf.sample @@ -268,3 +268,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index a1a874d..2b10f27 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -265,3 +265,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" -- cgit v1.2.3-54-g00ecf From b99118b3140a973c34f56101dd5534ba605c569f Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 1 Jul 2021 14:42:03 +0200 Subject: conf: remove python2 from EneaEdge Signed-off-by: Adrian Calianu Change-Id: Ic7f02246a56515284b62281ea053d431b5eb68cb --- conf/template.atom-c3000-debug/local.conf.sample | 3 --- conf/template.atom-c3000/bblayers.conf.sample | 1 - conf/template.atom-c3000/local.conf.sample | 3 --- conf/template.xeon-d-debug/local.conf.sample | 3 --- conf/template.xeon-d/bblayers.conf.sample | 1 - conf/template.xeon-d/local.conf.sample | 3 --- 6 files changed, 14 deletions(-) (limited to 'conf') diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index b5e3f8c..b96bf48 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample @@ -267,6 +267,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.atom-c3000/bblayers.conf.sample b/conf/template.atom-c3000/bblayers.conf.sample index f5d25ce..71c77cc 100644 --- a/conf/template.atom-c3000/bblayers.conf.sample +++ b/conf/template.atom-c3000/bblayers.conf.sample @@ -28,5 +28,4 @@ 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 558e110..c6cbdba 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -264,6 +264,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index e80ee61..4be1706 100644 --- a/conf/template.xeon-d-debug/local.conf.sample +++ b/conf/template.xeon-d-debug/local.conf.sample @@ -268,6 +268,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d/bblayers.conf.sample b/conf/template.xeon-d/bblayers.conf.sample index f5d25ce..71c77cc 100644 --- a/conf/template.xeon-d/bblayers.conf.sample +++ b/conf/template.xeon-d/bblayers.conf.sample @@ -28,5 +28,4 @@ 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 2b10f27..a1a874d 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -265,6 +265,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" -- cgit v1.2.3-54-g00ecf From a56dcb5ce1ec5ea3c9f35c5a902efc03f7bb8118 Mon Sep 17 00:00:00 2001 From: Matei Valeanu Date: Thu, 8 Jul 2021 20:19:49 +0200 Subject: Exclude some variables from signatures SAMPLE_UEFI_SB_KEYS_DIR and SAMPLE_BOOT_KEYS_DIR are defined in meta-secure-core/meta-signing-key/conf/layer.conf using ${LAYERDIR}, which changes at each automatic build. efitools and grub-efi recipes reference the 2 variables. The variables values change at each build, and this causes efitools and grub-efi to rebuild. To avoid the rebuild, exclude the 2 variables from task signatures. Change-Id: Ib3c51c14fa1e516b64e16adbee09ab28f2f818a7 Signed-off-by: Matei Valeanu --- conf/distro/eneanfvaccess.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'conf') diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 070bbb8..608c103 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -23,3 +23,8 @@ EFI_PREFIX_df-efi-secure-boot = "/boot/efi" SBFOLDER = "bootloader" HOSTTOOLS_append = " scp" + +BB_HASHBASE_WHITELIST_append += "\ + SAMPLE_UEFI_SB_KEYS_DIR \ + SAMPLE_BOOT_KEYS_DIR \ +" -- cgit v1.2.3-54-g00ecf From 06cb3727c2a013ff6927f85b9cdd708177e17609 Mon Sep 17 00:00:00 2001 From: Dan Andresan Date: Fri, 16 Jul 2021 15:58:25 +0200 Subject: distro/eneanfvaccess.conf: remove unused features Remove graphical and audio features from the distribution Change-Id: Ic5d1628d6daca0bdbd5699d5520d7f206db38865 Signed-off-by: Dan Andresan --- conf/distro/eneanfvaccess.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 608c103..13845e9 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -12,6 +12,7 @@ require ${@bb.utils.contains('SOTA_MACHINE', '${MACHINE}', 'conf/distro/sota.con INHERIT += "distrooverrides" DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge" +DISTRO_FEATURES_remove = "x11 opengl wayland vulkan pulseaudio alsa" DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" -- cgit v1.2.3-54-g00ecf