[PATCH 0/1] syslinux: add syslinux-nomtools to PACKAGES

[PATCH 0/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

The following changes since commit a7d8eaef04c9dd6ede8d4efd8c4b776efbe3c767:

  shadow: split files needed for PAM use into separate package (2015-04-09 19:48:04 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/syslinux
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/syslinux

Robert Yang (1):
  syslinux: add syslinux-nomtools to PACKAGES

 meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
1.7.9.5

[PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

The default installed syslinux depends on mtools, we install
syslinux-nomtools too, which has the ext2/3/4 support.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
index 33dd776..ddb8744 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
@@ -66,14 +66,17 @@ do_install() {
 	install -d ${D}${datadir}/syslinux/
 	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
 	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
+	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/
 }
 
-PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
+PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
 
 RDEPENDS_${PN} += "mtools"
+RDEPENDS_${PN}-nomtools += "libext2fs"
 RDEPENDS_${PN}-misc += "perl"
 
 FILES_${PN} = "${bindir}/syslinux"
+FILES_${PN}-nomtools = "${bindir}/syslinux-nomtools"
 FILES_${PN}-extlinux = "${sbindir}/extlinux"
 FILES_${PN}-mbr = "${datadir}/${BPN}/mbr.bin"
 FILES_${PN}-chain = "${datadir}/${BPN}/chain.c32"
-- 
1.7.9.5

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

On 04/13/2015 05:05 PM, Robert Yang wrote:
> The default installed syslinux depends on mtools, we install
> syslinux-nomtools too, which has the ext2/3/4 support.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> index 33dd776..ddb8744 100644
> --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> @@ -66,14 +66,17 @@ do_install() {
>   	install -d ${D}${datadir}/syslinux/
>   	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
>   	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
> +	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/

Sorry, I updated this patch a little, it should be:

-m 0755, not 0644.

   git://git.openembedded.org/openembedded-core-contrib rbt/syslinux

Thanks to Adrian.

// Robert

>   }
>
> -PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
> +PACKAGES += "${PN}-nomtools ${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"
>
>   RDEPENDS_${PN} += "mtools"
> +RDEPENDS_${PN}-nomtools += "libext2fs"
>   RDEPENDS_${PN}-misc += "perl"
>
>   FILES_${PN} = "${bindir}/syslinux"
> +FILES_${PN}-nomtools = "${bindir}/syslinux-nomtools"
>   FILES_${PN}-extlinux = "${sbindir}/extlinux"
>   FILES_${PN}-mbr = "${datadir}/${BPN}/mbr.bin"
>   FILES_${PN}-chain = "${datadir}/${BPN}/chain.c32"
>

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Richard Purdie]

On Wed, 2015-04-15 at 10:04 +0800, Robert Yang wrote:
> 
> On 04/13/2015 05:05 PM, Robert Yang wrote:
> > The default installed syslinux depends on mtools, we install
> > syslinux-nomtools too, which has the ext2/3/4 support.
> >
> > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > ---
> >   meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
> >   1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> > index 33dd776..ddb8744 100644
> > --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> > +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
> > @@ -66,14 +66,17 @@ do_install() {
> >   	install -d ${D}${datadir}/syslinux/
> >   	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
> >   	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
> > +	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/
> 
> Sorry, I updated this patch a little, it should be:
> 
> -m 0755, not 0644.
> 
>    git://git.openembedded.org/openembedded-core-contrib rbt/syslinux
> 
> Thanks to Adrian.

I merged master-next which contained this patch before seeing this. I've
created a fix for master-next. With this tweak in it. This is the
downside to tweaking branches already in master-next though :(.

Cheers,

Richard

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Robert Yang]

On 04/15/2015 09:35 PM, Richard Purdie wrote:
> On Wed, 2015-04-15 at 10:04 +0800, Robert Yang wrote:
>>
>> On 04/13/2015 05:05 PM, Robert Yang wrote:
>>> The default installed syslinux depends on mtools, we install
>>> syslinux-nomtools too, which has the ext2/3/4 support.
>>>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> ---
>>>    meta/recipes-devtools/syslinux/syslinux_6.03.bb |    5 ++++-
>>>    1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
>>> index 33dd776..ddb8744 100644
>>> --- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
>>> +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
>>> @@ -66,14 +66,17 @@ do_install() {
>>>    	install -d ${D}${datadir}/syslinux/
>>>    	install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
>>>    	install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
>>> +	install -m 644 ${S}/bios/linux/syslinux-nomtools ${D}${bindir}/
>>
>> Sorry, I updated this patch a little, it should be:
>>
>> -m 0755, not 0644.
>>
>>     git://git.openembedded.org/openembedded-core-contrib rbt/syslinux
>>
>> Thanks to Adrian.
>
> I merged master-next which contained this patch before seeing this. I've
> created a fix for master-next. With this tweak in it. This is the
> downside to tweaking branches already in master-next though :(.

Thanks, I'm sorry about this.

// Robert

>
> Cheers,
>
> Richard
>
>
>

Re: [PATCH 1/1] syslinux: add syslinux-nomtools to PACKAGES

[Adrian Freihofer]

From c0a00e59de0e5dad364b0f260303533bab6388a6 Mon Sep 17 00:00:00 2001
From: Adrian <adrian.freihofer@gmail.com>
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

diff --git a/scripts/lib/wic/plugins/source/rootfs-pcbios-ext.py b/scripts/lib/wic/plugins/source/rootfs-pcbios-ext.py
new file mode 100644
index 0000000..e455036
--- /dev/null
+++ b/scripts/lib/wic/plugins/source/rootfs-pcbios-ext.py
@@ -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)
diff --git a/scripts/syslinux-e2fs b/scripts/syslinux-e2fs
new file mode 100755
index 0000000..f0f563e
--- /dev/null
+++ b/scripts/syslinux-e2fs
@@ -0,0 +1,68 @@
+#!/bin/bash
+# Temporary solution
+# This is a wrapper around extlinux providing similar functionality like syslinux-e2fs will
+# do in future. syslinux-e2fs will be part of future syslinux versions. When this update of
+# syslinux will be released this script will be obsolete.
+#
+# Background:
+# The binary installed on the target device (ldlinux.sys) is the same for syslinux and for
+# extlinux. The difference is the installation procedure. Where extlinux needs a mounted
+# filesystem syslinux-e2fs will work on an image file. In other words, extlinux uses the kernel
+# capabilities to modify the filesystem where syslinux-e2fs will be based on a user space
+# library providing an ext2/3/4 implementation. The purpose of the installer in general is to
+# store the file ldlinux.sys in the first blocks of the filesystem. A regular file cannot be
+# found by mbr.bin since there are not fat or ext algorithm integrated there.
+#
+# Usage:
+# export PATH="$BUILDDIR/tmp/sysroots/x86_64-linux/usr/sbin:$PATH"
+
+
+P_OFFSET=""
+P_INSTALL=0
+P_DIRECTORY="/boot/syslinux"
+
+[ "$#" -ge 1 ] || { echo "pass at least the image name"; exit 1; }
+
+
+# options may be followed by one colon to indicate they have a required argument
+if ! options=$(getopt -o t:id: -l offset:,install,directory: -- "$@")
+then
+    # something went wrong, getopt will put out an error message for us
+    exit 1
+fi
+
+eval set -- $options
+
+while [ $# -gt 0 ]
+do
+    case $1 in
+    -t|--offset) 
+        P_OFFSET="-o $2"; shift;;
+    -i|--install)
+        P_INSTALL=1;;
+    -d|--directory)
+        P_DIRECTORY="$2"; shift;;
+    (--) shift; break;;
+    (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
+    (*) echo $1; break;;
+    esac
+    shift
+done
+
+# consider last command line parameter as image name
+IMAGE_FILE_NAME="$1"
+test -f $IMAGE_FILE_NAME || { echo "pass valid image file name"; exit 1; }
+
+if [ $P_INSTALL -eq 1 ]; then
+    LOOP_DEVICE=$(sudo losetup -f)
+    TMP_MOUNT_POINT=$(mktemp -d)
+
+    sudo losetup ${P_OFFSET} ${LOOP_DEVICE} ${IMAGE_FILE_NAME} || { echo "losetup failed"; exit 1; }
+    sudo mount ${LOOP_DEVICE} ${TMP_MOUNT_POINT} || { echo "mount failed"; exit 1; }
+    ex_val=0
+    sudo env "PATH=$PATH" extlinux -i ${TMP_MOUNT_POINT}/${P_DIRECTORY} || { echo "extlinux failed"; ex_val=1; }
+    sudo umount ${TMP_MOUNT_POINT} || { echo "umount failed"; ex_val=1; }
+    sudo losetup -d ${LOOP_DEVICE} || { echo "losetup -d failed"; ex_val=1; }
+    rmdir ${TMP_MOUNT_POINT}
+    exit $ex_val
+fi
\ No newline at end of file
-- 
-M