From patchwork Thu Feb 4 23:08:26 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: 297 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:3788:0:0:0:0:0 with SMTP id r130csp2035946oor; Fri, 5 Feb 2021 01:08:30 -0800 (PST) X-Received: by 2002:a1c:6a16:: with SMTP id f22mr2657295wmc.176.1612516109834; Fri, 05 Feb 2021 01:08:29 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1612516109; cv=pass; d=google.com; s=arc-20160816; b=ulXJAIz/sy8yxfcerc7sSScHsJC/D1lUV0xTuLw7kwUMNi7FqqSq4AK4babWRpcgCx 3EcMiGK6uBNHHqXdAkxTXez9S8zKZwbAimwxFVUArchLAo6Wptab9Sn91igfDjpDnLtU 27Rt0Ok1DkQKDAF67oSFx1vrQbnj6cfZJqCK0lAf9YsojG5GqIJnrg9STjz9iJAc+/xP UQQb84wFfqEjDcWIKIwY2YXM9Yd+F+wH1aFnvg/JElzaaOAo016FO/BVsNpFOgdVO2hz oUvp8/+J+P7UKy8j7hDHDbYnc6bpq2LebURfp6iyzrN6pLmnHC2q/HyfxVgmZtCWhTCE p48g== 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=Cm9UUlPp3K6spWUogprblAd73rZVtNkqWuwFv2ydJFk=; b=ALV4W2xoiP7ALBalK2PlS4ERIo2SgLJwiDs0/CqqOi+4YerdNz01jLD/qCpUNw0O88 IzIxbzal+WGU8PeHN45tr4p6c/2u0+hUk/CchYQclT00yNOSR0+y16BRD8b2XoUbAdb7 lOFpwYpu3yT+Y4MI4IhUtRkx1a3bt4ZGnh91rMimPnO+zL02nKxsUahzmgYHNnlyvv5O JwVk4kCGpVu6dT3QIQ+8sfomEJKlK45z3XLPWKU7+mauWAg+0RC1iXO321WwqG+CoAu0 WjRKv7cu8EdvhL7erGdjLwiZMX+HMHzstLfC8rgi6jloCWpjXZp+SqfqwdvZAUsZmJay n3GA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=sHH7WEwT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbdmw6saamgqegxlpena@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBDMW6SAAMGQEGXLPENA@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 z15sor4804070wrr.45.2021.02.05.01.08.29 (Google Transport Security); Fri, 05 Feb 2021 01:08:29 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbdmw6saamgqegxlpena@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=sHH7WEwT; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbdmw6saamgqegxlpena@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBDMW6SAAMGQEGXLPENA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1612516109; cv=pass; d=google.com; s=arc-20160816; b=psFQIgpkDi/egjx0msyfE86+1q0j20UrpMx4JOOPd1+5XxSF0JlbJgzzozr/WXGRyO p3D/qXhFypllvHugiE4jHedxsCQoVO2kvlDCDJ7dCi3M54K5SJgE2e6mz/DTp0KOWvTS pv129lATMEoWCPoM/dJ7YxhZR8zCvIqAAtaKShc0es7S3aQ/sYF6mz/i191uHkHDaFrq QnVAKtkXceQKWFWqlAc5EgK6PmUGrGlrpPCewVQYL0BM0qhLbs3yAHXkRs9rEB1rLZ7M t6ty/1ScUSex75IulFQS9+/a9vpGmFXsLBLUgCou8dK4J6YCsCUOjWTmVBVI3MXZVXjm ALFQ== 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=Cm9UUlPp3K6spWUogprblAd73rZVtNkqWuwFv2ydJFk=; b=zIOCNUhunMU7RM8u/31LJvLdyq2q7YeS4T7HZaY9l3hGi13L54NWicPQBY7YoM5cCa RkJu+wTT2yScB0Qo3+9/tC8I9SYtKyRYIiy+oma4DKt/ZUYlCenQPXEzjjwpyt+ONG1f H/t9RC2XYLIQY8FxUdSOT58xmD0c+jGrKrHqPsKeNW0uKp0SRE1PkOzSyP59q/ddvc42 c9a2IR6ZTBSrEpzDX80E14z4r2r/O6qsddStpDXZ3dx18e2uUv5XnqMss5J6LnRH/EYy q5cq94UcuPPEQ4qOzT2mNkvPyHKF11+eyuPBLgBuZ3/6pev7Kt9oO20bj0nAfCkId3MR cz5g== 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=Cm9UUlPp3K6spWUogprblAd73rZVtNkqWuwFv2ydJFk=; b=sHH7WEwTNEGjhFHKVdLfHnx4kVHlkUCRhIq5rZrU8VwGIkVzhwR29NVkm4gpw0R6mK q0N+5EEb2B2GywI+rdQkNueng/L3NVEdV4K8MTnimq68lgHuJ/hFwTriMPkEwczB+E26 oowfGIY6u1Cg6Jf607rn6yGpQay6weeqayHwRr3C0rnd5yHomxRlArPlFwUemfR8zQA1 VaxmkEPI/qcWji3h0tATBHNaDd8Z3oH7eZYxTGNmTSZxgDu/NR5rItZGyWFpKOrw50UL 4jgGvtDqIpvsW097L5aw4L13/vox1Ka2zf8OEklNufGmbly+D9u11txEavELPpcDspI4 Wkhw== 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=Cm9UUlPp3K6spWUogprblAd73rZVtNkqWuwFv2ydJFk=; b=Qj+KL4GcrECIws+5RcXd9/gqnWtr0ope67pFBxD7PewrLE0dabd9MY78S/VdbYpk4g BrbkPsZTq0kjAqDtA1Gw4T9k5zurKoNg5I34rxWAkJW3gEJFebGkD6MkAuOBtk5gmCxQ A9lPAJ3OoXNdMWwM7n0PKq/0UA0IhDKGFD4nPMgViLQ9Wm87Aoqx/3DBwe2+inhiAxGr UYFMHMfEynFaAr+VgIr6d0C7Tm/CyusYZEqm0w8ImhXu4JA72dM76wSDBSGZOZguF+0S 0U+fKWadry5Q0W6izmMVJkiC01s+byIXFdKn9Cns559ZZLyI7e0CE8FyyAmoOfu3hMB/ qCCw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531hsJg+t2exH9fOhU8uVPdRiPvcPEMAIBw+7emfSJOhgbw/vjr0 gEn9S7Hut+7n0BIze9OJMK8= X-Google-Smtp-Source: ABdhPJzROCgwjLwD3KfQops8x1zRjJfPgvKpEPvOb0UtL9BL5PS4kLX3wO3ykmpkl7a8vcem+pakoQ== X-Received: by 2002:adf:decb:: with SMTP id i11mr3785542wrn.78.1612516109251; Fri, 05 Feb 2021 01:08:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fd09:: with SMTP id e9ls3451641wrr.0.gmail; Fri, 05 Feb 2021 01:08:28 -0800 (PST) X-Received: by 2002:adf:ecc5:: with SMTP id s5mr3682427wro.423.1612516108523; Fri, 05 Feb 2021 01:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612516108; cv=none; d=google.com; s=arc-20160816; b=SGmAENvw9oDThMuRrlISiosljQlOfe4SwGxjKmo9jk8XTT88s6Ubjw4HFwDyI7jq+c dmTz0eYmtpqf4VbqRI25IqULCflMWWT4UZuwRKLne9DklOjLhMXjPArkVFD2ch94Tuqz VTPH/Ux8k+JAL9unINH6ffkrQPLx7IQG3vSlQBtieel+qkFum3zu41vSltVI/zCqcHWa 6fCrXfATimMgc9egMA8Tv3xanlILhsCsKjAto6uI0/YZE7f8i5OR33RaXvxA0B/WtvYB 1AVNlH+AMT5GwK7mxdTF5tk/mJnewe7sQ9MmDrdti1qvchZl7RqdkWx4mIO/BrrkUWGr UnIg== 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=x1bex1S5jfGN+5RU0xL3cT71qpKfvW9t76cf5QR17i4=; b=oAKm1LVgC6P5D3bI/8ay6CMZVs+70K7t+59qaOqAwgvccYzZDslWx86cPHPZYkkffq gyzJFfIO9+Pa/g0AMqI7ijQHbSgSrIh/bLCQHNeqWwEjZg5KQr5W7ENoZ1vFqL+xfU1c OGgBc69Ps0CDgiyV1vy/aO0zNQ0U1YmduXKMzY6SWwDrf+DS4cxyUYMCeLEQAivsJjCy afiFNHtGHR1F49V5/ZUaojsCn3mPD5Xp2PNnpIE9ItbaEjUBKYWblu5dU75mL0riqv85 WTNWY68zpCeVpTyl45pv8q5DZKB+cxKpLOWPTLKwhu75/MmGGWbac6aMQ3xsqtf20Mqo HL7w== 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 f196si350548wme.2.2021.02.05.01.08.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Feb 2021 01:08:28 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 11598So1005204 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 5 Feb 2021 10:08:28 +0100 Received: from md1sf36c.ad001.siemens.net ([167.87.60.163]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 11598RVx000712 for ; Fri, 5 Feb 2021 10:08:27 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH 1/2] sdk: support creation of container image Date: Fri, 5 Feb 2021 10:08:26 +0100 Message-Id: <20210205090827.17788-2-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210205090827.17788-1-silvano.cirujano-cuesta@siemens.com> References: <20210205090827.17788-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?1690845692060127922?= X-GMAIL-MSGID: =?utf-8?q?1690845692060127922?= 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 | 104 +++++++++++++++++++++-- 1 file changed, 97 insertions(+), 7 deletions(-) diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index a8c708a..082b16d 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -6,10 +6,81 @@ # 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 + bbnote "SDK rootfs available in ${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}" + bbnote "Containerized SDK available in ${image_archive}.xz" + ;; + "oci") + tar --create --xz --directory "${oci_img_dir}" \ + --file "${image_archive}.xz" . + bbnote "Containerized SDK available in ${image_archive}.xz" + ;; + "docker-daemon" | "containers-storage") + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${full_tag}" \ + "${sdk_format}:${image_name}:latest" + bbnote "Containerized SDK available in ${sdk_format} as '${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_FORMATS" do_populate_sdk() { if [ "${SDK_INCLUDE_ISAR_APT}" = "1" ]; then # Copy isar-apt with deployed Isar packages @@ -48,12 +119,31 @@ 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_FORMATS} ; do + case ${sdk_format} in + "tar-xz") + sdk_tar_xz + ;; + "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 + bbnote "Generating SDK container in${container_formats} format" + sdk_container_images "${container_formats}" + fi } addtask populate_sdk after do_rootfs