From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6952974119397752832 X-Received: by 2002:a05:6512:14a:: with SMTP id m10mr1825872lfo.74.1619080346965; Thu, 22 Apr 2021 01:32:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:f815:: with SMTP id a21ls249201lff.1.gmail; Thu, 22 Apr 2021 01:32:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylJzgPi81WJvHiIfxwtkkzwKMtnpyovgcshod1YNL0gVCgTxPVltppi165OpYpwOtgA8n+ X-Received: by 2002:a05:6512:1154:: with SMTP id m20mr1824070lfg.442.1619080345897; Thu, 22 Apr 2021 01:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619080345; cv=none; d=google.com; s=arc-20160816; b=N6E0DblA2rv6z0goI8rdtGyiMgIFqdE1Mffh7pr31P17fEmfy1PRuM/ienaCBo94Dg Jm1hRGUqmRDNAq+BLhGTg7deLSKdOjaIVNOL4g1Z7dsNtoILyG6ZLgOlxBSlROxNJsot f0zmVyuA6f5Z6jrHGmTeZU2+KaUBR/L+HGypzuZ3cvQDp/NfxI3Zl3qUU+yNW1dukm8z xjC1eD/KXoqF6eUxNHz6SsOqGG32e0N9nS3s1dWJOUnqAqlMDBY1sL7KIvcA5NSx3NCH bbPc+DLn5QTQFH2GxLYIxMYaURJC9dG9Qm92zppTi74B2RYw5vj5rvfeoJJlMdlVldJs iLJw== 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=/SwlyCLoLNafVarwxV/uzMuFzdGORu4FdOO6QVbQhm8=; b=vLhnVXqSxXPeW+AVmYyn6/uiS5QZ4Og3w5UUc0gYXIYPFf/QJfsShjDSOmhtmqZph5 DLZM0l/CXJVbGUcjEAG+HseYDj5iMbNL3+R7vxm67xqBkIxwToxIJnTnAo9L8jZ9cHe9 3QTA9l65R38m1Cf4xhexkjnOJzPWv9SSijZCUbg4T0oWzx5TMDgaFyKLQrVePdjQj93l +FvFJ8BRNJQHfLSqQ1gdDXlV3MuWiihikQFBUaUom+3EDezrw75DO2wnC3ZSV4LN+X0u ywspiW/dcrK1q1q8Vy9M0VnIMikd6td+w91OHT83gjVjT0dqjglBb/0vQ1p0GTTvAnP1 qHMg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id n10si324351lft.1.2021.04.22.01.32.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Apr 2021 01:32:25 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 13M8WPOx008537 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 Apr 2021 10:32:25 +0200 Received: from md2dvrtc.fritz.box ([167.87.28.149]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 13M8WOFr025851; Thu, 22 Apr 2021 10:32:24 +0200 From: "Q. Gylstorff" To: Jan.Kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff , Jan Kiszka Subject: [PATCH v11 2/2] meta/classes: add cpiogz-img Date: Thu, 22 Apr 2021 10:32:23 +0200 Message-Id: <20210422083223.2751-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210422083223.2751-1-Quirin.Gylstorff@siemens.com> References: <20210422083223.2751-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: CrC5F0ZK6hA/ From: Quirin Gylstorff This allows to create a initramfs like filesystem. Based on original patch by Michael Adler . Signed-off-by: Quirin Gylstorff [Jan: reformatting, dropped bullseye target, added to local.conf] Signed-off-by: Jan Kiszka --- meta-isar/conf/local.conf.sample | 1 + .../multiconfig/qemuamd64-buster-cpiogz.conf | 9 ++++++++ meta/classes/cpiogz-img.bbclass | 21 +++++++++++++++++++ scripts/ci_build.sh | 1 + 4 files changed, 32 insertions(+) create mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf create mode 100644 meta/classes/cpiogz-img.bbclass diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 6c1d299..02fc334 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -50,6 +50,7 @@ BBMULTICONFIG = " \ qemuamd64-stretch \ qemuamd64-buster \ qemuamd64-buster-tgz \ + qemuamd64-buster-cpiogz \ qemuamd64-bullseye \ container-stretch \ container-buster \ diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf new file mode 100644 index 0000000..cadcdac --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "debian-buster" + +IMAGE_TYPE = "cpiogz-img" diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass new file mode 100644 index 0000000..940e2fb --- /dev/null +++ b/meta/classes/cpiogz-img.bbclass @@ -0,0 +1,21 @@ +# This software is a part of ISAR. +# Copyright (C) 2020 Siemens AG +# +# SPDX-License-Identifier: MIT + +CPIOGZ_FNAME ?= "${IMAGE_FULLNAME}.cpio.gz" +CPIOGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${CPIOGZ_FNAME}" +IMAGER_INSTALL += "cpio" +CPIO_IMAGE_FORMAT ?= "newc" + +do_cpiogz_image() { + sudo rm -f ${CPIOGZ_IMAGE_FILE} + image_do_mounts + sudo chroot ${BUILDCHROOT_DIR} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o | /usr/bin/gzip -9 > \ + ${PP_DEPLOY}/${CPIOGZ_FNAME}" + sudo chown $(id -u):$(id -g) ${CPIOGZ_IMAGE_FILE} +} + +addtask cpiogz_image before do_image after do_image_tools diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index a77cf5a..ccbb47f 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -37,6 +37,7 @@ TARGETS_SET="\ mc:qemuamd64-stretch:isar-image-base \ mc:qemuamd64-buster:isar-image-base \ mc:qemuamd64-buster-tgz:isar-image-base \ + mc:qemuamd64-buster-cpiogz:isar-image-base \ mc:qemuamd64-buster:isar-initramfs \ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \ -- 2.20.1