From patchwork Mon Mar 29 06:56:38 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: 391 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp3546331oor; Mon, 29 Mar 2021 08:56:43 -0700 (PDT) X-Received: by 2002:adf:ea8b:: with SMTP id s11mr30326732wrm.413.1617033403189; Mon, 29 Mar 2021 08:56:43 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1617033403; cv=pass; d=google.com; s=arc-20160816; b=aK7QSvn1hqXjdXFoTomvysbMfB/Adv8tmKGXrrftHOzV0XXBn3WLaPuD0x1YTFuG8D RtwaVTTxW9scEOpqo+B7durkodaJMSbs+fcz2yZ+gZJrqSGhknDDH9mbm2MnPWVXkcL9 QTuKGUkXnlijRgcaqiDb4DkoEPnpS5HJi5/SlT6HZv2mQw0ErAaKzmB4zwsJGqRIfE6G j3T5KTDuEkvH1WNqbbM3AVFOoj3F5LZtoQH0igA+lSkPM5L0KJ48Igy8HCoVjO84qNjy x+A0r2pjwPxsmLWSvuehgcNMG2qHmVwEoXuTonSqDPRtcch2tBPxai28+CI2+/lePvYW jqTQ== 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=XvXQLtMbECdQ3UvhT3i4D0KrEUBK4DZDZX2L6k4wtTo=; b=AZfEqE5x/9e50f24RnRs3YrH9/41jPWni9W7tAkfEDj4AZp4Uq0SzGqWaGM+wU0PLs qIMB3lhID018ye8jCFYXmOn63eaQ/WlgoMBrFsUpWnB7AjBI9dDFq6S5XU3JGC+VTzgd 8/G+BTH27h9XZTaU9O5Lnz8Rlfb7TaJbLehKB19vyzvjt0HDluhEOZhA8Kv6h8nN08ec Ii5npBc4tyhUtNJcqKi+ptdXObHwAFHcS6Xzh8HiH9n7NdKB0QlPO/Y/qrDVZjhDDRuN BR1OXxs5VQV522vbtdz4/Pw5zexNhD5l1rDGYLsYVVWUJN8Plvn+wm+IZh5HXIzI40w5 8U5Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=PIS0hqoW; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrboxrq6bqmgqe7gl7qja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBOXRQ6BQMGQE7GL7QJA@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 y6sor4769239wrm.54.2021.03.29.08.56.43 (Google Transport Security); Mon, 29 Mar 2021 08:56:43 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrboxrq6bqmgqe7gl7qja@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=PIS0hqoW; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrboxrq6bqmgqe7gl7qja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBOXRQ6BQMGQE7GL7QJA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1617033403; cv=pass; d=google.com; s=arc-20160816; b=rvgiVoKWxnuA6S9EjPt+NUHd64qWomWkdI7zVdpJRCSlp0HHMtYh7IM41XUeKW2FVQ 8Ucd/OquIhhHWDOh+2nKVwnEn56x3xn+mmO84Gz+H9TrFQHn3Dx+anCNq19n9rO1neco iXxHPsN3sBOSAqTqzSvW01T85aobJNvkzdHjm1D6R/wpvlDVzzCoewiVMyRJ8KBcUp9X i3ZRuCjIbVzvDLmulTN522lC/ILHfEsp/dTjtisPBWbmEGQfORvEOBCequeSjamKTEux JeQKOH45VY/2/XQICx9FBP8chgP5bbVDdUkdHRBINAbNDSCchAZBqZKdM4ddZbhHRS+E 5HxQ== 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=XvXQLtMbECdQ3UvhT3i4D0KrEUBK4DZDZX2L6k4wtTo=; b=RcpLid/CeR/9ROcSQFPyMEkFJCSjQHEfcdUHzR1uKJnJ8zr9DeUkhp6Mf2o08LJRX8 IQ4+CKwkovXMl7/lxf9QQX3H+69yDFJIiMaIJtVI0+MdQtRr2mGSXWBZbPWFhQsDZFK8 BBfg870F1ErYxBmkisyycg/erUeOBSJgRO4IkZaCtos7jS9iIyeQ6cJYXm+C9c05mrfq C8YtKGVD9J/MyD99EjvTNW9WFaNnRRcWq9thWx/InPWE/uwutMbbXVw7ykXz1n1mMKCv DmXt04y5u/1IavEYTi3d7h+JLjuQM8NN+iG7mD6pjSFi/Yhyhu3MYmKOC05e1u4imdr0 kwyQ== 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=XvXQLtMbECdQ3UvhT3i4D0KrEUBK4DZDZX2L6k4wtTo=; b=PIS0hqoW+2A96TigJGgVv/Y5T8Os8FJoi2fbdQjgiQ1L5rYNprrHvXOIZOekzLovvY 5VMbEDAL49ghb4MeIN5JrIEFMoHy5Gctl62WWCLs9ReIQDTIc5vzBjVRjKW/WGUd8BPU cMtM5ak4JTAgflH0mPzhd2f1Ys1dw/0QmsRaPDY9QnT/4go34j9NRMtFERhwosGetnRR XXmYGaZalaQarfz/nYbPGF0fYd4KskkFltsoI08T1w7/Kwel7UfpA4iEDF5rxLp5eeCu GrUS0u14G4lxSSW1ARJvH/H2ojYGuwE9lYWO9tcjQJs3qFYtX1kDhBcK4WHdDgt6a+n6 MlUw== 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=XvXQLtMbECdQ3UvhT3i4D0KrEUBK4DZDZX2L6k4wtTo=; b=tC+bPD0yChOcFP5DGtePeCSf9z7vzoqLvcXvUIgA39gw/X1wLIiuc6EWtCWw8AzM/g 1fzEB4fGUsRt8rPjQyLal85wU3gSrJrKTvWP5QUviJXwNYe5m5gSCrP4uN6fD4FE4KIy M5hESHS7yw1JXWQRgwVbNvpGAOZTOKsMdeWzgbuTCX/4k5qSzN3B7R3ZQh1XYcqb8Rlg nb+zRiW0+oPBptN2VM9pYMaIV+LJadz7yUSjC3PXrV7qTWw8PE6vfJjMyhe4LXqsd33N MTks+t+LqX8JMVrqM52se2E9dGdgaVKXht+PGXYG615BETkJDU6lXiZEHlkYoVko1iTQ 8aFw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5322l45VGaLhRTGXGJTMUzQDB1oXWJoLH3ClT+f2KpX7KHbu+H/l m06dbqEvc7Sn3I5luLUgBjE= X-Google-Smtp-Source: ABdhPJyGwZBo6Y8xiN0SXU+OuWFe6/CrDGof0eVw0DAU473k9Zxw2JmlclNACjT8UOow7JIrmLSZwg== X-Received: by 2002:a05:6000:1563:: with SMTP id 3mr29164994wrz.211.1617033402914; Mon, 29 Mar 2021 08:56:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4f8f:: with SMTP id n15ls7916724wmq.2.gmail; Mon, 29 Mar 2021 08:56:42 -0700 (PDT) X-Received: by 2002:a7b:ce91:: with SMTP id q17mr26159188wmj.28.1617033402137; Mon, 29 Mar 2021 08:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617033402; cv=none; d=google.com; s=arc-20160816; b=kpSLnuZx+6EgF/IOmYlRwia+c1uyytudpDJ6eOsxakPr9a8odoqZ0vviDb8tHmuoc7 k3EQC3vbnSiDfdrHm4iEGrrSzO9WKv7tFnfRAZ76HO+pMAnvJnQjMQGO6T8isWsxE2v3 B5Y+O55MY+zBc1iG+JxeWH6b0ADJ67bZRgv1eYKQwbG/5uAYKPYliX8Em/t7tmBR0CJT FGBVwqWeuQAFTqS/e+oaonODjemMKHffwVOoYRjQuBx4PVeCRUMvQI3im203YQxGBgFK Jd9zQJoTEkn2kMjLi92MwN8zkTg4eHGyQ5y0p++cjPgkgT1AiYfO2v3tlQ/aIkyKCA9z mxzg== 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=cFUKx3xsFF7zqRq9Q8aE1NAjDDFR4l3c6GJsZ/OPsrA=; b=Gx6HA18o5oUfItqgGq2VoXPQSE0zkjGCNBptBN3/5Ac7s57gm8DRPJ7qTSYkHuwG/y Yjk6Zmh7WsBYQInD/4oWNXOid3m0m+BTBORhkdkhyfCM+N3jpzqBBQcF6e7NrBCn5b60 5IePQax8hkq9xnM9+5kEchEC1nWTvZ6IenFomHBnyLIjl9jSBQA91REkkQ+L745cCG/g TUA/dhbWUNRJm2lJiEax/4O0qqAmOuqBgXKBii0p6f4kYzWImbmNe6QG1uK+dBwCgnXi 85n1AfcdbYsw5/pRddYeGLllBAYXmCVk7vQzBTdcaDIcSJE3gCnCyrAJ+mUQl31iJuqB 7gHw== 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 b6si15482wmc.2.2021.03.29.08.56.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Mar 2021 08:56:42 -0700 (PDT) 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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 12TFuf3I000544 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 29 Mar 2021 17:56:41 +0200 Received: from md1sf36c.ad001.siemens.net ([167.87.46.205]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 12TFufsm031984 for ; Mon, 29 Mar 2021 17:56:41 +0200 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v8 3/5] sdk: add support for containerized sdk Date: Mon, 29 Mar 2021 17:56:38 +0200 Message-Id: <20210329155640.62445-4-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210329155640.62445-1-silvano.cirujano-cuesta@siemens.com> References: <20210329155640.62445-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?1695582417712699817?= X-GMAIL-MSGID: =?utf-8?q?1695582417712699817?= 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