From patchwork Tue Jan 12 00:33:37 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: 266 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:b386:0:0:0:0:0 with SMTP id p6csp3104658ooo; Tue, 12 Jan 2021 02:33:41 -0800 (PST) X-Received: by 2002:a17:907:7251:: with SMTP id ds17mr2784713ejc.448.1610447621106; Tue, 12 Jan 2021 02:33:41 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1610447621; cv=pass; d=google.com; s=arc-20160816; b=X6A1/FkpyGYIGfugAXhfwzRBXtgURzBLKWVmpzTPBSbBxQ+/ELPtkD4pE5cBrdFKJf jLjklqfgiD94YC6+VA/cuiYImrpByuV+YrbyXxYRArdm2ILrJyrBvP6ZoZ0xkBNMkY4l fNCyZXdjZKN68O6NO5RbE2zDaGye9NFa236vpnjT/yC+e3rKT3FWNcFBt2yNSKhVSC6Y Z80w+0yqoBb29eNwDbvjp0WTKpvJGdt+MD6UWKnV4rLp3/cyFO0YKtJoLXJp2Xuinvdz MbBf9wDlRg1ogRq3NX9lcvLXi5+HWytFUQyTJM8dKVFIDbINfs0+346RUEwJlVk71bQb p8hA== 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=I27m9o/fK660g6zfLabyz4SUZn5HKWQwF2wEzcBvpZ8=; b=Shthl4KbxivkCst6MfDwukiTWmtsLm78tbO2wNmb4xqUCbu9Noxo9KuxrrwDASERjy tHM5YboCxd4gqdUu9szice2bJ8OcvyBCTYMW37SMMqmiPQbcIzKFqz+aSHXobjRdnxhj Qlih9Pj8rzkLM79KocjbLkvAnGh+znb/M8IfZdh8MY1rzxjJYEwccLX+3ZeA+HLJ6vD6 CG7UPe1YyIy32BdnsIM7l3YqArqU0b8Za5ytEluB2Vzkodz+0Qjz54Lpy+Y5SVaFk2rw kGjCo+Fr5A/VrDObNGg/z8AMcmc2+9Qyuhz4fyiH451AG4jFUt3bwpj8CArePfWHb5ip Lfew== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=GSvPghMF; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbbhw6x7qkgqeamjzbui@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBBHW6X7QKGQEAMJZBUI@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 pw3sor1915783ejb.51.2021.01.12.02.33.40 (Google Transport Security); Tue, 12 Jan 2021 02:33:41 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbbhw6x7qkgqeamjzbui@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=GSvPghMF; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbbhw6x7qkgqeamjzbui@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBBHW6X7QKGQEAMJZBUI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1610447620; cv=pass; d=google.com; s=arc-20160816; b=hQeQ67KCkz0AQdhBbMpqXA3J84+mxGmyre/Yx27M5a4OiLHluoH0RBbbtYmhNoOqi2 0ofwoaNNMv5hhLAAv1dDjKgvOKtP74DTf9FjxIVWzNRFtLaFsrL3gfZORJJBEGtcF1Q9 CRZZdpUULm3XkFUOwDegFGkM2D7KA7RhWCqvnZSbrrT+9GgMDW7U1aWM4mTrbcQIyAzx UVeeo6yygSPi/4ZSZAKLG95sK+rFIuwf4kCT3YyOPIDKR3hg+B6loVJe7UJo1LP1lWBk 1qKfpB/AQgExxrcJRvOxpvA8nrCGC6lpU8goAG4rEcl5VtL0dGHFZ/oLb/7Vu/3KrZOD Ko8A== 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=I27m9o/fK660g6zfLabyz4SUZn5HKWQwF2wEzcBvpZ8=; b=JUO8/TqITpeOqpNtGLtQ8PG9DCT+Ytdy8OImqDHlukU96PfGVECedJWqKeO/STr11G hGGXNqdkwIXGEb3c9OQUTCxnKfvF9Se1/mjyaIjPg1KV+WRiRcYBQ22NlEFomQ7mNJvb uojLC1aBqRD/6Ga2gjVkS0aNTHKaMAjP4jCi8Dwn37nZiA7NYdaDIIynjSXB1nJuuzE2 ZxGfR3ZDbEfu9KF/LWsHDhRURSdMgLhqcmbF4IG5Br7kzg3BYxxn5WBL2f7rxrIpBES/ UOKKUw2GAJqXxwl4YecZdTLBz/EurHpv/m8EgekWpdQITEi1/CL/AEkBcqI9rFFVXS6c u9ow== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 192.35.17.2 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=I27m9o/fK660g6zfLabyz4SUZn5HKWQwF2wEzcBvpZ8=; b=GSvPghMFJ9X2bH1uCWDXdvl115O2hfG/8Hfx0lBmWVZptatp8djWnwKVnBUxthbqLD sXw7mU7z5lFuwGkL6GiJ084tfGixYuZ96toQtFswIYhbb9/kzReb+/ix8chYZhuOAGIx 4qXcErg1R9/FJz0KtrG2NpgTsI2azunr1k1nhee5u/NGKd4z08QfZDiH0/rka/EIYLWv bWLvodjqxbdSWsXQhY9DCEYxYnrErMjNDhZ3T3RDuoCDHxe6gMavVIb4MbdrxQ00cPRY 0s8X+AUfpl52BPh0OokwzyZFwtmR2XmdiFl2UZidYXtZ6++mk+fFUMD0yDMbXGDR6KZe MfFQ== 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=I27m9o/fK660g6zfLabyz4SUZn5HKWQwF2wEzcBvpZ8=; b=uOTI5XfASyOrtKsNEtrVfRZ63DHWUOeq4nx5+BBZgA+hkj3YCLMfF3fp/BqHQizXN0 5Uuk1UONUTI8CYrwezTHc5wnveOsiy3hoGAgPUTUqDFwN4u/9WhZAHj3YP6rFaa9U2z1 pELDFtX+cEanP1FDL4ugMtj9StRynQ0uETYB2XvkgW/v+BwN1TWvmdYyWxw+SlTqJGvM P1bZ8tACGJkcnLHOd/nXMdTo3icf00ssoBrLvCN1OTJhz7EzwIqRFpvuS5IB4G+YBYNO jHH9dOTXPHx1DAFDb9d8NRHZ9PMux8qTxo5OByVX54mKG877TBZxoAJu+kqYYgM55EOJ b1aw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531Arzp7Z87tw5f/KD81CAWfi9EXkLObhIMi7gmS6uYrCzD8xer1 I7w5zhjO9Xh0opQRfAv9g9s= X-Google-Smtp-Source: ABdhPJwbCRL8YEtPtO4Rl9wulZSW/9ibbhar8hBYTv2hX6AHGgeDL1Mke7d/NVY5h2MLt4tzW2BZ2w== X-Received: by 2002:aa7:d6c9:: with SMTP id x9mr2776540edr.96.1610447620194; Tue, 12 Jan 2021 02:33:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:22d3:: with SMTP id dm19ls2879002edb.2.gmail; Tue, 12 Jan 2021 02:33:39 -0800 (PST) X-Received: by 2002:a05:6402:17cb:: with SMTP id s11mr2728297edy.119.1610447619367; Tue, 12 Jan 2021 02:33:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610447619; cv=none; d=google.com; s=arc-20160816; b=ml5fa4++WPBvLbN6WOGqjUi6WxbN7/emITm8UVFuP8U/7nX5f9lmFTAETDOfeFCIha kyA8cQVIqPHzGT1tmaRHudkMR4SS4uiUnIXlrej7f3Gv0eCNnAFAbdwce5TAQBNM41XK 8JBLOgaoJPEZsMFDm1e62B8FRMmz7pHML2HqH4+wqCqexrfFHsqFIqotQWRbuhIPzDCM CAs4aoczX8Sz2GJcaRBUjJdf4yb6IiePvimSVNUYE2uwWMDmLeySbYzLmGvdXNZxGJtp VzjUVyYrLcbKvDUYgOQZbkhDmflhsTgoNUkaFPPejyOE8JzUuhJ2/vJaxRmQJGsou19j IRxw== 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=K/KeYD+pyCpaCQr2Dt+uhxBzlNo4AwW5H10SerJR40A=; b=Ux9tKAzTH2PwjD5V5GmDvHX0ziYxZQ4FFie8aGzfNSfcpEfeKT+8cJUdgVJ9Xgkr+s kqBzGrabqlYoHjZx7FBT6VWC3pL1EUCBzmcDhxk1AyUgL2NYYGquCl48VYps7eLFHMFX ywgsuX7k47XEQJI1jT7z/0O0k/q/sA8DhZTZdUgy1jdEdHh5Px5yz816R/8Zfb8KtGWV Z27D2JwejrNPOvqUFh1MnnraI/Cg0siR5Uc/GikZyAyw8MGDPiFIO/2hBJdDZPdMBmHD 4cWVFgIRBjO7h39ykJPeW8KRnJQikCMfJHQjxTwzFAO0VMJDk9h2eFlj+J89akIvLEhh Sqzg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z13si97504ejb.1.2021.01.12.02.33.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jan 2021 02:33:39 -0800 (PST) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 10CAXclN026019 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Jan 2021 11:33:39 +0100 Received: from md1sf36c.ad001.siemens.net ([139.22.36.115]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 10CAXc39010059 for ; Tue, 12 Jan 2021 11:33:38 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [RFC PATCH 1/2] sdk: support creation of container image Date: Tue, 12 Jan 2021 11:33:37 +0100 Message-Id: <20210112103338.14712-2-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112103338.14712-1-silvano.cirujano-cuesta@siemens.com> References: <20210112103338.14712-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 192.35.17.2 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?1688676724291813033?= X-GMAIL-MSGID: =?utf-8?q?1688676724291813033?= Extend 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 | 99 ++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index a8c708a..9317256 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -6,10 +6,77 @@ # This class extends the image.bbclass to supply the creation of a sdk SDK_INCLUDE_ISAR_APT ?= "0" +SDK_GENERATE_FORMATS = "${@d.getVar("SDK_FORMATS", "tar")}" + +sdk_tar() { + # 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 +} + +sdk_container_images() { + local cmd="/bin/dash" + local empty_tag="empty" + local full_tag="latest" + local oci_img_dir="${WORKDIR}/oci-image" + local sdk_container_formats="$1" + + # prepare OCI container image skeleton + sudo umoci init --layout "${oci_img_dir}" + sudo umoci new --image "${oci_img_dir}:${empty_tag}" + sudo umoci config --image "${oci_img_dir}:${empty_tag}" \ + --config.cmd="${cmd}" + sudo umoci unpack --image "${oci_img_dir}:${empty_tag}" \ + "${oci_img_dir}_unpacked" + + # add SDK root filesystem as the flesh of the skeleton + sudo cp -a "${SDKCHROOT_DIR}"/* "${oci_img_dir}_unpacked/rootfs/" + + # pack container image + sudo umoci repack --image "${oci_img_dir}:${full_tag}" \ + "${oci_img_dir}_unpacked" + sudo umoci remove --image "${oci_img_dir}:${empty_tag}" + sudo rm -rf "${oci_img_dir}_unpacked" + + # no root needed anymore + sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" + + # convert the OCI container image to the desired format + sdk_id="sdk-${DISTRO}-${DISTRO_ARCH}" + image_name="isar-${sdk_id}" + image_archive="${DEPLOY_DIR_IMAGE}/${sdk_id}-${sdk_format}.tar" + for sdk_format in ${sdk_container_formats} ; do + case "${sdk_format}" in + "docker-archive" | "oci-archive") + if [ "${sdk_format}" = "oci-archive" ] ; then + target="${sdk_format}:${image_archive}:latest" + else + target="${sdk_format}:${image_archive}:${image_name}:latest" + fi + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${full_tag}" "${target}" + xz -T0 "${image_archive}" + ;; + "oci") + tar --create --xz --directory "${oci_img_dir}" \ + --file "${image_archive}.xz" . + ;; + "docker-daemon" | "containers-storage") + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${full_tag}" \ + "${sdk_format}:${image_name}:latest" + ;; + esac + done +} 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_GENERATE_FORMATS" do_populate_sdk() { if [ "${SDK_INCLUDE_ISAR_APT}" = "1" ]; then # Copy isar-apt with deployed Isar packages @@ -48,12 +115,30 @@ 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 + container_formats="" + for sdk_format in ${SDK_GENERATE_FORMATS} ; do + case ${sdk_format} in + tar) + sdk_tar + ;; + "docker-archive" | "oci" | "oci-archive") + container_formats="${container_formats} ${sdk_format}" + ;; + "docker-daemon" | "containers-storage") + if [ -f /.dockerenv ] || [ -f /run/.containerenv ] ; then + die "Adding the SDK container image to a container runtime (${sdk_format}) not supported if running from a container (e.g. 'kas-container')" + fi + ;; + *) + 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 "${container_formats}" ] ; then + sdk_container_images "${container_formats}" + fi } addtask populate_sdk after do_rootfs