From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6651890010995818496 X-Received: by 2002:a1c:2dd0:: with SMTP id t199mr308447wmt.21.1548763833066; Tue, 29 Jan 2019 04:10:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:b6ac:: with SMTP id j44ls4264305wre.13.gmail; Tue, 29 Jan 2019 04:10:32 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ0JiIExR/LSbxp6xH+z9RfpP49H4CNpfUzt8dS5si6ekSciKWYxBXpwlvw6WojLRntAyLw X-Received: by 2002:adf:b6ab:: with SMTP id j43mr291451wre.22.1548763832685; Tue, 29 Jan 2019 04:10:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548763832; cv=none; d=google.com; s=arc-20160816; b=EBalkoVlDAC09EfPnA/a9VC8cP1+3sGpX5cof0RHym1d9iuhhqX2A9pf4BBYqEtceS GbSL6pupeL30hG8ECLZmPgYCUL+YpkAAYkVKmyOMWcT//3jArY8v88UU/tlvvX+hTBAc id8wr0dgredKYwLtEmRtKd2IfXJmqifTwwLW0Gj23JHoMaIxIBqY1KGzw3Jnemsu4Hk0 tbyPVhYD2hsNwrG8WOPngnH3bzW5quoh5oqXA92WveDnuEVOcMZbXE+2t/AG3vA96YIx jU040M3ziEw5QHKQX/x6zLDSCjKGy7I+7yMVnAPGr58vVvlyPDuvr1WSMwLjp9WabYzf BdYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=y3Zeyp2uNhnPYP9ZR0oPS+UnaIrAyYXhbf/8JRdDsWs=; b=vDvtS6SD+C4gpDSOoiozYeD+IGk+P4SzvdbcyOTVBUiUZiSjnu6nrxLAuaymR4yFHB DpJJrrGOafEyR8U6s8GQd4Y7cgPkpAGr1/Bf1iSNTBP8WgW1USSFnLlidf0Dh1/b9EQd 0KODwP86yjDHvIcUXA44yU+BQkoRcAyRbP4Oll9gq098N7v5eZyJg8InNcYN6mm3y5XR gQeIC8+xp1y3m7Wpb8bbgR4UD7LzV/3WwWpFtcKtw0EzwOFAvvflb1ykVA8bexferBAO uBWbZkpi7qet9qZSShIHHobOqFMQIXiZmHkZGiwTn4cWfBLiXwq0FT+QdL41Df3APUmo YtDw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id i11si97967wmb.2.2019.01.29.04.10.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 04:10:32 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x0TCAUjf016753 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Jan 2019 13:10:31 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x0TCAThX021516; Tue, 29 Jan 2019 13:10:30 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [RFC PATCH 2/2] meta-isar: added qemusabrelite example to demonstrate UBI use Date: Tue, 29 Jan 2019 13:10:20 +0100 Message-Id: <20190129121020.30845-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129121020.30845-1-claudius.heine.ext@siemens.com> References: <20190129121020.30845-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: NOJrQ5Dse55Y From: Claudius Heine Signed-off-by: Claudius Heine --- meta-isar/classes/ubi-ubifs-img.bbclass | 9 ++++ meta-isar/conf/machine/qemusabrelite.conf | 11 +++++ .../multiconfig/qemusabrelite-buster.conf | 13 +++++ .../images/files/ubinize.cfg.tmpl | 35 +++++++++++++ .../recipes-core/images/isar-image-ubi.bb | 49 +++++++++++++++++++ 5 files changed, 117 insertions(+) create mode 100644 meta-isar/classes/ubi-ubifs-img.bbclass create mode 100644 meta-isar/conf/machine/qemusabrelite.conf create mode 100644 meta-isar/conf/multiconfig/qemusabrelite-buster.conf create mode 100644 meta-isar/recipes-core/images/files/ubinize.cfg.tmpl create mode 100644 meta-isar/recipes-core/images/isar-image-ubi.bb diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass new file mode 100644 index 0000000..711492e --- /dev/null +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -0,0 +1,9 @@ +# UBI with UBIFS image recipe +# +# This software is a part of ISAR. +# Copyright (C) 2015-2018 ilbers GmbH + +inherit ubi-img ubifs-img +addtask do_ubi_image after do_ubifs_image + +UBINIZE_CFG_TMPL_VARS[UBIFS_IMG] = "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}" diff --git a/meta-isar/conf/machine/qemusabrelite.conf b/meta-isar/conf/machine/qemusabrelite.conf new file mode 100644 index 0000000..1f886be --- /dev/null +++ b/meta-isar/conf/machine/qemusabrelite.conf @@ -0,0 +1,11 @@ +# This software is a part of ISAR. +# Copyright (C) 2015-2017 ilbers GmbH + +MACHINE_SERIAL ?= "ttymxc0" +BAUDRATE_TTY ?= "115200" + +MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500" +UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000" +IMAGE_TYPE ?= "ubi-ubifs-img" + +DTB_FILE = "imx6q-sabrelite.dtb" diff --git a/meta-isar/conf/multiconfig/qemusabrelite-buster.conf b/meta-isar/conf/multiconfig/qemusabrelite-buster.conf new file mode 100644 index 0000000..aa29abb --- /dev/null +++ b/meta-isar/conf/multiconfig/qemusabrelite-buster.conf @@ -0,0 +1,13 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2018 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemusabrelite" + +DISTRO ?= "debian-buster" +DISTRO_ARCH ?= "armhf" + +KERNEL_NAME ?= "armmp" + +IMAGE_INSTALL += "sshd-regen-keys" diff --git a/meta-isar/recipes-core/images/files/ubinize.cfg.tmpl b/meta-isar/recipes-core/images/files/ubinize.cfg.tmpl new file mode 100644 index 0000000..f386915 --- /dev/null +++ b/meta-isar/recipes-core/images/files/ubinize.cfg.tmpl @@ -0,0 +1,35 @@ +[kernel] +mode=ubi +image=${KERNEL_IMG} +vol_id=1 +vol_type=static +vol_name=kernel +vol_size=16MiB +vol_alignment=1 + +[initrd] +mode=ubi +image=${INITRD_IMG} +vol_id=2 +vol_type=static +vol_name=initrd +vol_size=32MiB +vol_alignment=1 + +[dtb] +mode=ubi +image=${DTB_IMG} +vol_id=3 +vol_type=static +vol_name=dtb +vol_size=2MiB +vol_alignment=1 + +[rootfs] +mode=ubi +image=${UBIFS_IMG} +vol_id=4 +vol_type=dynamic +vol_name=rootfs +vol_size=300MiB +vol_alignment=1 diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb new file mode 100644 index 0000000..c5a94d0 --- /dev/null +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -0,0 +1,49 @@ +# UBI image recipe +# +# This software is a part of ISAR. +# Copyright (C) 2015-2018 ilbers GmbH + +DESCRIPTION = "UBI Isar image" + +LICENSE = "gpl-2.0" +LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" + +PV = "1.0" + +inherit isar-image + +SRC_URI += "file://ubinize.cfg.tmpl" + +def find_linux_image(d, root_var): + """ + Find path to the linux-image directory + + Takes the first it can find -> could lead to problems if more than one + linux-image package is installed. + + root_var: Name of variable that contains the path to the rootfs + returns: found path without leading path to the rootfs or "" + """ + import glob + + root = d.getVar(root_var, True) + if not root: + bb.fatal("Variable \"{}\" does not exist or is empty!".format(root_var)) + + found = glob.glob(os.path.join(root, 'usr/lib/linux-image-*')) + if not found: + return "" + + return found[0][len(root):] + +UBINIZE_CFG_TMPL_VARS ??= "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG" +UBINIZE_CFG_TMPL_VARS[KERNEL_IMG] = "${PP_DEPLOY}/${KERNEL_IMAGE}" +UBINIZE_CFG_TMPL_VARS[INITRD_IMG] = "${PP_DEPLOY}/${INITRD_IMAGE}" +UBINIZE_CFG_TMPL_VARS[DTB_IMG] = "${PP_ROOTFS}/${@find_linux_image(d, 'IMAGE_ROOTFS')}/${DTB_FILE}" + +do_copy_boot_files_append() { + DTB="${@find_linux_image(d, 'IMAGE_ROOTFS')}/${DTB_FILE}" + if [ -n "${DTB}" ]; then + cp -f ${IMAGE_ROOTFS}/${DTB} ${DEPLOY_DIR_IMAGE}/${DTB_FILE} + fi +} -- 2.20.1