From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652197203295076352 X-Received: by 2002:aa7:c393:: with SMTP id k19mr1176870edq.6.1548835357229; Wed, 30 Jan 2019 00:02:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:628b:: with SMTP id t11ls289255ejk.1.gmail; Wed, 30 Jan 2019 00:02:36 -0800 (PST) X-Google-Smtp-Source: ALg8bN4BuFEdow7YGIdn58DEdZYcOa8sz+RbQtFd9iVYahPA00vJFwZ8356w75EhnjDzZ4O799yq X-Received: by 2002:a17:906:8da:: with SMTP id o26mr1102135eje.7.1548835356826; Wed, 30 Jan 2019 00:02:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548835356; cv=none; d=google.com; s=arc-20160816; b=Lro9advYKXQDgU5Y6lzdsTD/lVNIWq8LP+Fwbwip8wlpRroWHPETjww5LA8QKE0mGo JP6FjC9AGZeLva7RsC8tML1fjMdJMqM4YJBdXmIU1lzBB9m2wCJIZc56rhmwmEsG7HYl AtVdTD/zVmskdZV1oHXd/hRqoGcF3LZuPplnzXtrK15YYOkwdJf0C2URIjHBXDB8H02k ykCFP5BS163rGVRrCT6nZMcwmDec6y9ikUgKtX2c2kLYhwI/W8uFa4e6B9VytgzNWmkh WOhfJP1kTfHq+VzlrdxEP1VRHaiMkoptb9JiKcZP7vaJlbAxeDEVaL5hPFiSp27ELyHG /EFw== 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=prVJP+f6fyVvFPBr/BtJESraa3sNU2zCuxBeD0cYRL8=; b=NSiG3q72SKpLgQ8D5XuedS3IjL3tfTZfkh6U6kbTCfLTAxrytmNXdcLaBVbxfwVbbi 6GZd+KQS4AjUVnRCV6hmsR4m0Hog88XNCSNVYOB3XUJ95zGduMMlbCO5IHeQihpTRP38 kYOOFwUJRKoNELucrrZNGu+HR+orOiwM5r0Xi/LliSTJKgkuIxj6mGNVeWu7KxgpuBj7 AwNUQLyXW0+r3JJ0WuDthNnhG2KurIrCbCpn0qtyorYQYnTeqDAIAGtSOcFhC5OaeXDp MrLvIw5txMvODAvSPrytK6GuoRCuTEepzFrOFgX1CfHaBopddcVRcWWmq+AmG5COBfEp DGBg== 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 k25si60520edd.1.2019.01.30.00.02.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 00:02:36 -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 x0U82ZNS023042 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jan 2019 09:02:36 +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 x0U82YnA015973; Wed, 30 Jan 2019 09:02:35 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 4/4] meta-isar: added nand-ubi-demo example to demonstrate UBI use Date: Wed, 30 Jan 2019 09:02:29 +0100 Message-Id: <20190130080229.604-5-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190130080229.604-1-claudius.heine.ext@siemens.com> References: <20190130080229.604-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: eXOOYKjZzRWB From: Claudius Heine Signed-off-by: Claudius Heine --- meta-isar/classes/ubi-ubifs-img.bbclass | 11 ++++ meta-isar/conf/local.conf.sample | 1 + meta-isar/conf/machine/nand-ubi-demo.conf | 13 +++++ .../multiconfig/nand-ubi-demo-buster.conf | 13 +++++ .../images/files/ubinize.cfg.tmpl | 35 +++++++++++++ .../recipes-core/images/isar-image-ubi.bb | 51 +++++++++++++++++++ scripts/ci_build.sh | 1 + 7 files changed, 125 insertions(+) create mode 100644 meta-isar/classes/ubi-ubifs-img.bbclass create mode 100644 meta-isar/conf/machine/nand-ubi-demo.conf create mode 100644 meta-isar/conf/multiconfig/nand-ubi-demo-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..c02c98f --- /dev/null +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -0,0 +1,11 @@ +# UBI with UBIFS image recipe +# +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + +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/local.conf.sample b/meta-isar/conf/local.conf.sample index a671b20..519a15d 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -53,6 +53,7 @@ BBMULTICONFIG = " \ hikey-stretch \ qemuamd64-buster \ qemuamd64-buster-tgz \ + nand-ubi-demo-buster \ rpi-jessie \ " diff --git a/meta-isar/conf/machine/nand-ubi-demo.conf b/meta-isar/conf/machine/nand-ubi-demo.conf new file mode 100644 index 0000000..e207d40 --- /dev/null +++ b/meta-isar/conf/machine/nand-ubi-demo.conf @@ -0,0 +1,13 @@ +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + +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/nand-ubi-demo-buster.conf b/meta-isar/conf/multiconfig/nand-ubi-demo-buster.conf new file mode 100644 index 0000000..1c88f00 --- /dev/null +++ b/meta-isar/conf/multiconfig/nand-ubi-demo-buster.conf @@ -0,0 +1,13 @@ +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "nand-ubi-demo" + +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..fbf0903 --- /dev/null +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -0,0 +1,51 @@ +# UBI image recipe +# +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT + +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 +} diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index f3523e8..abb638e 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -115,6 +115,7 @@ else multiconfig:qemuamd64-stretch:isar-image-base \ multiconfig:qemuamd64-buster:isar-image-base \ multiconfig:qemuamd64-buster-tgz:isar-image-base \ + multiconfig:nand-ubi-demo-buster:isar-image-ubi \ multiconfig:rpi-jessie:isar-image-base # qemu-user-static of <= buster too old to build that #multiconfig:qemuarm64-buster:isar-image-base -- 2.20.1