From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6952976920918097920 X-Received: by 2002:a2e:98d0:: with SMTP id s16mr14725692ljj.115.1631029422738; Tue, 07 Sep 2021 08:43:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:4016:: with SMTP id br22ls559608lfb.0.gmail; Tue, 07 Sep 2021 08:43:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL2H63A4BF+GK93tgzBIz8zUgFCj25idMslT7hUpm+0pxibSa2brZFoB4r9CxhoG6v2Bv4 X-Received: by 2002:ac2:51d9:: with SMTP id u25mr13304544lfm.541.1631029418587; Tue, 07 Sep 2021 08:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631029418; cv=none; d=google.com; s=arc-20160816; b=0WQwA0kGVPAOM9hfkD2BpZzd9TAPE5iQs/CZWoX8XW3wQyQR1XhSmay7hwWGCYdmJU 65C+vE68r5M181987WYXETXh5951fs4S3S9dw2M6hWoNA2CFuXKFc5LDC2th+rjmQHGn U/e3rpl2DT4gk9LR1FCUOl4G5pJcB1+FKqPEa7AK45Pg3U3wSjCahAwttLgiiyeQ66Qg YQhdH+JHbLOhJolZPfbaCqeiJyDkim2tKswhHiCRE/1AIgT1sl2QJ0dVAhB2w7+AArrB phxMP5Ml6uVCPJ1jJ5SpCdL/i7AiVJ6WRODyDzN3XU4RMNXmm8D4U9aQePQK9GwVOUVn nD1Q== 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=558OVNG5DQSK6pg9YwCXEoXnxogpajxVja6luOYiFdc=; b=x94mA5W8uDYtqDYnFJT4ereRlGtp1nE1oxN0Sy7iM6aCYJFUxfReZbxJUG/RPv7O5Y D/RA+8mEI3wDEUeCT5MA3x+hLk7EmnzO+Ni3YQjH4bDu2Ii7WZFDT3xptA20MyMRmyMR r244iFAxDVQzKDUd5AENGH9ckXqFoeQJiLItCVFlpWbFrQhCqAVaQ9N0LHdxSK4ftjZ1 e3tLr4zOoyhWuoqXJNKDFXKby/GhNWZsK5QeDoFzVnzrjgWqBBSdOGFAaGrcEf17x+kV Cs7+Jo3HRnbsnIPvTwDpRCrhpuTHBYgJV30BI4ZbWckQ+RZx6neFW3lsUU5MQFBmyX4A G8IQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id e17si546776ljo.2.2021.09.07.08.43.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Sep 2021 08:43:38 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 187Fhb50005584 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Sep 2021 17:43:37 +0200 Received: from md2dvrtc.fritz.box ([139.22.39.227]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 187FhZxT020208; Tue, 7 Sep 2021 17:43:37 +0200 From: "Q. Gylstorff" To: amikan@ilbers.de, isar-users@googlegroups.com, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v15 2/2] meta/classes: add cpiogz-img Date: Tue, 7 Sep 2021 17:43:35 +0200 Message-Id: <20210907154335.27161-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210907154335.27161-1-Quirin.Gylstorff@siemens.com> References: <20210907154335.27161-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: u8s8RpnBtmtS 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 4e462b7..88a8175 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 1d530e6..a4aa74e 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