From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6651523578180141056 X-Received: by 2002:a19:f60d:: with SMTP id x13mr1541326lfe.12.1548680627682; Mon, 28 Jan 2019 05:03:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9c6:: with SMTP id 189-v6ls2141467ljj.8.gmail; Mon, 28 Jan 2019 05:03:47 -0800 (PST) X-Google-Smtp-Source: ALg8bN4xG2KDXN28v+tAxUyGnSEAAn2fsEY4/aj5eHUBl4nw6SvQeEZ6u4yA+D097h3U8lMPZDUZ X-Received: by 2002:a2e:42ce:: with SMTP id h75-v6mr1696184ljf.27.1548680627128; Mon, 28 Jan 2019 05:03:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548680627; cv=none; d=google.com; s=arc-20160816; b=vgOSIRTp/l/3u6Hvf6KDTmOfx4ug+zYU2ZNCu0OYRknvNx7cz98QG/y2VoebeV37+E W7Be9HgETvSrI9V5qx6NiApseOclPwMOSIwN3dLBDjWIXB/FfnApkOq8sKDrR6VhB+S9 2B4u8S5IEz1wmqXI5+8vuPgJWISw+rV4rTXPpNDj5vmdFqrPFkiA46N9nQEqGGpzm8Bm BhALivfsaCvie49rD93yKYT9PXrnw3dHuTL9VTvUt3CfUDor4nkGigJYSJ/uS/m/x8L0 RcmYnYhZGMpdyOB1nqTJg8J8HWFThkZh5lmSRRLD39lZHkHZZAkTLFJW6PFnxt4H/t9p Hn8A== 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:subject:cc:to:from:date; bh=11vIlYt9fkTNn0aj7pqhXikGhdSf+LyYMjkeTrfXWB8=; b=zSY6IEif+On3ROvPOJqLUws17nya5P2rrSSRpIq1gk5JLc3k84JLat5PYv+0OpqxwC hLw2oM1QkgFs8lTmu4v9czpfsoH94HiHgqmyG106zFNTWA3geO7JVwXXtxUm6uT/Ol5d 1b9puRo/zmMSaiEgBxiL3D/xluxR0JUmPzJj7VDrV6hwoyHfAAm7cBaU9ap/B5WHAlev LmKH29xqmHbxD5/wGwY583sgm+d3fY15yCPwmeiTO8ftSzyurRlfEvM/ED5h2MgIINIT LIVyjrn85F6vZzPuEgW+TeUbNi2VF74fEeoZBZVwEILeo0xuxzQRtD1XyIK5SDM983Qv jlJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id t16-v6si502816ljc.1.2019.01.28.05.03.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 05:03:47 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x0SD3jJJ000562 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Jan 2019 14:03:46 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.69]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0SD3i07026439; Mon, 28 Jan 2019 14:03:44 +0100 Date: Mon, 28 Jan 2019 14:03:44 +0100 From: Henning Schild To: "[ext] claudius.heine.ext@siemens.com" Cc: , Claudius Heine Subject: Re: [PATCH 2/2] integrate ubifs image type Message-ID: <20190128140344.7bc5f072@md1za8fc.ad001.siemens.net> In-Reply-To: <20190128122821.10002-3-claudius.heine.ext@siemens.com> References: <20190128122821.10002-1-claudius.heine.ext@siemens.com> <20190128122821.10002-3-claudius.heine.ext@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: Lqp7EhI/yWxj Am Mon, 28 Jan 2019 13:28:21 +0100 schrieb "[ext] claudius.heine.ext@siemens.com" : > 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 I dislike all this variable setting and additional mounting. > +UBIFS_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubifs.img" > + > +IMAGER_INSTALL += "mtd-utils" > + > +PP = "/home/builder/${PN}" That is already defined in another file in Isar. We should rather find a common location and refactor. > +PP_DEPLOY = "${PP}/deploy" > +PP_ROOTFS = "${PP}/rootfs" Similar comments might apply here. > +BUILDROOT = "${BUILDCHROOT_DIR}${PP}" > +BUILDROOT_DEPLOY = "${BUILDCHROOT_DIR}${PP_DEPLOY}" > +BUILDROOT_ROOTFS = "${BUILDCHROOT_DIR}${PP_ROOTFS}" Same here, and "buildroot" to me is something else ;). > +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} > + ' I think this mounting should also be required by a proper ext4 class. On the other hand the wic one moves the image into the final deploy folder. Not sure what is best but maybe a good idea to go for "always move" or "always mount". Henning > + # 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 diff --git a/scripts/ci_build.sh > b/scripts/ci_build.sh index f3523e8..dcde0b4 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:qemuamd64-buster-ubifs:isar-image-base \ > multiconfig:rpi-jessie:isar-image-base > # qemu-user-static of <= buster too old to build that > #multiconfig:qemuarm64-buster:isar-image-base