initial commit of Enea Linux 3.1

Migrated from the internal git server on the dora-enea branch

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

7 files changed, 778 insertions, 0 deletions

diff --git a/scripts/lib/mic/kickstart/custom_commands/__init__.py b/scripts/lib/mic/kickstart/custom_commands/__init__.py
new file mode 100644
index 0000000000..6aed0ff6fa
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/__init__.py
@@ -0,0 +1,17 @@
+from desktop import Mic_Desktop
+from micrepo import Mic_Repo, Mic_RepoData
+from micpartition import Mic_Partition
+from micpartition import Mic_PartData
+from installerfw import Mic_installerfw
+from partition import Wic_Partition
+
+__all__ = (
+    "Mic_Desktop",
+    "Mic_Repo",
+    "Mic_RepoData",
+    "Mic_Partition",
+    "Mic_PartData",
+    "Mic_installerfw",
+    "Wic_Partition",
+    "Wic_PartData",
+)
diff --git a/scripts/lib/mic/kickstart/custom_commands/desktop.py b/scripts/lib/mic/kickstart/custom_commands/desktop.py
new file mode 100644
index 0000000000..c8bd647ae3
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/desktop.py
@@ -0,0 +1,95 @@
+#!/usr/bin/python -tt
+#
+# Copyright (c) 2008, 2009, 2010 Intel, Inc.
+#
+# Yi Yang <yi.y.yang@intel.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; version 2 of the License
+#
+# 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., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+from pykickstart.base import *
+from pykickstart.errors import *
+from pykickstart.options import *
+
+class Mic_Desktop(KickstartCommand):
+    def __init__(self, writePriority=0,
+                       defaultdesktop=None,
+                       defaultdm=None,
+                       autologinuser=None,
+                       session=None):
+
+        KickstartCommand.__init__(self, writePriority)
+
+        self.__new_version = False
+        self.op = self._getParser()
+
+        self.defaultdesktop = defaultdesktop
+        self.autologinuser = autologinuser
+        self.defaultdm = defaultdm
+        self.session = session
+
+    def __str__(self):
+        retval = ""
+
+        if self.defaultdesktop != None:
+            retval += " --defaultdesktop=%s" % self.defaultdesktop
+        if self.session != None:
+            retval += " --session=\"%s\"" % self.session
+        if self.autologinuser != None:
+            retval += " --autologinuser=%s" % self.autologinuser
+        if self.defaultdm != None:
+            retval += " --defaultdm=%s" % self.defaultdm
+
+        if retval != "":
+            retval = "# Default Desktop Settings\ndesktop %s\n" % retval
+
+        return retval
+
+    def _getParser(self):
+        try:
+            op = KSOptionParser(lineno=self.lineno)
+        except TypeError:
+            # the latest version has not lineno argument
+            op = KSOptionParser()
+            self.__new_version = True
+
+        op.add_option("--defaultdesktop", dest="defaultdesktop",
+                                          action="store",
+                                          type="string",
+                                          nargs=1)
+        op.add_option("--autologinuser", dest="autologinuser",
+                                         action="store",
+                                         type="string",
+                                         nargs=1)
+        op.add_option("--defaultdm", dest="defaultdm",
+                                     action="store",
+                                     type="string",
+                                     nargs=1)
+        op.add_option("--session", dest="session",
+                                   action="store",
+                                   type="string",
+                                   nargs=1)
+        return op
+
+    def parse(self, args):
+        if self.__new_version:
+            (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno)
+        else:
+            (opts, extra) = self.op.parse_args(args=args)
+
+        if extra:
+            m = _("Unexpected arguments to %(command)s command: %(options)s") \
+                  % {"command": "desktop", "options": extra}
+            raise KickstartValueError, formatErrorMsg(self.lineno, msg=m)
+
+        self._setToSelf(self.op, opts)
diff --git a/scripts/lib/mic/kickstart/custom_commands/installerfw.py b/scripts/lib/mic/kickstart/custom_commands/installerfw.py
new file mode 100644
index 0000000000..2466f1dc07
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/installerfw.py
@@ -0,0 +1,63 @@
+#!/usr/bin/python -tt
+#
+# Copyright (c) 2013 Intel, Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; version 2 of the License
+#
+# 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., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+from pykickstart.base import *
+from pykickstart.options import *
+
+class Mic_installerfw(KickstartCommand):
+    """ This class implements the "installerfw" KS option. The argument
+    of the option is a comman-separated list of MIC features which have to be
+    disabled and instead, will be done in the installer. For example,
+    "installerfw=extlinux" disables all the MIC code which installs extlinux to
+    the target images, and instead, the extlinux or whatever boot-loader will
+    be installed by the installer instead.
+
+    The installer is a tool which is external to MIC, it comes from the
+    installation repositories and can be executed by MIC in order to perform
+    various configuration actions. The main point here is to make sure MIC has
+    no hard-wired knoledge about the target OS configuration. """
+
+    removedKeywords = KickstartCommand.removedKeywords
+    removedAttrs = KickstartCommand.removedAttrs
+
+    def __init__(self, *args, **kwargs):
+        KickstartCommand.__init__(self, *args, **kwargs)
+        self.op = self._getParser()
+        self.features = kwargs.get("installerfw", None)
+
+    def __str__(self):
+        retval = KickstartCommand.__str__(self)
+
+        if self.features:
+            retval += "# Enable installer framework features\ninstallerfw\n"
+
+        return retval
+
+    def _getParser(self):
+        op = KSOptionParser()
+        return op
+
+    def parse(self, args):
+        (_, extra) = self.op.parse_args(args=args, lineno=self.lineno)
+
+        if len(extra) != 1:
+            msg = "Kickstart command \"installerfw\" requires one " \
+                  "argumet - a list of legacy features to disable"
+            raise KickstartValueError, formatErrorMsg(self.lineno, msg = msg)
+
+        self.features = extra[0].split(",")
+        return self
diff --git a/scripts/lib/mic/kickstart/custom_commands/micboot.py b/scripts/lib/mic/kickstart/custom_commands/micboot.py
new file mode 100644
index 0000000000..66d1678aa7
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/micboot.py
@@ -0,0 +1,49 @@
+#!/usr/bin/python -tt
+#
+# Copyright (c) 2008, 2009, 2010 Intel, Inc.
+#
+# Anas Nashif
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; version 2 of the License
+#
+# 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., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+from pykickstart.base import *
+from pykickstart.errors import *
+from pykickstart.options import *
+from pykickstart.commands.bootloader import *
+
+class Mic_Bootloader(F8_Bootloader):
+    def __init__(self, writePriority=10, appendLine="", driveorder=None,
+                 forceLBA=False, location="", md5pass="", password="",
+                 upgrade=False, menus=""):
+        F8_Bootloader.__init__(self, writePriority, appendLine, driveorder,
+                                forceLBA, location, md5pass, password, upgrade)
+
+        self.menus = ""
+        self.ptable = "msdos"
+
+    def _getArgsAsStr(self):
+        ret = F8_Bootloader._getArgsAsStr(self)
+
+        if self.menus == "":
+            ret += " --menus=%s" %(self.menus,)
+        if self.ptable:
+            ret += " --ptable=\"%s\"" %(self.ptable,)
+        return ret
+
+    def _getParser(self):
+        op = F8_Bootloader._getParser(self)
+        op.add_option("--menus", dest="menus")
+        op.add_option("--ptable", dest="ptable", type="string")
+        return op
+
diff --git a/scripts/lib/mic/kickstart/custom_commands/micpartition.py b/scripts/lib/mic/kickstart/custom_commands/micpartition.py
new file mode 100644
index 0000000000..59a87fb486
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/micpartition.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python -tt
+#
+# Marko Saukko <marko.saukko@cybercom.com>
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+#
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2. This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties 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.
+
+from pykickstart.commands.partition import *
+
+class Mic_PartData(FC4_PartData):
+    removedKeywords = FC4_PartData.removedKeywords
+    removedAttrs = FC4_PartData.removedAttrs
+
+    def __init__(self, *args, **kwargs):
+        FC4_PartData.__init__(self, *args, **kwargs)
+        self.deleteRemovedAttrs()
+        self.align = kwargs.get("align", None)
+        self.extopts = kwargs.get("extopts", None)
+        self.part_type = kwargs.get("part_type", None)
+
+    def _getArgsAsStr(self):
+        retval = FC4_PartData._getArgsAsStr(self)
+
+        if self.align:
+            retval += " --align"
+        if self.extopts:
+            retval += " --extoptions=%s" % self.extopts
+        if self.part_type:
+            retval += " --part-type=%s" % self.part_type
+
+        return retval
+
+class Mic_Partition(FC4_Partition):
+    removedKeywords = FC4_Partition.removedKeywords
+    removedAttrs = FC4_Partition.removedAttrs
+
+    def _getParser(self):
+        op = FC4_Partition._getParser(self)
+        # The alignment value is given in kBytes. e.g., value 8 means that
+        # the partition is aligned to start from 8096 byte boundary.
+        op.add_option("--align", type="int", action="store", dest="align",
+                      default=None)
+        op.add_option("--extoptions", type="string", action="store", dest="extopts",
+                      default=None)
+        op.add_option("--part-type", type="string", action="store", dest="part_type",
+                      default=None)
+        return op
diff --git a/scripts/lib/mic/kickstart/custom_commands/micrepo.py b/scripts/lib/mic/kickstart/custom_commands/micrepo.py
new file mode 100644
index 0000000000..b31576e400
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/micrepo.py
@@ -0,0 +1,127 @@
+#!/usr/bin/python -tt
+#
+# Copyright (c) 2008, 2009, 2010 Intel, Inc.
+#
+# Yi Yang <yi.y.yang@intel.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; version 2 of the License
+#
+# 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., 59
+# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+from pykickstart.base import *
+from pykickstart.errors import *
+from pykickstart.options import *
+from pykickstart.commands.repo import *
+
+class Mic_RepoData(F8_RepoData):
+
+    def __init__(self, baseurl="", mirrorlist=None, name="", priority=None,
+                 includepkgs=(), excludepkgs=(), save=False, proxy=None,
+                 proxy_username=None, proxy_password=None, debuginfo=False,
+                 source=False, gpgkey=None, disable=False, ssl_verify="yes",
+                 nocache=False):
+        kw = {}
+        # F8_RepoData keywords
+        if includepkgs:
+            kw['includepkgs'] = includepkgs
+        if excludepkgs:
+            kw['excludepkgs'] = excludepkgs
+
+        #FC6_RepoData keywords
+        if baseurl:
+            kw['baseurl'] = baseurl
+        if mirrorlist:
+            kw['mirrorlist'] = mirrorlist
+        if name:
+            kw['name'] = name
+
+        F8_RepoData.__init__(self, **kw)
+        self.save = save
+        self.proxy = proxy
+        self.proxy_username = proxy_username
+        self.proxy_password = proxy_password
+        self.debuginfo = debuginfo
+        self.disable = disable
+        self.source = source
+        self.gpgkey = gpgkey
+        self.ssl_verify = ssl_verify.lower()
+        self.priority = priority
+        self.nocache = nocache
+
+    def _getArgsAsStr(self):
+        retval = F8_RepoData._getArgsAsStr(self)
+
+        if self.save:
+            retval += " --save"
+        if self.proxy:
+            retval += " --proxy=%s" % self.proxy
+        if self.proxy_username:
+            retval += " --proxyuser=%s" % self.proxy_username
+        if self.proxy_password:
+            retval += " --proxypasswd=%s" % self.proxy_password
+        if self.debuginfo:
+            retval += " --debuginfo"
+        if self.source:
+            retval += " --source"
+        if self.gpgkey:
+            retval += " --gpgkey=%s" % self.gpgkey
+        if self.disable:
+            retval += " --disable"
+        if self.ssl_verify:
+            retval += " --ssl_verify=%s" % self.ssl_verify
+        if self.priority:
+            retval += " --priority=%s" % self.priority
+        if self.nocache:
+            retval += " --nocache"
+
+        return retval
+
+class Mic_Repo(F8_Repo):
+    def __init__(self, writePriority=0, repoList=None):
+        F8_Repo.__init__(self, writePriority, repoList)
+
+    def __str__(self):
+        retval = ""
+        for repo in self.repoList:
+            retval += repo.__str__()
+
+        return retval
+
+    def _getParser(self):
+        def list_cb (option, opt_str, value, parser):
+            for d in value.split(','):
+                parser.values.ensure_value(option.dest, []).append(d)
+
+        op = F8_Repo._getParser(self)
+        op.add_option("--save", action="store_true", dest="save",
+                      default=False)
+        op.add_option("--proxy", type="string", action="store", dest="proxy",
+                      default=None, nargs=1)
+        op.add_option("--proxyuser", type="string", action="store",
+                      dest="proxy_username", default=None, nargs=1)
+        op.add_option("--proxypasswd", type="string", action="store",
+                      dest="proxy_password", default=None, nargs=1)
+        op.add_option("--debuginfo", action="store_true", dest="debuginfo",
+                      default=False)
+        op.add_option("--source", action="store_true", dest="source",
+                      default=False)
+        op.add_option("--disable", action="store_true", dest="disable",
+                      default=False)
+        op.add_option("--gpgkey", type="string", action="store", dest="gpgkey",
+                      default=None, nargs=1)
+        op.add_option("--ssl_verify", type="string", action="store",
+                      dest="ssl_verify", default="yes")
+        op.add_option("--priority", type="int", action="store", dest="priority",
+                      default=None)
+        op.add_option("--nocache", action="store_true", dest="nocache",
+                      default=False)
+        return op
diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
new file mode 100644
index 0000000000..302cace234
--- /dev/null
+++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
@@ -0,0 +1,370 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (c) 2013, Intel Corporation.
+# All rights reserved.
+#
+# 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.
+#
+# DESCRIPTION
+# This module provides the OpenEmbedded partition object definitions.
+#
+# AUTHORS
+# Tom Zanussi <tom.zanussi (at] linux.intel.com>
+#
+
+import shutil
+
+from pykickstart.commands.partition import *
+from mic.utils.oe.misc import *
+
+from mic.kickstart.custom_commands import *
+
+BOOTDD_EXTRA_SPACE = 16384
+
+class Wic_PartData(Mic_PartData):
+    removedKeywords = Mic_PartData.removedKeywords
+    removedAttrs = Mic_PartData.removedAttrs
+
+    def __init__(self, *args, **kwargs):
+        Mic_PartData.__init__(self, *args, **kwargs)
+        self.deleteRemovedAttrs()
+        self.source = kwargs.get("source", None)
+        self.source_file = ""
+        self.size = 0
+
+    def _getArgsAsStr(self):
+        retval = Mic_PartData._getArgsAsStr(self)
+
+        if self.source:
+            retval += " --source=%s" % self.source
+
+        return retval
+
+    def prepare(self, cr_workdir, oe_builddir, boot_type, rootfs_dir,
+                bootimg_dir, kernel_dir, native_sysroot):
+        """
+        Prepare content for individual partitions, depending on
+        partition command parameters.
+        """
+        if not self.source:
+            if self.fstype and self.fstype == "swap":
+                self.prepare_swap_partition(cr_workdir, oe_builddir,
+                                            native_sysroot)
+            elif self.fstype:
+                self.prepare_empty_partition(cr_workdir, oe_builddir,
+                                             native_sysroot)
+            return
+
+        if self.source == "bootimg" and boot_type == "pcbios":
+            self.prepare_bootimg_pcbios(cr_workdir, oe_builddir, bootimg_dir,
+                                        kernel_dir, native_sysroot)
+        elif self.source == "bootimg" and boot_type == "efi":
+            self.prepare_bootimg_efi(cr_workdir, oe_builddir, bootimg_dir,
+                                     kernel_dir, native_sysroot)
+        elif self.source.startswith("rootfs"):
+            self.prepare_rootfs(cr_workdir, oe_builddir, rootfs_dir,
+                                native_sysroot)
+
+    def prepare_bootimg_pcbios(self, cr_workdir, oe_builddir, bootimg_dir,
+                               kernel_dir, native_sysroot):
+        """
+        Prepare content for a legacy bios boot partition.
+        """
+        staging_kernel_dir = kernel_dir
+        staging_data_dir = bootimg_dir
+
+        hdddir = "%s/hdd/boot" % cr_workdir
+
+        install_cmd = "install -m 0644 %s/bzImage %s/vmlinuz" \
+            % (staging_kernel_dir, hdddir)
+        tmp = exec_cmd(install_cmd)
+
+        install_cmd = "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" \
+            % (staging_data_dir, hdddir)
+        tmp = exec_cmd(install_cmd)
+
+        du_cmd = "du -bks %s" % hdddir
+        rc, out = exec_cmd(du_cmd)
+        blocks = int(out.split()[0])
+
+        blocks += BOOTDD_EXTRA_SPACE
+
+        # Ensure total sectors is an integral number of sectors per
+        # track or mcopy will complain. Sectors are 512 bytes, and we
+        # generate images with 32 sectors per track. This calculation is
+        # done in blocks, thus the mod by 16 instead of 32.
+        blocks += (16 - (blocks % 16))
+
+        # dosfs image, created by mkdosfs
+        bootimg = "%s/boot.img" % cr_workdir
+
+        dosfs_cmd = "mkdosfs -n boot -S 512 -C %s %d" % (bootimg, blocks)
+        exec_native_cmd(dosfs_cmd, native_sysroot)
+
+        mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)
+        exec_native_cmd(mcopy_cmd, native_sysroot)
+
+        syslinux_cmd = "syslinux %s" % bootimg
+        exec_native_cmd(syslinux_cmd, native_sysroot)
+
+        chmod_cmd = "chmod 644 %s" % bootimg
+        exec_cmd(chmod_cmd)
+
+        du_cmd = "du -Lbms %s" % bootimg
+        rc, out = exec_cmd(du_cmd)
+        bootimg_size = out.split()[0]
+
+        self.size = bootimg_size
+        self.source_file = bootimg
+
+    def prepare_bootimg_efi(self, cr_workdir, oe_builddir, bootimg_dir,
+                            kernel_dir, native_sysroot):
+        """
+        Prepare content for an EFI (grub) boot partition.
+        """
+        staging_kernel_dir = kernel_dir
+        staging_data_dir = bootimg_dir
+
+        hdddir = "%s/hdd/boot" % cr_workdir
+
+        install_cmd = "install -m 0644 %s/bzImage %s/vmlinuz" % \
+            (staging_kernel_dir, hdddir)
+        tmp = exec_cmd(install_cmd)
+
+        shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir,
+                        "%s/grub.cfg" % cr_workdir)
+
+        cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (staging_data_dir, hdddir)
+        exec_cmd(cp_cmd, True)
+
+        shutil.move("%s/grub.cfg" % cr_workdir,
+                    "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
+
+        du_cmd = "du -bks %s" % hdddir
+        rc, out = exec_cmd(du_cmd)
+        blocks = int(out.split()[0])
+
+        blocks += BOOTDD_EXTRA_SPACE
+
+        # Ensure total sectors is an integral number of sectors per
+        # track or mcopy will complain. Sectors are 512 bytes, and we
+        # generate images with 32 sectors per track. This calculation is
+        # done in blocks, thus the mod by 16 instead of 32.
+        blocks += (16 - (blocks % 16))
+
+        # dosfs image, created by mkdosfs
+        bootimg = "%s/boot.img" % cr_workdir
+
+        dosfs_cmd = "mkdosfs -n efi -C %s %d" % (bootimg, blocks)
+        exec_native_cmd(dosfs_cmd, native_sysroot)
+
+        mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)
+        exec_native_cmd(mcopy_cmd, native_sysroot)
+
+        chmod_cmd = "chmod 644 %s" % bootimg
+        exec_cmd(chmod_cmd)
+
+        du_cmd = "du -Lbms %s" % bootimg
+        rc, out = exec_cmd(du_cmd)
+        bootimg_size = out.split()[0]
+
+        self.size = bootimg_size
+        self.source_file = bootimg
+
+    def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir,
+                                     rootfs_dir):
+        """
+        Handle an already-created partition e.g. xxx.ext3
+        """
+        rootfs = oe_builddir
+        du_cmd = "du -Lbms %s" % rootfs
+        rc, out = exec_cmd(du_cmd)
+        rootfs_size = out.split()[0]
+
+        self.size = rootfs_size
+        self.source_file = rootfs
+
+    def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir,
+                       native_sysroot):
+        """
+        Prepare content for a rootfs partition i.e. create a partition
+        and fill it from a /rootfs dir.
+
+        Currently handles ext2/3/4 and btrfs.
+        """
+        if self.fstype.startswith("ext"):
+            return self.prepare_rootfs_ext(cr_workdir, oe_builddir,
+                                           rootfs_dir, native_sysroot)
+        elif self.fstype.startswith("btrfs"):
+            return self.prepare_rootfs_btrfs(cr_workdir, oe_builddir,
+                                             rootfs_dir, native_sysroot)
+
+    def prepare_rootfs_ext(self, cr_workdir, oe_builddir, rootfs_dir,
+                           native_sysroot):
+        """
+        Prepare content for an ext2/3/4 rootfs partition.
+        """
+        populate_script = "%s/usr/bin/populate-extfs.sh" % native_sysroot
+        image_extra_space = 10240
+
+        image_rootfs = rootfs_dir
+        rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype)
+
+        du_cmd = "du -ks %s" % image_rootfs
+        rc, out = exec_cmd(du_cmd)
+        actual_rootfs_size = out.split()[0]
+
+        rootfs_size = int(actual_rootfs_size) + image_extra_space
+
+        dd_cmd = "dd if=/dev/zero of=%s bs=1024 seek=%d count=0 bs=1k" % \
+            (rootfs, rootfs_size)
+        rc, out = exec_cmd(dd_cmd)
+
+        extra_imagecmd = "-i 8192"
+
+        mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, rootfs)
+        rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
+
+        populate_cmd = populate_script + " " + image_rootfs + " " + rootfs
+        rc, out = exec_native_cmd(populate_cmd, native_sysroot)
+
+        # get the rootfs size in the right units for kickstart (Mb)
+        du_cmd = "du -Lbms %s" % rootfs
+        rc, out = exec_cmd(du_cmd)
+        rootfs_size = out.split()[0]
+
+        self.size = rootfs_size
+        self.source_file = rootfs
+
+        return 0
+
+    def prepare_rootfs_btrfs(self, cr_workdir, oe_builddir, rootfs_dir,
+                             native_sysroot):
+        """
+        Prepare content for a btrfs rootfs partition.
+
+        Currently handles ext2/3/4 and btrfs.
+        """
+        image_extra_space = 10240
+
+        image_rootfs = rootfs_dir
+        rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype)
+
+        du_cmd = "du -ks %s" % image_rootfs
+        rc, out = exec_cmd(du_cmd)
+        actual_rootfs_size = out.split()[0]
+
+        rootfs_size = int(actual_rootfs_size) + image_extra_space
+
+        dd_cmd = "dd if=/dev/zero of=%s bs=1024 seek=%d count=0 bs=1k" % \
+            (rootfs, rootfs_size)
+        rc, out = exec_cmd(dd_cmd)
+
+        mkfs_cmd = "mkfs.%s -b %d -r %s %s" % \
+            (self.fstype, rootfs_size * 1024, image_rootfs, rootfs)
+        rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
+
+        # get the rootfs size in the right units for kickstart (Mb)
+        du_cmd = "du -Lbms %s" % rootfs
+        rc, out = exec_cmd(du_cmd)
+        rootfs_size = out.split()[0]
+
+        self.size = rootfs_size
+        self.source_file = rootfs
+
+    def prepare_empty_partition(self, cr_workdir, oe_builddir, native_sysroot):
+        """
+        Prepare an empty partition.
+        """
+        if self.fstype.startswith("ext"):
+            return self.prepare_empty_partition_ext(cr_workdir, oe_builddir,
+                                                    native_sysroot)
+        elif self.fstype.startswith("btrfs"):
+            return self.prepare_empty_partition_btrfs(cr_workdir, oe_builddir,
+                                                      native_sysroot)
+
+    def prepare_empty_partition_ext(self, cr_workdir, oe_builddir,
+                                    native_sysroot):
+        """
+        Prepare an empty ext2/3/4 partition.
+        """
+        fs = "%s/fs.%s" % (cr_workdir, self.fstype)
+
+        dd_cmd = "dd if=/dev/zero of=%s bs=1M seek=%d count=0" % \
+            (fs, self.size)
+        rc, out = exec_cmd(dd_cmd)
+
+        extra_imagecmd = "-i 8192"
+
+        mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, fs)
+        rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
+
+        self.source_file = fs
+
+        return 0
+
+    def prepare_empty_partition_btrfs(self, cr_workdir, oe_builddir,
+                                      native_sysroot):
+        """
+        Prepare an empty btrfs partition.
+        """
+        fs = "%s/fs.%s" % (cr_workdir, self.fstype)
+
+        dd_cmd = "dd if=/dev/zero of=%s bs=1M seek=%d count=0" % \
+            (fs, self.size)
+        rc, out = exec_cmd(dd_cmd)
+
+        mkfs_cmd = "mkfs.%s -b %d %s" % (self.fstype, self.size * 1024, rootfs)
+        rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
+
+        mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, fs)
+        rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
+
+        self.source_file = fs
+
+        return 0
+
+    def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot):
+        """
+        Prepare a swap partition.
+        """
+        fs = "%s/fs.%s" % (cr_workdir, self.fstype)
+
+        dd_cmd = "dd if=/dev/zero of=%s bs=1M seek=%d count=0" % \
+            (fs, self.size)
+        rc, out = exec_cmd(dd_cmd)
+
+        import uuid
+        label_str = ""
+        if self.label:
+            label_str = "-L %s" % self.label
+        mkswap_cmd = "mkswap %s -U %s %s" % (label_str, str(uuid.uuid1()), fs)
+        rc, out = exec_native_cmd(mkswap_cmd, native_sysroot)
+
+        self.source_file = fs
+
+        return 0
+
+class Wic_Partition(Mic_Partition):
+    removedKeywords = Mic_Partition.removedKeywords
+    removedAttrs = Mic_Partition.removedAttrs
+
+    def _getParser(self):
+        op = Mic_Partition._getParser(self)
+        # use specified source file to fill the partition
+        # and calculate partition size
+        op.add_option("--source", type="string", action="store",
+                      dest="source", default=None)
+        return op