summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorAdrian Stratulat <adrian.stratulat@enea.com>2020-06-16 08:30:23 +0200
committerAdrian Stratulat <adrian.stratulat@enea.com>2020-07-13 04:22:55 +0200
commitc82336bb19d4a6462af8d00366118704aa73239e (patch)
tree71bdb688cf957e3066a8500b965b59ee95573fa4 /classes
parentde9614aad1d7da8204cfe2da9c2006ea757fc106 (diff)
downloadmeta-el-nfv-access-c82336bb19d4a6462af8d00366118704aa73239e.tar.gz
Ampere/aarch64 bring-up changes
* Refactor the efi-secure-boot feature (in order for it to be disabled for certain targets) * Add support for emag8180 compilation target (used as Enea NFV Access host) * Add emag8180 support in ostree * Add support for qemuarm64 compilation target (used as Enea NFV Access VNF) Note: The aarch64 family does not support the secure-boot feature yet, so the "efi-secure-boot" has been disabled. Change-Id: I32336761d322102a07d065c9ab02ea5051854609 Signed-off-by: Adrian Stratulat <adrian.stratulat@enea.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/override_image_types_ostree.inc10
-rw-r--r--classes/sota_emag8180.bbclass13
2 files changed, 20 insertions, 3 deletions
diff --git a/classes/override_image_types_ostree.inc b/classes/override_image_types_ostree.inc
index 241afcd..34d2d1f 100644
--- a/classes/override_image_types_ostree.inc
+++ b/classes/override_image_types_ostree.inc
@@ -12,6 +12,7 @@ do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"
12do_image_ostree[subimages] = "rootfs.ostree.tar.bz2" 12do_image_ostree[subimages] = "rootfs.ostree.tar.bz2"
13do_image_ostree[imgsuffix] = "." 13do_image_ostree[imgsuffix] = "."
14export OSTREE_ROOTFS 14export OSTREE_ROOTFS
15SECURE_BOOT_ENABLED = "${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "1", "0", d)}"
15 16
16IMAGE_CMD_ostree () { 17IMAGE_CMD_ostree () {
17 if [ -z "$OSTREE_REPO" ]; then 18 if [ -z "$OSTREE_REPO" ]; then
@@ -128,11 +129,14 @@ IMAGE_CMD_ostree () {
128 129
129 checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " "` 130 checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " "`
130 131
131 # Copy kernel and initramfs and their signature files
132 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum} 132 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum}
133 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL}.p7b boot/vmlinuz-${checksum}.p7b
134 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum} 133 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum}
135 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT}.p7b boot/initramfs-${checksum}.p7b 134
135 if [ "${SECURE_BOOT_ENABLED}" == "1" ]; then
136 # Copy kernel and initramfs and their signature files
137 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL}.p7b boot/vmlinuz-${checksum}.p7b
138 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT}.p7b boot/initramfs-${checksum}.p7b
139 fi
136 140
137 # Copy image manifest 141 # Copy image manifest
138 cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest 142 cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
diff --git a/classes/sota_emag8180.bbclass b/classes/sota_emag8180.bbclass
new file mode 100644
index 0000000..dff4294
--- /dev/null
+++ b/classes/sota_emag8180.bbclass
@@ -0,0 +1,13 @@
1OSTREE_BOOTLOADER ?= "grub"
2EFI_PROVIDER_sota = "grub-efi"
3PREFERRED_PROVIDER_virtual/bootloader_sota = "grub-efi"
4
5WKS_FILE_sota = "efiimage-sota.wks"
6
7OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz"
8
9# Set .otaimg to be used as source for generating hddimg
10ROOTFS_sota = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.otaimg"
11
12# OSTree initrd needs 'ramdisk_size' and 'rw' parameters in order to boot
13OSTREE_KERNEL_ARGS ?= "rw"