From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6945105578761912320 X-Received: by 2002:adf:e441:: with SMTP id t1mr29133526wrm.21.1617033403008; Mon, 29 Mar 2021 08:56:43 -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-Google-Smtp-Source: ABdhPJw/XKXvjYqIWy2lxJFd36CDr1LRgkWS3I4B8Mz4jiazzTCcB7EjZWqkrREz9PrRnPEFKisA 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: 92dFPDA9FrJy 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 -- 2.30.2