From patchwork Fri Mar 12 09:58:41 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: 360 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp1562283oop; Fri, 12 Mar 2021 12:08:47 -0800 (PST) X-Received: by 2002:adf:9b82:: with SMTP id d2mr15679032wrc.193.1615579727134; Fri, 12 Mar 2021 12:08:47 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1615579727; cv=pass; d=google.com; s=arc-20160816; b=aCCLiI5oSkPmNi578OgHtGaeKnYwwX9EngKFHvJmLgHvsIyk+AO4f/jKThvm7KbTVS mjFjRuQ8T35SdoNchbgAZ4/UFPGLkBeZVcOv2hzTHWmdYG+CckYvyxKNZCRk9+1rXpJi r0b8dlNvhH66gUSzvdEB4NWYUnM4wJXBqkpCC4qwT2ws80Syubzr2PRcEgcgM3b8V6ZI Dy0SxcvWHrSywq4rAPAWX1EKwyOm2xmg+49qdSafHq1QiHEMXEaY5XEO2bGxpf/DWeDF eIdew6YgA0PZsx9lt3frPdB8D7QoxK3YWg7vz9EGRJ6KjrB9Pj8Fwe7eW3RZ4dD14PEu h4sQ== 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=BV26kLrzQM38y6S2rckv8cVJzEYkUM/linm58cCw4HQ=; b=LGqt0/hTjzDdZJbzKqgYSyBo2kdCWH7+2Nr0PJXr1j8PsUYjlBklDCJrTgCZf6U7zY OACU8HxaS2rv916DRBxC+5pFpLXC6y2fjujSWBTQaH/NvmqC7AqjTzAgy9oLNWKPYNLD siYTvKjmKbDcaumMJrhkztcXGrSOHg6FeLCQompIHrlXmyUeOvEetB4HOhZ5KREVB5Dr PqBtLZjNpPvXkMTMZiTL9nVJTX8IJXuffjMjzzBPLMj+KsDhDcxD2TIcdz8CYR+Yy16/ nY2+3/qpwiDXMiKKbKnyjV4Yz3MwZUNN2aQ0XEkVtqQUYFkUUcmm2jRCEfLcaEv7wMJ6 /UtA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=e8yF4955; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbtuuv6bamgqerpfd2zi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBTUUV6BAMGQERPFD2ZI@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 w130sor3885969wmg.23.2021.03.12.12.08.46 (Google Transport Security); Fri, 12 Mar 2021 12:08:47 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbtuuv6bamgqerpfd2zi@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=e8yF4955; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbtuuv6bamgqerpfd2zi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBTUUV6BAMGQERPFD2ZI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1615579726; cv=pass; d=google.com; s=arc-20160816; b=dzivca0J+xdspZZ3Rjt7o1I3vNAcrq7ZQbonidA/5mrSTE6AUlrsKcOsKR6i3cT9dD 9Z8z2eIbKwPhqCoh/BPRi0x4i8l1Yj0gmtjvYwkNdhIiCd8j8HKYieAErOE4Ae2JH8SY UkB4rJNHdKKt/UMqE+cN131WT6Ln1zG92OnALtUAX1U4O1jH2jNa6iidTln8EWSzD5ld W0RZfn6eDRE/+6Rnh88yFjfdC4KAcZVe4m6mGNMPflUa7DCbOsEtbcralR0bhCpI7Vrh F7TI058C7mnCDu3hLVaxZVg6/DVhk3e4g0TVu4aUx61e3XD6JFyaK689iFKXn/KdxxCG NRSQ== 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=BV26kLrzQM38y6S2rckv8cVJzEYkUM/linm58cCw4HQ=; b=GdocxyH514WCI6rnBGGOPqPdKetkstQoJrMBR25fYL3fNZT19TYLqdL5QAs17cIXDQ CCj1q5u1nnWrQlbAFTm8M58+8XWPqHLWTsuwt/iuiwhu2DYTtYZxLD7bMJ+xX9VaBwv2 Dc2/v/Mv4NaGWF32RYdSEnVPxRwAUEjAz44GYrtN5trrbqp/spINvW22tlw6aa66duOR tcbAyI+z4pPOTTXhaTcAvb+HDAk9QXu77OWp3HU7bs681dIC8LmYyNoJQKhj2rbUvVDt 1sJs716PM29GMhbkP1kW7ee8Bnw0dcv8YXwqAIB0Sqak46CYm1cGXcJjEl8Z2qnVvfXd GdnA== 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=BV26kLrzQM38y6S2rckv8cVJzEYkUM/linm58cCw4HQ=; b=e8yF4955/V/hm5cQO45UQytwuvrKacXAK/goEYFsCADgiZ3ukfXrrPetEhx03+tuaI kxcf3NodYO1ykpgCOPtVa2f0OEkviFzB+H7cc3WLikH1BYlnX/CveslOJz4gBXpIhEUx l0dNvWvDjzpEwr2eGbboIKD9HXI17dIIhM4O/GM+rLNNcZXhNWrBhIfboZ/DnYYLcD5p jn/MeAW+0Xf4cm5wlC57vaquQmkgSrwKGIA+k5GmKwrKtYa16nmY34wUJxX3j+mVu0ch 2AX5Zdtzgp9/pdGQ7a0LTxCOlgjADEepQDkSRW8H0qxCx4LClkCzEI9kfutfKtyezbsv NrAg== 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=BV26kLrzQM38y6S2rckv8cVJzEYkUM/linm58cCw4HQ=; b=A7lIlDVMPAYEt3fkLe8D08Zvnf6+VgcVPnT53ssUYEweSF/jvs/jt81KMz8O5TRz/C XHplaQvBAp4RzQufwQ0DIb4bK/SzS8cmtEUgjGmPMHwOR8Azo6Tm6DvRk1qKReKmJ5fP mb9pHyaiww/O3InEtIPMknRFHR/MtIVmrhdDIEBEBbEF7/hIl00SL1SXiezUahnUaLce NR3x+he0TnWIv2B8kHibV0/LN31k1yne1iV9lvjVtXepNYX2Iaz8MLSCXsBN5Eh5h0G1 X/1fovaqYqW4IVj7pXLBe5Kg58UAGYapzzeAGmVhRZtAP/taboYK4c3Q7tk23IUP7sou 3kjQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532ReFEodLCt3fppbnUU8ia3zfPD6TqmnWi6y460p4py606SyCkO wfcO9iR7K4ZMAGqQ53uqtmg= X-Google-Smtp-Source: ABdhPJwGfTtSbHc59VmeznaFZTDclRmh7kLUZuh5hDM7L9l+Hct7ubRS496yGTZfTZfonaHwoShCUg== X-Received: by 2002:a05:600c:198d:: with SMTP id t13mr14992002wmq.73.1615579726905; Fri, 12 Mar 2021 12:08:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:162d:: with SMTP id v13ls1047846wrb.1.gmail; Fri, 12 Mar 2021 12:08:46 -0800 (PST) X-Received: by 2002:a05:6000:191:: with SMTP id p17mr16003557wrx.154.1615579726342; Fri, 12 Mar 2021 12:08:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615579726; cv=none; d=google.com; s=arc-20160816; b=SAfOjEATnGLt22jpgpaSKKJ9z7ORm+xeU7mosoOF+c87gtZxzXkxsSiiy/8yAzt2EW VNEBYNhO1DPm+TySMvTnwZHWiUcCsGhqEZKqoM66H0uURjDFBfVQsytcnh0q7soZVY1F bkGUf/EXMdmWmQK3DuQDhvfU2Z+CC3f0xQZ1zxeUUNAXgZv1lPSgYiAeQSAtV3wqQd1j Zz6ly9hW5llreMUO6lMmMZxL0d3ny1XjZiWhRx5A/oAtEU2a40e+68y++iU1Bf3jMrFe 1b6g3Y0Q2WqO7Rvs/RQH/TLFKdr8dozCs12gC6uXb+kd0IwcKkUKRtVlRihS8hAeTrBc Zutg== 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=dcliY5suJLKfzoRZiVAV+tpHEC2Sa3Ry9NxPhmM5IO/ZkftnExev8Xiq0F8A6MpE5N X8Y4nObJRi/a/ofsVUf69HBvk3t7g1+M5UOAij0hIrS+YaAwAp+z3gnVyTYqi9ZPxl1o hQ91OYs76ZQ5mZ85evd+wVlFVypfkQpaUq/6xlHkQslAh80kW+E3GWergS47h6fAHbN2 Kjw9BcifBV3KscLBVNyIAafy4wZWuXUve9ckRGyVDPITGekGmTaXonEkwMhhsh/s9Nwq c95g0WYrHtBbgHfjyOrRGOJAUe02kpeIclJiFUvQ7edwcnf8hTJvyOSp1ZWbA9kuZ8az wb/g== 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 t124si426086wmb.3.2021.03.12.12.08.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Mar 2021 12:08:46 -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 12CK8kpl025888 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 12 Mar 2021 21:08:46 +0100 Received: from md1sf36c.ad001.siemens.net ([167.87.3.106]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 12CJwiaP008930 for ; Fri, 12 Mar 2021 20:58:45 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v7 3/5] sdk: add support for containerized sdk Date: Fri, 12 Mar 2021 20:58:41 +0100 Message-Id: <20210312195843.96000-4-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312195843.96000-1-silvano.cirujano-cuesta@siemens.com> References: <20210312195843.96000-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?1694058128167177843?= X-GMAIL-MSGID: =?utf-8?q?1694058128167177843?= 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