Revert "arm-bsp/tc0: Enable verified u-boot"

This reverts commit 29cee51f84.
Revert "arm-bsp/u-boot: update SHA for tc0"
2026-07-18 16:37:08 +00:00 · 2021-04-22 23:27:47 +01:00 · 2021-04-22 23:24:10 +01:00 · 2021-04-22 23:23:34 +01:00 · 2021-04-22 23:23:13 +01:00 · 2021-04-22 23:22:02 +01:00
351 changed files with 24986 additions and 9359 deletions
@@ -1,53 +1,37 @@
-image: ghcr.io/siemens/kas/kas:3.2
+# Use our custom Crops-derived image
+image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/yocto-builder:master

  # First do a common bootstrap, and then build all the targets
 stages:
-  - prep
  - bootstrap
  - build

 # Common job fragment to get a worker ready
 .setup:
  stage: build
-  interruptible: true
  variables:
    KAS_WORK_DIR: $CI_PROJECT_DIR/work
-    KAS_REPO_REF_DIR: $CI_BUILDS_DIR/persist/repos
    SSTATE_DIR: $CI_BUILDS_DIR/persist/sstate
    DL_DIR: $CI_BUILDS_DIR/persist/downloads
-    BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml
-    TOOLCHAIN_DIR: $CI_BUILDS_DIR/persist/toolchains
-    IMAGE_DIR: $CI_PROJECT_DIR/work/build/tmp/deploy/images
-    TOOLCHAIN_LINK_DIR: $CI_PROJECT_DIR/work/build/toolchains
+    BB_LOGCONFIG: $CI_PROJECT_DIR/kas/logging.yml
  before_script:
    - echo KAS_WORK_DIR = $KAS_WORK_DIR
    - echo SSTATE_DIR = $SSTATE_DIR
    - echo DL_DIR = $DL_DIR
-    - rm -rf $KAS_WORK_DIR
-    - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
-    # Must do this here, as it's the only way to make sure the toolchain is installed on the same builder
-    - ./ci/get-binary-toolchains $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
+    - mkdir --verbose --parents $KAS_WORK_DIR $SSTATE_DIR $DL_DIR

 # Generalised fragment to do a Kas build
 .build:
  extends: .setup
  script:
-    - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)
-    - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
-    - kas build $KASFILES
-    - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
+  - KASFILES=$(kas/jobs-to-kas $CI_JOB_NAME)
+  - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
+  - kas build $KASFILES
+  - ./kas/check-warnings $KAS_WORK_DIR/build/warnings.log
+

 #
-# Prep stage, update repositories once
-#
-update-repos:
-  extends: .setup
-  stage: prep
-  script:
-  - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos
-
-#
-# Bootstrap stage, bootstrap and machine coverage
+# First phase, bootstrap and machine coverage
 #

 # Build a number of native tools first to ensure the other builders don't race
@@ -59,24 +43,15 @@ n1sdp/bootstrap:
 # What percentage of machines in the layer do we build
 machine-coverage:
  stage: bootstrap
-  interruptible: true
  script:
-  - ./ci/check-machine-coverage
+  - ./kas/check-machine-coverage
  coverage: '/Coverage: \d+/'


 #
-# Build stage, the actual build jobs
+# Second phase, the actual build jobs
 #

-# Validate layers are Yocto Project Compatible
-check-layers:
-  extends: .setup
-  coverage: '/Coverage: \d+/'
-  script:
-  - kas shell --update --force-checkout ci/base.yml:ci/meta-python.yml --command \
-    "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR"
-
 corstone500:
  extends: .build

@@ -92,33 +67,18 @@ fvp-base:
 fvp-base-arm32:
  extends: .build

-fvp-base-arm32/external-gccarm:
-  extends: .build
-
-fvp-baser-aemv8r64:
+fvp-base-arm32/external-gcc-arm32:
  extends: .build

 gem5-arm64:
  extends: .build

-gem5-arm64-xen:
-  extends: .build
-
-gem5-atp-arm64:
-  extends: .build
-
-generic-arm64:
-  extends: .build
-
 juno:
  extends: .build

 juno/clang:
  extends: .build

-microbit-v1:
-  extends: .build
-
 musca-b1:
  extends: .build

@@ -131,28 +91,16 @@ n1sdp:
 n1sdp/armgcc:
  extends: .build

-qemu-cortex-a53:
+qemuarm64-secureboot:
  extends: .build

-qemuarm/testimage:
+qemuarm64-secureboot/clang:
  extends: .build

-qemuarm64-sbsa:
+qemuarm64-secureboot/clang/musl:
  extends: .build

-qemuarm64-secureboot/testimage:
-  extends: .build
-
-qemuarm64-secureboot/clang/testimage:
-  extends: .build
-
-qemuarm64-secureboot/clang/musl/testimage:
-  extends: .build
-
-qemuarm64-secureboot/musl/testimage:
-  extends: .build
-
-qemuarmv5/testimage:
+qemuarm64-secureboot/musl:
  extends: .build

 sgi575:
@@ -166,47 +114,26 @@ tc0:
 # Utility tasks, not executed automatically
 #

-delete-dl-dir:
+# Report on disk usage
+usage:
  extends: .setup
-  stage: prep
+  stage: bootstrap
  when: manual
  script:
-  - rm -rf $DL_DIR/*
-
-delete-repo-dir:
-  extends: .setup
-  stage: prep
-  when: manual
-  script:
-  - rm -rf $KAS_REPO_REF_DIR/*
-
-# Delete all sstate
-delete-sstate:
-  extends: .setup
-  stage: prep
-  when: manual
-  script:
-  - rm -rf $SSTATE_DIR/*
-
-delete-toolchains:
-  extends: .setup
-  stage: prep
-  when: manual
-  script:
-  - rm -rf $TOOLCHAIN_DIR/*
+  - du -h -s $DL_DIR $SSTATE_DIR

 # Wipe out old sstate
 prune-sstate:
  extends: .setup
-  stage: prep
+  stage: bootstrap
  when: manual
  script:
  - find $SSTATE_DIR -type f -atime +30 -delete

-# Report on disk usage
-usage:
+# Delete all sstate
+delete-sstate:
  extends: .setup
-  stage: prep
+  stage: bootstrap
  when: manual
  script:
-  - du -h -s $DL_DIR $SSTATE_DIR $KAS_REPO_REF_DIR $TOOLCHAIN_DIR
+  - rm -rf $SSTATE_DIR/*
@@ -1,43 +0,0 @@
-#! /usr/bin/env python3
-
-import argparse
-import pathlib
-import re
-import subprocess
-import sys
-
-import yaml
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("config", type=argparse.FileType())
-    parser.add_argument("metaarm", type=pathlib.Path, help="Path to meta-arm")
-    parser.add_argument("others", type=pathlib.Path, help="Path to parent of dependencies")
-    args = parser.parse_args()
-
-    config = yaml.safe_load(args.config)
-    layers = config["layers"]
-    dependencies = config["dependencies"]
-
-    found_layers = [p for p in args.metaarm.glob("meta-*") if p.is_dir()]
-    print(f"Testing {len(layers)} layers: {', '.join(layers)}.")
-    print(f"Found {len(found_layers)} layers in meta-arm.")
-    print()
-
-    cli = ["yocto-check-layer-wrapper",]
-    cli.extend([args.metaarm / layer for layer in layers])
-    cli.append("--dependency")
-    cli.extend([args.others / layer for layer in dependencies])
-
-    passed = 0
-    process = subprocess.Popen(cli, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
-    while True:
-        line = process.stdout.readline()
-        if process.poll() is not None:
-            break
-        print(line.strip())
-        if re.search(r"meta-.+ PASS", line):
-            passed += 1
-
-    print(f"Coverage: {int(passed / len(found_layers) * 100)}%")
-    sys.exit(process.returncode)
@@ -1,7 +0,0 @@
-layers:
-  - meta-arm
-  - meta-arm-bsp
-  - meta-arm-toolchain
-  - meta-gem5
-dependencies:
-  - meta-openembedded/meta-oe
@@ -1,7 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: fvp-baser-aemv8r64
-
@@ -1,28 +0,0 @@
-
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-python.yml
-
-repos:
-  meta-arm:
-    layers:
-      meta-gem5:
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    layers:
-      meta-oe:
-      meta-filesystems:
-      meta-networking:
-  meta-virtualization:
-    url: git://git.yoctoproject.org/meta-virtualization
-
-machine: gem5-arm64
-
-local_conf_header:
-  meta-virt:
-    DISTRO_FEATURES_append = " virtualization xen"
-
-target:
-  - xen-image-minimal
@@ -1,15 +0,0 @@
-header:
-  version: 9
-  includes:
-    - gem5-arm64.yml
-
-repos:
-  meta-arm:
-    layers:
-      meta-atp:
-
-machine: gem5-atp-arm64
-
-target:
-  - atp-native
-  - core-image-minimal
@@ -1,6 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: generic-arm64
@@ -1,46 +0,0 @@
-#!/bin/bash
-set -u
-
-HOST_ARCH=$(uname -m)
-VER="10.2-2020.11"
-
-DOWNLOAD_DIR=$1
-TOOLCHAIN_DIR=$2
-TOOLCHAIN_LINK_DIR=$3
-
-# These should be already created by .gitlab-ci.yml, but do here if run outside of that env
-mkdir -p $DOWNLOAD_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
-
-if [ $HOST_ARCH = "aarch64" ]; then
-	#AArch64 Linux hosted cross compilers
-
-	#AArch32 target with hard float (arm-none-linux-gnueabihf)
-	wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
-elif [ $HOST_ARCH = "x86_64" ]; then
-	#x86_64 Linux hosted cross compilers
-
-	#AArch32 target with hard float (arm-linux-none-gnueabihf)
-	wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
-
-	#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
-	wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
-
-	#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
-	wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
-else
-	echo "ERROR - Unknown build arch of $HOST_ARCH"
-	exit 1
-fi
-
-for i in arm aarch64 aarch64_be; do
-	if [ ! -d $TOOLCHAIN_DIR/gcc-arm-$VER-$HOST_ARCH-$i-none-linux-gnu*/ ]; then
-		if [ ! -f $DOWNLOAD_DIR/gcc-arm-$VER-$HOST_ARCH-$i-none-linux-gnu*.tar.xz ]; then
-			continue
-		fi
-
-		tar -C $TOOLCHAIN_DIR -axvf $DOWNLOAD_DIR/gcc-arm-$VER-$HOST_ARCH-$i-none-linux-gnu*.tar.xz
-	fi
-
-	# Setup a link for the toolchain to use local to the building machine (e.g., not in a shared location)
-	ln -s $TOOLCHAIN_DIR/gcc-arm-$VER-$HOST_ARCH-$i-none-linux-gnu* $TOOLCHAIN_LINK_DIR/$i
-done
@@ -1,10 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-zephyr.yml
-
-machine: microbit-v1
-
-target:
-  - zephyr-philosophers
@@ -1,10 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-zephyr.yml
-
-machine: qemu-cortex-a53
-
-target:
-  - zephyr-philosophers
@@ -1,6 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: qemuarm
@@ -1,16 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: qemuarm64-secureboot
-
-local_conf_header:
-  bugs: |
-    # Only ping until errors can be resolved
-    TEST_SUITES = "ping"
-
-target:
-  - core-image-base
-  - perf
-  - optee-examples
@@ -1,11 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: qemuarmv5
-
-local_conf_header:
-  bugs: |
-    # Remove parselogs until errors can be resolved
-    TEST_SUITES_remove = "parselogs"
@@ -1,17 +0,0 @@
-header:
-  version: 9
-
-local_conf_header:
-  testimage: |
-    IMAGE_CLASSES += "testimage"
-    TESTIMAGE_AUTO = "1"
-  slirp: |
-    TEST_RUNQEMUPARAMS = "slirp"
-    TEST_SERVER_IP = "127.0.0.1"
-    QEMU_USE_SLIRP = "1"
-  packages: |
-    IMAGE_FEATURES_append = " ssh-server-dropbear"
-
-# Multiple targets are available, put it down to just one
-target:
-  - core-image-base
@@ -1,43 +0,0 @@
-#! /usr/bin/env python3
-
-# Update clones of the repositories we need in KAS_REPO_REF_DIR to speed up fetches
-
-import sys
-import os
-import subprocess
-import pathlib
-
-def repo_shortname(url):
-    # Taken from Kas (Repo.__getattr__) to ensure the logic is right
-    from urllib.parse import urlparse
-    url = urlparse(url)
-    return ('{url.netloc}{url.path}'
-            .format(url=url)
-            .replace('@', '.')
-            .replace(':', '.')
-            .replace('/', '.')
-            .replace('*', '.'))
-
-repositories = (
-    "https://git.yoctoproject.org/git/poky",
-    "https://git.openembedded.org/meta-openembedded",
-    "https://git.yoctoproject.org/git/meta-virtualization",
-    "https://git.yoctoproject.org/git/meta-zephyr",
-    "https://github.com/kraj/meta-clang",
-)
-
-if __name__ == "__main__":
-    if "KAS_REPO_REF_DIR" not in os.environ:
-        print("KAS_REPO_REF_DIR needs to be set")
-        sys.exit(1)
-
-    base_repodir = pathlib.Path(os.environ["KAS_REPO_REF_DIR"])
-
-    for repo in repositories:
-        repodir = base_repodir / repo_shortname(repo)
-        if repodir.exists():
-            print("Updating %s..." % repo)
-            subprocess.run(["git", "-C", repodir, "fetch"], check=True)
-        else:
-            print("Cloning %s..." % repo)
-            subprocess.run(["git", "clone", "--bare", repo, repodir], check=True)
@@ -5,7 +5,7 @@ distro: poky

 defaults:
  repos:
-    refspec: hardknott
+    refspec: master

 repos:
  meta-arm:
@@ -22,7 +22,6 @@ repos:

 env:
  BB_LOGCONFIG: ""
-  TOOLCHAIN_DIR: ""

 local_conf_header:
  base: |
@@ -30,12 +29,12 @@ local_conf_header:
    PACKAGE_CLASSES = "package_ipk"
    LICENSE_FLAGS_WHITELIST += "armcompiler"
    PACKAGECONFIG_remove_pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
    BB_NUMBER_THREADS = "16"
    PARALLEL_MAKE = "-j16"
    INHERIT += "rm_work"
    PACKAGECONFIG_append_pn-perf = " coresight"
-  noptest: |
+    ERROR_QA = "${WARN_QA}"
+  ptest: |
    DISTRO_FEATURES_remove = "ptest"

 machine: unset
@@ -14,7 +14,7 @@ machines = metaarm.glob("meta-*/conf/machine/*.conf")
 machines = set(p.stem for p in machines)

 # All kas files
-kas = metaarm.glob("ci/*.yml")
+kas = metaarm.glob("kas/*.yml")
 kas = set(p.stem for p in kas)

 missing = machines - kas
@@ -7,8 +7,7 @@ set -e -u

 LOGFILE=$1

-LINES=$(grep --invert-match "attempting MIRRORS if available" $LOGFILE | wc -l)
-if test "$LINES" -ne 0; then
+if test -s $LOGFILE; then
    echo ==============================
    echo The build had warnings/errors:
    echo ==============================
@@ -5,4 +5,4 @@ local_conf_header:
  cc: |
    PNBLACKLIST[gcc-cross-arm] = "Using external toolchain"
    TCMODE = "external-arm"
-    EXTERNAL_TOOLCHAIN = "${TOPDIR}/toolchains/${TARGET_ARCH}"
+    EXTERNAL_TOOLCHAIN = "/usr/local/gcc-arm-10.2-2020.11-aarch64-arm-none-linux-gnueabihf"
@@ -1,32 +0,0 @@
-header:
-  version: 9
-
-distro: poky
-machine: fvp-baser-aemv8r64
-
-defaults:
-  repos:
-    refspec: hardknott
-
-repos:
-  meta-arm:
-    layers:
-      meta-arm:
-      meta-arm-bsp:
-      meta-arm-toolchain:
-
-  poky:
-    url: https://git.yoctoproject.org/git/poky
-    layers:
-      meta:
-      meta-poky:
-
-local_conf_header:
-  base: |
-    CONF_VERSION = "1"
-    PACKAGE_CLASSES = "package_ipk"
-    PACKAGECONFIG_remove_pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
-
-target:
-  - core-image-minimal
@@ -8,8 +8,8 @@ set -e -u
 # Read Job namne from $1 and split on /
 IFS=/ read -r -a PARTS<<<$1

