diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 24 | ||||
-rw-r--r-- | classes/sota.bbclass | 8 | ||||
-rw-r--r-- | recipes-core/images/initramfs-ostree-image.bb | 2 | ||||
-rw-r--r-- | recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | 52 |
4 files changed, 60 insertions, 26 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 051dcf9..0b928a3 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -3,14 +3,11 @@ inherit features_check | |||
3 | 3 | ||
4 | REQUIRED_DISTRO_FEATURES = "usrmerge" | 4 | REQUIRED_DISTRO_FEATURES = "usrmerge" |
5 | 5 | ||
6 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | ||
7 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | 6 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" |
8 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" | 7 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" |
9 | OSTREE_COMMIT_BODY ??= "" | 8 | OSTREE_COMMIT_BODY ??= "" |
10 | OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}" | 9 | OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}" |
11 | OSTREE_UPDATE_SUMMARY ??= "0" | 10 | OSTREE_UPDATE_SUMMARY ??= "0" |
12 | OSTREE_DEPLOY_DEVICETREE ??= "0" | ||
13 | OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}" | ||
14 | 11 | ||
15 | BUILD_OSTREE_TARBALL ??= "1" | 12 | BUILD_OSTREE_TARBALL ??= "1" |
16 | 13 | ||
@@ -135,27 +132,6 @@ IMAGE_CMD_ostree () { | |||
135 | 132 | ||
136 | ln -sf ../var/usrlocal usr/local | 133 | ln -sf ../var/usrlocal usr/local |
137 | 134 | ||
138 | if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then | ||
139 | # this is a hack for ostree not to override init= in kernel cmdline - | ||
140 | # make it think that the initramfs is present (while it is in FIT image) | ||
141 | # since initramfs is fake file, it does not need to be included in checksum | ||
142 | checksum=$(sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " ") | ||
143 | touch boot/initramfs-${checksum} | ||
144 | else | ||
145 | if [ ${@ oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}')} = True ] && [ -n "${OSTREE_DEVICETREE}" ]; then | ||
146 | checksum=$(cat ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} ${OSTREE_DEVICETREE} | sha256sum | cut -f 1 -d " ") | ||
147 | for DTS_FILE in ${OSTREE_DEVICETREE}; do | ||
148 | DTS_FILE_BASENAME=$(basename ${DTS_FILE}) | ||
149 | cp ${DEPLOY_DIR_IMAGE}/${DTS_FILE_BASENAME} boot/devicetree-${DTS_FILE_BASENAME}-${checksum} | ||
150 | done | ||
151 | else | ||
152 | checksum=$(cat ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} | sha256sum | cut -f 1 -d " ") | ||
153 | fi | ||
154 | cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} boot/initramfs-${checksum} | ||
155 | fi | ||
156 | |||
157 | cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum} | ||
158 | |||
159 | # Copy image manifest | 135 | # Copy image manifest |
160 | cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest | 136 | cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest |
161 | } | 137 | } |
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 | ||
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb index bc21ed3..4af1548 100644 --- a/recipes-core/images/initramfs-ostree-image.bb +++ b/recipes-core/images/initramfs-ostree-image.bb | |||
@@ -20,7 +20,7 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" | |||
20 | # Avoid circular dependencies | 20 | # Avoid circular dependencies |
21 | EXTRA_IMAGEDEPENDS = "" | 21 | EXTRA_IMAGEDEPENDS = "" |
22 | 22 | ||
23 | inherit core-image | 23 | inherit core-image nopackages |
24 | 24 | ||
25 | IMAGE_ROOTFS_SIZE = "8192" | 25 | IMAGE_ROOTFS_SIZE = "8192" |
26 | 26 | ||
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb new file mode 100644 index 0000000..fe8a9cc --- /dev/null +++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | |||
@@ -0,0 +1,52 @@ | |||
1 | SUMMARY = "Ostree linux kernel, devicetrees and initramfs packager" | ||
2 | DESCRIPTION = "Ostree linux kernel, devicetrees and initramfs packager" | ||
3 | SECTION = "kernel" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||
6 | |||
7 | # Whilst not a module, this ensures we don't get multilib extended (which would make no sense) | ||
8 | inherit module-base kernel-artifact-names | ||
9 | |||
10 | PACKAGES = "ostree-kernel ostree-initramfs ostree-devicetrees" | ||
11 | |||
12 | ALLOW_EMPTY_ostree-initramfs = "1" | ||
13 | ALLOW_EMPTY_ostree-devicetrees = "1" | ||
14 | |||
15 | FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" | ||
16 | FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" | ||
17 | FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/*" | ||
18 | |||
19 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
20 | |||
21 | KERNEL_BUILD_ROOT = "${nonarch_base_libdir}/modules/" | ||
22 | |||
23 | # There's nothing to do here, except install the artifacts where we can package them | ||
24 | do_fetch[noexec] = "1" | ||
25 | do_unpack[noexec] = "1" | ||
26 | do_patch[noexec] = "1" | ||
27 | do_configure[noexec] = "1" | ||
28 | do_compile[noexec] = "1" | ||
29 | deltask do_populate_sysroot | ||
30 | |||
31 | do_install() { | ||
32 | kerneldir=${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION} | ||
33 | install -d $kerneldir | ||
34 | |||
35 | cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} $kerneldir/vmlinuz | ||
36 | |||
37 | if [ "${KERNEL_IMAGETYPE}" != "fitImage" ]; then | ||
38 | if [ -n "${INITRAMFS_IMAGE}" ]; then | ||
39 | cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} $kerneldir/initramfs.img | ||
40 | fi | ||
41 | |||
42 | if [ ${@ oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}')} = True ] && [ -n "${OSTREE_DEVICETREE}" ]; then | ||
43 | mkdir -p $kerneldir/dtb | ||
44 | for dts_file in ${KERNEL_DEVICETREE}; do | ||
45 | dts_file_basename=$(basename $dts_file) | ||
46 | cp ${DEPLOY_DIR_IMAGE}/$dts_file_basename $kerneldir/dtb/$dts_file_basename | ||
47 | done | ||
48 | fi | ||
49 | fi | ||
50 | } | ||
51 | do_install[vardepsexclude] = "KERNEL_VERSION" | ||
52 | do_install[depends] = "virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']}" | ||