From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6952974119397752832 X-Received: by 2002:a1c:2b44:: with SMTP id r65mr863054wmr.57.1618865439029; Mon, 19 Apr 2021 13:50:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:1287:: with SMTP id f7ls9272075wrx.3.gmail; Mon, 19 Apr 2021 13:50:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+xoudptbu2uUhUAdw2lXcWiYgWvuusF6y3y7qOPK/C6G29HinV+5XqT46tHLYP0a6LB2S X-Received: by 2002:a05:6000:181b:: with SMTP id m27mr16394650wrh.11.1618865438154; Mon, 19 Apr 2021 13:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618865438; cv=none; d=google.com; s=arc-20160816; b=D4QojYL16VHmwbWxW6cdszkF1c4MH17lHxxOiUnXSaSkLioa2An5ZqmVFYKEOC38aU fvV6d0KGK37dLKzEakyjubAYBXbvUl8QsC1XFlb57Df6mFHzzZAfpJF1NtbetgazM34A d3JD4DcelLwvkx0Th1uJ/1P7DS0XHJx0KlnC+cPDuIdy/X8XIoUbGF7twQQuLeJUD50N +V6h85UDO9/S0HuLmNxWMF95QBS/R/EFDC7329O0CqfOrpnI8zixB1p3ceJG1EZRQPpO ASAHt788bFhywB5aGQxtKp7YiieJuqjcQtY/dixugB2MKlPidfYL4/oy6IgO4+6eNofN LMbQ== 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=ZMDcOE5lrjZ4/e3TsaUUH/cpnKXhGr68hcUWaQa63RE=; b=ATaHxbON/wh+0llHaK8JW+ISaOfn+Vty8ZWwkNgBw5/iLYo1GgSiJ7L0fgXa+N1c2G MYVAG3w3jfYz0wmYNNq8yfhL0leXg51lI1UBejVLUWRm4GvSGP3W68eqNjWBMzpOSDF9 vnPNd0iA3to6a1PUoGAimEz0iUgrpEm+91NH+mFrwOiwFKE2ovaFJMpvzHOexoYc4Lr9 exGllhsb3LyZKqZahlS5EAlBvqe9K1C15qzxRMqyBI+zcsywA94E4dJ/ofPFbh4g7a8f QZXDeFjcIn4hd4ox1JM3ioJOnhN/iN14aDg+OOHqIVRNcwg/YzYv1IzlMbKG4CpCrVGR 0ErA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@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 s8si1437747wrn.5.2021.04.19.13.50.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Apr 2021 13:50:38 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@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 13JKobEv005518 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 19 Apr 2021 22:50:37 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.240.116]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13JKoaBO032525; Mon, 19 Apr 2021 22:50:37 +0200 From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH v9 2/2] meta/classes: add cpiogz-img Date: Mon, 19 Apr 2021 22:50:36 +0200 Message-Id: <671150d9b910c497f8b3d1a1f903e82c4c26fc3f.1618865436.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 9zrj+AdcgkiN 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] Signed-off-by: Jan Kiszka --- .../multiconfig/qemuamd64-buster-cpiogz.conf | 9 ++++++++ meta/classes/cpiogz-img.bbclass | 21 +++++++++++++++++++ scripts/ci_build.sh | 1 + 3 files changed, 31 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/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.26.2