-# Prefix each part with ci/
-PARTS=("${PARTS[@]/#/ci/}")
+# Prefix each part with kas/
+PARTS=("${PARTS[@]/#/kas/}")

 # Suffix each part with .yml
 PARTS=("${PARTS[@]/%/.yml}")
@@ -3,9 +3,9 @@ header:
  includes:
    - base.yml

-machine: qemuarm64-sbsa
+machine: qemuarm64-secureboot

 target:
  - core-image-base
  - perf
-  - sbsa-acs
+  - optee-examples
@@ -4,8 +4,8 @@ meta-arm-autonomy Yocto Layer
 Introduction
 ------------
 This layer provides an hypervisor based solution (currently based on Xen) for
-autonomous system. It contains recipes and classes to build host and guest
-images.
+autonomous system. It contains recipes and classes to build host and guests
+systems.

 To start using this layer, please check the
 [Quick Start Guide](documentation/arm-autonomy-quickstart.md).
@@ -16,14 +16,13 @@ This layer depends on several other Yocto layers:
 * meta-openembedded (https://git.openembedded.org/meta-openembedded)
 * poky (https://git.yoctoproject.org/poky)
 * meta-virtualization (https://git.yoctoproject.org/meta-virtualization)
-* meta-networking (git://git.openembedded.org/meta-openembedded)

 Distribution Features
 ---------------------
-This layer adds the following Yocto DISTRO_FEATURES:
+This layer is adding the following Yocto DISTRO_FEATURES:

 * arm-autonomy-host: this feature activates functionalities required to build
-  an autonomy host system. It has the following effects:
+  an autonomy host system. It is doing the following:
  - add 'xen' and 'ipv4' to DISTRO_FEATURES.
  - add xen backend drivers to linux kernel configuration.
  - To reduce the root filesystem image size the kernel image is not installed.
@@ -44,40 +43,40 @@ its documentation.
 Those documentation files should be checked for variables:
 - [xen-devicetree](documentation/xen-devicetree.md)
 - [xenguest-manager](documentation/xenguest-manager.md)
- [xenguest-network](documentation/xenguest-network.md)
+- [xenguest-network-bridge](documentation/xenguest-network-bridge.md)

 BSPs
 ----
-This layer adds the following machine:
+This layer is adding the following machines:

-* arm64-autonomy-guest: This machine creates a minimal BSP suitable to be used
+* arm64-autonomy-guest: this machines creates a minimal BSP suitable to be used
  as an autonomy guest. It is in fact only activating ARM64 architecture and
  SMP in the linux kernel and is enabling the DISTRO_FEATURE
-  'arm-autonomy-guest'.
+  arm-autonomy-guest.

 Images
 ------
 This layer is adding the following images:

-* arm-autonomy-host-image-minimal: This image includes all elements required
-  to create a minimal arm-autonomy-host system. This includes xen, and tools to
-  manage xen guests and xenguest images. This image depends on
- 'arm-autonomy-host' distribution feature.
+* arm-autonomy-host-image-minimal: this image includes all elements required
+  to create a minimal arm-autonomy-host system. This includes xen and tools to
+  manage xen guests. This image depends on 'arm-autonomy-host' distribution
+  feature.

 Recipes and classes
 -------------------
-This layer adds the following recipes and classes:
+This layer is adding the following recipes and classes:

-* [xen-devicetree](documentation/xen-devicetree.md): This is a recipe to modify
+* [xen-devicetree](documentation/xen-devicetree.md): this is a recipe to modify
  a device tree blob to add information required to boot xen and a Dom0 linux.

-* [xenguest-mkimage](documentation/xenguest-mkimage.md): This is a tool used to
+* [xenguest-mkimage](documentation/xenguest-mkimage.md): this is a tool to
  create and modify images to be used as Xen guests.

-* [xenguest-manager](documentation/xenguest-manager.md): This is a tool used to
+* [xenguest-manager](documentation/xenguest-manager.md): this is a tool to
  create/remove/start/stop xen guest generated using xenguest-mkimage.

-* [xenguest-network](documentation/xenguest-network.md): This
+* [xenguest-network-bridge](documentation/xenguest-network-bridge.md): this
  recipe add tools and init scripts to create a bridge connected to the
  external network on the host and allow guests to be connected to it.

@@ -1,115 +0,0 @@
-# Docker Extern Containers
-#
-# This class allows docker image tarballs to be installed in the rootfs
-#
-# The images can be selected using the variable CONTAINER_IMAGE_FILES which
-# should contain a space seperated list of absolute paths or yocto urls for
-# docker images that have been exported using docker export:
-# - https://docs.docker.com/engine/reference/commandline/export/
-#
-# src_uri_parse_var.bbclass is used to parse CONTAINER_IMAGE_FILES
-#
-# There are 4 supported formats for CONTAINER_IMAGE_FILES entries:
-#
-# - http/https url
-#   - CONTAINER_IMAGE_FILES = "https://[url]:[port]/alpine.tar;md5sum=..."
-#
-# - file:// absolute local path from root
-#   - CONTAINER_IMAGE_FILES = "file:///containers/alpine2.tar"
-#
-# - file:// path relative to FILESEXTRAPATHS
-#   - CONTAINER_IMAGE_FILES = "file://foo/alpine3.tar"
-#     FILESEXTRAPATHS .= "/containers:"
-#
-# - plain absolute local path from root
-#   - CONTAINER_IMAGE_FILES = "/containers/foo/bar/alpine4.tar"
-#
-# It is not recommended to use other yocto URL types, as they may result in
-# undefined behaviour.
-#
-# A semicolon seperated list of install arguments can follow each image path:
-# - conname : the name that will be attached when the image is imported
-#             (default: [filename, without extension])
-# - contag  : the tag that will be attached when the image is imported
-#             (default: local)
-# - conkeep : Flag for whether the exported container image file should be
-#             kept once the import has been completed
-#             (default: 0)
-#
-# Any other arguments, for example an md5sum, will be assumed to be fetch
-# arguments, and will be kept when the path is added to the SRC_URI
-#
-# e.g.  CONTAINER_IMAGE_FILES = "\
-# https://[url]:[port]/alpine.tar;md5sum=[checksum];conkeep=1 \
-# file:///containers/alpine2.tar;contag=latest;conname=docker2 \
-# file://foo/alpine3.tar \
-# /containers/foo/bar/alpine4.tar;contag=1.0;conkeep=1 "
-#
-# Resulting Manifest:
-# ARCHIVE     NAME    TAG    KEEP
-# alpine.tar  alpine  local  1
-# alpine2.tar docker2 latest 0
-# alpine3.tar alpine3 local  0
-# alpine4.tar alpine4 1.0    1
-#
-# Other configurable variables:
-# CONTAINERS_INSTALL_DIR  : The folder underneath ${WORKDIR} where the docker
-#                           images will be stored
-#                           (default: "/usr/share/docker/images")
-# CONTAINERS_MANIFEST     : The name of the manifest file containing image
-#                           parameters, also stored in CONTAINERS_INSTALL_DIR
-#                           (default: "containers.manifest")
-# CONTAINERS_TAG_DEFAULT  : Use this to change the value that will be used as
-#                           contag if no value is provided
-#                           (default: "local")
-# CONTAINERS_KEEP_DEFAULT : Use this to change the value that will be used for
-#                           conkeep if no value is provided
-#                           (default: "0")
-#
-
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "docker"
-
-RDEPENDS_${PN} = "packagegroup-docker-runtime-minimal"
-
-CONTAINER_IMAGE_FILES ??= ""
-CONTAINERS_INSTALL_DIR ??= "${datadir}/docker/images"
-CONTAINERS_MANIFEST ??= "containers.manifest"
-CONTAINERS_TAG_DEFAULT ??= "local"
-CONTAINERS_KEEP_DEFAULT ??= "0"
-
-inherit set_src_uri_from_var
-
-SRC_URI_FROM_VAR_NAME = "CONTAINER_IMAGE_FILES"
-# Define installation params
-SRC_URI_FROM_VAR_MANIFEST_PARAMS = "conname=[basename] \
-contag=${CONTAINERS_TAG_DEFAULT} conkeep=${CONTAINERS_KEEP_DEFAULT}"
-
-SRC_URI_FROM_VAR_UNPACK_DIR = "containers"
-
-# Read manifest and install container images
-do_install() {
-    local archive name tag keep
-
-    if [ -f "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/manifest" ]; then
-
-        install -d "${D}${CONTAINERS_INSTALL_DIR}"
-        install -m 644 \
-            "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/manifest" \
-            "${D}${CONTAINERS_INSTALL_DIR}/${CONTAINERS_MANIFEST}"
-
-        while read -r archive name tag keep _; do
-            [ -f "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/${archive}" ] ||
-                bbfatal "${archive} does not exist"
-
-            install -m 644 \
-                "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/${archive}" \
-                "${D}${CONTAINERS_INSTALL_DIR}/${archive}"
-        done < "${D}${CONTAINERS_INSTALL_DIR}/${CONTAINERS_MANIFEST}"
-    fi
-}
-
-do_install[vardeps] += "CONTAINER_IMAGE_FILES"
-
-FILES_${PN} += "${CONTAINERS_INSTALL_DIR}"
@@ -1,7 +1,7 @@
 # Create a xenguest image with kernel and filesystem produced by Yocto
 # This will create a .xenguest file that the xenguest-manager can use.

-inherit xenguest_image
+inherit xenguest-image

 # We are creating our guest in a local subdirectory
 # force the value so that we are not impacted if the user is changing it
@@ -63,67 +63,6 @@ IMAGE_TYPEDEP_xenguest ?= "tar"
 IMAGE_TYPES_MASKED += "xenguest"
 IMAGE_TYPES += "xenguest"

-XENGUEST_IMAGE_RECIPE = "${PN}"
-XENGUEST_IMAGE_VARS += "XENGUEST_IMAGE_RECIPE"
-
-# Merge intermediate env files from all recipes into a single file
-python do_merge_xenguestenv () {
-
-    import re
-
-    # Open final merged file in DEPLOY_DIR_IMAGE for writing, or create
-    outdir = d.getVar('DEPLOY_DIR_IMAGE')
-    with open(os.path.join(outdir,'xenguest.env'), 'w') as merged_file:
-
-        # Adds vars from xenguest_image to list
-        merged_env = []
-        xenguest_vars = d.getVar('XENGUEST_IMAGE_VARS')
-        for var in xenguest_vars.split():
-            value = d.getVar(var)
-            if value:
-                merged_env.append(var + "=" + " ".join(value.split()) + "\n")
-
-        # Resolve dependencies for this task to find names of intermediate
-        # .xenguestenv files
-        taskdepdata = d.getVar('BB_TASKDEPDATA')
-        task_mc = d.getVar('BB_CURRENT_MC')
-        task_file = d.getVar('FILE')
-
-        # See runqueue.py function build_taskdepdata
-        DEPS_INDEX = 3
-
-        depdata_key = task_file + ":do_merge_xenguestenv"
-
-        # If in a multiconfig, need to add that to the key
-        if task_mc != "default":
-            depdata_key = "mc:" + task_mc + ":" + depdata_key
-
-        # Retrieve filename using regex
-        get_filename = re.compile(r'/([^/]+\.bb):do_deploy_xenguestenv$')
-        env_dir = d.getVar('XENGUEST_ENV_STAGING_DIR')
-
-        for task_dep in taskdepdata[depdata_key][DEPS_INDEX]:
-            if task_dep.endswith(":do_deploy_xenguestenv"):
-                filename = re.search(get_filename, task_dep).group(1) + ".xenguestenv"
-                bb.note("Merging: " + filename)
-                try:
-                    with open(env_dir + "/" + filename, 'r') as f:
-                        # Eliminate duplicates
-                        merged_env = list(set(merged_env + f.readlines()))
-                except (FileNotFoundError, IOError):
-                    bb.note(" " + filename + " has no extra vars")
-
-        # Sort Alphabetically and write
-        merged_env.sort()
-        merged_file.write("".join(merged_env))
-}
-do_merge_xenguestenv[dirs] = "${DEPLOY_DIR_IMAGE}"
-do_merge_xenguestenv[vardeps] += "${XENGUEST_IMAGE_VARS}"
-do_merge_xenguestenv[vardepsexclude] += "BB_TASKDEPDATA"
-do_merge_xenguestenv[recrdeptask] += "do_deploy_xenguestenv"
-
-addtask merge_xenguestenv before do_populate_lic_deploy after do_image_complete
-
 python __anonymous() {
    # Do not do anything if we are not in the want FSTYPES
    if bb.utils.contains_any('IMAGE_FSTYPES', 'xenguest', '1', '0', d):
@@ -3,10 +3,7 @@
 # This is done using kernel-fitimage as model
 # To activate this, kernel-xenguest must be added to KERNEL_CLASSES

-# Add a variable name to XENGUEST_IMAGE_VARS_EXTRA if you want it to
-# appear in xenguest.env when the image is deployed
-
-inherit xenguest_image
+inherit xenguest-image

 # use a local copy to pack all together
 XENGUEST_IMAGE_DEPLOY_DIR = "${WORKDIR}/tmp-xenguest"
@@ -27,7 +24,7 @@ do_assemble_xenguest_initramfs() {
    rm -f ${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest
    call_xenguest_mkimage pack ${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest
 }
-do_assemble_xenguest_initramfs[depends] += "${INITRAMFS_IMAGE}:do_merge_xenguestenv"
+do_assemble_xenguest_initramfs[depends] += "${INITRAMFS_IMAGE}:do_image_complete"

 kernel_do_deploy_append() {
    if [ -f "${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest" ]; then
@@ -1,224 +0,0 @@
-# Set SRC_URI from Variable
-
-# This class parses a variable named in SRC_URI_FROM_VAR_NAME for entries that
-# should be added to the SRC_URI
-#
-# There are 4 supported formats for entries:
-#
-# - http/https url
-#   - Note that a checksum (md5sum or sha256sum) must be provided for http(s)
-#
-# - file:// absolute local path from root
-#   - In this case the filename will be added to SRC_URI and the path from '/'
-#   added to FILESEXTRAPATHS
-#
-# - file:// path relative to FILESEXTRAPATHS
-#   - In this case the filename will be added to SRC_URI and the preceding path
-#   added to FILESOVERRIDES, so that the full path to the file will
-#   be available in FILESPATH when it is generated by combining
-#   FILESEXTRAPATHS and FILESOVERRIDES.
-#
-# - plain absolute local path from root
-#   - This will be treated the same as an file:// path from root. Plain paths
-#   must be absolute, and cannot be relative to FILESEXTRAPATHS
-#
-# It is not recommended to use other yocto URL types, as they may result in
-# undefined behaviour.
-#
-# These entries will be added to the SRC_URI so that the yocto fetcher can
-# unpack a copy into ${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}
-#
-#
-# A list of arguments can follow each entry in the input variable, seperated
-# by semi-colons (;). Arguments may be FETCH arguments or MANIFEST arguments.
-#
-# FETCH arguments will be appended to the entry in SRC_URI, for example
-# "downloadfilename" to specify the filename used when storing a
-# downloaded file.
-# Each SRC_URI entry will automatically have the arguments
-# "unpack=0;subdir=${SRC_URI_FROM_VAR_UNPACK_DIR}" added to them, so do not
-# attempt to set these options.
-#
-# MANIFEST arguments are defined in the variable
-# SRC_URI_FROM_VAR_MANIFEST_PARAMS which should be a space seperated list of
-# names, each optionally followed by an equals sign (=) and a default value.
-#
-# The values provided for the manifest arguments will be written to the manifest
-# file in ${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR} as columns, in the same
-# order as they appear in SRC_URI_FROM_VAR_MANIFEST_PARAMS.
-#
-# For entries that do not provide a value for a manifest argument, the default
-# value will be used if possible.
-# If no default is availale, omitting the parameter on any item will cause
-# an error.
-#
-# "[basename]" is a special case default that will set the value to
-# the filename without the path or file extension.
-#
-# e.g.
-# SRC_URI_FROM_VAR_MANIFEST_PARAMS="conname=[basename] contag=local conkeep"
-#
-# Any arguments that follow an entry in SRC_URI_FROM_VAR_NAME, that are not
-# named in SRC_URI_FROM_VAR_MANIFEST_PARAMS are assumed to be FETCH arguments,
-# so are added to the corresponding entry in the SRC_URI.
-
-SRC_URI_FROM_VAR_NAME ??= ""
-SRC_URI_FROM_VAR_MANIFEST_PARAMS ??= ""
-SRC_URI_FROM_VAR_UNPACK_DIR ??= "items"
-
-python __anonymous() {
-
-    parse_var = d.getVar('SRC_URI_FROM_VAR_NAME')
-
-    if not parse_var:
-        return
-
-    parse_var_items = d.getVar(parse_var)
-
-    if parse_var_items:
-        for item in parse_var_items.split(' '):
-            if not item:
-                continue
-
-            if item.startswith('/'):
-                # If not a Yocto URL, must be an absolute path
-                yocto_url = "file://" + item
-            else:
-                # Otherwise assume valid Yocto URL.
-                # Error case is caught later
-                yocto_url = item
-
-            fetcher = host = path = parm = None
-            try:
-                # Attempt to parse a Yocto URL
-                fetcher,host,path,_,_,parm = bb.fetch.decodeurl(yocto_url)
-            except:
-                # Something invalid is in the variable!
-                raise bb.parse.SkipRecipe(parse_var + \
-                                          " contains an invalid entry:\n'" + \
-                                          item + "'")
-
-            # This var is space seperated list of parameter names,
-            # with optional default value following an equals sign
-            # (name=default)
-            item_params_str = d.getVar('SRC_URI_FROM_VAR_MANIFEST_PARAMS')
-
-            # remove directories from path
-            filename = os.path.basename(path)
-
-            if "downloadfilename" in parm:
-                filename = parm["downloadfilename"]
-
-            item_manifest_args = {"filename": filename}
-
-            if item_params_str:
-                # required manifest arguments have been provided
-
-                # If no default is given add "=" for map parsing
-                item_params_list = [ arg + "=" if '=' not in arg
-                                     else arg
-                                     for arg in item_params_str.split(' ')
-                                   ]
-
-                # Generate key value pairs of argument names and
-                # default values
-                item_params_map = dict( (name.strip(), val.strip())
-                                        for name, val in (arg.split('=')
-                                        for arg in item_params_list)
-                                      )
-
-                for argname in item_params_map:
-                    # Iterate over required manifest arguments
-
-                    argvalue = parm.pop(argname, None)
-                    if argvalue:
-                        # a value has been provided for this item
-                        item_manifest_args[argname] = argvalue
-
-                    else:
-                        # No value provided, process default value
-                        default = item_params_map[argname]
-                        if default:
-                            # A default value is provided
-                            if default == "[basename]":
-                                # use the filename without extension
-                                default = os.path.splitext(filename)[0]
-
-                            # store default value in dict
-                            item_manifest_args[argname] = default
-
-                        else:
-                            # No default provided
-                            raise bb.fatal(parse_var + \
-                              " entry is missing a required parameter '" + \
-                              argname + "':\n'" + item + "'")
-
-            # Write value to var flags to ensure data structure is preserved
-            # Each entry of parse_var will have a varflag  where the value
-            # is a dictionary of argument names and values
-            d.setVarFlags(parse_var, {item: item_manifest_args})
-
-            src_uri_entry_suffix = ';'
-
-            # HTTP(S) fetcher must provide a checksum
-            if fetcher.startswith('http') and not \
-            ( 'md5sum' in parm or 'sha256sum' in parm ):
-                # Ensure http/https fetchers get a checksum
-                raise bb.parse.SkipRecipe(parse_var + \
-                                          " entry is missing a checksum:\n'" + \
-                                          item + "'")
-
-            # add remaining fetch parameters including checksum
-            for arg in parm:
-                src_uri_entry_suffix += ";" + arg + "=" + parm[arg]
-
-            # Add default and extra parameters to SRC_URI entry
-            src_uri_entry_suffix += ';unpack=0;subdir=' + \
-                                    d.getVar('SRC_URI_FROM_VAR_UNPACK_DIR')
-
-            if fetcher == 'file':
-                # Prevent local fetcher from re-creating dir structure
-                filedir = os.path.split(path)[0]
-                if filedir.startswith('/'):
-                    # Path is from the root
-                    d.appendVar('FILESEXTRAPATHS', filedir + ':')
-                else:
-                    # Path is relative to FILESEXTRAPATHS
-                    d.appendVar('FILESOVERRIDES', ':' + filedir)
-
-                # Add filename without path to SRC_URI
-                d.appendVar('SRC_URI', ' file://' + \
-                                        filename + src_uri_entry_suffix)
-            else:
-                # Add full entry to SRC_URI
-                d.appendVar('SRC_URI', ' ' + fetcher + \
-                            "://" + host + path + src_uri_entry_suffix)
-}
-
-python generate_manifest() {
-
-    parse_var = d.getVar('SRC_URI_FROM_VAR_NAME')
-
-    if not parse_var:
-        return
-
-    target_dir = os.path.join(d.getVar('WORKDIR'),
-                              d.getVar('SRC_URI_FROM_VAR_UNPACK_DIR'))
-
-    # Write a manifest file containing the parameters so SRC_URI
-    # doesn't need to be parsed by do_install
-    with open (target_dir + "/manifest", 'w') as manifest_file:
-        manifest_args = d.getVarFlags(parse_var)
-
-        parse_var_items = d.getVar(parse_var)
-
-        if parse_var_items:
-            for item in parse_var_items.split():
-
-                manifest_file.write(" ".join(manifest_args[item].values())+"\n")
-
-}
-
-do_unpack[cleandirs] += "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}"
-do_unpack[postfuncs] += "generate_manifest"
-do_unpack[vardeps] += "${SRC_URI_FROM_VAR_NAME}"
@@ -4,11 +4,8 @@
 # The class is extending deploy function so you recipe must inherit deploy and
 # have a do_deploy function (even if it is empty)

-# Add a variable name to XENGUEST_IMAGE_VARS_EXTRA if you want it to
-# appear in xenguest.env when the image is deployed
-
-# Use standard xenguest_image
-inherit xenguest_image
+# Use standard xenguest-image
+inherit xenguest-image

 # Add a DTB file for the guest
 # Only one file should be added, if this is set multiple times or in several
@@ -42,12 +39,6 @@ XENGUEST_EXTRA_FILES ??= ""
 # dir1/file1 file in the disk content parameters).
 XENGUEST_EXTRA_DISK_FILES ??= ""

-# Extra vars to be written to xenguest.env
-XENGUEST_IMAGE_VARS_EXTRA += "\
- XENGUEST_EXTRA_DTB XENGUEST_EXTRA_RAMDISK XENGUEST_EXTRA_XENCONFIG \
- XENGUEST_EXTRA_INIT_PRE XENGUEST_EXTRA_INIT XENGUEST_EXTRA_INIT_POST \
- XENGUEST_EXTRA_FILES XENGUEST_EXTRA_DISK_FILES"
-
 do_deploy_append() {
    if [ -z "${XENGUEST_IMAGE_DEPLOY_DIR}" -o \
        -z "${XENGUEST_IMAGE_DEPLOY_SUBDIR}" ]; then
@@ -58,14 +49,14 @@ do_deploy_append() {

    if [ -n "${XENGUEST_EXTRA_DTB}" ]; then
        if [ ! -f ${XENGUEST_EXTRA_DTB} ]; then
-            die "xenguest_image: DTB file ${XENGUEST_EXTRA_DTB} does not exist"
+            die "xenguest-image: DTB file ${XENGUEST_EXTRA_DTB} does not exist"
        fi
        call_xenguest_mkimage partial --xen-device-tree=${XENGUEST_EXTRA_DTB}
    fi

    if [ -n "${XENGUEST_EXTRA_RAMDISK}" ]; then
        if [ ! -f ${XENGUEST_EXTRA_RAMDISK} ]; then
-            die "xenguest_image: DTB file ${XENGUEST_EXTRA_RAMDISK} does not exist"
+            die "xenguest-image: DTB file ${XENGUEST_EXTRA_RAMDISK} does not exist"
        fi
        call_xenguest_mkimage partial --xen-ramdisk=${XENGUEST_EXTRA_RAMDISK}
    fi
@@ -73,7 +64,7 @@ do_deploy_append() {
    if [ -n "${XENGUEST_EXTRA_XENCONFIG}" ]; then
        for f in ${XENGUEST_EXTRA_XENCONFIG}; do
            if [ ! -f $f ]; then
-                die "xenguest_image: Xen config $f does not exist"
+                die "xenguest-image: Xen config $f does not exist"
            fi
            call_xenguest_mkimage partial --xen-append=$f
        done
@@ -81,21 +72,21 @@ do_deploy_append() {

    if [ -n "${XENGUEST_EXTRA_INIT_PRE}" ]; then
        if [ ! -f ${XENGUEST_EXTRA_INIT_PRE} ]; then
-            die "xenguest_image: Init script ${XENGUEST_EXTRA_INIT_PRE} does not exist"
+            die "xenguest-image: Init script ${XENGUEST_EXTRA_INIT_PRE} does not exist"
        fi
        call_xenguest_mkimage partial --init-pre=${XENGUEST_EXTRA_INIT_PRE}
    fi

    if [ -n "${XENGUEST_EXTRA_INIT}" ]; then
        if [ ! -f ${XENGUEST_EXTRA_INIT} ]; then
-            die "xenguest_image: Init script ${XENGUEST_EXTRA_INIT} does not exist"
+            die "xenguest-image: Init script ${XENGUEST_EXTRA_INIT} does not exist"
        fi
        call_xenguest_mkimage partial --init-script=${XENGUEST_EXTRA_INIT}
    fi

    if [ -n "${XENGUEST_EXTRA_INIT_POST}" ]; then
        if [ ! -f ${XENGUEST_EXTRA_INIT_POST} ]; then
-            die "xenguest_image: Init script ${XENGUEST_EXTRA_INIT_POST} does not exist"
+            die "xenguest-image: Init script ${XENGUEST_EXTRA_INIT_POST} does not exist"
        fi
        call_xenguest_mkimage partial --init-post=${XENGUEST_EXTRA_INIT_POST}
    fi
@@ -103,7 +94,7 @@ do_deploy_append() {
    if [ -n "${XENGUEST_EXTRA_FILES}" ]; then
        for f in ${XENGUEST_EXTRA_FILES}; do
            if [ ! -f $f ]; then
-                die "xenguest_image: Xen file $f does not exist"
+                die "xenguest-image: Xen file $f does not exist"
            fi
            call_xenguest_mkimage partial --xen-add-file=$f
        done
@@ -112,12 +103,12 @@ do_deploy_append() {
    if [ -n "${XENGUEST_EXTRA_DISK_FILES}" ]; then
        for f in ${XENGUEST_EXTRA_DISK_FILES}; do
            if [ ! -f $f ]; then
-                die "xenguest_image: Disk file $f does not exist"
+                die "xenguest-image: Disk file $f does not exist"
            fi
            call_xenguest_mkimage partial --disk-add-file=$f
        done
    fi
 }
-# Need to have xenguest_image tool
+# Need to have xenguest-image tool
 do_deploy[depends] += "xenguest-base-image:do_deploy"

@@ -30,7 +30,7 @@ XENGUEST_IMAGE_ROOT ??= "/dev/xvda1"
 # Guest kernel command line arguments
 XENGUEST_IMAGE_CMDLINE ??= "earlyprintk=xenboot console=hvc0 rw"

-# Extra commands to add to xenguest_image when creating the image
+# Extra commands to add to xenguest-image when creating the image
 XENGUEST_IMAGE_EXTRA_CMD ??= ""

 # Kernel binary
@@ -83,18 +83,6 @@ XENGUEST_IMAGE_DEPLOY_SUBDIR ?= "xenguest"
 # - something in ${WORKDIR} if you need to clone and manipulate an image
 XENGUEST_IMAGE_DEPLOY_DIR ??= "${DEPLOYDIR}"

-# These vars are used by image_types_xenguest.bbclass to generate the
-# xenguest.env file. In a recipe that inherits this class and extra variables
-# that should be included in xenguest.env need to be added to
-# XENGUEST_IMAGE_VARS_EXTRA
-XENGUEST_IMAGE_VARS ?= "\
- MACHINE DISTRO DISTRO_VERSION DISTRO_FEATURES TUNE_FEATURES TARGET_FPU \
- IMAGE_FEATURES INITRAMFS_IMAGE_BUNDLE INITRAMFS_IMAGE \
- XENGUEST_IMAGE_MEMORY_SIZE XENGUEST_IMAGE_NUM_VCPUS XENGUEST_IMAGE_AUTOBOOT \
- XENGUEST_IMAGE_ROOT XENGUEST_IMAGE_CMDLINE XENGUEST_IMAGE_EXTRA_CMD \
- XENGUEST_IMAGE_KERNEL XENGUEST_IMAGE_DISK_SIZE XENGUEST_IMAGE_DISK_DEVICE \
- XENGUEST_IMAGE_DISK_PARTITIONS XENGUEST_IMAGE_NETWORK_TYPE"
-
 #
 # Wrapper to call xenguest-mkimage
 # It is using XENGUEST_IMAGE_DEPLOY_DIR and XENGUEST_IMAGE_DEPLOY_SUBDIR
@@ -179,38 +167,7 @@ xenguest_image_create() {
    fi
 }

-XENGUEST_ENV_STAGING_DIR ??= "${STAGING_DIR}/${MACHINE}/xenguestenv"
-
-# Create an intermediary file containing all variables used to by a
-# particular recipe that inherits this class
-
-# File will contain the values of all variables listed in:
-#   XENGUEST_IMAGE_VARS_EXTRA
-python do_deploy_xenguestenv () {
-    xenguest_vars = d.getVar('XENGUEST_IMAGE_VARS_EXTRA')
-    if not xenguest_vars:
-        return
-
-    outdir = d.getVar('XENGUEST_ENV_STAGING_DIR')
-
-    # Writes file to tmp/sysroots/${MACHINE}/xenguestenv/ by default
-    filename = os.path.basename(d.getVar('FILE')) + '.xenguestenv'
-    with open(os.path.join(outdir, filename), 'w') as envf:
-        for var in xenguest_vars.split():
-            value = d.getVar(var)
-            if value:
-                # Write value only if set
-                envf.write('%s="%s"\n' % (var, " ".join(value.split())))
-        envf.close()
-}
-
-# Since the intermediary file is deleted by do_merge_xenguestenv it
-# must be re-created every time
-do_deploy_xenguestenv[vardeps] += "${XENGUEST_IMAGE_VARS_EXTRA}"
-do_deploy_xenguestenv[dirs] = "${XENGUEST_ENV_STAGING_DIR}"
-
-addtask deploy_xenguestenv before do_populate_sysroot
-
+#
 # Clone the current xenguest from deploy to manipulate it locally
 # This is required if you need to change things before packing an image
 # To set the local directory where to clone you must set
@@ -224,7 +181,7 @@ xenguest_image_clone() {
    fi

    if [ ! -f ${DEPLOY_DIR_IMAGE}/${XENGUEST_IMAGE_DEPLOY_SUBDIR}/guest.cfg ]; then
-        die "xenguest_image: ${DEPLOY_DIR_IMAGE}/${XENGUEST_IMAGE_DEPLOY_SUBDIR} does not contain a valid guest"
+        die "xenguest-image: ${DEPLOY_DIR_IMAGE}/${XENGUEST_IMAGE_DEPLOY_SUBDIR} does not contain a valid guest"
    fi

    rm -rf ${XENGUEST_IMAGE_DEPLOY_DIR}/${XENGUEST_IMAGE_DEPLOY_SUBDIR}
@@ -4,11 +4,6 @@
 DISTRO_FEATURES_append = " xen ipv4"
 DISTRO_FEATURES_NATIVE_append = " arm-autonomy-host"

-# Since meta-virtualization master branch bumped to 4.15+stable we need to
-# force the 4.14+stable selection until we validate the new version
-PREFERRED_VERSION_xen = "4.14+stable%"
-PREFERRED_VERSION_xen-tools = "4.14+stable%"
-
 # Don't include kernels in standard images when building arm-autonomy-host
 # If the kernel image is needed in the rootfs the following should be set from
 # a bbappend: RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image"
@@ -14,10 +14,9 @@ LAYERDEPENDS_meta-arm-autonomy = " \
   core \
   yocto \
   openembedded-layer \
-   networking-layer \
   virtualization-layer \
 "
-LAYERSERIES_COMPAT_meta-arm-autonomy = "hardknott"
+LAYERSERIES_COMPAT_meta-arm-autonomy = "gatesgarth"

 # We don't activate virtualization feature from meta-virtualization as it
 # brings in lots of stuff we don't need. We need to disable the sanity check
@@ -33,7 +32,7 @@ USER_CLASSES_append = " arm-autonomy-features"

 BBFILES_DYNAMIC += " \
    meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bbappend \
-    meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bb \
+    meta-gem5:${LAYERDIR}/dynamic-layers/meta-gem5/*/*/*.bbappend \
 "
 # Root directory for the meta-arm-autonomy/dynamic-layers/meta-arm-bsp
 ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR = "${ARM_AUTONOMY_LAYERDIR}/dynamic-layers/meta-arm-bsp"
@@ -1,5 +0,0 @@
-# This file will be required by different xenguest recipes to provide
-# common variables, which can be configured in local.conf
-
-# Xenguest image file install location
-XENGUEST_MANAGER_GUEST_DIR ?= "${datadir}/guests/"
@@ -32,16 +32,16 @@ Ensure it has all the required layers in bblayers.conf as listed in
 Add multiconfig
 ----------------

-The steps required to make the project build both the host and any
-number of guests as required are:
+Here are the steps required to make the project build both the host and any
+number of guests as required.

 1. Create a new directory under `conf/` named `multiconfig/`

 2. Create two new files in this directory:
 `multiconfig/host.conf`
 `multiconfig/guest.conf`
-These files will contain any configurations that are specific to either the
-host or the guest. The resulting directory tree should be:
+These files will contain any configurations that a specific to either the
+host or the guest

 ```
 -- conf
@@ -73,12 +73,12 @@ MC_GUEST_INITRAMFS_IMAGE ?= ""
 #MC_GUEST_INITRAMFS_IMAGE_BUNDLE = "1"
 #MC_GUEST_INITRAMFS_IMAGE = "${MC_GUEST_IMAGERECIPE}"

-# These variables are set automatically, don't override them!
+# These variables are set automatically, don't edit them!
 MC_GUEST_FILENAME_PREFIX = "${@ 'Image-initramfs' if d.getVar('MC_GUEST_INITRAMFS_IMAGE_BUNDLE',d) else '${MC_GUEST_IMAGERECIPE}' }"

 MC_GUEST_FILENAME = "${MC_GUEST_FILENAME_PREFIX}-${MC_GUEST_MACHINE}.xenguest"

-MC_GUEST_DEP = "${@ 'virtual/kernel:do_deploy' if d.getVar('MC_GUEST_INITRAMFS_IMAGE_BUNDLE',d) else '${MC_GUEST_IMAGERECIPE}:do_merge_xenguestenv'}"
+MC_GUEST_DEP = "${@ 'virtual/kernel:do_deploy' if d.getVar('MC_GUEST_INITRAMFS_IMAGE_BUNDLE',d) else '${MC_GUEST_IMAGERECIPE}:do_image_complete'}"

 MC_DOIMAGE_MCDEPENDS += "mc:${MC_HOST}:${MC_GUEST}:${MC_GUEST_DEP} "

@@ -114,10 +114,9 @@ IMAGE_FSTYPES += "${@ 'cpio' if d.getVar('MC_GUEST_INITRAMFS_IMAGE_BUNDLE',d) el
 # ANY OTHER GUEST CONFIG
 ```

-To modify the MACHINE or INITRAMFS variables change the equivalent
-config in local.conf rather than modifying this file directly. You can also
-append any other config desired for the guest after "ANY OTHER GUEST CONFIG",
-for example `XENGUEST_IMAGE_DISK_SIZE`.
+This contents shouldn't be changed directly, rather change the equivalent
+config in local.conf. You can append any other config desired for the
+guest at this point, for example `XENGUEST_IMAGE_DISK_SIZE`

 Make sure not to change `${DEPLOY_DIR_IMAGE}` to anything other than
 `${TMPDIR}/deploy/images`, as this is assumed by local.conf.
@@ -128,8 +127,6 @@ Make sure not to change `${DEPLOY_DIR_IMAGE}` to anything other than
 TMPDIR = "${TOPDIR}/${MC_HOST}"

 DISTRO_FEATURES += " arm-autonomy-host"
-
-# ANY OTHER HOST CONFIG
 ```

 Building the image
@@ -140,56 +137,29 @@ To build the multiconfig image the command is:
 bitbake mc:host:arm-autonomy-host-image-minimal
 ```

-The first time this is run you may see a warning related to the SRC_URI:
-```
-Unable to get checksum for xenguest-extern-guests SRC_URI entry foo.xenguest: file could not be found
-```
+You should see that this triggers guest tasks to be built in
+parallel. Once the build completes the guest will already be in the
+rootfs of the host thanks to `ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUEST`

-This is expected, and only indicates that the guest image has not yet been
-generated when the host parses the SRC_URI. By the time it is needed by the
-host recipe fetch task it will be present.
-
-During the build you should see that guest tasks are also being executed in
-parallel. Once the build completes the guest will already be in the rootfs of
-the host thanks to `ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUEST`
-
-The final host image including the guests will be deployed in
-`host/deploy/images/`
+The deployed image including the guest will be in `host/deploy/images/`


 Multiple Guests
 ----------------

 To have multiple guests with the same config the line which appends to
-`ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS` just needs to pass the argument
-'guestcount=#' to install symlink copies of the xenguest file on the host.
-Documentation for the guestcount parameter can be found in
-documentation/arm-autonomy-quickstart.md in the section titled
-'Include guests directly in the host image'. This will ensure that the guest
-is still only built once, despite resulting in multiple copies on the target.
+`ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUEST` just needs to be duplicated with
+a different guestname.

-If guests are required to have different configurations, each will need its own
-config file, e.g. 'netguest.conf'. Ensure that the name of the conf file does
-not contain any hyphens, as this will create errors when it becomes part of a
-function name. In this file the values of TMPDIR, MACHINE, DISTRO_FEATURES etc.
-should be the same as above, but with the prefix "MC_GUEST_*" modified to
-something different to avoid collisions (e.g. MC_GUEST_2_*).
+To have different config for each guest, each will need its own config
+file similar to guest.conf, ensuring TMPDIR is set to a different path,
+and everything between `---Guest Config Start---` and
+`---Guest Config End---` will need to be duplicated.

-As before, your additional config for the guest type should
-follow "ANY OTHER GUEST CONFIG"
+Any copies of variables that start `MC_GUEST` must be altered to avoid
+collisions (e.g. `MC_GUEST_2_*`), and the name of the conf file must also
+be added to BBMULTICONFIG.

-In your local.conf, everything between `---Guest Config Start---` and
-`---Guest Config End---` will need to be duplicated for each desired guest type.
-All copies of variables that start `MC_GUEST` must be modified with the same
-prefix as in the new guest config file (e.g. `MC_GUEST_2_*`).
-
-Each chunk of guest config in local.conf has automatic guest variables
-(found after the line "These variables are set automatically...").
-These should all use the same prefix as their chunk in their values,
-for example:
-```
-MC_GUEST_2_FILENAME_PREFIX = "${@ 'Image-initramfs' if d.getVar('MC_GUEST_2_INITRAMFS_IMAGE_BUNDLE',d) else '${MC_GUEST_2_IMAGERECIPE}' }"
-```

 Guest with provisioned disk
 ----------------
@@ -202,12 +172,11 @@ AUTONOMY_HOST_EXTRA_PARTITION = "part --label provisioned-guest --source rawcopy
 --sourceparams=file=${TOPDIR}/${MC_GUEST}/deploy/images/${MC_GUEST_MACHINE}/${MC_GUEST_FILENAME_PREFIX}-${MC_GUEST_MACHINE}.ext4"
 ```

-inside your host.conf file.
+inside host.conf file.

 The rest of the configuration has to be appended to guest.conf file:

 ```
-# ANY OTHER GUEST CONFIG
 XENGUEST_IMAGE_DISK_SIZE = "0"
 XENGUEST_IMAGE_SRC_URI_XEN_CONFIG = "file://\${TOPDIR}/path/to/rootdisk.cfg"
 XENGUEST_IMAGE_DISK_DEVICE = "_GUEST_DISK_DEVICE_"
@@ -216,7 +185,7 @@ IMAGE_ROOTFS_SIZE = "102400"
 IMAGE_FSTYPES = "ext4"
 ```

-Example content of rootdisk.cfg:
+content of rootdisk.cfg"

 ```
 disk = ["phy:_GUEST_DISK_DEVICE_,xvda,w"]
@@ -1,9 +1,9 @@
 arm-autonomy Quick Start
 ==================

-This documentation explains how to quickly start with the arm-autonomy layer,
+This documentation is explaining how to quickly start with arm-autonomy layer
 and the main features provided.
-In the documentation directory you will find some more detailed documentation
+You will find in the documentation directory some more detailed documentation
 for each of the functionalites provided by this layer.

 What to use this layer for?
@@ -29,7 +29,7 @@ First you must download the Yocto layers needed:
 - all other layers you might want to use

 For each of the downloaded layer make sure you checkout the release of Yocto
-you want to use (for example hardknott using `git checkout hardknott`).
+you want to use (for example gatesgarth using `git checkout gatesgarth`).

 Please follow [Yocto documentation](https://www.yoctoproject.org/docs/latest/brief-yoctoprojectqs/brief-yoctoprojectqs.html)
 in order to have the required dependencies.
@@ -110,8 +110,7 @@ The project will generate a Linux kernel, a root filesystem, a Xen binary and
 a DTB modified to include the required entries to boot Xen and Linux as Dom0
 (this DTB has the extension `-xen.dtb`).

-To boot the system using a u-boot base board for machines other than FVP-Base
-you will need to:
+To boot the system using an u-boot base board you will need to:
 - Load the kernel (by default at 0x80080000 unless you modify
  XEN_DEVICETREE_DOM0_ADDR value)
 - Load the xen device tree (for example at 0x83000000)
@@ -120,88 +119,49 @@ you will need to:

 In this example the addresses might need to be adapted depending on your board.

-For arm-autonomy host on FVP-Base, u-boot has been modified such that
-`booti 0x84000000 - 0x83000000` is the default boot command. If FVP-Base is your
-MACHINE target there should be no need to interfere with u-boot.
-
 Guest project
 -------------
-The guest projects are not target specific and will instead use a Yocto MACHINE
-defined in meta-arm-autonomy to include only the Linux configuration required to
-run a xen guest.
+The guest projects are not target specific and will use a Yocto MACHINE defined
+in meta-arm-autonomy to include only the Linux configuration required to run
+a xen guest.

 To create a guest project:

 1. Follow the steps of "Create a project"

-2. Optionally add layers required to build the guest image, and any features you
-   need.
+2. Optionaly add layers required to build the image and features you need.

-3. Edit conf/local.conf to add `arm-autonomy-guest` to the DISTRO_FEATURES and
+3. edit conf/local.conf to add `arm-autonomy-guest` to the DISTRO_FEATURES and
   set MACHINE to `arm64-autonomy-guest`:
  ```
  MACHINE = "arm64-autonomy-guest"
  DISTRO_FEATURES += "arm-autonomy-guest"
  ```

-4. Build the image you want.
+4. build the image you want.
   For example `bitbake core-image-minimal`

 The build will create a ".xenguest" image that can be use on an host project
-with the xenguest-manager, as well as a file "xenguest.env" containing the
-variables used to configure and generate the guest image.
+with the xenguest-manager.

 The guest can also be built as a 'multiconfig' sub project of the host, see
-`meta-arm-autonomy/documentation/arm-autonomy-multiconfig.md` for more
- information
+`meta-arm-autonomy/documentation/arm-autonomy-multiconfig.md` for more information

 Include guests directly in the host image
 -----------------------------------------
-The layer provides a way to directly include one or more images generated by
-guest projects in the host project.
+The layer provides a way to directly include in the host project one or several
+images generated by guest projects.

 To use this feature, you must edit your host project `local.conf` file and
-add set the value of 'ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS' to the list of
-paths to xenguest images you want to include in your host.
-
-There are 4 supported formats for ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS
-entries:
-
- http/https url
-  - "https://[url]:[port]/foo.xenguest;md5sum=..."
-
- file:// absolute local path from root
-  - "file:///xenguests/bar.xenguest"
-
- file:// path relative to FILESEXTRAPATHS
- - "file://relative/baz.xenguest"
-
- plain absolute local path from root
-  - "/xenguests/absolute/xyzzy.xenguest"
-
-It is not recommended to use other bitbake URL types, as they may result in
-undefined behaviour.
-
-A semicolon seperated list of install arguments can follow each image path:
- guestname  : the name that will be attached when the image is imported
-               (default: [filename, without extension])
- guestcount : the number of copies of the guest to install, with
-               incrementing numbers appended to the name
-               (default: 1)
-
-Any other arguments, for example an md5sum, will be assumed to be fetch
-arguments, and will be appended to the path in the SRC_URI.
+add set ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS to the list of xenguest images
+you want to include in your host. Each xenguest image must be given using a
+full path to it.
 For example:
 ```
-ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS = "\
-https://[url]:[port]/base.xenguest;md5sum=[checksum];guestname=http \
-file:///guests/base.xenguest;guestname=file_abs \
-file://foo/base.xenguest;guestname=file_rel;guestcount=2 \
-/guests/foo/bar/base.xenguest;guestname=no_fetcher \ "
+ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS = "/home/user/guest-project/tmp/deploy/images/arm64-autonomy-guest/core-image-minimal-arm64-autonomy-guest.xenguest;guestname=myguest"
 ```
-
-Documentation for setting up a multiconfig build can be found in:
-meta-arm-autonomy/documentation/arm-autonomy-multiconfig.md
+This will add the guest and name it `myguest` on the host project image and
+the xenguest-manager will automatically boot it during startup.

 Add support for your board
 --------------------------
@@ -222,7 +182,7 @@ started). You can find the complete list of the kernel configuration elements
 required in `recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.cfg`.

 ### Define the drive and partition to use for the LVM volume
-The xenguest-manager creates guest storage drives using LVM on an empty
+The xenguest-manager is creating disk hard drive using LVM on an empty
 partition. The default value is set to use /dev/sda2.
 You can change this for your board by setting XENGUEST_MANAGER_VOLUME_DEVICE.

@@ -231,37 +191,37 @@ Check `recipes-extended/xenguest/xenguest-manager.bbappend` for examples.
 Please also read xenguest-manager.md.

 ### Define the interface to add to xenguest network bridge
-xenguest-network bridge creates a bridge on the host and adds network
-interfaces to it so that guests connected to it have access to external network.
+xenguest-network bridge is creating a bridge on the host and adds network
+interfaces to it so that guest connected to it have access to external network.
 By default `eth0` is set as the list of interfaces to be added to the bridge.
 Depending on your board or use case you might want to use an other interface
 or use multiple interfaces.
 You can change this for your board by setting XENGUEST_NETWORK_BRIDGE_MEMBERS.

-Check `recipes-extended/xenguest/xenguest-network.bbappend` for
+Check `recipes-extended/xenguest/xenguest-network-bridge.bbappend` for
 exmaples.

 Please also read xenguest-network-bridge.md.

 ### Define the network configuration of the xenguest network bridge
-xenguest-network puts the host network interfaces in a bridge and configures it
-by default to use dhcp.
+xenguest network bridge is putting the host network interfaces in a bridge
+and is configuring it by default to use dhcp.
 If you need a different type of configuration you can set
-XENGUEST_NETWORK_BRIDGE_CONFIG in your xenguest-network-bridge.bbappend to use
+XENGUEST_NETWORK_BRIDGE_CONFIG in a xenguest-network-bridge.bbappend to use
 a different file.
-The recipe will look for the file in ${WORKDIR}, so you will need to add it to
-the SRC_URI in your bbappend.
+The recipe will look for the file in ${WORKDIR} so you will need to add it to
+SRC_URI in your bbappend.
 The recipe will also substitute `###BRIDGE_NAME###` with the bridge name
-configured in ${XENGUEST_NETWORK_BRIDGE_NAME} when the config file is installed.
+configured in ${XENGUEST_NETWORK_BRIDGE_NAME}.

 You can find an example configuration file in
 `recipes-extended/xenguest/files/xenguest-network-bridge-dhcp.cfg.in`.

-Please also read xenguest-network.md.
+Please also read xenguest-network-bridge.md.

 ### Customize Dom0 and Xen boot arguments for you board
-xen-devicetree modifies the generated DTB Xen and Linux boot arguments,
-as long as the address where Dom0 Linux kernel can be found.
+xen-devicetree is writting inside the generated DTB Xen and Linux boot
+arguments as long as the address where Dom0 Linux kernel can be found.
 You might need to have different values for your board or depending on your
 use case.

@@ -28,7 +28,7 @@ perform a couple of customizations in the generated wic image:
 The `arm-autonomy-n1sdp-efidisk.wks.in` and `arm-autonomy-n1sdp-grub.cfg` files
 are located at `meta-arm-autonomy/dynamic-layers/meta-arm-bsp/wic`.

-Other variables can also be customized to set what files need to be included
+Other variables can also be custmized to set what files need to be included
 in the wic image boot partition. Please refer to
 `meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc`
 for more details.
@@ -56,8 +56,7 @@ The following parameters are available:
  the xen devicetrees are properly regenerated if the source DTBs are changed.
  This variable is set by default to "virtual/kernel:do_deploy" to use DTBs
  generated during the compilation of the Linux kernel. This must be changed
-  if the machine you are using is not using a DTB listed in
-  KERNEL_DEVICETREE.
+  if the machine your are using is not using a DTB listed in KERNEL_DEVICETREE.

 - XEN_DEVICETREE_DTBS: This should be set to the list of DTBs you want to be
  modified by xen-devicetree. Those must be files that xen-devicetree can find
@@ -7,7 +7,7 @@ Introduction
 xenguest-manager is a tool to manage Xenguest images generated by
 [xenguest-mkimage](xenguest-mkimage.md).

-On a Xen Dom0 system it can:
+On a Xen Dom0 system it will:
 - create a xen guest from a xenguest image: extract its components, create a
  disk for the guest using LVM volumes.
 - start/stop a xen guest (during init or using xenguest-manager directly).
@@ -48,7 +48,6 @@ Bitbake parameters

 Several parameters are available to configure the xenguest manager during Yocto
 project compilation (those can be set in your project local.conf, for example).
-This config will be written to a file xenguest-manager.conf in /etc/xenguest/.

 The following parameters are available:

@@ -69,22 +68,13 @@ The following parameters are available:
  name).
  This is set by default to "/usr/share/guests".

- XENGUEST_MANAGER_LOG_LEVEL: Set the default log level for xenguest manager.
-  Must be one of ERROR, INFO, VERBOSE (default: ERROR). The logs will be
+- XENGUEST_MANAGER_LOG_LEVEL: Set the default log level for xenguest manager. Must
+  be one of ERROR, INFO, VERBOSE (default: ERROR). The extra will be
  written to /var/log/xenguest.

  If a verbosity argument (-v or -vv) is passed to xenguest-manager directly, it
  will override the setting in xenguest-manager.conf

-  Since /var/log is by default a volatile location, extra configuration is
-  required if logs are desired to be kept between reboots:
-    VOLATILE_LOG_DIR="no"
-
-  Read more here: https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#var-VOLATILE_LOG_DIR
-
-  When this is enabled, logrotate will monitor the file to ensure it does not
-  grow excessively large. See recipes-extended/xenguest/files/logrotate-xenguest
-
 Init scripts
 ------------

@@ -113,30 +103,26 @@ and variables from the parent file's scope, including:
                    Takes an optional log level and a message body
                    e.g. log ERROR "blah"

-                    Options for log level: ERROR, INFO, VERBOSE,
-                    and FATAL which will call exit 1 immediately after logging
-                    the message at level ERROR.
+                    Options for log level: ERROR, INFO, VERBOSE, and FATAL, which
+                    will call exit 1 immediately after logging the message

 - log_command()   : Used to call a shell command and log that it has been
                    called, as well as capturing both stdout and stderr.

-                    By default the command output is dumped to the logfile as an
-                    error if the command returns a status > 0, or as a verbose
-                    message if the whole script is running in verbose mode.
-
-                    An optional log level can be passed to alter the level the
-                    log should be if the command returns a status >0, which may
-                    be useful if the command is expected to return a non-zero
-                    result.
+                    By default the command output is dumped to the logfile as an error
+                    if the command returns a status > 0, or as a verbose message if the
+                    whole script is running in verbose mode. An optional log level can
+                    be passed to alter the level the log should be if the command returns
+                    a status >0,
                    e.g. log_command INFO "ls -lh ~"

                    Options for log level: ERROR, INFO, and VERBOSE

-Attempting to call any other functions from xenguest_manager in an init script
-may result in a fatal error, from which cleanup is not guarenteed.
+Attempting to call any other functions from xenguest_manager in an init script may
+result in a fatal error, from which cleanup is not guarenteed.


-Init scripts also have access to config variables defined in params.cfg.
+Sourcing also allows the script to access params.cfg.

 An example of how to create the directory and install an init shell script can
 be found in:
@@ -4,9 +4,9 @@ Xenguest mkimage
 Introduction
 ------------

-xenguest-mkimage is a tool to create and modify images to be used as a Guest
-with Xen. It defines a format to store completely defined guests as a file or as
-a directory, and provides options to create and modify those images.
+xenguest-mkimage is a tool to create and modify images to be used as Guest with
+Xen. It defines a format to store completely defined guests as a file or as
+a directory and provides options to create and modify those images.

 A xenguest image contains all elements required to create a xen guest.
 This is the base elements like a Xen configuration and a Linux kernel binary
@@ -15,8 +15,8 @@ but also some more advanced elements like init scripts or a disk definition.
 The format is made to be deployable easily by storing everything in a single
 file and provide tools to easily manipulate the images. It can also easily be
 extended to have features like encryption or signature of images, updates or
-complex configurations by providing the ability to have init scripts embedded
-inside the image that will be executed on the host when the guest is started.
+complex configurations by providing features to have init script that will be
+executed on the host embedded inside the image.

 Xenguest images content
 -----------------------
@@ -35,7 +35,7 @@ before starting the guest.

 ### files
 This directory contains files that can be used by the xen configuration, for
-example the kernel image referenced in xen configuration.
+example the binary of the kernel referenced in xen configuration).
 This is where the kernel binary, the dtb or a ramdisk will be stored.

 ### init.pre, init.d and init.post
@@ -47,7 +47,7 @@ contains scripts called at a different time:
     generate part of the xen configuration dynamically.
 - init.d: scripts executed when the guest has been created but before it is
     started. This can be used to do some xenstore operations or configure the
-     guest behaviour, using xl for example.
+     guest behaviour using xl, for example.
 - init.post: scripts executed just after starting the guest. This can be
     used to configure things created by xen for the guest like network
     network interfaces.
@@ -4,36 +4,4 @@
 # default rootfs, so use vda3 for guest lvm
 XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/vda3"

-# We need to extend the wks search path to be able to find the wks file set in
-# ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
-
-ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-fvp-base-disk.wks.in"
-# set wks file only if INITRAMFS_IMAGE_BUNDLE is not set
-WKS_FILE = "${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', '',\
-                                 '${ARM_AUTONOMY_WKS_FILE}', d)}"
-
-XEN_FILE ?= "xen-fvp-base"
-DTB_FILE ?= "${@ get_xen_dtb_filename(d)}"
-XEN_ADDR ?= "0x84000000"
-DTB_ADDR ?= "0x83000000"
-
-FVP_DATA    += "cluster0.cpu0=${DEPLOY_DIR_IMAGE}/${XEN_FILE}@${XEN_ADDR} \
-                cluster0.cpu0=${DEPLOY_DIR_IMAGE}/${DTB_FILE}@${DTB_ADDR}"
-
-# Set the wks guest partition size and unit. It must be aligned with the sum of
-# all XENGUEST_IMAGE_DISK_SIZE set for the guests. By default, LVM2 metadata is
-# 1 MiB per physical volume, hence it needs to be taken into account when
-# setting GUEST_PART_SIZE. The XENGUEST_IMAGE_DISK_SIZE default value is 4GiB.
-GUEST_PART_SIZE ?= "4097"
-GUEST_PART_SIZE_UNIT ?= "M"
-
 XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0"
-
-# This function uses the "KERNEL_DEVICETREE" variable and manipulates it to
-# return the xen kernel device tree file name.
-def get_xen_dtb_filename(d):
-    kernel_dtb_filename = d.getVar('KERNEL_DEVICETREE',d)
-    xen_dtb_filename = os.path.splitext(os.path.basename(kernel_dtb_filename))[0] + '-xen.dtb'
-    return xen_dtb_filename
-
@@ -49,16 +49,20 @@ do_image_wic[depends] += "xen:do_deploy"
 IMAGE_EFI_BOOT_FILES += "xen-n1sdp.efi;xen.efi"
 IMAGE_EFI_BOOT_FILES += "${XEN_MOD_DEVICETREE_DTBS}"

-# When alternate-kernel DISTRO_FEATURE is present we set the linux-yocto-rt
+# Use 5.4 kernel until later versions have been validated for autonomy-host
+PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-arm"
+PREFERRED_VERSION_linux-linaro-arm = "5.4%"
+
+# When alternate-kernel DISTRO_FEATURE is present we set the linux-linaro-arm-rt
 # by default
 PREFERRED_PROVIDER_alternate/kernel ?= "\
 ${@bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', \
-'linux-yocto-rt', '', d)}"
+'linux-linaro-arm-rt', '', d)}"

 KERNEL_PACKAGE_NAME_alternate/kernel ?= "kernel-rt"
 # When alternate-kernel DISTRO_FEATURE is present we set the kernel-rt by
 # default
-KERNEL_PACKAGE_NAME_pn-linux-yocto-rt = "\
+KERNEL_PACKAGE_NAME_pn-linux-linaro-arm-rt = "\
 ${@ d.getVar('KERNEL_PACKAGE_NAME_alternate/kernel') \
 if bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', True, False, d) \
 else 'kernel' }"
@@ -84,7 +88,3 @@ IMAGE_EFI_BOOT_FILES += "\
 ${@ d.getVar('GRUB_CFG_EXTRA_FILE',d) or '' \
 if bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', True, False, d) and \
 d.getVar('PREFERRED_PROVIDER_alternate/kernel') else ''}"
-
-# Additionnal kernel modules are necessary for n1sdp to be able to mount FAT
-# filesystems using CP437.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
@@ -1,14 +1,14 @@
 # Use OVERRIDES to minimize the usage of
-# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
-OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
+# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ...
+OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"

-FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_xen := "${THISDIR}/${PN}:"

-DEPENDS_append_autonomy-host = " dos2unix-native"
+DEPENDS_append_xen = " dos2unix-native"

-SRC_URI_append_autonomy-host = " file://add-xen-support.patch;patchdir=../"
+SRC_URI_append_xen = " file://add-xen-support.patch;patchdir=../"

-do_install_append_autonomy-host() {
+do_install_append_xen() {
    mv -v ${D}/${UNPACK_DIR}/SOFTWARE/uEnv.txt \
          ${D}/${UNPACK_DIR}/SOFTWARE/uenvfile
    for dir in $(ls ${D}/${UNPACK_DIR}/SITE1/)
@@ -18,11 +18,11 @@ do_install_append_autonomy-host() {
 }

 DEPLOY_EXTRA_DEPS ??= ""
-DEPLOY_EXTRA_DEPS_autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
+DEPLOY_EXTRA_DEPS_xen = "xen:do_deploy xen-devicetree:do_deploy"

 do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"

-do_deploy_prepend_autonomy-host() {
+do_deploy_prepend_xen() {
    # To avoid dependency loop between firmware-image-juno:do_install,
    # xen:do_deploy and xen-devicetree:do_deploy when
    # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
@@ -0,0 +1,80 @@
+From c2971c8a3f076ea8a522ce4fbb367d112d86c13a Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <sstabellini@kernel.org>
+Date: Mon, 27 Apr 2020 16:15:26 -0700
+Subject: [PATCH] xen: use handle_fasteoi_irq to handle xen dynamic events
+
+When handling Xen events, we need to make sure the following sequence is
+followed:
+
+- mask event
+- handle event and clear event (the order does not matter)
+- unmask event
+
+It is not possible to implement this flow with handle_edge_irq, so
+switch back to handle_fasteoi_irq. Please note that Xen event irqs are
+ONESHOT. Also note that handle_fasteoi_irq was in-use before the
+following commit, that is partially reverted by this patch:
+
+7e186bdd0098 xen: do not clear and mask evtchns in __xen_evtchn_do_upcall
+
+PIRQ handling is left unchanged.
+
+This patch fixes a domU hang observed when using LinuxRT as dom0 kernel.
+
+Link: https://lkml.org/lkml/2020/4/27/1287
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+
+Upstream-Status: Inappropriate since the upstream solution diverges from this patch
+Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
+---
+ drivers/xen/events/events_base.c | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
+index 6c8843968a52..1873a19b8b24 100644
+--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
+@@ -845,7 +845,7 @@ int bind_evtchn_to_irq(unsigned int evtchn)
+ 			goto out;
+ 
+ 		irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,
+-					      handle_edge_irq, "event");
+					      handle_fasteoi_irq, "event");
+ 
+ 		ret = xen_irq_info_evtchn_setup(irq, evtchn);
+ 		if (ret < 0) {
+@@ -978,7 +978,7 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu)
+ 						      handle_percpu_irq, "virq");
+ 		else
+ 			irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,
+-						      handle_edge_irq, "virq");
+						      handle_fasteoi_irq, "virq");
+ 
+ 		bind_virq.virq = virq;
+ 		bind_virq.vcpu = xen_vcpu_nr(cpu);
+@@ -1387,12 +1387,6 @@ static void ack_dynirq(struct irq_data *data)
+ 		clear_evtchn(evtchn);
+ }
+ 
+-static void mask_ack_dynirq(struct irq_data *data)
+-{
+-	disable_dynirq(data);
+-	ack_dynirq(data);
+-}
+-
+ static int retrigger_dynirq(struct irq_data *data)
+ {
+ 	unsigned int evtchn = evtchn_from_irq(data->irq);
+@@ -1595,8 +1589,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
+ 	.irq_mask		= disable_dynirq,
+ 	.irq_unmask		= enable_dynirq,
+ 
+-	.irq_ack		= ack_dynirq,
+-	.irq_mask_ack		= mask_ack_dynirq,
+	.irq_eoi		= ack_dynirq,
+ 
+ 	.irq_set_affinity	= set_affinity_irq,
+ 	.irq_retrigger		= retrigger_dynirq,
+-- 
+2.17.1
+
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
+
+SRC_URI_append = " \
+    file://0001-xen-use-handle_fasteoi_irq-to-handle-xen-dynamic-eve.patch \
+    "
+
+KERNEL_FEATURES += "features/arm-autonomy/preempt-rt-extras.scc"
@@ -1,17 +0,0 @@
-# short-description: Create a disk image
-# long-description: Creates a partitioned disk image that the user
-# can directly dd to boot media.
-
-# For FVP Base first partition is empty to keep compatibility with disk.img
-part --label empty --source empty --ondisk sda --size="1M" --system-id 8e --align 1024
-
-# Second partition is rootfs normally populated as /dev/vda2
-part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024
-
-# Third partition to accomodate guests images normally populated as /dev/vda3 (used by XENGUEST_MANAGER_VOLUME_DEVICE)
-part --label guests --source empty --ondisk sda --size="${GUEST_PART_SIZE}${GUEST_PART_SIZE_UNIT}" --system-id 8e --align 1024
-
-# Fourth partition is user defined entry normally populated as /dev/vda4
-${AUTONOMY_HOST_EXTRA_PARTITION}
-
-bootloader --ptable msdos
@@ -1,7 +1,7 @@
 # When booting gem5-arm64 with Xen we need to set the cpu as Cortex A53 and
 # remove support for pointer authentification
 GEM5_RUN_EXTRA_append = " \
-${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'xen', \
+${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'arm-autonomy-host', \
 '--param=system.cpu_cluster[0].cpus[0].isa[0].midr=0x410fd030 \
 --param=system.cpu_cluster[0].cpus[0].isa[0].id_aa64isar1_el1=0x0', \
 '', d)}"
@@ -0,0 +1 @@
+XENGUEST_NETWORK_BRIDGE_MEMBERS_gem5-arm64 ?= "eth0"
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend_gem5-arm64 := "${THISDIR}:"
+
+#
+# arm-autonomy kmeta extra
+#
+SRC_URI_append_gem5-arm64 = " file://arm-autonomy-kmeta-extra-gem5;type=kmeta;name=arm-autonomy-kmeta-extra-gem5;destsuffix=arm-autonomy-kmeta-extra-gem5"
+
+# We need to turn off SVE support in the Linux kernel otherwise Xen is stopping
+# Linux kernel with a coredump while trying to access XEN bit of CPACR1 core
+# register.
+LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE_gem5-arm64 = "${@bb.utils.contains_any('DISTRO_FEATURES', \
+                                         'arm-autonomy-host arm-autonomy-guest', \
+                                         ' features/arm-autonomy/disable-arm64-sve.scc','',d)}"
+
+KERNEL_FEATURES_append_gem5-arm64 = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
@@ -1 +1 @@
-GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'xen_boot', '', d)}"
+GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen_boot', '', d)}"
@@ -1,16 +0,0 @@
-Upstream Status: Inappropriate [meta-arm-autonomy specifc u-boot config]
-Signed-off-by: Nathan Dunne <nathan.dunne@arm.com>
-
-diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
-index e63c335f85..9ee050a4a6 100644
--- a/include/configs/vexpress_aemv8a.h
-+++ b/include/configs/vexpress_aemv8a.h
-@@ -162,7 +162,7 @@
- #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
- #define CONFIG_EXTRA_ENV_SETTINGS	\
- 				"kernel_name=Image\0"		\
-				"kernel_addr=0x80080000\0"	\
-+				"kernel_addr=0x84000000\0"	\
- 				"initrd_name=ramdisk.img\0"	\
- 				"initrd_addr=0x88000000\0"	\
- 				"fdtfile=devtree.dtb\0"		\
@@ -1,9 +0,0 @@
-# Machine specific u-boot
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
-
-#
-# FVP BASE
-#
-
-SRC_URI_append_fvp-base = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ' file://xen_u-boot_kernel_addr.patch', '', d)}"
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-INSTALL_DIR="###CONTAINERS_INSTALL_DIR###"
-MANIFEST="${INSTALL_DIR}/###CONTAINERS_MANIFEST###"
-
-INIT_DIR="/etc/init.d"
-DOCKER_INIT="docker.init"
-
-find_docker_init() {
-    if [ -f "$INIT_DIR/$DOCKER_INIT" ]; then
-         $INIT_DIR/$DOCKER_INIT "start"
-    else
-        echo "ERROR: Couldn't find docker init script! ($INIT_DIR/$DOCKER_INIT)"
-        exit 1
-    fi
-}
-
-is_docker_started() {
-    if ! docker info > /dev/null 2>&1; then
-        find_docker_init
-    fi
-}
-
-check_manifest() {
-    if [ ! -f ${MANIFEST} ]; then
-        echo "No manifest found!"
-        exit 1
-    fi
-}
-
-has_docker_image() {
-    docker image inspect "$1" >/dev/null 2>&1
-}
-
-start() {
-    check_manifest
-    is_docker_started
-
-    while read -r archive name tag keep _; do
-
-        CONTAINER_IMAGE_NAME_AND_TAG="${name}:${tag}"
-
-        # Image does not exist and image file exists: Import the image.
-        if ! has_docker_image "${CONTAINER_IMAGE_NAME_AND_TAG}" && \
-           [ -f "${INSTALL_DIR}/${archive}" ]; then
-            echo "Importing ${CONTAINER_IMAGE_NAME_AND_TAG} container image..."
-            docker import "${INSTALL_DIR}/${archive}" \
-                   "${CONTAINER_IMAGE_NAME_AND_TAG}" 2>&1 || {
-                echo "Import ${CONTAINER_IMAGE_NAME_AND_TAG} container image: Failed."
-                exit $?
-            }
-            echo "Import ${CONTAINER_IMAGE_NAME_AND_TAG} container image: Done."
-
-            if [ "${keep}" != "1" ]; then
-                rm "${INSTALL_DIR}/${archive}"
-            fi
-        fi
-    done < ${MANIFEST}
-}
-
-case "$1" in
-    start)
-        start && exit 0
-        ;;
-    *)
-        echo "Usage: $0 {start}"
-        exit 2
-esac
-
-exit $?
@@ -1,36 +0,0 @@
-#
-# This recipe adds an init script to import the containers added by
-# docker_extern_containers.bbclass at boot time
-# Notes:
-# docker_extern_containers.bbclass creates a manifest file which contains
-# the columns:   archive   name   tag   keep
-# for each container. This file is read by the import_containers
-# script to determine the parameters of the import
-#
-# Since the script needs knowledge of the values of $CONTAINERS_INSTALL_DIR
-# and $CONTAINERS_MANIFEST these are substituted for placeholder strings when
-# the script is installed.
-
-DESCRIPTION = "Add init script to import docker images at boot"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit docker_extern_containers
-
-SRC_URI = "file://import_containers.sh"
-
-inherit update-rc.d
-INITSCRIPT_PARAMS = "start 30 2 3 4 5 ."
-INITSCRIPT_NAME = "import_containers.sh"
-
-S = "${WORKDIR}"
-do_install_append() {
-    install -d ${D}${sysconfdir}/init.d
-    install -m 755 import_containers.sh ${D}${sysconfdir}/init.d
-
-    sed -i "s,###CONTAINERS_INSTALL_DIR###,${CONTAINERS_INSTALL_DIR}," \
-           ${D}${sysconfdir}/init.d/import_containers.sh
-    sed -i "s,###CONTAINERS_MANIFEST###,${CONTAINERS_MANIFEST}," \
-           ${D}${sysconfdir}/init.d/import_containers.sh
-}
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+CONTAINER_IMAGE_FILE="###CONTAINER_IMAGE_FILE###"
+CONTAINER_IMAGE_NAME_AND_TAG="###CONTAINER_IMAGE_NAME_AND_TAG###"
+CONTAINER_IMAGE_FILE_KEEP="###CONTAINER_IMAGE_FILE_KEEP###"
+
+has_docker_image() {
+    docker image inspect "$1" >/dev/null 2>&1
+}
+
+start() {
+    # Image does not exist and image file exists: Import the image.
+    if ! has_docker_image ${CONTAINER_IMAGE_NAME_AND_TAG} && \
+       [ -f "/usr/share/docker/images/${CONTAINER_IMAGE_FILE}" ]; then
+        echo "Importing ${CONTAINER_IMAGE_NAME_AND_TAG} container image..."
+        docker import \
+               /usr/share/docker/images/${CONTAINER_IMAGE_FILE} \
+               ${CONTAINER_IMAGE_NAME_AND_TAG} 2>&1 || {
+            echo "Import ${CONTAINER_IMAGE_NAME_AND_TAG} container image: Failed."
+            exit $?
+        }
+        echo "Import ${CONTAINER_IMAGE_NAME_AND_TAG} container image: Done."
+
+        if [ "${CONTAINER_IMAGE_FILE_KEEP}" != "1" ]; then
+            rm /usr/share/docker/images/${CONTAINER_IMAGE_FILE}
+        fi
+    fi
+}
+
+case "$1" in
+    start)
+        start && exit 0
+        ;;
+    *)
+        echo "Usage: $0 {start}"
+        exit 2
+esac
+
+exit $?
@@ -0,0 +1,79 @@
+#
+# This recipe imports a docker container image to the xenguest image
+# Notes:
+# - Users should add docker in the local.conf of their target with
+# DISTRO_FEATURES += " docker" to make sure docker is installed.
+# - The CONTAINER_IMAGE_FILE variable defines the docker
+# container image to be imported and should be set in local.conf.
+# - The CONTAINER_IMAGE_FILE_KEEP variable defines the
+# behaviour that if the container image file is kept after import.
+# Setting this variable to 1 means keep the container image file after
+# import. This variable can be set in local.conf.
+# - The CONTAINER_IMAGE_NAME_AND_TAG variable defines the name and
+# tag of the imported image. The value of this variable should follow
+# the format of `NAME:TAG`. This variable can be set in local.conf.
+#
+
+DESCRIPTION = "Import a docker image to xenguest"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+CONTAINER_IMAGE_FILE ??= ""
+CONTAINER_IMAGE_FILE_KEEP ??= ""
+CONTAINER_IMAGE_NAME_AND_TAG ??= "local:local"
+
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "docker"
+
+python __anonymous() {
+    # Check if `CONTAINER_IMAGE_FILE` is empty.
+    container_image_file = d.getVar('CONTAINER_IMAGE_FILE')
+    if not container_image_file:
+        raise bb.parse.SkipRecipe("CONTAINER_IMAGE_FILE is empty")
+
+    # In case we have a symlink we need to convert the link to its realpath.
+    if os.path.islink(container_image_file):
+        container_image_file = os.path.realpath(container_image_file)
+        bb.warn("Given CONTAINER_IMAGE_FILE: %s is a symlink, "
+                "convert the link to its realpath: %s" %
+                (d.getVar('CONTAINER_IMAGE_FILE'), container_image_file))
+        d.setVar('CONTAINER_IMAGE_FILE', container_image_file)
+
+    # Check if the container image file exists.
+    # The container image file here is either the real file or the symlink target.
+    if not os.path.exists(container_image_file):
+        raise bb.parse.SkipRecipe("CONTAINER_IMAGE_FILE: %s does not exist." %
+                                  container_image_file)
+
+    # Here we can ensure that the CONTAINER_IMAGE_FILE exists and is valid.
+    # Therefore we can append this file to SRC_URI.
+    d.appendVar('SRC_URI',  ' file://' + container_image_file + ';unpack=0')
+}
+
+S = "${WORKDIR}"
+SRC_URI = "file://import_container.sh"
+
+inherit update-rc.d
+INITSCRIPT_PARAMS = "start 30 2 3 4 5 ."
+INITSCRIPT_NAME = "import_container.sh"
+
+do_install() {
+    install -d ${D}${sysconfdir}/init.d
+    install -d -m 755 ${D}${datadir}/docker/images
+
+    install -m 777 ${CONTAINER_IMAGE_FILE} ${D}${datadir}/docker/images/.
+    install -m 755 import_container.sh ${D}${sysconfdir}/init.d
+
+    BASENAME_CONTAINER_IMAGE_FILE=$(basename "${CONTAINER_IMAGE_FILE}")
+
+    sed -i "s,###CONTAINER_IMAGE_FILE###,${BASENAME_CONTAINER_IMAGE_FILE}," \
+           ${D}${sysconfdir}/init.d/import_container.sh
+    sed -i "s,###CONTAINER_IMAGE_NAME_AND_TAG###,${CONTAINER_IMAGE_NAME_AND_TAG}," \
+           ${D}${sysconfdir}/init.d/import_container.sh
+    sed -i "s,###CONTAINER_IMAGE_FILE_KEEP###,${CONTAINER_IMAGE_FILE_KEEP}," \
+           ${D}${sysconfdir}/init.d/import_container.sh
+}
+
+FILES_${PN} += "${datadir}/docker/images"
+RDEPENDS_${PN} = "packagegroup-docker-runtime-minimal"
@@ -1,4 +1,4 @@
-# Recipe to create a minimal Arm Autonomy reference stack host image
+# Recipe to create a minimal Arm Autonomy stack host image

 DESCRIPTION = "Arm Autonomy stack host minimal image"

@@ -11,6 +11,39 @@ inherit core-image features_check
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

+# The ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS variable can be used to include in the
+# image one or several xenguest images.
+# The list must be space separated and each entry must have the following
+# format: URL[;params]
+#  - URL can be the full path to a file or a Yocto compatible SRC_URI url
+#  - params encompasses two values that can be optionally set:
+#    - guestname=NAME can be used to specify the name of the guest. If not
+#      specified the default value is the basename of the file
+#      (without .xenguest extension).
+#    - guestcount=NUM can be used to created NUM guests with the same config.
+#      All guests after the first will have numbers appended to the guestname,
+#      starting from 2. In the rootfs additional xenguest files will be
+#      symlinks to the original.
+#  params should be semicolon seperated, without a space, and can appear in
+#  any order.
+#
+#  Here are examples of values:
+#  /home/mydir/myguest.xenguest;guestname=guest1;guestcount=3
+#  http://www.url.com/testguest.xenguest
+#
+#  If you are using the output of an other Yocto project, you should use the
+#  full path syntax instead of the Yocto SRC_URI to be able to use the
+#  symlink version of your image (as the real file has a new name on each
+#  build as it includes the date). You must not use SRC_URI type file:// as
+#  it will try to include the symlink and not the destination file which will
+#  be detected by the recipe and output an error 'Guest file is a symlink'.
+#
+#  Guests can also be added using a bbapend to this recipe by adding entries
+#  to SRC_URI with parameter ;guestname=NAME to specify the destination
+#  guestname. The parameter guestname must be present as it is used to detect
+#  guests to be added
+ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS ??= ""
+
 # Includes minimal set required to start and manage guest. The xen specific
 # modules are not explicitly included as they are built as part of the kernel
 # image for performance reasons. It doesn't include all kernel modules to
@@ -20,7 +53,6 @@ IMAGE_INSTALL += " \
    packagegroup-core-boot \
    packagegroup-core-ssh-openssh \
    qemu-system-i386 \
-    xenguest-extern-guests \
    xenguest-manager \
    xenguest-network \
    "
@@ -31,5 +63,107 @@ EXTRA_IMAGEDEPENDS += "xen"
 # Build xen-devicetree to produce a xen ready devicetree
 EXTRA_IMAGEDEPENDS += "xen-devicetree"

+# Documentation for setting up a multiconfig build can be found in:
+# meta-arm-autonomy/documentation/arm-autonomy-multiconfig.md
+
+# In a multiconfig build this variable will hold a dependency string, which differs based
+# on whether the guest has initramfs or not.
+# It may have a space seperated list of dependency strings if mulitple guest types are
+# configured
+MC_DOIMAGE_MCDEPENDS ?= ""
+# Example value: mc:host:guest:core-image-minimal:do_image_complete
+
+# In a multiconfig build the host task 'do_image' has a dependency on multiconfig guest.
+# This ensures that the guest image file already exists when it is needed by the host
+DO_IMAGE_MCDEPENDS := "${@ '${MC_DOIMAGE_MCDEPENDS}' if d.getVar('BBMULTICONFIG') else ''}"
+
+# Apply mc dependency. Empty string if multiconfig not enabled
+do_image[mcdepends] += "${DO_IMAGE_MCDEPENDS}"
+
 REQUIRED_DISTRO_FEATURES += 'arm-autonomy-host'
 REQUIRED_DISTRO_FEATURES += 'xen'
+
+python __anonymous() {
+    import re
+    guestfile_pattern = re.compile(r"^([^;]+);")
+    guestname_pattern = re.compile(r";guestname=([^;]+);?")
+    guestcount_pattern = re.compile(r";guestcount=(\d+);?")
+
+    # Check in ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS for extra guests and add them
+    # to SRC_URI with xenguest parameter if not set
+    guestlist = d.getVar('ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS')
+    if guestlist:
+        for guest in guestlist.split():
+            # If the user just specified a file instead of file://FILE, add
+            # the file:// prefix
+            if guest.startswith('/'):
+                guestname = os.path.basename(guest)
+                guestfile = guest
+                guestcount = "1"
+                f = guestfile_pattern.search(guest)
+                n = guestname_pattern.search(guest)
+                c = guestcount_pattern.search(guest)
+
+                if f is not None:
+                    guestfile = f.group(1)
+                if n is not None:
+                    guestname = n.group(1)
+                if c is not None:
+                    guestcount = c.group(1)
+                # in case we have a link we need the destination
+                guestfile = os.path.realpath(guestfile)
+
+                # make sure the file exist to give a meaningfull error
+                if not os.path.exists(guestfile):
+                    raise bb.parse.SkipRecipe("ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS entry does not exist: " + guest)
+
+                # In case the file is a symlink make sure we use the destination
+                d.appendVar('SRC_URI',  ' file://' + guestfile + ';guestname=' + guestname + ';guestcount=' + guestcount)
+            else:
+                # we have a Yocto URL
+                try:
+                    _, _, path, _, _, parm = bb.fetch.decodeurl(guest)
+                    # force guestname param in if not already there
+                    if not 'guestname' in parm:
+                        guest  += ';guestname=' + os.path.basename(path)
+                    d.appendVar('SRC_URI', ' ' + guest)
+                except:
+                    raise bb.parse.SkipRecipe("ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS contains an invalid entry: " + guest)
+}
+
+python add_extern_guests () {
+    # Destination directory on the rootfs
+    guestdir = d.getVar('IMAGE_ROOTFS') + d.getVar('datadir') + '/guests'
+
+    # Parse SRC_URI for files with ;guestname= parameter
+    src_uri = d.getVar('SRC_URI')
+    for entry in src_uri.split():
+        _, _, path, _, _, parm = bb.fetch.decodeurl(entry)
+        if 'guestname' in parm:
+            if os.path.islink(path):
+                realpath = os.path.realpath(path)
+
+                if not os.path.exists(realpath):
+                    bb.fatal("ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS link does not resolve: " + path)
+
+                bb.note("Guest file is a symlink:\n " + path + "\nResolved to:\n " + realpath)
+                path = realpath
+
+            bb.utils.mkdirhier(guestdir)
+            dstname = parm['guestname']
+            # Add file extension if not there
+            if not dstname.endswith('.xenguest'):
+                dstname += '.xenguest'
+
+            if not bb.utils.copyfile(path, guestdir + '/' + dstname):
+                bb.fatal("Fail to copy Guest file " + path)
+
+        if 'guestcount' in parm:
+            guestcount = int(parm['guestcount']) + 1
+
+            for i in range(2, guestcount):
+                os.symlink('./' + dstname, guestdir + '/' + dstname.replace('.xenguest', str(i) + '.xenguest'))
+}
+
+IMAGE_PREPROCESS_COMMAND += "add_extern_guests; "
+
@@ -1,12 +1,12 @@
 # Use OVERRIDES to minimize the usage of
-# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
+# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ...
+OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"

 # For Xen we only need the i386 binaries
-QEMU_TARGETS_autonomy-host = "i386"
+QEMU_TARGETS_xen = "i386"

 PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
-PACKAGECONFIG_append_autonomy-host = " noaudio"
-PACKAGECONFIG_remove_autonomy-host = "fdt sdl kvm"
+PACKAGECONFIG_append_xen = " noaudio"
+PACKAGECONFIG_remove_xen = "fdt sdl kvm"

-require ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}
@@ -12,9 +12,9 @@ S = "${WORKDIR}"

 DESCRIPTION = "Add entries in DTB for Xen and Dom0"

-# Please refer to documentation/xen-devicetree.md for documentation on these
-# customizable parameters
-# kernel size is passed to xen via xen.dtb so we need to add
+# Please refer to documentation/xen-devicetree.md for documentation on those
+# parameters
+# kernel size is passed to xen via xen.dtb so wee need to add
 # 'virtual/kernel:do_deploy' as a dependency
 XEN_DEVICETREE_DEPEND_append = " virtual/kernel:do_deploy"
 XEN_DEVICETREE_DTBS ?= "${KERNEL_DEVICETREE}"
@@ -25,8 +25,8 @@ XEN_DEVICETREE_DOM0_ADDR ?= "0x80080000"
 XEN_DEVICETREE_DOM0_SIZE ?= "0x01000000"
 XEN_DEVICETREE_DTSI_MERGE ?= "xen.dtsi"

-# Our package does not generate any packages for the rootfs, but instead
-# contributes to deploy
+# Our package does not generate any package for the rootfs but contributes to
+# deploy
 inherit nopackages deploy

 DEPENDS += "dtc-native"
@@ -0,0 +1,40 @@
+From 3b418b33265402aab0cb1bf2b745a25724bae2d8 Mon Sep 17 00:00:00 2001
+Message-Id: <3b418b33265402aab0cb1bf2b745a25724bae2d8.1602684880.git.diego.sueiro@arm.com>
+From: Bertrand Marquis <bertrand.marquis@arm.com>
+Date: Tue, 18 Aug 2020 14:47:38 +0100
+Subject: [PATCH] arm: Add Neoverse N1 processor identification
+
+Add MIDR and CPU part numbers for Neoverse N1
+
+Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+
+Upstream-Status: Backport
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+---
+ xen/include/asm-arm/processor.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h
+index aa642e3..3ca67f8 100644
+--- a/xen/include/asm-arm/processor.h
+++ b/xen/include/asm-arm/processor.h
+@@ -58,6 +58,7 @@
+ #define ARM_CPU_PART_CORTEX_A73     0xD09
+ #define ARM_CPU_PART_CORTEX_A75     0xD0A
+ #define ARM_CPU_PART_CORTEX_A76     0xD0B
+#define ARM_CPU_PART_NEOVERSE_N1    0xD0C
+ 
+ #define MIDR_CORTEX_A12 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A12)
+ #define MIDR_CORTEX_A17 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A17)
+@@ -68,6 +69,7 @@
+ #define MIDR_CORTEX_A73 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A73)
+ #define MIDR_CORTEX_A75 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A75)
+ #define MIDR_CORTEX_A76 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76)
+#define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1)
+ 
+ /* MPIDR Multiprocessor Affinity Register */
+ #define _MPIDR_UP           (30)
+-- 
+2.7.4
+
@@ -0,0 +1,42 @@
+From 858c0be8c2fa4125a0fa0acaa03ae730e5c7cb3c Mon Sep 17 00:00:00 2001
+Message-Id: <858c0be8c2fa4125a0fa0acaa03ae730e5c7cb3c.1602684183.git.diego.sueiro@arm.com>
+From: Bertrand Marquis <bertrand.marquis@arm.com>
+Date: Tue, 18 Aug 2020 14:47:39 +0100
+Subject: [PATCH] xen/arm: Enable CPU Erratum 1165522 for Neoverse
+
+Enable CPU erratum of Speculative AT on the Neoverse N1 processor
+versions r0p0 to r2p0.
+Also Fix Cortex A76 Erratum string which had a wrong errata number.
+
+Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+
+Upstream-Status: Backport
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+---
+ xen/arch/arm/cpuerrata.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c
+index 0248893..6c09017 100644
+--- a/xen/arch/arm/cpuerrata.c
+++ b/xen/arch/arm/cpuerrata.c
+@@ -477,8 +477,14 @@ static const struct arm_cpu_capabilities arm_errata[] = {
+     },
+ #endif
+     {
+        /* Neoverse r0p0 - r2p0 */
+        .desc = "ARM erratum 1165522",
+        .capability = ARM64_WORKAROUND_AT_SPECULATE,
+        MIDR_RANGE(MIDR_NEOVERSE_N1, 0, 2 << MIDR_VARIANT_SHIFT),
+    },
+    {
+         /* Cortex-A76 r0p0 - r2p0 */
+-        .desc = "ARM erratum 116522",
+        .desc = "ARM erratum 1165522",
+         .capability = ARM64_WORKAROUND_AT_SPECULATE,
+         MIDR_RANGE(MIDR_CORTEX_A76, 0, 2 << MIDR_VARIANT_SHIFT),
+     },
+-- 
+2.7.4
+
@@ -0,0 +1,35 @@
+From 1814a626fb5811184eda64fe22f0055df4600211 Mon Sep 17 00:00:00 2001
+Message-Id: <1814a626fb5811184eda64fe22f0055df4600211.1602684203.git.diego.sueiro@arm.com>
+From: Julien Grall <jgrall@amazon.com>
+Date: Tue, 25 Aug 2020 18:38:10 +0100
+Subject: [PATCH] xen/arm: Update silicon-errata.txt with the Neovers AT
+ erratum
+
+Commit 858c0be8c2fa "xen/arm: Enable CPU Erratum 1165522 for Neoverse"
+added a new erratum but forgot to update silicon-errata.txt.
+
+Update the file accordingly to keep track of errata workaround in Xen.
+
+Signed-off-by: Julien Grall <jgrall@amazon.com>
+Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
+Acked-by: Stefano Stabellini <sstabellini@kernel.org>
+
+Upstream-Status: Backport
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+---
+ docs/misc/arm/silicon-errata.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/misc/arm/silicon-errata.txt b/docs/misc/arm/silicon-errata.txt
+index 11e5a9d..e15d092 100644
+--- a/docs/misc/arm/silicon-errata.txt
+++ b/docs/misc/arm/silicon-errata.txt
+@@ -51,4 +51,5 @@ stable hypervisors.
+ | ARM            | Cortex-A57      | #1319537        | N/A                     |
+ | ARM            | Cortex-A72      | #1319367        | N/A                     |
+ | ARM            | Cortex-A76      | #1165522        | N/A                     |
+| ARM            | Neoverse-N1     | #1165522        | N/A
+ | ARM            | MMU-500         | #842869         | N/A                     |
+-- 
+2.7.4
+
@@ -0,0 +1,51 @@
+From 968bb86d04913f52d7678a842474f2a674a8b23e Mon Sep 17 00:00:00 2001
+Message-Id: <968bb86d04913f52d7678a842474f2a674a8b23e.1602683678.git.diego.sueiro@arm.com>
+From: Wei Chen <wei.chen@arm.com>
+Date: Fri, 28 Aug 2020 02:34:03 +0000
+Subject: [PATCH] xen/arm: Missing N1/A76/A75 FP registers in vCPU context
+ switch
+
+Xen has cpu_has_fp/cpu_has_simd to detect whether the CPU supports
+FP/SIMD or not. But currently, these two MACROs only consider value 0
+of ID_AA64PFR0_EL1.FP/SIMD as FP/SIMD features enabled. But for CPUs
+that support FP/SIMD and half-precision floating-point arithmetic, the
+ID_AA64PFR0_EL1.FP/SIMD are 1 (see Arm ARM DDI0487F.b, D13.2.64).
+For these CPUs, xen will treat them as no FP/SIMD support, the
+vfp_save/restore_state will not take effect.
+
+From the TRM documents of Cortex-A75/A76/N1, we know these CPUs support
+basic Advanced SIMD/FP and half-precision floating-point arithmetic. In
+this case, on N1/A76/A75 platforms, Xen will always miss the floating
+pointer registers save/restore. If different vCPUs are running on the
+same pCPU, the floating pointer registers will be corrupted randomly.
+
+This patch fixes Xen on these new cores.
+
+Signed-off-by: Wei Chen <wei.chen@arm.com>
+Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
+Reviewed-by: Julien Grall <jgrall@amazon.com>
+
+Upstream-Status: Backport
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+---
+ xen/include/asm-arm/cpufeature.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h
+index 674beb0..10878ea 100644
+--- a/xen/include/asm-arm/cpufeature.h
+++ b/xen/include/asm-arm/cpufeature.h
+@@ -13,8 +13,8 @@
+ #define cpu_has_el2_64    (boot_cpu_feature64(el2) >= 1)
+ #define cpu_has_el3_32    (boot_cpu_feature64(el3) == 2)
+ #define cpu_has_el3_64    (boot_cpu_feature64(el3) >= 1)
+-#define cpu_has_fp        (boot_cpu_feature64(fp) == 0)
+-#define cpu_has_simd      (boot_cpu_feature64(simd) == 0)
+#define cpu_has_fp        (boot_cpu_feature64(fp) < 8)
+#define cpu_has_simd      (boot_cpu_feature64(simd) < 8)
+ #define cpu_has_gicv3     (boot_cpu_feature64(gic) == 1)
+ #endif
+ 
+-- 
+2.7.4
+
@@ -1,3 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-vif-nat-fix-hostname.patch \
+           "
+
 PACKAGECONFIG_remove = "\
    ${@bb.utils.contains('DISTRO_FEATURES', \
                         'arm-autonomy-host', \
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
-
-SRC_URI += "file://0001-vif-nat-fix-hostname.patch \
-           "
@@ -1,5 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"

 SRC_URI += " \
-    file://0001-xen-arm-Throw-messages-for-unknown-FP-SIMD-implement.patch \
+    file://0001-arm-Add-Neoverse-N1-processor-identification.patch \
+    file://0002-xen-arm-Enable-CPU-Erratum-1165522-for-Neoverse.patch \
+    file://0003-xen-arm-Update-silicon-errata.txt-with-the-Neovers-A.patch \
+    file://0004-xen-arm-Missing-N1-A76-A75-FP-registers-in-vCPU-cont.patch \
+    file://0005-xen-arm-Throw-messages-for-unknown-FP-SIMD-implement.patch \
    "
@@ -22,7 +22,7 @@ case "$1" in
  *)
        # do not advertise unreasonable commands that there is no reason
        # to use with this device
