connectivity: kuksa-databroker: update to 0.6.1

README.md

@@ -1,14 +1,13 @@
-# Aos meta layer
+# AosCore meta layer
 
-This meta layer contains recipes for Aos components such as:
+This meta layer contains recipes for AosCore components such as:
 
-* aos-communicationmanager - Aos communication manager;
-* aos-iamanager - Aos identity and access manager;
-* aos-servicemanager - Aos service manager;
-* aos-updatemanager - Aos update manager;
-* aos-vis - Aos vehicle information service;
-* Aos CNI plugins;
-* other tools and utility for AosEdge core part.
+* aos-communicationmanager - AosCore communication manager;
+* aos-iamanager - AosCore identity and access manager;
+* aos-servicemanager - AosCore service manager;
+* aos-updatemanager - AosCore update manager;
+* aos-vis - AosCore vehicle information service;
+* other tools and utility for AosCore operation.
 
 ## How to integrate Aos meta layer to custom product
 
@@ -18,5 +17,3 @@ see [Aos Core integration](doc/integration.md) document.
 ## Misc
 
 * Set PREFERRED_PROVIDER_virtual/runc = "runc-opencontainers" to build runc from opencontainers.
-* Set AOS_RUNNER to define which runner will be used to run Aos services. Currently supported: runc and crun.
-Default is crun.

classes/layer-generator.bbclass

@@ -1,37 +1,31 @@
-# This class containes functions to generate layers
+# This class contains functions to generate layers
 
 # Configuration
 
 AOS_BASE_IMAGE ??= "aos-image"
 AOS_PARENT_LAYER ??= "${AOS_BASE_IMAGE}"
 AOS_LAYER_FEATURES ??= ""
-AOS_LAYER_VERSION ??= "1"
-AOS_LAYER_DIGEST_TYPE ??= "sha256"
+AOS_LAYER_VERSION ??= "1.0.0"
 AOS_LAYER_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}/layers"
-
-# Inherit
-
-inherit metadata-generator
+AOS_LAYER_OS ??= "${AOS_OS}"
+AOS_LAYER_ARCH ??= "${AOS_ARCHITECTURE}"
 
 # Dependencies
 
 DEPENDS:append = " rsync-native"
 
 # Variables
 
-LAYER_MEDIA_TYPE = "application/vnd.aos.image.layer.v1.tar"
-LAYER_WORK_DIR = "${WORKDIR}/layer"
 PARENT_LAYER_ROOTFS = "${TMPDIR}/work-shared/${AOS_PARENT_LAYER}-${MACHINE}/rootfs"
 ROOTFS_DIFF_DIR = "${WORKDIR}/rootfs_diff"
-SHARED_DIGEST_DIR = "${TMPDIR}/work-shared/layers-${AOS_LAYER_DIGEST_TYPE}"
 
 IMAGE_INSTALL:append = "${AOS_LAYER_FEATURES}"
 
 # Dirs
 
-do_create_layer[cleandirs] += "${LAYER_WORK_DIR} ${ROOTFS_DIFF_DIR}"
+do_create_layer[cleandirs] += "${ROOTFS_DIFF_DIR}"
 do_create_layer[depends] += "${AOS_PARENT_LAYER}:do_create_shared_links"
-do_create_layer[dirs] += "${SHARED_DIGEST_DIR} ${AOS_LAYER_DEPLOY_DIR} ${LAYER_WORK_DIR}"
+do_create_layer[dirs] += "${AOS_LAYER_DEPLOY_DIR}"
 
 # Disable unneeded tasks
 
