diff options
author | Ming Liu <ming.liu@toradex.com> | 2020-05-11 20:16:05 +0200 |
---|---|---|
committer | Ming Liu <ming.liu@toradex.com> | 2020-06-18 19:48:12 +0200 |
commit | 6eecf1593d31dc04566c646717f248b3fb0aa40d (patch) | |
tree | d686211b05ba0d99c3e52cccc5278c36e2941129 /classes/sota.bbclass | |
parent | 80072521db9312965d8c52a09bbfb29a633d2274 (diff) | |
download | meta-updater-6eecf1593d31dc04566c646717f248b3fb0aa40d.tar.gz |
meta: introduce ostree-kernel-initramfs recipe
We package kernel image, devicetrees, initramfs and install them to
/usr/lib/modules/${KERNEL_VERSION}, which is the preferred location
according to ostree's new implementation, this could simplify the
deployment.
Reference:
https://github.com/ostreedev/ostree/commit/3ab0d5e6644885440bac6abd17b6d2637df5435f
To let initramfs-ostree-image be able to be depended by
ostree-kernel-initramfs, it must inherit nopackages to avoid a annoying
QA warning like the follows:
| WARNING: initramfs-ostree-image-0.0.1-r0 do_package: Manifest ...initramfs-ostree-image.packagedata
| not found in colibri_imx6 armv7ahf-neon-imx armv7at2hf-neon-imx armv7at2hf-neon armv7ahf-neon armv7at2hf-vfp
| armv7ahf-vfp armv6thf-vfp armv6hf-vfp armv5tehf-vfp armv5ehf-vfp armv5thf-vfp armv5hf-vfp allarch
| x86_64_x86_64-nativesdk (variant '')?
Also we need define OSTREE_KERNEL, OSTREE_DEPLOY_DEVICETREE and
OSTREE_DEVICETREE in sota.bbclass so they could be accessed in other
recipes as well as in image recipes.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'classes/sota.bbclass')
-rw-r--r-- | classes/sota.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 71bd303..dc18cbc 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -5,8 +5,11 @@ SOTA_CLIENT_PROV ??= "aktualizr-shared-prov" | |||
5 | SOTA_DEPLOY_CREDENTIALS ?= "1" | 5 | SOTA_DEPLOY_CREDENTIALS ?= "1" |
6 | SOTA_HARDWARE_ID ??= "${MACHINE}" | 6 | SOTA_HARDWARE_ID ??= "${MACHINE}" |
7 | 7 | ||
8 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" | ||
9 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" | 8 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" |
9 | IMAGE_INSTALL_append_sota = " ${SOTA_CLIENT} ${SOTA_CLIENT_PROV} \ | ||
10 | ostree os-release ostree-kernel \ | ||
11 | ${@'ostree-initramfs' if d.getVar('KERNEL_IMAGETYPE') != 'fitImage' else ''} \ | ||
12 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" | ||
10 | 13 | ||
11 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" | 14 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" |
12 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" | 15 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" |
@@ -27,6 +30,9 @@ OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" | |||
27 | OSTREE_OSNAME ?= "poky" | 30 | OSTREE_OSNAME ?= "poky" |
28 | OSTREE_BOOTLOADER ??= 'u-boot' | 31 | OSTREE_BOOTLOADER ??= 'u-boot' |
29 | OSTREE_BOOT_PARTITION ??= "/boot" | 32 | OSTREE_BOOT_PARTITION ??= "/boot" |
33 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | ||
34 | OSTREE_DEPLOY_DEVICETREE ??= "0" | ||
35 | OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}" | ||
30 | 36 | ||
31 | INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 37 | INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
32 | 38 | ||