syslinux: add syslinux-nomtools to PACKAGES
From c0a00e59de0e5dad364b0f260303533bab6388a6 Mon Sep 17 00:00:00 2001
From: Adrian <[email protected]>
Date: Tue, 14 Apr 2015 23:49:05 +0200
Subject: [PATCH] wic: plugin for single ext partition
This is not the final implementatio yet. It is based on a temporary wrapper script calling extlinux and sudo. The final solution will call syslinux-nomtools instead of the script.
The wic plugin creates a disk image containig just one ext2/3/4 partition. The target devices are PCs with legacy BIOS. Syslinux is used as a bootloader.
Creating just one ext partition instead of a fat partiton for boot and an ext partiton for rootfs solves several issues related to package based kernel updates on the device.
--- .../lib/wic/plugins/source/rootfs-pcbios-ext.py | 165 +++++++++++++++++++++ scripts/syslinux-e2fs | 68 +++++++++ 2 files changed, 233 insertions(+) create mode 100644 scripts/lib/wic/plugins/source/rootfs-pcbios-ext.py create mode 100755 scripts/syslinux-e2fs
scripts/lib/wic/plugins/source/rootfs-pcbios-ext.py new file +165 -0
@@ -0,0 +1,165 @@ +# 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 distribute 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 mo 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 plugin creates a disk image containing a bootable root partition with +# syslinux installed. The filesystem is ext2/3/4, no extra boot partition is +# required. +# +# Example kickstart file: +# part / --source rootfs-pcbios-ext --ondisk sda --fstype=ext4 --label rootfs --align 1024 +# bootloader --timeout=0 --append="rootwait rootfstype=ext4" --source rootfs-pcbios-ext +# +# The first line generates a root file system including a syslinux.cfg file +# The "--source rootfs-pcbios-ext" in the second line triggers the ldlinux.sys +# installation into the image. +# +# AUTHOR +# Adrian Freihofer <adrian.freihofer (at] gmail.com> +# + +import os +from wic import kickstart, msger +from wic.utils import runner +from wic.pluginbase import SourcePlugin +from wic.utils.oe.misc import * + + +class RootfsPlugin(SourcePlugin): + name = 'rootfs-pcbios-ext' + + @staticmethod + def __get_rootfs_dir(rootfs_dir): + if os.path.isdir(rootfs_dir): + return rootfs_dir + + bitbake_env_lines = find_bitbake_env_lines(rootfs_dir) + if not bitbake_env_lines: + msg = "Couldn't get bitbake environment, exiting." + msger.error(msg) + + image_rootfs_dir = find_artifact(bitbake_env_lines, "IMAGE_ROOTFS") + if not os.path.isdir(image_rootfs_dir): + msg = "No valid artifact IMAGE_ROOTFS from image named" + msg += " %s has been found at %s, exiting.\n" % \ + (rootfs_dir, image_rootfs_dir) + msger.error(msg) + + return image_rootfs_dir + + @classmethod + def do_configure_partition(self, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + native_sysroot): + """ + Called before do_prepare_partition(), creates syslinux config + """ + (rootdev, root_part_uuid) = cr._get_boot_config() + options = cr.ks.handler.bootloader.appendLine + + syslinux_conf = "" + syslinux_conf += "PROMPT 0\n" + timeout = kickstart.get_timeout(cr.ks) + if not timeout: + timeout = 0 + syslinux_conf += "TIMEOUT " + str(timeout) + "\n" + syslinux_conf += "\n" + syslinux_conf += "ALLOWOPTIONS 1\n" + syslinux_conf += "SERIAL 0 115200\n" + syslinux_conf += "\n" + syslinux_conf += "DEFAULT boot\n" + syslinux_conf += "LABEL boot\n" + syslinux_conf += "KERNEL /boot/bzImage\n" + + if cr._ptable_format == 'msdos': + rootstr = rootdev + else: + raise ImageError("Unsupported partition table format found") + + syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) + + syslinux_cfg = os.path.join(cr.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg") + msger.debug("Writing syslinux config %s" % syslinux_cfg) + cfg = open(syslinux_cfg, "w") + cfg.write(syslinux_conf) + cfg.close() + + @classmethod + def do_prepare_partition(self, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + krootfs_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. + """ + def _has_syslinux(dir): + if dir: + syslinux = "%s/syslinux" % dir + if os.path.exists(syslinux): + return True + return False + + if not _has_syslinux(bootimg_dir): + bootimg_dir = get_bitbake_var("STAGING_DATADIR_NATIVE") + if not bootimg_dir: + msger.error("Couldn't find STAGING_DATADIR_NATIVE, exiting\n") + if not _has_syslinux(bootimg_dir): + msger.error("Please build syslinux-native before calling wic\n") + + if part.rootfs is None: + if not 'ROOTFS_DIR' in krootfs_dir: + msg = "Couldn't find --rootfs-dir, exiting" + msger.error(msg) + rootfs_dir = krootfs_dir['ROOTFS_DIR'] + else: + if part.rootfs in krootfs_dir: + rootfs_dir = krootfs_dir[part.rootfs] + elif part.rootfs: + rootfs_dir = part.rootfs + else: + msg = "Couldn't find --rootfs-dir=%s connection" + msg += " or it is not a valid path, exiting" + msger.error(msg % part.rootfs) + + real_rootfs_dir = self.__get_rootfs_dir(rootfs_dir) + + part.set_rootfs(real_rootfs_dir) + part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot) + + @classmethod + def do_install_disk(self, 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. In this case, we install the MBR. + """ + mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/mbr.bin") + if not os.path.exists(mbrfile): + msger.error("Couldn't find %s. If using the -e option, do you have the right MACHINE set in local.conf? If not, is the bootimg_dir path corct?" % mbrfile) + + full_path = disk['disk'].device + msger.debug("Installing MBR on disk %s as %s with size %s bytes" \ + % (disk_name, full_path, disk['min_size'])) + + rc = runner.show(['dd', 'if=%s' % mbrfile, + 'of=%s' % full_path, 'conv=notrunc']) + if rc != 0: + raise ImageError("Unable to set MBR to %s" % full_path) + + # install syslinux + syslinux_cmd = "syslinux-e2fs -t %d -d /boot -i %s" % (2048*512, full_path) + # syslinux_cmd = "syslinux-nomtools -t %d -d /boot -i %s" % (2048*512, full_path) + exec_cmd(syslinux_cmd)
scripts/syslinux-e2fs new file +68 -0
69 lines not on this page · raw message
Signature · 1 line
-M