From patchwork Wed Jun 30 11:15:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 568 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c3cb:0:0:0:0:0 with SMTP id e11csp607601ooq; Wed, 30 Jun 2021 12:15:08 -0700 (PDT) X-Received: by 2002:aa7:dd53:: with SMTP id o19mr49947498edw.259.1625080507978; Wed, 30 Jun 2021 12:15:07 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1625080507; cv=pass; d=google.com; s=arc-20160816; b=BXeXO7KIGL5bh6/szpGsFyUzQZqVeM303IoV/9XukbCzVbysxAu07t/FwKVgm+5phE 1MsVXUmH7I23+/KZRclx4UJ75JQX/Irxwbfu/EFCWHe4LHe2ZNV+IQ9CJjeVM5H79rGP vsZ8glsFoawLLzLKHnNdwhRW3Y1a1QCAazLxtB0z6jNfXG1DNJX/U5UdYkw0h0vU2WN9 Y5s0RL04uAugK29TIZ3nBaRzPyaFWht0DIqbS1Q5teDdwSG+GfHMmK25wdzMrUGErGQ7 /S8449NYvQkiLY6x/n2vcfhi2WlGlCaCeGtBYWbx5TJkE6YQfp1Dhjx5Zf81bcHq7nfU /FtA== ARC-Message-Signature: i=3; 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=vIU6NqmgNAYtjoNItqqAZK2GcVkKd5tItBbP4DcUgPnEeE+1ka3zudG3XMiwX2E3/v DGJH7y+GDRCVRACatdTybAQmyV2O3jvDx1QfjnvsjJZbBN0q6I2/DgTNWx0/ytgu0sdV ubrOPtaoyeAgO0TZaeX3wCvxsBF4FoEXBg99yqB8V+Ajllau+nZOXqQzaRzEF42BHi3+ U9HcyZKZSD6R95jJBkegFkiw+GP2kQpIRfwdK7qw/D96Ds7CBhIcXYQ4b44DWyzmToY1 HBDMv9U8ImH/upZNfd1rF4Do+2GhLXkR9CPcbq8YhkPsce8Z4oQtEJL6/Yb7JrZ9RsZO qgjA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=W6kT1lDT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBO4F6ODAMGQESY3VLZI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id js11sor1217963ejc.14.2021.06.30.12.15.07 (Google Transport Security); Wed, 30 Jun 2021 12:15:07 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=W6kT1lDT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbo4f6odamgqesy3vlzi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBO4F6ODAMGQESY3VLZI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1625080507; cv=pass; d=google.com; s=arc-20160816; b=QoFyBXaN4rHbsp5JJgjlnm0vqzIOBRAmMAGQnvEoGGMwEhZjLEy9BPkGAo0mAzJgqF HKSBwggIfzWKv11ujnU588AoDZx5hNAknnod+N8glqD1WyqtOlOX3YHOo7XJ6cT/q2OG T1tgpFhZOxsd5Zpt/fpOFndqODEprO+rbjqBSHk0zafTQd6uWKSCSj9A8ZwKf4mGl4jO oao5q+1ShrVZD2+dRkM255tR4lbmml0s4hz5ylHvGu9g0J1BXdZ+Imkq97M0EC+ztVtQ znwTJCh99oMsc/UR0U2xivxAzTIbNwVJqGYNsitlLdurNqMT6RMI1QVZXK9MuSXzNDhH UKRw== 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=bEk8+n10re7DL/weJVxZTKeq6yjCKGWGinexQzeu8iYuN1yz958qFlvY/0mTugpkqW ToDbVCmLEtDiC6mwaCLF/YuJ9o9t2v10Nzd6DJX6oLoraXYBoGjo0yqprPTU3BU+Vhu8 gGAwFF/8AnfoZK51wWsrJvNiM+cuxsN3PF/a2w8e1VCIFajhNKE+thVxlEBOWd+MV4FZ wvk4yW2MZiFhOPaO4bJDUhRjhNM9ugGJtBxuZScNpOUizHcjAT90+HZC+xtbwZ360WET iMQwzyLqsVQ6zXFr8tmxAayTD8nSxbNFV48OH1KWHhWHi95qbyzXasTI51+qOTyI2HIf ZoEw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=W6kT1lDTD7BaCLBVFYhrevKW7VBfiiScy6LBvqkt1tMVhrD6Kr7jFey1YHEUZd7Spz RnGYAieizpmz3r3XgOzKRYA+bKGuLI59LYLi77csR/ENiVN7F0fL2Z0uIGy0XzfWHBBQ a7c2OkpSlgkhuDlo7XXgvtJCh7/UJ55jJXS6zQWlN/t+FjiEaqB9BBBC5fBdhZvAsfwU uKW+nz8UMMlIr7tDQdkmm/GfAuiwxzJziAca2jxTYMmSYji1EaLs/uIpvMI/va0d9H/u RCSPememzaGxgry0d+gvkJs8QPt3byLal9XMc65daT1GcP7mzl9FSOVXMf4MaM+H7Xpw rI1g== 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=pQY7hDw/TEnzxoKuMf2sj01rJpqWA646hDWKA8rI/IE=; b=uf3RRXzPmYYEXcbwFpS7RRW45e97fZCLkFcM/nayMb9Sl4qVvSlEcSiqu97JXKWWw3 Nt3tU8pRdulLDdGYDamTz1Ibt3SMezuuQiF30rgu9ZbgZwe8IFdMUg3pfF+0nDulCGrj f5CwnZHquA260CMB9jpVNwY9d+EWVWbGHndtG5S7ZQraYFV3RZqNf8csyioKACFrN6KR pE8hB1UhQvP2xwOh4OA7EG6LxbIo8nKDELe7RpWPC3cStludPxkKip6zh4j09bf7Jr9P 0yA8c5TL7VrxuoCenHOijvQ85eSRHScVd1O0DHn1IPXwZ1V/+3ELUvCY1UZB/QGHWmis Gh/w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531W7K4pnoU+eedbOQiQriFj2FmHdWWspODbZkN8E946gqWUBdy9 pgR7Yi8rKJfFWrmMexN/vIs= X-Google-Smtp-Source: ABdhPJwErwKVRAbtTVSKktTOsxnlUmm8OLrCC+512LfCV9KQRiNs51IIM9tEP+1/XfiGn7rQKTKGdg== X-Received: by 2002:a17:906:dbd5:: with SMTP id yc21mr37359754ejb.223.1625080507339; Wed, 30 Jun 2021 12:15:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c5c5:: with SMTP id h5ls3580797eds.0.gmail; Wed, 30 Jun 2021 12:15:06 -0700 (PDT) X-Received: by 2002:aa7:c256:: with SMTP id y22mr48887111edo.177.1625080506586; Wed, 30 Jun 2021 12:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625080506; cv=none; d=google.com; s=arc-20160816; b=Zzbzgdl3Xg3cA5umsVHJMdm/w1ljyuDvcNNOSqNltp23OCOw5PfycvSuPc/tGW3VTE 0uONI3xTNbiOB3chUOx1LAdEfoj0w9WTvmAHbQ0n013AEo5c9q9CnTm9jQkZhYrrZtYr s+wHaZasrBneiIIzig7toqCy5LYmoCLJBMQUuG4aCHvY4OFpXr5erOCtL+qWB09Nl9rG yybxvdJKEifuCIVJ9XXY7vxRrppRyX4dCCX2w4VOjRn8vv2ZOisCEym0L4GdGzqGOt7K QSkpS6h+vzCJ9kAtv2gYODKE6hPu1+FSLfhcv747H//BPck0q94c0RsBVlcWwmjzz6fG H+9w== 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=CzNnoTEU3E8QLkc+gLzp4yo3UB+xBc4P1Lgl3I9p1U3h8Vp4vWwlvaUCBGck3ScOX+ aSkmBfWnYYQeLdbySyfvAO3raXmaLveAXwNRCbmK1G9bcfdMcwG1Toi9TDDmKsGxe2tU I+G552jY90FXjaOR0/wM69+C6zcGMUxN479LLep2SOTml0JZrqhwdj4ShrwJyWwrSf4R qX6C0JUUH9dp0RxO9PBwZJp6pbBcVwyz3alg8l4SZAMgDKTut5ZvUfmpGMo3BJVWw3lf mKM0GhHm7VesIEbH4IWXLEW/E5IeMH7CWCdW0syOj+9TtF1D7Rni67QE0FinZ/aFQSM5 zqhQ== 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 Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id k3si1076768edr.5.2021.06.30.12.15.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jun 2021 12:15:06 -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; 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 15UJF6Ox015785 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jun 2021 21:15:06 +0200 Received: from md2dvrtc.fritz.box ([167.87.0.38]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 15UJF4LP007016; Wed, 30 Jun 2021 21:15:05 +0200 From: "Q. Gylstorff" To: amikan@ilbers.de, isar-users@googlegroups.com, jan.kiszka@siemens.com Cc: Quirin Gylstorff Subject: [PATCH v13 2/2] meta/classes: add cpiogz-img Date: Wed, 30 Jun 2021 21:15:04 +0200 Message-Id: <20210630191504.2650-3-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210630191504.2650-1-Quirin.Gylstorff@siemens.com> References: <20210630191504.2650-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 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 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 X-GMAIL-THRID: =?utf-8?q?1704020418704450568?= X-GMAIL-MSGID: =?utf-8?q?1704020418704450568?= 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 \