From patchwork Thu Jul 8 00:42:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 579 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:e2d8:0:0:0:0:0 with SMTP id l24csp54276oot; Thu, 8 Jul 2021 01:42:42 -0700 (PDT) X-Received: by 2002:a2e:951:: with SMTP id 78mr7435720ljj.303.1625733762025; Thu, 08 Jul 2021 01:42:42 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1625733762; cv=pass; d=google.com; s=arc-20160816; b=I/3+Nw+8wbGAtHhUNY7TJobJDGrFetHYmrKz+Uak1YIwPJxPfuM8zVPHVs4iGDdkN6 RJEoeRCOCVrDK37+/QuPZflbkAEIGA6q1L6POqhINH8ReZoxIly0g2vmU5vD9m2hNcT5 mEhEmhK9z36bOSMcbNflEZGNDdyLIBuaTbhs7HdXEvQF9UndETJJp62N2vMz2FQ/Di76 L+H5iFsBqygiuhDpiGJGQ02XftCEeudtCmOQPQt2WPb9bKeexUk0ctSGPNTuAa1JE4QZ cOukzUG5fRHq6rABcqSo+h6w7KGR+sUmbHwqi13y5kSYF3Cik63LWfQFGZORi6i2n+t+ S4Qw== 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=IWKA/IRgK8LjFEIKxtN9yc03kxaQpxW4MkJm7GsTIOw=; b=fWZ+pHnHNg2SwKWVLIlbu7en2Wj3CKRas/BcA4XDEgUYkdtEo3VdVaxp9xEtYZt3iT /ixVtddluU3QPEs2Y5G3EUlEPCMWY+vROEPQ9B0j5nBev4dIkjd3CuwpOlwkV4787ame yBY7QtjTKP+1UhfqX2m66Rrogp8t3cZpbZRKoduc5WG7wjvf2isNP+5tsu7WtZL6J1n3 bLIjCiN53O/pmMBLvBkopEQ+ReJNrRALmpmHuJCNLhYOJM6HLzb4r3/B0FF/ZQ2mnhDr VKPbF6o312NQ1qXCIsq7KfYCCu1VzuFg2W7rnUNIx8IfMFt6GVnLXV3GoRrXCf8fwQMD FEuw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dQ7UYhg2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbapvtkdqmgqeboa2gmi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBAPVTKDQMGQEBOA2GMI@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 i18sor626260ljm.21.2021.07.08.01.42.41 (Google Transport Security); Thu, 08 Jul 2021 01:42:42 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbctzztvx2qcrbapvtkdqmgqeboa2gmi@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=dQ7UYhg2; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbctzztvx2qcrbapvtkdqmgqeboa2gmi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCTZZTVX2QCRBAPVTKDQMGQEBOA2GMI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1625733761; cv=pass; d=google.com; s=arc-20160816; b=WW10EBH56KFsPhoWM0gtkA33Z5LlHyh5llvZZ36z6in9cTqncybUgrKhnMmdN5JmPJ 9HD+RCfGaeWD5I9yWHKPyIOBIze4FY3n0Au2Umd3EKxHI3jHVs/QI5cPM9eKNu3eW0e3 HYCyPa7RHviDLEfIOZ8KzZQVT+nUxohkADPiPrbZCEoqk2FssY4zqkm0vZglFJcG3NXS x6GQ1jzb1lNxtzQ5WCGNyZZItVAmgOSGVClTReGPubqH6z1re71XyIbZwxpNzG6cpk4T UmKVFttWF8rE2nCLcCtqnINgYZT6IzWXal5AKApxjh1DPsKTRHTyAwCSjQMsqmrHgb4U qszA== 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=IWKA/IRgK8LjFEIKxtN9yc03kxaQpxW4MkJm7GsTIOw=; b=bAm2GN/JkIoS/6/luset+YHGgyl7wlOSYqrR8ENmPgHnVjM9dR5ds1JX6XIIsYuUDi DEI6qvtH/mNVIucT4sk01adq9mskr8xxzn3c5v594Y7UPhn0clqIpfX/ISShmR7JwwrT vFUk9yf3XiaqKxZTp+wFaoPciQymSFdCpnJJBidx6qoGjOMeInLw6LNulVc4K5UZ5r+i 9DjmJ7BRJXp8zlRTuSIGrbr2//F5mBshmKrV0itzNvVjbuClwzcKPFUtlxaMR8CLXSwL nMxDC1X531UPdyzu9ksQ1gvgWIM8IpLvVINIXWSLJ1/9w+SoZ5Ov8MAdQ+D0LB4e261m 79Wg== 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=IWKA/IRgK8LjFEIKxtN9yc03kxaQpxW4MkJm7GsTIOw=; b=dQ7UYhg2jAh0sKjAySvoxyXYg/84VABw5EraOtBKd9NpWAY8L2LjtPxEbi2KtvQShW 89U26Um9Apyhb/mKgXtmeYoYsTgyZ0oxYw7GMJzSG7Q/mHh2R4Jv7edhO2EeslsRvWp2 L3ZmJi2FqnydfsUTEBsgPl7WQrajTtauU3EAZXCrPpSnZc9uLP7ez4vhMAs+BcAgsy0t +hkyKoBe327GFyaxi/a0Ji62tGx6EHnlCVHsnMizT0QCnDV8N2ADwTi3yXBzl7j2oMKr 6jPk1CrUPIqSPDNZXoDEa3o+RjmEBcer7klHBZR/Sq/QnQNL7DXmX2PTAXeZJ6eglhgZ X8sw== 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=IWKA/IRgK8LjFEIKxtN9yc03kxaQpxW4MkJm7GsTIOw=; b=l3YRW1VrAUSxcVhc/6/MQOGqyXVWqFYVTv8s1uRrCdR36RqwkN5w/nIB7VG2dfIJg1 hM765IyvLB7wSWGf1TMnQSsejUWiVl0nNZbwxBm9x861lS3XMVdh8t0VIqpYZlUszLs8 cZhc9rWJihVdA371yiblJu7IVVFhLgoGeVH9KOdmSb+0OP+P7pVwGfxZpQ3cu+JsQ4gG mKID5jyYDeTvF4OzIWg4TbS3kx7MjhS57SpC/NqN7+BEg3N9sK6OVb+9+D4WPvK8kc0u aaeMpyvzC2HD1XR7FVOgKAGqxEIBQPGbiJaxOh1/AUhzr8tr2ARmKove52bK0BGozFlF GT1A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531MF36JNZXQbaT6JFOu8cC9eAt3WrjwYLZm3Mv5nMTOVlq6UtWM UGU5jgqzxnHhUxHugd44gDE= X-Google-Smtp-Source: ABdhPJzt2poVki4Ir6zN+mY1rIf2ClJ2AHEy3in6vmwkAq5fcm9ShBpyBO589xybZx0TKxhqd9c04g== X-Received: by 2002:a2e:a7d6:: with SMTP id x22mr19622170ljp.361.1625733761551; 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-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 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; 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 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?1704705404879325909?= X-GMAIL-MSGID: =?utf-8?q?1704705404879325909?= 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 \