From patchwork Tue Mar 9 10:52: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: 351 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp2944548oop; Tue, 9 Mar 2021 12:57:42 -0800 (PST) X-Received: by 2002:a05:6000:114e:: with SMTP id d14mr30424060wrx.236.1615323462599; Tue, 09 Mar 2021 12:57:42 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1615323462; cv=pass; d=google.com; s=arc-20160816; b=IMueCkhr7Fpzqi4DBO8P9Et4Tm6RMr56sD3XMcIcyND0v5Ff0Oxy1J4AVTbwDgmYZW M7GCSTBvQMlLGCxlHOXq3RPELkm57tnwKGRP6HXUDWQPjS9RFrjSkzUFgohvfhkyoiLL +sAapd9qRsgHX5I78dbyl9TTz7GhtOSWLjc5topwF/ufkrxI5yM/98H9ds9yBxARcJ79 pO/ujCD6oIw5kAAAllqoijPCU3JoKGejkGi/WbF0yo4Q5NQZ+wp0mImBzVxwId0Lq2Dy gObJIfRO9Jr8kXH1CRvKcJbBhiVgiR8ETF5m+IH1Y5L6SyC8TVkELGy/6SoOd4GuUF5M xLIA== 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=QmjgTURFCiDjyc+1WIOYoSZU+BnLekeu6zKFDSOUWVw=; b=vbPRhG7tkXDXLGMBYxHSO/PRxq3AXf483oy/ua7UdJUvZ4gTy8EYa7uZiW9voaVj/b IqysaMDqVqXayqwV4/xRh3ccwYyP/9u0rxjVLj375JXIiYY9Ybu3stvhtEovwlqmhmIL 5zx4mwfL0BuwssD+csJlY0z8E9X1h8j/DlVq3bR4vthFgLS9LvAFBn2YorWzf3NQLXXF BzwzED1A+8Qi9xxP6KwWhuwb+t+XtAt72oO9jA6jKtb7mOo7b/ieE8Jp/T6nWe+/r1y0 zX7F7wmc8GqLwDeuZxi2TRFCEsdf5s7vX8lHn1nQcvJkGZs+4/KCdm+a/NAf4Ec8qQ/q PlKg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=CJvXpegB; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbroct6bamgqeyufeg7i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBROCT6BAMGQEYUFEG7I@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 c13sor7993061wrv.6.2021.03.09.12.57.41 (Google Transport Security); Tue, 09 Mar 2021 12:57:42 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbroct6bamgqeyufeg7i@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=CJvXpegB; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbroct6bamgqeyufeg7i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBROCT6BAMGQEYUFEG7I@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1615323461; cv=pass; d=google.com; s=arc-20160816; b=dP5h5nG4u0ZDAxC26HRH/RsHY0LAcCv9gtjv047hbRnWOZtxhydvb3NxJmb+iG2gHJ y8yVDwIPf0H1UDZNIouFn9W43GvpIAHzY7KA9cfBxUZJbXC2fuHHs4eAL1i2I3q9dHyf 2qExXgE2vfSDo4EiW+rWVV3pA841NWU3++iIk0c1mjyrcRxGBSguyUvEiQVndtFaf11H hfAluRDfm/9FwJfiu0C3DqUKREQwhlkumEZjxyD0dC1VjSEwMkJlsmNGhsg5nBe1TMVu AJwK9LfIKohYHa4Jc1dMiNlnYA572qR2VdhwBwCFLipJTLoNFmk2pYQUZYzufN01NPSp N1vw== 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=QmjgTURFCiDjyc+1WIOYoSZU+BnLekeu6zKFDSOUWVw=; b=vmvwZ1Efva8ib/320wg1HUR6cTQj4vmT9wpiGL7T+tVLuZM3upLrn+WUTJZnxpcQHz E42z4Ql4Bypn+NIDP2ux+RX6pILq4DQyb49EMu+kYYAhHWPjjy37c6uzIO2EZk6BUts0 is0gRyPEJ1d5R6Y2HVxAOCAClYT9+dxC16swWFVJyhDpjKgu22q4bh/gBUW3gMhzfVkg Vw8wxbN335LXitxooiiVAbqmkwptlEM3eAW4R0aWGsE2j4HfONGg5kKE/ApaBrBd+j/s 7Mv1xTnI7S0dJhyGywi/8BeiL6/qpoSce++4veV8OghJ/elE97ZIGQF1oc4zU4ssHe98 Yj3g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.39 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=QmjgTURFCiDjyc+1WIOYoSZU+BnLekeu6zKFDSOUWVw=; b=CJvXpegB7Di3euXNb+zTHHQK7eyLomTO2CeCCt4PGPmELck1PMKnOcCtVuDU0eu+h6 oybQWCuQ+rjpQCuOG+HZOy0uyN5lrdr+F2kvuBlEpWgP68FfucYib8SySxM8rq4FcGT+ NtSYvtdJtSWvEQSiSRj5XjHgjOfMSWHEnpsd29N0aXkouMjs+n5FrUTjSc7hN3AY44fP /JM6AxkWnQkdFCiWUJ+MaNVD1LRor4/k13P/eXWvjNthP18qxJw391bQKw3hh8GsUBfH 29XtdkT3MsklNYM+mapsyk54LiqUYGHpCH1QpECfGkSwtYUEE44iTvMzUyM8/lWfqycY AzWQ== 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=QmjgTURFCiDjyc+1WIOYoSZU+BnLekeu6zKFDSOUWVw=; b=rxG/LAxv3UwtTqG8os31DRnuP+uWHdEZwxu14cI9VIoQKzjDkT92R+ON16mlcZiblU gB77PIwqMX+k+CbtSYW3aWvLDmsnTF6FqmukuOJWvxquEtm+VWphsYgDnQsJEXbORb6l LBrNhCtqTWAuW8zQzy6KZ3C+wfH+cjKkIv01SMtq5h10JbMvu4IsHsDjTh18/j/Ns6oP ewbsreFArfTVr988qhu4npiCFAtlnwjgpfmiNj/MW6ukSdD3yZHrsQn1qrJN4nOV4xXy iNb3IU2w9UO2m4L2oFfpwIVDkbkXkmZLBf5dE4GhIaWzXkrOq/adjEZcCArsTlE8SRtr yOwA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533m+Ur+mt9QvE3V57gi1TBSK9cGRp4uzAU0gWvlcbIyfvTKGOr2 jINqJ2/mW2BSHyFRtGMfXzI= X-Google-Smtp-Source: ABdhPJwNgOBLm34QEo9L3fCTtDEI4EKZjL0lF221sJoaK0R+bal4clCdwXjwwzXjxSiAlR8jypSQDA== X-Received: by 2002:a5d:5047:: with SMTP id h7mr31390132wrt.111.1615323461804; Tue, 09 Mar 2021 12:57:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:162d:: with SMTP id v13ls6877wrb.1.gmail; Tue, 09 Mar 2021 12:57:41 -0800 (PST) X-Received: by 2002:adf:eb8a:: with SMTP id t10mr29359838wrn.318.1615323461124; Tue, 09 Mar 2021 12:57:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615323461; cv=none; d=google.com; s=arc-20160816; b=X81ghq66TrpMC1MjqWeaZgsMLhIhOampocfMZ9wP2Wh9DRvCgQXOpH4b1SlJWCM3Cr qJymVNJ4Mx04L1heoTwzh0Pkfsg0UwWuJZY6df4YKn0Z1Awfo/2+EOh8Bxy7KXvqDEQS xDYKlmzFVBsmy9YPepgez/RqCwRzyG7tzfMqtuqti1zMIhq3QtcEKTkT16nEhrKqtHOm RefMQOx81uKOyxJQQJuQoBWfguD4SUStkTMHMPgqDxu0Rf746xmHuP8zgH4DFc0vvadE /uh0F3dS+BzZZicANbbULr5hQGWUE/nAlC8mQWvH55TVLhB4xwXuMIs4RmrxufrUex3H di+A== 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=U7DTa0sVt/6OyYtPD/XyRRt4Q4U6Uvk2DwAX6qJMrZc=; b=mWQFLBn/lmKbjHpHgm0BkyiaOgklfbAHEg4Q2d3jnQk4pEt06IMe9CQKhCudnOHj9i j1n7Vdz3vhyWzEc1yjLgD3Fl0s06R152AhE0VdT803xowHAplzZYhCDnA1i7ftIZUZQG G+FX7F1X3XmOUldKyf7cvC9NKkpCgpLLCqa4olfp/ZdV3VB+YR6N8ofDFb9sC/UsCCT+ 8PoCB8LFdpYps+ndEIUrZwbVfCzUhla7oaA3sIZwmVuFyR/IHE3wj1ZwZWoxoxDHtdoT SesinDuCTx2TqsTLST0ldEoYkYq2jXvLSW1g5M3vw/qyTDp27obfyDcYU11BMA5euS1T y/lA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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 i22si160332wml.2.2021.03.09.12.57.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Mar 2021 12:57:41 -0800 (PST) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 129KvefU008766 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 9 Mar 2021 21:57:40 +0100 Received: from md1sf36c.ad001.siemens.net ([139.22.35.216]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 129Kqeb4031095 for ; Tue, 9 Mar 2021 21:52:40 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v6 3/5] sdk: add support for containerized sdk Date: Tue, 9 Mar 2021 21:52:37 +0100 Message-Id: <20210309205239.652677-4-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210309205239.652677-1-silvano.cirujano-cuesta@siemens.com> References: <20210309205239.652677-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.39 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?1693789414770836522?= X-GMAIL-MSGID: =?utf-8?q?1693789414770836522?= 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