Merge pull request #40 from advancedtelematic/feat/syncagl

Synchronize with AGL's meta-sota progress

3 files changed, 129 insertions, 0 deletions

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
new file mode 100755
index 0000000..316a782
--- /dev/null
+++ b/scripts/envsetup.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+SCRIPT="envsetup.sh"
+
+MACHINE=$1
+
+if [ "$#" -lt 1 ]; then
+        echo "Usage: ${SCRIPT} <machine> [builddir]"
+        return -1
+elif [ "$#" -eq 2 ]; then
+        BUILDDIR=$2
+else
+        BUILDDIR=build
+fi
+BULDDIR=$2
+
+# detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594
+SOURCED=0
+if [ -n "$ZSH_EVAL_CONTEXT" ]; then
+        [[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); }
+elif [ -n "$KSH_VERSION" ]; then
+        [[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); }
+elif [ -n "$BASH_VERSION" ]; then
+        [[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); }
+fi
+
+if [ $SOURCED -ne 1 ]; then
+        unset SOURCED
+        unset SOURCEDIR
+    echo "Error: this script needs to be sourced in a supported shell" >&2
+    echo "Please check that the current shell is bash, zsh or ksh and run this script as '. $0 <args>'" >&2
+    exit -1
+fi
+
+SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P)
+METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)
+
+if ! [[ -e ${SCRIPTDIR}/../conf/include/local/sota_${MACHINE}.inc && -e ${SCRIPTDIR}/../conf/include/bblayers/sota_${MACHINE}.inc ]]; then
+        echo "Error: invalid machine: ${MACHINE}" >&2
+        return -1
+fi
+
+if [ -e ${BUILDDIR}/conf/local.conf ]; then
+        source $METADIR/poky/oe-init-build-env ${BUILDDIR}
+else
+        source $METADIR/poky/oe-init-build-env ${BUILDDIR}
+        echo "METADIR  := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
+        cat ${METADIR}/meta-updater/conf/include/bblayers/sota.inc >> conf/bblayers.conf
+        cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf
+        echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf
+        echo "include conf/distro/sota.conf.inc" >> conf/local.conf
+fi
+
diff --git a/scripts/lib/wic/canned-wks/sdimage-sota.wks b/scripts/lib/wic/canned-wks/sdimage-sota.wks
new file mode 100644
index 0000000..c31c3a5
--- /dev/null
+++ b/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/scripts/lib/wic/plugins/otaimage.py b/scripts/lib/wic/plugins/otaimage.py
new file mode 100644
index 0000000..016c996
--- /dev/null
+++ b/scripts/lib/wic/plugins/otaimage.py
@@ -0,0 +1,69 @@
+# 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, "")
+