@@ -44,19 +38,6 @@ do_image_complete[noexec] = "1"
 do_create_rootfs_archive() {
     rsync -HXlrvcm --append --progress --delete --compare-dest=${PARENT_LAYER_ROOTFS}/ ${IMAGE_ROOTFS}/* ${ROOTFS_DIFF_DIR}
     find ${ROOTFS_DIFF_DIR} -type d -empty -delete
-
-    # Create layer rootfs tar
-
-    IMAGE_ROOTFS_TAR=${LAYER_WORK_DIR}/${PN}.tar
-
-    ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMAGE_ROOTFS_TAR} -C ${ROOTFS_DIFF_DIR} .
-
-    # Create layer rootfs digest
-
-    DIGEST="$(${AOS_LAYER_DIGEST_TYPE}sum -b ${IMAGE_ROOTFS_TAR} | cut -d' ' -f1)"
-    echo "${DIGEST} ${AOS_LAYER_VERSION}" >  ${SHARED_DIGEST_DIR}/${PN}.${AOS_LAYER_DIGEST_TYPE}
-
-    mv ${IMAGE_ROOTFS_TAR} ${LAYER_WORK_DIR}/${DIGEST}
 }
 
 python do_create_whiteouts() {
@@ -88,51 +69,15 @@ python do_create_whiteouts() {
 
 }
 
-python do_create_metadata() {
-    import os
-
-    # Plarform info
-
-    platform_info = create_layer_platform_info(d.getVar("TARGET_ARCH"), d.getVar("TARGET_OS"), d.getVar("DISTRO_VERSION"),
-        d.getVar("AOS_LAYER_FEATURES").split())
-
-    # Annotations
-
-    parent_id = ""
-    parent_digest = ""
-
-    if d.getVar("AOS_PARENT_LAYER") != d.getVar("AOS_BASE_IMAGE"):
-        f = open(os.path.join(d.getVar("SHARED_DIGEST_DIR"),
-            "{}.{}".format(d.getVar("AOS_PARENT_LAYER"), d.getVar("AOS_LAYER_DIGEST_TYPE"))), "r")
-
-        data = f.read().split()
-        parent_id = "{}:{}".format(d.getVar("AOS_PARENT_LAYER"), data[1])
-        parent_digest = "{}:{}".format(d.getVar("AOS_LAYER_DIGEST_TYPE"), data[0])
-
-    annotations = create_layer_annotations("{}:{}".format(d.getVar("PN"), d.getVar("AOS_LAYER_VERSION")), parent_id, parent_digest)
-
-    # Write metadata
-
-    f = open(os.path.join(d.getVar("SHARED_DIGEST_DIR"),
-        "{}.{}".format(d.getVar("PN"), d.getVar("AOS_LAYER_DIGEST_TYPE"))), "r")
-
-    data = f.read().split()
-    digest = "{}:{}".format(d.getVar("AOS_LAYER_DIGEST_TYPE"), data[0])
-
-    write_layer_metadata(d.getVar("LAYER_WORK_DIR"), d.getVar("LAYER_MEDIA_TYPE"), digest,
-        os.path.getsize(os.path.join(d.getVar("LAYER_WORK_DIR"), data[0])), platform_info, annotations)
-}
-
 do_pack_layer() {
-    ${IMAGE_CMD_TAR} --numeric-owner -czf ${AOS_LAYER_DEPLOY_DIR}/${PN}-${AOS_LAYER_VERSION}-${MACHINE}.tar.gz -C ${LAYER_WORK_DIR} .
+    ${IMAGE_CMD_TAR} --numeric-owner -cf - -C ${ROOTFS_DIFF_DIR} . | gzip -n > ${AOS_LAYER_DEPLOY_DIR}/${AOS_LAYER_OS}-${AOS_LAYER_ARCH}-${AOS_LAYER_VERSION}.tar.gz
 }
 
 do_create_layer[nostamp] = "1"
 
 fakeroot python do_create_layer() {
     bb.build.exec_func("do_create_whiteouts", d)
     bb.build.exec_func("do_create_rootfs_archive", d)
-    bb.build.exec_func("do_create_metadata", d)
     bb.build.exec_func("do_pack_layer", d)
 }
 

conf/distro/aos-core.conf

@@ -0,0 +1,12 @@
+include conf/distro/poky.conf
+
+DISTRO = "aos-core"
+DISTRO_NAME = "AosCore"
+DISTRO_VERSION = "${AOS_ROOTFS_IMAGE_VERSION}"
+SDK_VENDOR = "-aossdk"
+SDK_VERSION="${AOS_ROOTFS_IMAGE_VERSION}"
+SDK_VERSION[vardepvalue] = "${AOS_ROOTFS_IMAGE_VERSION}"
+SDK_NAME = "${DISTRO}-${SDKMACHINE}"
+SDKPATHINSTALL = "/opt/${DISTRO}-sdk/${MACHINE}/${SDK_VERSION}"
+TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${MACHINE}-${SDK_VERSION}"
+TARGET_VENDOR = "-aos"

conf/layer.conf

@@ -22,12 +22,10 @@ AOS_MAIN_NODE ?= "1"
 AOS_NODE_TYPE ?= "${AOS_UNIT_MODEL}-${AOS_UNIT_VERSION}-${@'main' \
 	if bb.utils.to_boolean(d.getVar('AOS_MAIN_NODE')) else 'secondary'}"
 
-AOS_RUNNER ??= "crun"
-
 AOS_NODE_HOSTNAME ?= "${@'main' if bb.utils.to_boolean(d.getVar('AOS_MAIN_NODE')) else 'secondary'}"
 AOS_MAIN_NODE_HOSTNAME ?= "main"
 
-AOS_UM_COMPONENT_PREFIX ?= ""
+AOS_COMPONENT_RUNTIME_PREFIX ?= ""
 
 # Overrides