-        echo "Usage: $0 {start|stop|status|restart|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|force-reload}"
        exit 1
 esac

@@ -10,16 +10,13 @@ BRIDGE_NAME="###BRIDGE_NAME###"

 case "${XENGUEST_NETWORK_TYPE:=}" in
    nat)
-        echo "vif = ['script=vif-nat']" >> "${guestcfgfile:?}"
+        echo "vif = ['script=vif-nat']" >> ${guestcfgfile}
        log info "Network type is NAT"
        ;;
    bridge)
-        echo "vif = ['script=vif-bridge,bridge=${BRIDGE_NAME}']" >> "${guestcfgfile:?}"
+        echo "vif = ['script=vif-bridge,bridge=${BRIDGE_NAME}']" >> ${guestcfgfile}
        log info "Network type is bridge: ${BRIDGE_NAME}"
        ;;
-    none)
-        log info "Network type is none"
-        ;;
    *)
        log error "XENGUEST_NETWORK_TYPE=$XENGUEST_NETWORK_TYPE invalid"
        ;;
@@ -25,19 +25,19 @@ case "$1" in
        echo "Starting xenguest"

        # Create unconfigured guests
-        if [ -d "${XENGUEST_GUEST_DIR}" ]; then
-            shopt -s nullglob
-            for path in "${XENGUEST_GUEST_DIR}"/*.xenguest; do
-                f=$(basename "${path}" .xenguest)
-                if [ ! -f "${XENGUEST_CONF_BASE}/guests/${f}/guest.cfg" ]; then
+        if [ -d ${XENGUEST_GUEST_DIR} ]; then
+            for f in $(find ${XENGUEST_GUEST_DIR} -name "*.xenguest" \
+                -exec basename {} .xenguest \;); do
+                if [ ! -f ${XENGUEST_CONF_BASE}/guests/${f}/guest.cfg ]; then
                    # Check if this guest should be auto booted
                    autoboot=$(/usr/bin/xenguest-mkimage dump-paramsconfig \
-                        "${path}" | \
+                        ${XENGUEST_GUEST_DIR}/${f}.xenguest | \
                        grep GUEST_AUTOBOOT | sed -e "s,.*=,," | tr -d '"')
                    if [ "$autoboot" = "0" ]; then
                        echo "Do not create $f, autoboot disabled"
                    else
-                        /usr/bin/xenguest-manager create "${path}"
+                        /usr/bin/xenguest-manager create \
+                            ${XENGUEST_GUEST_DIR}/${f}.xenguest
                        # Update guestlist
                        if [ $? -eq 0 ]; then
                            guestlist="${guestlist} ${f}"
@@ -49,11 +49,11 @@ case "$1" in
        if [ -n "${guestlist}" ]; then
            for f in ${guestlist}; do
                GUEST_AUTOBOOT="1"
-                if [ -f "${XENGUEST_CONF_BASE}/guests/${f}/params.cfg" ]; then
-                    source "${XENGUEST_CONF_BASE}/guests/${f}/params.cfg"
+                if [ -f ${XENGUEST_CONF_BASE}/guests/${f}/params.cfg ]; then
+                    source ${XENGUEST_CONF_BASE}/guests/${f}/params.cfg
                fi
                if [ "${GUEST_AUTOBOOT}" = "1" ]; then
-                    /usr/bin/xenguest-manager start "${f}"
+                    /usr/bin/xenguest-manager start ${f}
                fi
            done
        else
@@ -66,9 +66,9 @@ case "$1" in
  stop)
        echo "Stopping xenguest"
        # update guest list
-        guestlist=$(xenguest-manager status | grep Running | cut -d " " -f1)
+        guestlist=$(xenguest-manager status | grep Running | cut -d ":" -f1)
        for f in ${guestlist}; do
-            xenguest-manager shutdown "${f}" --kill
+            xenguest-manager shutdown ${f} --kill
        done
        ;;
  reload)
@@ -36,7 +36,7 @@ case "$1" in
  *)
        # do not advertise unreasonable commands that there is no reason
        # to use with this device
-        echo "Usage: $0 {start|stop|status|restart|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|force-reload}"
        exit 1
 esac

@@ -11,20 +11,19 @@ set +u
 #

 check_if_vif_is_ready() {
-    ret=$(xl network-list "${guestname:?}" | grep  "${1}" \
-        | tr -s ' ' | cut -d' ' -f5)
-    # ${ret} is network interface status value
+    ret=($(xl network-list "${guestname}" | grep  "${1}"))
+    # ${ret[4]} is network interface status value
    # 1 means vif is not ready
    # 4 means vif is ready
-    [ "${ret}" = "4" ] && return 0
+    [ "${ret[4]}" = "4" ] && return 0
    return 1
 }

 case "${XENGUEST_NETWORK_TYPE:-}" in
    nat)
-        vif_name="$(xl network-list "${guestname:?}" | grep -o "vif.*")"
+        vif_name="$(xl network-list ${guestname} | grep -o vif.*)"

-        for try in $(seq 20)
+        for try in {1..20}
        do
            if check_if_vif_is_ready "${vif_name}"; then
                claim_lock "vif-nat-kea"
@@ -1,11 +1,11 @@
 # Create a xenguest base image
 #
 # This recipe creates a base image that is then extended by other recipes
-# through xenguest_image class.
-# xenguest image type uses this recipe as a base to add a kernel and a disk
-# image to create a guest
+# through xenguest-image class.
+# xenguest image type is using this as base to add a kernel and a disk image
+# to create a guest
 #
-# The recipe also adds files in those directories to the xenguest image:
+# The recipe is also adding files in those directories to the xenguest image:
 # - ${WORKDIR}/extend/disk-files: all files in this directory will be added to
 #   the guest disk files (using --disk-add-file)
 # - ${WORKDIR}/extend/files: all files in this directory will be added to the
@@ -72,15 +72,7 @@ XENGUEST_IMAGE_SRC_URI_INIT_POST ??= ""

 S = "${WORKDIR}"

-# Extra vars to add to xenguest.env
-XENGUEST_IMAGE_VARS_EXTRA += "\
- XENGUEST_IMAGE_HOST_PORT XENGUEST_IMAGE_GUEST_PORT \
- XENGUEST_IMAGE_NAT_PORT_FORWARD_SCRIPT XENGUEST_IMAGE_SRC_URI_DISK_FILES \
- XENGUEST_IMAGE_SRC_URI_XEN_FILES XENGUEST_IMAGE_SRC_URI_XEN_CONFIG \
- XENGUEST_IMAGE_SRC_URI_INIT_PRE XENGUEST_IMAGE_SRC_URI_INIT \
- XENGUEST_IMAGE_SRC_URI_INIT_POST"
-
-inherit deploy xenguest_image
+inherit deploy xenguest-image

 # parse XENGUEST_IMAGE_SRC_URI_ variables and add them to SRC_URI
 python __anonymous() {
@@ -1,85 +0,0 @@
-# Xenguest Extern Guests
-#
-# This recipe installs the extern guest files specified in
-# ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS into the host image, They are installed
-# to the directory XENGUEST_MANAGER_GUEST_DIR
-#
-# src_uri_parse_var.bbclass is used to parse
-# ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS and add the guest paths to the SRC_URI
-# to be fetched and unpacked to ${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}
-#
-# Further documentation can be found in documentation/arm-autonomy-quickstart.md,
-# in the section named "Include guests directly in the host image"
-
-DESCRIPTION = "Xenguest Extern Guests"
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-# Global value of XENGUEST_MANAGER_GUEST_DIR set here
-require conf/xenguest.conf
-
-ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS ??= ""
-
-# Parse the variable ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS for xenguest files,
-# unpack them to SRC_URI_FROM_VAR_UNPACK_DIR and create a manifest file
-# containing each of SRC_URI_FROM_VAR_MANIFEST_PARAMS for each entry
-inherit set_src_uri_from_var
-SRC_URI_FROM_VAR_NAME = "ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS"
-SRC_URI_FROM_VAR_MANIFEST_PARAMS= "guestname=[basename] guestcount=1"
-SRC_URI_FROM_VAR_UNPACK_DIR = "xenguests"
-
-# Unnecessary tasks
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
-do_patch[noexec] = "1"
-
-# Install guest files to XENGUEST_MANAGER_GUEST_DIR
-do_install() {
-
-    local guestfile guestname guestcount
-
-    if [ -f "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/manifest" ]; then
-
-        install -d "${D}${XENGUEST_MANAGER_GUEST_DIR}"
-
-        # Iterate over manifest file containing parameters
-        while read -r guestfile guestname guestcount _; do
-            [ -f "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/${guestfile}" ] ||
-                bbfatal "${guestfile} does not exist"
-
-            install -m 644 \
-                "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/${guestfile}" \
-                "${D}${XENGUEST_MANAGER_GUEST_DIR}/${guestname}.xenguest"
-
-            # Create symlinks for duplicate guests, appending numbers to
-            # guestname
-            for i in `seq 2 $guestcount`
-            do
-                ln -s -r \
-                    "${D}${XENGUEST_MANAGER_GUEST_DIR}/${guestname}.xenguest" \
-                    "${D}${XENGUEST_MANAGER_GUEST_DIR}/${guestname}$i.xenguest"
-            done
-
-        done < "${WORKDIR}/${SRC_URI_FROM_VAR_UNPACK_DIR}/manifest"
-    fi
-}
-
-do_install[vardeps] += "ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS"
-
-FILES_${PN} += "${XENGUEST_MANAGER_GUEST_DIR}"
-
-# In a multiconfig build this variable will hold a dependency string, which
-# differs based on whether the guest has initramfs or not.  It may have a space
-# seperated list of dependency strings if mulitple guest types are configured
-MC_DOIMAGE_MCDEPENDS ?= ""
-# Example value: mc:host:guest:core-image-minimal:do_merge_xenguestenv
-
-# In a multiconfig build the host task 'do_image' has a dependency on
-# multiconfig guest.  This ensures that the guest image file already exists
-# when it is needed by the host
-DO_IMAGE_MCDEPENDS := "${@ '${MC_DOIMAGE_MCDEPENDS}' \
-if d.getVar('BBMULTICONFIG') else ''}"
-
-# Apply mc dependency. Empty string if multiconfig not enabled
-do_fetch[mcdepends] += "${DO_IMAGE_MCDEPENDS}"
@@ -1,10 +1,17 @@
 # Xenguest manager recipe
 #
-# xenguest-manager is a tool to control xen guests (e.g. create, start, stop)
+# xenguest-manager is a tool to control xen guest (e.g. create, start, stop)
 #
-# Usage documentation for the xenguest-manager tool can be found in
-# meta-arm-autonomy/documentation/xenguest-manager.md including the
-# customizable bitbake variables.
+# By default xenguest-manager logs to /var/log when in verbose mode, which is a
+# Volatile directory. To persist logs across reboots the following needs to be
+# added to either local.conf or distro.conf
+#
+#   VOLATILE_LOG_DIR="no"
+#
+# Read more here: https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#var-VOLATILE_LOG_DIR
+#
+# When this is enabled, logrotate will monitor the file to ensure it does not grow
+# excessively large. See files/logrotate-xenguest

 DESCRIPTION = "Xen Guest Manager"
 LICENSE = "MIT"
@@ -18,12 +25,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

 S = "${WORKDIR}"

+# Please refer to documentation/xenguest-manager.md for documentation on those
+# parameters
 XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/sda2"
 XENGUEST_MANAGER_VOLUME_NAME ?= "vg-xen-$(basename ${XENGUEST_MANAGER_VOLUME_DEVICE})"
+XENGUEST_MANAGER_GUEST_DIR ?= "${datadir}/guests/"
 XENGUEST_MANAGER_LOG_LEVEL ?= "ERROR"
-#XENGUEST_MANAGER_GUEST_DIR set in xenguest.conf
-
-require conf/xenguest.conf

 # We add an init script to create and start guests automatically
 # run start script after xen-tools and run stop script before xen-tools
@@ -2,11 +2,8 @@
 #
 # xenguest-mkimage is a tool to create/modify images to be used as xen guests
 # Produced images contains a xen configuration and several optional components
-# (kernel, device-tree, disk definition and files, and init scripts) which all
-# together fully define a xen guest image
-#
-# Usage documentation for the xenguest-mkimage tool can be found in
-# meta-arm-autonomy/documentation/xenguest-mkimage.md
+# (kernel, device-tree, disk definition and files, init scripts) which all
+# together fully define a full xen guest

 DESCRIPTION = "Xenguest mkimage tool"
 LICENSE = "MIT"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 S = "${WORKDIR}"

 # Please refer to documentation/xenguest-network-bridge.md for documentation on
-# the parameters available for customization
+# those parameters
 XENGUEST_NETWORK_BRIDGE_NAME ?= "xenbr0"

 # The XENGUEST_NETWORK_BRIDGE_MEMBERS should be set in a machine.conf
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tushar Khandelwal	f90f028646	Revert "arm-bsp/tc0: Enable verified u-boot" This reverts commit `29cee51f84`.	2021-04-22 23:27:47 +01:00
Tushar Khandelwal	1cba8aee6d	Revert "arm-bsp/u-boot: update SHA for tc0" This reverts commit `70a9c4991e`.	2021-04-22 23:24:10 +01:00
Tushar Khandelwal	5262d3d174	Revert "arm-bsp/images: Add tc0-kernel-image" This reverts commit `da57312334`.	2021-04-22 23:23:34 +01:00
Tushar Khandelwal	664d2a5f6a	Revert "arm-bsp: Enable SPM build option in yocto framework" This reverts commit `86f9419b9d`.	2021-04-22 23:23:13 +01:00
Tushar Khandelwal	ebee7ce68d	Revert "tc0/spm: boot SP according to boot order specified in manifest" This reverts commit `56514201ad`.	2021-04-22 23:22:02 +01:00
Tushar Khandelwal	cc645908ef	Merge branch 'upstream' into totalcompute	2021-04-22 22:36:21 +01:00
Ben Horgan	36314f2d87	arm-bsp/tc0: Add secure partitions secure-storage and crypo-sp These are added along with the existing optee secure partition. Change-Id: I50ce8adfa264d442cf52863f4f8572e623504ca3 Signed-off-by: Ben Horgan <ben.horgan@arm.com>	2021-04-22 22:25:47 +01:00
Ben Horgan	cddb08a7a2	arm-trusted-services: Add recipes for arm trusted services Signed-off-by: Ben Horgan <ben.horgan@arm.com> Change-Id: I14ac7649ae5899578167efca45d5c19d6248cb8f	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	5d47d3f9db	arm-bsp/linux: Add linux-trusted-services driver, FF-A ABI changes for TC0 This adds below patches: - buf driver for trusted service test applications - Fix in FFA-ABI aligning with latest SPMC (hafnium) Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Change-Id: I6b36a73a910f6e10748d78b2ad74603dde42c8a9	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	9d1724c3d4	arm-bsp/tc0: Update hafnium revision and add patches - Remove PSCI patches as those changes are upstreamed - Adds Theodul, GICR changes - Reverts FFA Set and verify allocator fix - Adds fix to fetch proper vCPU for UP SP Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Change-Id: I26a7b31558e5bc4ce2fea61b76a3a92615f3e641	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	29f0e5982c	arm-bsp/tc0: Add patches in optee-os for FF-A ABI changes Adds below patches: - To use FFA_SECONDARY_EP_REGISTER - To align with latest FFA_ABIs in SPMC (hafnium) Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Change-Id: I4ae386e2dd846e747cbc426270fc0c489ccdfe1f	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	853f3e0565	arm-bsp/tc0: Update TF-A revision, add trusted-services support - Update TF-A revision - Add patch for trusted services support - Add patch for GICR changes to support latest tc0 model Change-Id: I3ba1fd9c1f89721fc6349db4e0270c8b42e9fcf0 Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	806bbb07ed	arm-bsp/tc0: Update SCP firmware revision and add patches Add below patches: - add clock and dvfs support for all cores - fix in CFGM base address calculation Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Change-Id: I2e70736070dd59f6209012dc875f3ea08d811046	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	9bb19dd0d6	arm-bsp/tc0: add Theodul DSU support - Adds patches required to support Theodul DSU in optee-os, hafnium - Updates SHA of TF-A, SCP with revision that has Theodul DSU support Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Change-Id: I62f0990b7de919839be9ab0e3234914624c8afde Signed-off-by: Jon Mason <jon.mason@arm.com>	2021-04-22 22:25:47 +01:00
Arunachalam Ganapathy	88c201ca9d	arm-bsp/linux: add asymmetric AArch32 EL0 support for TC0 This adds patches for asymmetric AArch32 EL0 configuration support for android11-5.4-lts kernel. And enables CONFIG_ASYMMETRIC_AARCH32 and disables CONFIG_KVM in TC0 defconfig. Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Change-Id: Iab94b5c48b60aca4a71267ba1be1cb1836002d10 Signed-off-by: Jon Mason <jon.mason@arm.com>	2021-04-22 22:25:47 +01:00
Usama Arif	56514201ad	tc0/spm: boot SP according to boot order specified in manifest This is currently in review at: https://review.trustedfirmware.org/c/hafnium/hafnium/+/4997/36 Signed-off-by: Usama Arif <usama.arif@arm.com>	2020-10-27 17:35:35 +00:00
Arunachalam Ganapathy	86f9419b9d	arm-bsp: Enable SPM build option in yocto framework This patch adds: spm, tf-a-tests recipes. This builds tf-a with SPM at S-EL2 and test secure partitions at S-EL1. Change-Id: Ia2f44f4000aa0786b945bc8fb66c9edb1a0094e8 Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Signed-off-by: Usama Arif <usama.arif@arm.com>	2020-10-27 17:35:26 +00:00
Usama Arif	da57312334	arm-bsp/images: Add tc0-kernel-image This depends on trusted-firmware-a which is the last component to be built. Calling bitbake tc0-kernel-image will create all the required images to boot poky. Change-Id: Ia8675b048db4a127d32394f536632ce88fe20826 Signed-off-by: Usama Arif <usama.arif@arm.com>	2020-10-26 18:26:37 +00:00
Usama Arif	70a9c4991e	arm-bsp/u-boot: update SHA for tc0 Change-Id: Ideb4866df92d05bdc07b53f47346ae4f381dfc6d Signed-off-by: Usama Arif <usama.arif@arm.com>	2020-10-26 18:26:35 +00:00
Usama Arif	29cee51f84	arm-bsp/tc0: Enable verified u-boot This involes creating the fitImage which contains both the kernel and ramdisk. The fitImage is also signed. Change-Id: Iaedffd54751585a7ef6b467d63f5f8fb6e744aa7 Signed-off-by: Usama Arif <usama.arif@arm.com>	2020-10-26 18:20:22 +00:00
				`@@ -0,0 +1 @@`
				`XENGUEST_NETWORK_BRIDGE_MEMBERS_gem5-arm64 ?= "eth0"`