From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6937761441015398400 X-Received: by 2002:adf:eec9:: with SMTP id a9mr30671483wrp.252.1615323461847; 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-Google-Smtp-Source: ABdhPJx08bYRolXKNEdw7CjcGzx5uB1DqJ4gnh86Ta5vQRmjKw3YuUgnvtJCVnOEKJDmL/VFR+ED 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: zrK7/+rbwrbX 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.1