From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6952976920918097920 X-Received: by 2002:ac2:4d11:: with SMTP id r17mr3217585lfi.311.1624023598317; Fri, 18 Jun 2021 06:39:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3a86:: with SMTP id q6ls807687lfu.3.gmail; Fri, 18 Jun 2021 06:39:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjs1KZuKgu6BCToMarTvUIRBeRh6CAPsYJaHFH5qUlxf1CO/sitEe+Y/xdiTapLIeAWZHS X-Received: by 2002:a05:6512:39ca:: with SMTP id k10mr3267455lfu.473.1624023597483; Fri, 18 Jun 2021 06:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624023597; cv=none; d=google.com; s=arc-20160816; b=W6ENpu/69uazWta+Z6GzcGv8veMtNOvsWi+s8qJRqtenHZxKeyFWti6z3UKMarB4MC Gr2foE5LRaNbz6IdeFQ+g+NXGAWvZBI7ocRYxiwgedWhBYxTeWlNBM6pM//U2DIhHJT6 mZaC3BNIwVNIHAF2i6mJqXkMejAP0ymasguKBxE+7AYiokuhCBQRfZ1ueq66G9zJixsy JG5oxD6ELrv4034cnhKGxuKPqlB1JxULrs2xQeUolQbnnvPtOhqYWliwVAtznlM1HnPv zKtjIGKX5XBYCMPIE4lj0+5Kx4O8k6TBoUes1crZo9SPXYq63v5vCsk+z9v46xmdROqH vsJQ== 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=AStdNfVX3ca/tzFOaujw0fPeqQjUHMhnCL56eNO8wGI=; b=EottnYAdcRvjLjpGdj62jk4qOn3OUAZV0YYON+UP3h6A/zQm6BkuLuDirTk9ap7fp1 L5jOETBWU5dlShOmDXI0S1ghQ567i4OcximW8kWqgw7k8J1TRHjO8qmfygIQRRKAEuj5 Wzrrn4yzwAd32yRcb3fhB1ePTpQZIotMSprg9JxNMCXQqNp5fywEyhZz8ENnBcbpizDE 91x5pfjxXYDJBs1nZ7qo30s8Tnz3/Nh9ZtUhSCzXb3N7BXIWyqTxDGO3JHl2S4PviRIe HMycaPmsXYPhqYXCrw/D+TUA6zUClgvcwq30J/o6dCje7RlV72BDTJ24IJ2KRKp7J/B5 jr/A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id q10si374649lfo.11.2021.06.18.06.39.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jun 2021 06:39:57 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 15IDduOg018066 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Jun 2021 15:39:56 +0200 Received: from md2dvrtc.fritz.box ([167.87.2.150]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 15IDdtlU017493; Fri, 18 Jun 2021 15:39:56 +0200 From: "Q. Gylstorff" To: isar-users@googlegroups.com, amikan@ilbers.de, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v12 2/2] meta/classes: add cpiogz-img Date: Fri, 18 Jun 2021 15:39:55 +0200 Message-Id: <20210618133955.22505-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210618133955.22505-1-Quirin.Gylstorff@siemens.com> References: <20210618133955.22505-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: k5qKlXLL3vp0 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 Signed-off-by: Quirin Gylstorff --- 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 7b20a62..fcdc277 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-amd64-stretch \ container-amd64-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 b1bbe51..a2895f6 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