From 607029521eb71dcf873ed911eae4a721a1d2605f Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 20 Feb 2017 10:45:20 +0100 Subject: Add WKS for OTA-enabled bootable SD cards. [oytis]: v2 deleted 'sleep 2' [oytis]: v3 disabled wic for devices that don't yet support sota+wic Bug-AGL: SPEC-413 Change-Id: I52a31c9bc66001ed83e83c2f883d046d99ee3c67 Signed-off-by: Anton Gerasimov --- meta-sota/conf/include/agl-sota.inc | 20 ++++++- .../scripts/lib/wic/canned-wks/sdimage-sota.wks | 7 +++ .../scripts/lib/wic/plugins/source/otaimage.py | 68 ++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks create mode 100644 meta-sota/scripts/lib/wic/plugins/source/otaimage.py diff --git a/meta-sota/conf/include/agl-sota.inc b/meta-sota/conf/include/agl-sota.inc index 4960e1a..700d36a 100644 --- a/meta-sota/conf/include/agl-sota.inc +++ b/meta-sota/conf/include/agl-sota.inc @@ -5,7 +5,25 @@ IMAGE_INSTALL_append = " ostree" # live image for OSTree-enabled systems IMAGE_CLASSES += "image_types_ostree image_types_ota" -IMAGE_FSTYPES += "ostreepush otaimg" +IMAGE_FSTYPES += "ostreepush otaimg wic" +WKS_FILE = "sdimage-sota.wks" +do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" + +# required by wic's partitions.py, but is not pulled properly by bitbake +EXTRA_IMAGEDEPENDS += " dosfstools-native mtools-native" + +# No working WKS for Raspberry Pi yet +IMAGE_FSTYPES_remove_raspberrypi3 = "wic" +IMAGE_FSTYPES_remove_raspberrypi2 = "wic" + +# Still to be integrared +IMAGE_FSTYPES_remove_cyclone5 = "wic" +IMAGE_FSTYPES_remove_dra7xx-evm = "wic" +IMAGE_FSTYPES_remove_h3ulcb = "wic" +IMAGE_FSTYPES_remove_intel-corei7-64 = "wic" +IMAGE_FSTYPES_remove_joule = "wic" +IMAGE_FSTYPES_remove_qemux86-64 = "wic" +IMAGE_FSTYPES_remove_qemux86 = "wic" # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" diff --git a/meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks b/meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks new file mode 100644 index 0000000..c31c3a5 --- /dev/null +++ b/meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks @@ -0,0 +1,7 @@ +# short-description: Create OTA-enabled SD card image +# long-description: Creates a partitioned SD card image with OSTree +# physical sysroot as a payload. Boot files are located in the +# first vfat partition. + +part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 20 +part / --source otaimage --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/meta-sota/scripts/lib/wic/plugins/source/otaimage.py b/meta-sota/scripts/lib/wic/plugins/source/otaimage.py new file mode 100644 index 0000000..4ef3b69 --- /dev/null +++ b/meta-sota/scripts/lib/wic/plugins/source/otaimage.py @@ -0,0 +1,68 @@ +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +import os + +from wic import msger +from wic.pluginbase import SourcePlugin +from wic.utils.oe.misc import get_bitbake_var + +class OTAImagePlugin(SourcePlugin): + """ + Add an already existing filesystem image to the partition layout. + """ + + name = 'otaimage' + + @classmethod + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, + bootimg_dir, kernel_dir, native_sysroot): + """ + Called after all partitions have been prepared and assembled into a + disk image. Do nothing. + """ + pass + + @classmethod + def do_configure_partition(cls, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + native_sysroot): + """ + Called before do_prepare_partition(). Possibly prepare + configuration files of some sort. + """ + pass + + @classmethod + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + rootfs_dir, native_sysroot): + """ + Called to do the actual content population for a partition i.e. it + 'prepares' the partition to be incorporated into the image. + """ + if not bootimg_dir: + bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") + if not bootimg_dir: + msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") + + msger.debug('Bootimg dir: %s' % bootimg_dir) + + src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg" + + msger.debug('Preparing partition using image %s' % (src)) + part.prepare_rootfs_from_fs_image(cr_workdir, src, "") -- cgit 1.2.3-korg