From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6927266035414335488 X-Received: by 2002:a19:342:: with SMTP id 63mr8610360lfd.297.1613396661625; Mon, 15 Feb 2021 05:44:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:6d4:: with SMTP id u20ls377346lff.1.gmail; Mon, 15 Feb 2021 05:44:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVuxm118YQz59voFLL9bg2mjcYsxOqmHXzJhyGkR2FdctwH2fGXrxLXxM/h8Y7iqJHYAq3 X-Received: by 2002:ac2:418b:: with SMTP id z11mr5150002lfh.33.1613396660648; Mon, 15 Feb 2021 05:44:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613396660; cv=none; d=google.com; s=arc-20160816; b=x875z/DBzhd121ktaSoJiVWyrJPKUvkCpbUdIWyBxF2mbAt2N2RgvxoiUIsYCaKG36 cIMhFRRWDmEAbkyW91ve4WxfxkUR9j8Pdo9yiFvg5CEwdJaX+BHQSHqoD5m24sZibtux BVfcFMM9ixw2SEPVSNahjMx3bJkYYcry0rIt/XGMJ2punuV6bhPZB+9JRWMAouFPKSGg Dy19dYaSSu8ivmykxzUYM54F9kQn75MxiA7UNSowg/Ogk7cktXrxxy5XKCoKbDAKh384 7cy7iKcdMeyKnFwx4DMgIW3FzAkuC2Yspn0y80AJe5nfsGtP+vcUs3XWjqCST+pg1YOR rnKg== 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=ilrsxfOzaENQp2ucnPYlxyLNBAHhFqzrtA+TmhEcOUo=; b=0sC+wAElTvAWuPu2Y4h+X/xHFsUoQNjyzfR18+fTcofta3kNJbIauT8bamShzC5sgT lMO+LCatnMUWS5DjEt4hQlHS+DS9wZqih8Fo/pXpF+njKO2pZVfzJ96kHz5RVR5qb1X7 hVIy07S0OUG/sQGIwaCbE1iGurSkN3+fsYMpbMqOHvCE5AWx663G20TshwTzIT2L9dAU Fd+LeExxdbk/iSeL4EQJ7i8qHjLf3EWNaiUwxt8VyrQ64SjxtsF9CPFnoHznbJwtSRWl +w7jVtMfElXMjC5pYrHf2F8YLxQfVGLwQnPqv9+YMi9OrHtyvMvw4xSu4ChdN3LZ6S0y fNTw== 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 s5si844651ljg.7.2021.02.15.05.44.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2021 05:44:20 -0800 (PST) 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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 11FDiJxZ015670 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 15 Feb 2021 14:44:19 +0100 Received: from md1sf36c.ad001.siemens.net ([139.22.119.30]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 11FDdIHG008716 for ; Mon, 15 Feb 2021 14:39:19 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v5 3/4] sdk: add support for containerized sdk Date: Mon, 15 Feb 2021 14:39:17 +0100 Message-Id: <20210215133918.50988-4-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210215133918.50988-1-silvano.cirujano-cuesta@siemens.com> References: <20210215133918.50988-1-silvano.cirujano-cuesta@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: a/G21HJhBI/j 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.0