From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6651523578180141056 X-Received: by 2002:a2e:505a:: with SMTP id v26-v6mr1646694ljd.5.1548678515954; Mon, 28 Jan 2019 04:28:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:3fc4:: with SMTP id m187ls1551199lfa.1.gmail; Mon, 28 Jan 2019 04:28:35 -0800 (PST) X-Google-Smtp-Source: ALg8bN6M+f9t2AFjEFkuIp9TvbS1Gmrt0t9T4nLh1DPMCmYcjNkr8g3eYc/rGOT6baM2uaSwk6hL X-Received: by 2002:a19:fc11:: with SMTP id a17mr1527034lfi.11.1548678515415; Mon, 28 Jan 2019 04:28:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548678515; cv=none; d=google.com; s=arc-20160816; b=bZWsxS1uq35mJWoS2plJY1U/HXtXvVOCEiLHFtIeIm3IgcERZxBnnrd8qUkvx/dzxJ Z3ypQ+A+eOKe41ojYRTTPjc6iZhzXcLvMU+Ee9dNJc1hING76kxz2vW/M8S0lJHw6Tyr 0z4EHADz4i3ORdRuXI4DxVxkCsHtsMOPs2MSJsLDv7YFlAVu8bWGzb7TFCHcl1qrp5no gWyJiNwRqwJtt0nIvv1Xo9S70SQr15OXuHEmHvo+1e73ZsApfwXCwt4nL99acmCgMvS2 NVJte6kkvTijQlHQQ1naKEKXqjSBhoTlwFPtcD8cc4hANOvJcCpdQ65us3PLhSy6Qvdr eJOw== 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=GVr97UmvOaTTIvjDSBHFidy3xCgM+KO+KywdmbzkaU4=; b=0BKu8HiAPWYJFhZ2u02BW91lGf78sr1WHVloyg7izC+9Ie2E8vMvNmmOP9z3muw0Hu nIuMwlKR1+XGj1dcH/adHqswzGgLP5kfV8Q9OGbfGzDhY+adOZ8bc9JUfMotyEEBsSnq J72z1ny5LUaZreNi+QpAKIzlf4VeeoF8HvOcbfLeB3jFt/saJjjk8etzl5GIkUBpkj6H 2VqowrgQ1b2zAwFrsI3NEbpKw6Ue3Zy1rpjzQRp8A0zQJLMfCInYUNWbCYAneFKiC1+7 cT3627f06UfneckuKmDWDh+HWG2EZKBpaKB3jaWVW98yR09yJYF4aHQHYTWP131QMyE6 n6jA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id w10si748818lfc.5.2019.01.28.04.28.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 04:28:35 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0SCSYsO004089 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Jan 2019 13:28:34 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0SCSXpr023394; Mon, 28 Jan 2019 13:28:34 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 2/2] integrate ubifs image type Date: Mon, 28 Jan 2019 13:28:21 +0100 Message-Id: <20190128122821.10002-3-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128122821.10002-1-claudius.heine.ext@siemens.com> References: <20190128122821.10002-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: meJc2d/4YyyO 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 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 -- 2.20.1