From patchwork Tue Sep 7 07:43:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 756 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 07 Sep 2021 17:43:50 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 187FhlpX018068 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 7 Sep 2021 17:43:48 +0200 Received: by mail-lj1-f185.google.com with SMTP id v2-20020a2e5042000000b001def54ff19esf5134435ljd.2 for ; Tue, 07 Sep 2021 08:43:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1631029422; cv=pass; d=google.com; s=arc-20160816; b=xUaVc5O83swFJUEFlckNSRV4UQN0bO6FEhZ97KlVJp2/Hg8CC5RlnvOQA3eOcG6cZO yNc1lMZTUY6kBDuYp5AreUD8F5uftLW4wuH+gAFJUMJtHkaZB2rQ1GGDGbFzo0+I7iRV wmICEE0MTBRCwxLEpWvU/oivoXRY/cNas038HY3BP5kanu5Bt+8GPVkN5M//Yr8QpGJk 5RTCIC8diJpGfqhaLOvSRo+zJ/+oE9ZkW8yKRiGHiokoQPBfONyrIrzs89PKPKUSJe7X oodzeqYdLcG6gaDqD19jZ9FMauW78D4TnYQC6hJW3sbZIaSSbCW5VlwthicrZ10N1tsn k04g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=jlcTpGzfKzg7ajNHzzrRNqwcX7Iz8QGfKwVMMhxhxZY=; b=mtZkKiFjs+RyFoontnXVdyanbf92b9Osjc7hjsK9UuhmNHKEL0mWQllIfgoyDwa29I dNUMs+ArhRD/lQiX/+DYnq0QOvkj0xY72ZlLe1C5OobFRDAAtDIo1Sw+00P1m+GnaKuN IHEqiYR4CL112DYrhfq6rJlxyhvwrrhZ3fqeFcmEJrVFDt7p1wNuGbXySqqAJ9bAe531 9QDk7nCsYGWB9U1XcPV6mrWDhFzg0vZqoJpKr0w8hpWd4tt5auYRTDsy5S4J6CnCoRBA ZG6fIWo4kfiBC/st4PCLerSr65e7i5hfNSj/D3134ZP7aUPRZ2cBgu1+2XUGjJ6PMwnh N0oQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=jlcTpGzfKzg7ajNHzzrRNqwcX7Iz8QGfKwVMMhxhxZY=; b=t2a+Lqks88gTJQWID+k0gkTADRIGvSiCQ2JTp0IMz0RXJy7UigKc+9QMJ7X1vvX0if iCZDGdauBKoa6Ye7I8KKj2v/MWOLacLei1skFBc8rKKU2NdmQ56LIk+DKSmoGR111wlZ hgVs4NdObTDcK0dL/NykXn/+KBLcZZxGo/dDrcqEjmjjp8bB9X6Y+iqS5CLflSb+/sXR dKA78gLBHSM/AbL6bxvxeFheXVlk+os9Ji/5TNGlw+m7aDwnHKLE1XP+eeOhML2KzLsz G3aSErQMLA8Lztvcd81H3Zwyh+hiKgOrEIChk3OdlqVB13rb0A6VBh7gI8d2RSkiVJbv HkOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=jlcTpGzfKzg7ajNHzzrRNqwcX7Iz8QGfKwVMMhxhxZY=; b=Kx7izrLAo/9FjQRTcp9BP0rsNzPCBvbRWIplj0e5rA3QW12tGvRfrfduWNMBH9m2Ww U9WRpAqTDghp7pNzh5SqAFagx7PXhi1ojoGdg8ae7PZFoYUzZ29TTPfqcR8cZ8oUg0qu y6wUXH+yglzBM5e2fLibrfKzqIjIYigGZF2GBF6eNaNTVanO4OpMNL1Os3/MHQ7N3pOB ThUAkefZpe+2tIp6Pbq1SyfFbrPAJWXUd9Myect+Gl/IpOHrkuJy1MyihZxXqy896gPr IG94QjeSQnmvhrbqsqy+FGALdj2H8dN8vMSl/sHC6SHRFKtqnm8AIGLzUdR3uowv2Tfl 0q0A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533lGoyqjP4eIDRdkFYFsqv5szppuZS5dGd5ZKeYt8bMQpwWf5hN ZBR23jgq0nD3DTY52nby9xs= X-Google-Smtp-Source: ABdhPJwa/iZfjb2U3NgvRgGsoj9+yJAwCqgq4KJWXqDbY319jXJo0DMFP47s//F0j7J1QiryeCXsrA== X-Received: by 2002:a05:6512:3404:: with SMTP id i4mr13344196lfr.375.1631029419621; Tue, 07 Sep 2021 08:43:39 -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-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 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; 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 X-Original-Sender: quirin.gylstorff@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX 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 \