From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6952976920918097920 X-Received: by 2002:a05:6512:38ce:: with SMTP id p14mr23553750lft.197.1625733761616; Thu, 08 Jul 2021 01:42:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:211f:: with SMTP id a31ls284348ljq.4.gmail; Thu, 08 Jul 2021 01:42:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQFSIfAvY0ixqnKvRAvgk1l+C64J13JkI0DW9SlX5atTjJwByB+0OoS1GImxjVhT1vLVNm X-Received: by 2002:a05:651c:10aa:: with SMTP id k10mr17433139ljn.114.1625733760614; Thu, 08 Jul 2021 01:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625733760; cv=none; d=google.com; s=arc-20160816; b=KP92Yg9B9s71G8EDcnsg9VecuZv45QAiJBS2uCost8Oca6czqai8KfhBJXBmlKG5N+ aZ9sAKTodAzJg75rIdr10Ybj0PWTKkDGsWwQJfMR8apSS1xMZVXUgilJjYuAp5B2vD6P PuQNhB+95jUFIPqK0H3Do86mScvaT7mBH2Bi0jp/j2YwMU/+96DmM/k9hrWpbOTjlZEX BmETnvt7P4sy+SF9xl1hwvtLY+PuWA9LJ7HvandYeXEDGbIwBBoRy1VEpt7VMMWUqILy hepmx+8lu6oZ92Pc76i4Yzzl0nUMT4Xp7GcSJ9DV9ADsPLT4zvQrprIa5S37Z29I3/Ps RUqQ== 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=hT7aT3bEphJbwoQ/8sCOwNP/YLOsCs9OU4Ar6/zeDWw=; b=WHCa6rN2PxkQa5+Xu27Vn6mgPH2SfGLZymsR3oR57e233eaISio3vFeGCbbkE6h8ke 07PZtj5eeKHBquG8RGIJBsQck7WIFy2NFPUueJtVoT7WMtwPSJWxy7yD3fSXRxVAdZqA X4p+rXBo5QikUI4XfW4PCRs2jLdxkCMCVFliuciW1SZwX4OMSIRdDeBIxTToPV2Vtt/K nVocirON16ywE6YQPOZdCmbE98xliklJTb6MES9zhPIKBup8HqQl9jv9cAL//xtz6N0z 8Q9+NwaqJbxTJ1ZFmq+XKS2G3uKyAsQ0/FvsuliYNxsoo17IUNLqLbyCWocv9q+Vb2Y5 ACIw== 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 o13si26447ljp.0.2021.07.08.01.42.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jul 2021 01:42:40 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1688gdX4013215 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 Jul 2021 10:42:40 +0200 Received: from md2dvrtc.fritz.box ([139.22.43.67]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1688gcWs014170; Thu, 8 Jul 2021 10:42:39 +0200 From: "Q. Gylstorff" To: jan.kiszka@siemens.com, isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v14 2/2] meta/classes: add cpiogz-img Date: Thu, 8 Jul 2021 10:42:38 +0200 Message-Id: <20210708084238.2933-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708084238.2933-1-Quirin.Gylstorff@siemens.com> References: <20210708084238.2933-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 0O+JydzifUor 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 | 22 +++++++++++++++++++ scripts/ci_build.sh | 1 + 4 files changed, 33 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..8e90acb --- /dev/null +++ b/meta/classes/cpiogz-img.bbclass @@ -0,0 +1,22 @@ +# 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} + image_undo_mounts +} + +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