From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6651523578180141056 X-Received: by 2002:a17:906:46ca:: with SMTP id k10mr2232979ejs.2.1548679269374; Mon, 28 Jan 2019 04:41:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:994d:: with SMTP id l13ls4015143edb.1.gmail; Mon, 28 Jan 2019 04:41:08 -0800 (PST) X-Google-Smtp-Source: ALg8bN5vo2ja5Am7NUr8bZ3b+4C/JrdcDwphw2Ecb+P9qBwIXN4G10mu8ot445mUyj+MRUSqeBzT X-Received: by 2002:a05:6402:286:: with SMTP id l6mr3331462edv.11.1548679268955; Mon, 28 Jan 2019 04:41:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548679268; cv=none; d=google.com; s=arc-20160816; b=MSdbFa4VOGcGMVBpYfQYtwl81hmg78YfuFNUu0c6vyriOHrVKG2VL1yTQL3d5hA3Sd fwPa1ljPEciofB9zqrX0UZA7yYi+87FpLfBXm1Px+nFN6qjKnXJ3QIVTS6HzgEc3Vlsd OMXRSiseYJB/NDvpvuJKfNXB0mEx6I4goHSv4JJFvGLQyOMqa89cXQvRVBOkNTlgJhf0 hG/EE7vMEHN4mzWqxWWkWoxzwt24fCbPK511JlEAQxQfdm2vfIwOyV+MK6/RcTeoxa4t Q7X6ytv1xSlp3O832wTuG7CFbNyC//uM7m3KQmsQeHE3N+uuTUkRd8Po4jb6W4N8awP0 IJjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=OtCEK0lAfPr6rF7+LOfbZFk7rJVr3rBj/6amhG4qwjM=; b=K/vsUQPXmEhC2c6NS/6Z2CUaANjA4eCP3re4QbYPu4wLbDHe6tXrIssjmbqNgFvMzF uXpYVUuYrbnEGt5qrW+I3rYSWjh/YClna2b/zxC7fe58W51uBzM6b91x+zFLDb577On0 AJCsXcWN4DIGVF3nxkSTVQZ5PqRjJPWOUQ3i0APhPjTgT5CoQDZ20uEYoD4lgoCsvnFb 6Gbu4cPq1Mo6xLJGj2obOxJNz9yotxJl0lv7sBWtXI6LcW6CQPv9+fd4ayLEzbRUpSvw Ce/azXzYK/naOmbU7LeKrFrDwUvhms+vO/L8UHXoKYRj5QI7Zw4m0X6sM/9EI9nLlb6c 52Wg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id k25si2551493edd.1.2019.01.28.04.41.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 04:41:08 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x0SCf8t6002202 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Jan 2019 13:41:08 +0100 Received: from [139.25.69.181] (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0SCf8lS029271; Mon, 28 Jan 2019 13:41:08 +0100 Subject: Re: [PATCH 2/2] integrate ubifs image type To: Jan Kiszka , isar-users@googlegroups.com Cc: Claudius Heine References: <20190128122821.10002-1-claudius.heine.ext@siemens.com> <20190128122821.10002-3-claudius.heine.ext@siemens.com> <80d2d5f3-13ef-ec61-d1b1-cea587e25b34@siemens.com> From: Claudius Heine Message-ID: Date: Mon, 28 Jan 2019 13:41:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <80d2d5f3-13ef-ec61-d1b1-cea587e25b34@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: AnFhpl4bpzve Hi Jan, On 28/01/2019 13.36, Jan Kiszka wrote: > On 28.01.19 13:28, [ext] claudius.heine.ext@siemens.com wrote: >> From: Claudius Heine >> >> Signed-off-by: Claudius Heine >> --- >>   doc/user_manual.md                            |  1 + >>   meta-isar/conf/local.conf.sample              |  1 + >>   .../multiconfig/qemuamd64-buster-ubifs.conf   | 16 +++++++ >>   meta/classes/ubifs-img.bbclass                | 42 +++++++++++++++++++ >>   scripts/ci_build.sh                           |  1 + >>   5 files changed, 61 insertions(+) >>   create mode 100644 >> meta-isar/conf/multiconfig/qemuamd64-buster-ubifs.conf >>   create mode 100644 meta/classes/ubifs-img.bbclass >> >> diff --git a/doc/user_manual.md b/doc/user_manual.md >> index c4fe42a..c9924ad 100644 >> --- a/doc/user_manual.md >> +++ b/doc/user_manual.md >> @@ -476,6 +476,7 @@ Isar contains additional image type classes that >> can be used as reference: >>    - `ext4-img` >>    - `rpi-sdimg` >>    - `targz-img` >> + - `ubifs-img` >>    - `wic-img` >>   --- >> diff --git a/meta-isar/conf/local.conf.sample >> b/meta-isar/conf/local.conf.sample >> index a671b20..9ea366c 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 \ >> +    qemuamd64-buster-ubifs \ >>       rpi-jessie \ >>   " >> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-ubifs.conf >> b/meta-isar/conf/multiconfig/qemuamd64-buster-ubifs.conf >> new file mode 100644 >> index 0000000..7c638b9 >> --- /dev/null >> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-ubifs.conf >> @@ -0,0 +1,16 @@ >> +# This software is a part of ISAR. >> +# Copyright (c) Siemens AG, 2018 >> +# >> +# SPDX-License-Identifier: MIT >> + >> +MACHINE ?= "qemuamd64" >> + >> +DISTRO ?= "debian-buster" >> +DISTRO_ARCH ?= "amd64" >> + >> +KERNEL_NAME ?= "amd64" >> + >> +MKUBIFS_ARGS ?= "-m 0x1000 -e 0x3e000 -c 1500" >> +IMAGE_TYPE ?= "ubifs-img" >> + >> +IMAGE_INSTALL += "sshd-regen-keys" >> diff --git a/meta/classes/ubifs-img.bbclass >> b/meta/classes/ubifs-img.bbclass >> new file mode 100644 >> index 0000000..f5e17d3 >> --- /dev/null >> +++ b/meta/classes/ubifs-img.bbclass >> @@ -0,0 +1,42 @@ >> +# This software is a part of ISAR. >> +# Copyright (c) Siemens AG, 2018 >> + >> +python() { >> +    if not d.getVar("MKUBIFS_ARGS"): >> +        bb.fatal("MKUBIFS_ARGS must be set") >> +} >> + >> +inherit image >> + >> +UBIFS_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubifs.img" >> + >> +IMAGER_INSTALL += "mtd-utils" >> + >> +PP = "/home/builder/${PN}" >> +PP_DEPLOY = "${PP}/deploy" >> +PP_ROOTFS = "${PP}/rootfs" >> + >> +BUILDROOT = "${BUILDCHROOT_DIR}${PP}" >> +BUILDROOT_DEPLOY = "${BUILDCHROOT_DIR}${PP_DEPLOY}" >> +BUILDROOT_ROOTFS = "${BUILDCHROOT_DIR}${PP_ROOTFS}" >> + >> +do_ubifs_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" >> + >> +# Generate ubifs filesystem image >> +do_ubifs_image() { >> +    rm -f ${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE} >> + >> +    buildchroot_do_mounts >> + >> +    sudo flock ${MOUNT_LOCKFILE} -c ' \ >> +        mkdir -p ${BUILDROOT_DEPLOY} ${BUILDROOT_ROOTFS} >> +        mount --bind ${DEPLOY_DIR_IMAGE} ${BUILDROOT_DEPLOY} >> +        mount --bind ${IMAGE_ROOTFS} ${BUILDROOT_ROOTFS} >> +    ' >> + >> +    # Create ubifs image using buildchroot tools >> +    sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/mkfs.ubifs >> ${MKUBIFS_ARGS} \ >> +                -r "${PP_ROOTFS}" "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}" >> +} >> + >> +addtask ubifs_image before do_build after do_copy_boot_files >> do_install_imager_deps > > For me as UBIFS newbie: I assume that this image class is already > usable, e.g. as input for an out-of-isar ubi image generation, right? > So, for someone familiar with ubi, it would be obvious what to do with > this output artifact, and it does not need any form of documentation hint? I would suppose so. UBI is like a partition table or LVM and UBIFS image like an ext4 image. Claudius -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de