From patchwork Mon Feb 15 03:39:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silvano Cirujano Cuesta X-Patchwork-Id: 330 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp5398175oop; Mon, 15 Feb 2021 05:44:22 -0800 (PST) X-Received: by 2002:a05:6512:3383:: with SMTP id h3mr8609408lfg.273.1613396661856; Mon, 15 Feb 2021 05:44:21 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1613396661; cv=pass; d=google.com; s=arc-20160816; b=r6WPIvJ6bgOpwvYu9BRBcTTfntNAoQQ9h9THdA2Kv6rTi3KmFdH0ksRruUiSBcc5IS XsSwCbxfnsxRCjhuUI4Oe+kGvNhPECuzXnBXlnyh7xLV68c8ZXZ92nMKw/75DWqaD6OJ 1mDfDb4Ba1YdPXurjalJ504FVh9AspghH3dHTF53Oo5UQ4+U4AalnG1eo8TaAr++QnHz 3FidTKj7h8V18INpu+N3v52fCNngxoruR95NjzKCoZEUAH0RnPG2Rj9g4C3rqQwDeeud zQXXzIGR5BD/PEhVOMmVAZt7/HSHRBsenX+Yuj6MmEX2qIfeZaCMl2LletNd2vkTwTJj AaXQ== 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:to:from:sender:dkim-signature; bh=tMB01BCOFVnC4yBuVS6lBSv7Rq0MY6HrVoBnX/8eAM0=; b=cziobmX6nieJnRbeliQS/a+QDHt/n80sBvQ0V+F9r5HN0wTHggbN8LX5oG8zcJBqLh uf9rcqNRgfWDuNpnooomAVQirdXD8MlQnBZGe3z486clUkB+3dxaADrJOP/rKe746WkA QucO0uLNNgcV1tW11TcsDEDQdwVXI1pxP0WbPkJVHjVSfL7FEE3bH3iGpYRuLNs+poSH VGL3NWTnQmvEEOYDTMENZnsxlE/+GEvhNrb/Vs6IeNCDx/MbmhF50RZsczA3olZeLeNJ uMFm2pm/EcJSF843VthSNF4bYEtKVDz6adTn4uFJmmd4ZYQAFNhWZOIGqkY9kK7aSyhM Xi0A== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Pn5dJ1J7; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbnpvvgaqmgqeultqqqa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBNPVVGAQMGQEULTQQQA@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 j6sor3524887lfj.10.2021.02.15.05.44.21 (Google Transport Security); Mon, 15 Feb 2021 05:44:21 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbnpvvgaqmgqeultqqqa@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=Pn5dJ1J7; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbnpvvgaqmgqeultqqqa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBNPVVGAQMGQEULTQQQA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1613396661; cv=pass; d=google.com; s=arc-20160816; b=bvGHS7yrqZFvYxiuA7sD+fjvA6ikEV44KeTgQ2SviCi47dkG8yg5EJv4HTFwHbkrMJ 5QUFR9LCFHkH/WOTXAvpthGUAWzpVerFocE9lUi3SLetcbeEsj0aofPmE0rHXIAq+Fct zQhqVDePAnkviq9NI26Fmf12Qz/sK2kiqCMRQ5s1u78ZO7ztugUUUWAIR9pmFAuIspG3 Qrf+QYmmLutmkQNHvMOzVFxCo2KoReUFErc+eiQ0dCzkAH4GWJ15fCS3IDjDkx/AukiC HxOgCQSBEquk0+VEjNkrrOY1zdppCb5yW7xsXsd/AXMNvHJI/fKcKsxqpxdoQJ/SdwMF pCpg== 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:to:from:sender:dkim-signature; bh=tMB01BCOFVnC4yBuVS6lBSv7Rq0MY6HrVoBnX/8eAM0=; b=aQHqVPyZp73IRXgxWCsOkB4btrvBdO+ZVYPJgSC938gto8S0FQsl+Lhg/jqJJzp0Nl ySlXF9eP7WLf5yZRYU+v/2DNJyctTQZJDnNtiMQamjXfmkr2oOfGNclT9HNfpwTwcEBF M1DEwLerVxKKkZ26USD6EJ1wr1qXO6noagEWYWyOg69FwHEAagxFZGwdDvSKCIt+SqNW kEGTgTPZeo5QiQMgghUk9eEvSvyH7N1q/nwZDytHeJE/ORtytnJ0DgLh0rehvcKpPhNU fnrM9rxYsj/yz9UikbrAoACiXzkKGcJOnMGlFIxCexfcBmGXDeOgvKBprKh+wT1WIyAH 6Ywg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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: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=tMB01BCOFVnC4yBuVS6lBSv7Rq0MY6HrVoBnX/8eAM0=; b=Pn5dJ1J7KR9KM/naerGadbpPBuv0SEY1nRfIpHRP1On3HgYBkx5VkedqjjeWoGXtbQ tG6Vfl0TY04/AQ6r8vz7I7KoW7lNbudNBHlnZfpY1+Fmywcao1A7WoepBm7oTFZzLwPL jdUXMefzZBmW7esOhqd79cSs3h6b4YN2g+TCtP/7y1z1hAJDcic3BCaP7a76HomHbuD8 z/mRwaaGKZOLBgexE4LlfJ1oFgBEAzE9IgoLzP5iyWSVpsWZP7JN70u9EwxWS5k/fEVl xopJWxZ4yxOe6ukvaPqD25VR+IVWq7w85cJ1MEF6W1Sp9C3xWIHQZVFwxmi8CGRwuR8y Yu1Q== 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: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=tMB01BCOFVnC4yBuVS6lBSv7Rq0MY6HrVoBnX/8eAM0=; b=mC7cZ7MWeuaPUD3tsgdmYzHajZ0nhiL5We5qWH6ZL5C5S9NVuxWAI94xLU1IytLZN1 WUhEtBOMu9hHUkZDKTKTpdgS2xCRULqRZPCxZgAgPIGi9W+016/d5AtDK7xTR1HqnpHM jgpcJvVzRJtHPGwcbYdJW4dqOKobYW7KzKXdsK1n+IHc5mKo+IL8fmdx3ZwUQw4GPx/o LFykj8sK6ThcUhO3wF/LwRWyKVN+Dal7+4MZNc3A5HHHEYvUChYrJwV11zJ6+IgHywqh bYlRHsH/76oepG4T54/FkX7JpesYEHgpHsx7vtRLE1Q/o8JipDgFu5UUMomFg2ouYIJ0 qzSQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531il4gPicT4v70Ia9HDGbkjqcCb2mhG4eokRXqWT4V0yaf42Wm5 v3Kimzn6kVF7XC1pLdwaSx4= X-Google-Smtp-Source: ABdhPJxrOG5caaivaRgQQgP27fj1C0q9+JPy1WHx6cB0T1iAr7DANqpkAp8WK03VZho8BfCKJ4aRKA== X-Received: by 2002:a19:7b12:: with SMTP id w18mr9023228lfc.548.1613396661563; Mon, 15 Feb 2021 05:44:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:6d4:: with SMTP id u20ls377346lff.1.gmail; Mon, 15 Feb 2021 05:44:20 -0800 (PST) X-Received: by 2002:ac2:418b:: with SMTP id z11mr5150002lfh.33.1613396660648; Mon, 15 Feb 2021 05:44:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613396660; cv=none; d=google.com; s=arc-20160816; b=x875z/DBzhd121ktaSoJiVWyrJPKUvkCpbUdIWyBxF2mbAt2N2RgvxoiUIsYCaKG36 cIMhFRRWDmEAbkyW91ve4WxfxkUR9j8Pdo9yiFvg5CEwdJaX+BHQSHqoD5m24sZibtux BVfcFMM9ixw2SEPVSNahjMx3bJkYYcry0rIt/XGMJ2punuV6bhPZB+9JRWMAouFPKSGg Dy19dYaSSu8ivmykxzUYM54F9kQn75MxiA7UNSowg/Ogk7cktXrxxy5XKCoKbDAKh384 7cy7iKcdMeyKnFwx4DMgIW3FzAkuC2Yspn0y80AJe5nfsGtP+vcUs3XWjqCST+pg1YOR rnKg== 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:to:from; bh=ilrsxfOzaENQp2ucnPYlxyLNBAHhFqzrtA+TmhEcOUo=; b=0sC+wAElTvAWuPu2Y4h+X/xHFsUoQNjyzfR18+fTcofta3kNJbIauT8bamShzC5sgT lMO+LCatnMUWS5DjEt4hQlHS+DS9wZqih8Fo/pXpF+njKO2pZVfzJ96kHz5RVR5qb1X7 hVIy07S0OUG/sQGIwaCbE1iGurSkN3+fsYMpbMqOHvCE5AWx663G20TshwTzIT2L9dAU Fd+LeExxdbk/iSeL4EQJ7i8qHjLf3EWNaiUwxt8VyrQ64SjxtsF9CPFnoHznbJwtSRWl +w7jVtMfElXMjC5pYrHf2F8YLxQfVGLwQnPqv9+YMi9OrHtyvMvw4xSu4ChdN3LZ6S0y fNTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s5si844651ljg.7.2021.02.15.05.44.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2021 05:44:20 -0800 (PST) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 11FDiJxZ015670 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 15 Feb 2021 14:44:19 +0100 Received: from md1sf36c.ad001.siemens.net ([139.22.119.30]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 11FDdIHG008716 for ; Mon, 15 Feb 2021 14:39:19 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v5 3/4] sdk: add support for containerized sdk Date: Mon, 15 Feb 2021 14:39:17 +0100 Message-Id: <20210215133918.50988-4-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210215133918.50988-1-silvano.cirujano-cuesta@siemens.com> References: <20210215133918.50988-1-silvano.cirujano-cuesta@siemens.com> MIME-Version: 1.0 X-Original-Sender: silvano.cirujano-cuesta@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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?1691769018151037848?= X-GMAIL-MSGID: =?utf-8?q?1691769018151037848?= Extend also task "populate_sdk" to support the creation of a container image containing the SDK. Signed-off-by: Silvano Cirujano Cuesta --- meta/classes/image-sdk-extension.bbclass | 42 ++++++++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index a8c708a..426b925 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -6,11 +6,25 @@ # This class extends the image.bbclass to supply the creation of a sdk SDK_INCLUDE_ISAR_APT ?= "0" +SDK_FORMATS ?= "tar-xz" + +sdk_tar_xz() { + # Copy mount_chroot.sh for convenience + sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR} + + # Create SDK archive + cd -P ${SDKCHROOT_DIR}/.. + sudo tar --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ + -c rootfs | xz -T0 > ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz + bbdebug 1 "SDK rootfs available in ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz" +} do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_populate_sdk[depends] = "sdkchroot:do_build" -do_populate_sdk[vardeps] += "SDK_INCLUDE_ISAR_APT" +do_populate_sdk[vardeps] += "SDK_INCLUDE_ISAR_APT SDK_FORMATS" do_populate_sdk() { + local sdk_container_formats="" + if [ "${SDK_INCLUDE_ISAR_APT}" = "1" ]; then # Copy isar-apt with deployed Isar packages sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt @@ -48,12 +62,26 @@ do_populate_sdk() { done done - # Copy mount_chroot.sh for convenience - sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR} + # separate SDK formats: TAR and container formats + for sdk_format in ${SDK_FORMATS} ; do + case ${sdk_format} in + "tar-xz") + sdk_tar_xz + ;; + "docker-archive" | "oci" | "oci-archive" | "docker-daemon" | "containers-storage") + sdk_container_formats="${sdk_container_formats} ${sdk_format}" + ;; + *) + die "unsupported SDK format specified: ${sdk_format}" + ;; + esac + done - # Create SDK archive - cd -P ${SDKCHROOT_DIR}/.. - sudo tar --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ - -c rootfs | xz -T0 > ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz + # generate the SDK in all the desired container formats + if [ -n "${sdk_container_formats}" ] ; then + bbnote "Generating SDK container in ${sdk_container_formats} format" + containerize_rootfs "${SDKCHROOT_DIR}" "sdk-${DISTRO}-${DISTRO_ARCH}" "${sdk_container_formats}" + fi } + addtask populate_sdk after do_rootfs