From patchwork Mon Mar 29 06:56:40 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: 394 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp3557995oor; Mon, 29 Mar 2021 09:11:44 -0700 (PDT) X-Received: by 2002:a17:906:cb18:: with SMTP id lk24mr28243909ejb.70.1617034304040; Mon, 29 Mar 2021 09:11:44 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1617034304; cv=pass; d=google.com; s=arc-20160816; b=exz4qT2A+V/VkHkKjwS6MarcjABJJ6B6pWmF/2mL0SMoz6reVUkyqdT+W8UoXnPDbV npEvuPM/ivQDGKEoLh3TYCEy1Kd1P6/P1DidAV/mt5fdCMF5iJ/k+eh6c/oPBEivVU4w uI2UlJOYVfN4O0KLiIKgRMioRbGiW7jX8PtVacuqqoywWf3BbPaHh/SXaeZO5Nlf0M/y +6YbHRM+jpYwncDxvuulsp2Sx+MyR0iFyqRMyiOA3r93+zolbol/BCkEvzKiwrxYyRPy wheOuPS0SdNYcAsFCV1PjdasoB3eM3tT0DcFGRNttfuUmKH7tRbQ9LRqaWlOo2uUfxUi T1zw== 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=sBREnlMJ0CKffyM/tXb926JKvw8tMoN5yG8+GcD5AXo=; b=jjoCOThJAd/KVcVNFatyhI2BMJMKOwRNUOQjyejzEhfbw/wK0JxJ+/cyK3c4a77XQ7 JG4PTRpFkvZrbTtICjKmSnDzlXtVy320FyDjJSAHTgyzFhXtt1M9Nxy7EcrQYylTGE5b CBA64PUXKzDkx8+T3hIhuN2LG0GNtcntV/8uVB38IqQw0bCBC1pPveuP0ToFeiQYjXr+ mn0xjvusZ/fnc648b+ObhJfqhEYNjeCAt8yW//55RVdaS8bFNsqhhQIviHH5LsMcjP1i 3q8F2VeU7QQ6SqigCsd3JyKWlMO1DNQBT4EPk6SLW3yIZdTiKd2QIprZE9og6l0oYj8L tLRw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=CllQippD; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbp7yq6bqmgqeclzpuhy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBP7YQ6BQMGQECLZPUHY@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 m19sor7459254edq.18.2021.03.29.09.11.43 (Google Transport Security); Mon, 29 Mar 2021 09:11:44 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbp7yq6bqmgqeclzpuhy@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=CllQippD; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbp7yq6bqmgqeclzpuhy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBP7YQ6BQMGQECLZPUHY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1617034303; cv=pass; d=google.com; s=arc-20160816; b=v175saMUQXm1AEIykf7D/8yAh+iMIlxkqxyExHj31NAXuNvHsQDPPqTivm7drB2qOS uoC61XFJ+jCVDmWTJ5NxoDPenDRtbPKwwN8gQ2fRr077s81TA32yzi/zQJvvxweRx3Pj /Y5TwvEdYIqFATlCNrNMtozlpuP8vQJiYli62h3hMaq/ajf9TbZlsdZEW9LBXeLfqiZU gKrFsKzOxWLmNxOyT/OXqynlO2ybqfhDwRr9cs2cR0ol8JR5w8gKrveqaYGZKpVE6nsd 2m4axGLuX15R6y+qXr1RGbxu1Ch3CUqjjBH3X2t6O90ISnPSzo3cNbV5U86fUXACL5u6 9xuA== 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=sBREnlMJ0CKffyM/tXb926JKvw8tMoN5yG8+GcD5AXo=; b=RTb7+suV4I/v3BlIqg/qRLzTRL+obwxgYYRoQ2Tt4CzUNNm212yk52Jp8j9vmkrX6w AJEfZs6CkjJYzGXq0Li5TGnFW3c2n5b/qm34ubfeftQsKMwrH4qcgW6V/PYSx6/j1Hzm wjvm/FbI17JU8QZGN/r9uEU1cENREMlP7moOsNT7oRRcUEv8tD9OzkHrN4YtegsBlgcq k/9pOgU6zqciNCcWdyLrINDC/B3FX+6cjlGODALkqkidxjwupdfhFSu3qBXl8vOg0is/ GUezUp1f0r93LZ+rAhVwCX1cO/a2A02+CF3N6/9TNkAU5AthrxSedR2Ah+IsxMenx524 cCow== 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=sBREnlMJ0CKffyM/tXb926JKvw8tMoN5yG8+GcD5AXo=; b=CllQippD3OiHLK0YPNo+llK5+IbbMNGQ9dv93yNSFRoe9EAA1BVLZpbVHIWhtfQerr JotJEP/gW1fJRMDjyP2oZo+uT+86tWlcA5rY3myFJ6ZjUftwlDiiv+JlFGCxYRz5axLJ DsLh1vJhkrTKT2byLpc2ZIax3IDrd8kyJcWIwk3a7MXzbGeKJJyCf5uIgCtD8ewp535+ /FqMOUSsqKAjldMQSoITiE+94ll+ehyPSEDMmlFKtXf0NJCetbId2LeH8ykHJujhB0Uo dJ9eEBB2fE7aZcMn6ZUjjgBtAeYUxjCzwp/pdOSgy3PZ2n7IJte9J+FG5+es6W5iL/0k fsdw== 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=sBREnlMJ0CKffyM/tXb926JKvw8tMoN5yG8+GcD5AXo=; b=oTFQfawkUWQthKl4j7E4iIakPIFMT1BvddhjVPYSac5oNkSyee4uuC5bOHqPVM8chb 9VplddRgGtQBnWCyJa4BNqlDWsHYH5L4coMlntaeXTePi5OI1u0Z2TZeeKlxyD0WXPbE g9C290qtFPcOi62H1Srg8aoxjOWW+8B/6eKydIP3eVvSuDey4UpJxM6fixzizij5xpx3 n3X0NybaUXoa5V/0opUh7jfY3+88GtPJLxrBMFJ3lPgsqeJGKG6KaMJTdEmIZ+w2hBo0 qEpSxVMB7sdAw+rzaf6j/54dOA/yCNVWD+Ek8qZ0cJApYK6LU/OfRLYK+SD+ey2fcxIg f0tw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533m2U0KW5ns0eu6ipBVLZYUXIgTDSurv7f3AhiUW/FzTzs6k/cb QFz+WAHeCPzzJSO1y+yXubQ= X-Google-Smtp-Source: ABdhPJys671o40AGX3jHSnjgQzSjCYat2amftyq1ro/le9OLxLU/PxuZ8NcXNYon3fODiqaDE+mj5g== X-Received: by 2002:a05:6402:84b:: with SMTP id b11mr28873927edz.56.1617034303639; Mon, 29 Mar 2021 09:11:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:80f:: with SMTP id e15ls8510346ejd.1.gmail; Mon, 29 Mar 2021 09:11:42 -0700 (PDT) X-Received: by 2002:a17:906:aac6:: with SMTP id kt6mr29368651ejb.260.1617034302870; Mon, 29 Mar 2021 09:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617034302; cv=none; d=google.com; s=arc-20160816; b=bwvXgsAaZtJ/vB2qTXE0gPAS7sTs0YBE+ZG9THlFNn4U6HI/fOxbIRfz0dNTCOltZe dOb7p42dwvmPFsTDANqKIou74vDrqNehTjYRnl1N5oS3bfVy47PoKGHLIZPUCEsfUz5n 3WzzDukcyyBa776d9PoTt6J4x/5h+LVYt8gNQhFOfEAysfEg86buUkBUoWsyE7TcIdAL YeJT+wEN1mnGN19619kABnFTnoN3vM0Bsh1IRsPpC+c1/hxUFbyJ2I0bNlo2B/JFfx5K cWulXQp1+kU711bWzaBTRQFmHpQ+rTFor/DKLZqhb+XK8rZ3ddg8Y+NAMpPQFcterbPd F8Bg== 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=9q/+l+nkNvM1hiajqG6q3Qt1DGOZBKJ9gigloMzlPb0=; b=cRlsyiG2+EC8SJsYzjb+T9zz1PwnXsXpuc0pUSQmqTxUjTM/aFdBCsdarNNsPQ4/9i YlJRVFjq01CnX51v6UTJSw/paBNCKPVaMXLgXXEFIF8dN6iNni3rKkYL0ygNPuZfTXoe p18vEJnZLRy4kVXRD+sQi/eEqghX0beIkcrThCdPbiBiAR1uEJdwb5mH2OR5y83kShSJ ddkzkWxqRswEMhgPX5A0WqUkykKyYHo7Qcctt6Wh0L5tqeLphTx3lmdRfuIogs0r23Fw 3abN4qDrqVsu1gi5lKD2gegxtAv82ku9yuD8KxA1X/yRDO24XEmFGawjZPk+LwvPJJQK LRxg== 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 f25si653607edx.4.2021.03.29.09.11.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Mar 2021 09:11: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 12TGBggl020031 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 29 Mar 2021 18:11:42 +0200 Received: from md1sf36c.ad001.siemens.net ([167.87.46.205]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 12TFufso031984 for ; Mon, 29 Mar 2021 17:56:42 +0200 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v8 5/5] ci: add container image sample configurations Date: Mon, 29 Mar 2021 17:56:40 +0200 Message-Id: <20210329155640.62445-6-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?1695583362531759227?= X-GMAIL-MSGID: =?utf-8?q?1695583362531759227?= Add samples for the creation of container images and containerized SDKs as well as testing configurations to the CI script. Signed-off-by: Silvano Cirujano Cuesta --- meta-isar/conf/local.conf.sample | 3 ++ meta-isar/conf/machine/container.conf | 5 ++++ .../conf/multiconfig/container-bullseye.conf | 4 +++ .../conf/multiconfig/container-buster.conf | 4 +++ .../conf/multiconfig/container-stretch.conf | 4 +++ scripts/ci_build.sh | 29 ++++++++++++++++++- 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta-isar/conf/machine/container.conf create mode 100644 meta-isar/conf/multiconfig/container-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/container-buster.conf create mode 100644 meta-isar/conf/multiconfig/container-stretch.conf diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 107496c..87ba26f 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -51,6 +51,9 @@ BBMULTICONFIG = " \ qemuamd64-buster \ qemuamd64-buster-tgz \ qemuamd64-bullseye \ + container-stretch \ + container-buster \ + container-bullseye \ qemumipsel-stretch \ qemumipsel-buster \ qemumipsel-bullseye \ diff --git a/meta-isar/conf/machine/container.conf b/meta-isar/conf/machine/container.conf new file mode 100644 index 0000000..367d790 --- /dev/null +++ b/meta-isar/conf/machine/container.conf @@ -0,0 +1,5 @@ +# This software is a part of ISAR. +# Copyright (C) 2015-2017 ilbers GmbH + +IMAGE_TYPE = "container-img" + diff --git a/meta-isar/conf/multiconfig/container-bullseye.conf b/meta-isar/conf/multiconfig/container-bullseye.conf new file mode 100644 index 0000000..200b241 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-bullseye.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/container-buster.conf b/meta-isar/conf/multiconfig/container-buster.conf new file mode 100644 index 0000000..78b0324 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-buster.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/container-stretch.conf b/meta-isar/conf/multiconfig/container-stretch.conf new file mode 100644 index 0000000..3ff8bcb --- /dev/null +++ b/meta-isar/conf/multiconfig/container-stretch.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "debian-stretch" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 3868fb6..6445b10 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -17,6 +17,15 @@ cd "$(dirname "$0")/.." # Start build in Isar tree by default BUILD_DIR=./build +# Check dependencies +DEPENDENCIES="umoci skopeo" +for prog in ${DEPENDENCIES} ; do + if [ ! -x "$(which $prog)" ] ; then + echo "missing $prog in PATH, exiting" >&2 + exit 1 + fi +done + BB_ARGS="-v" TARGETS_SET="\ @@ -33,7 +42,8 @@ TARGETS_SET="\ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \ mc:rpi-stretch:isar-image-base \ - mc:qemuamd64-focal:isar-image-base" + mc:qemuamd64-focal:isar-image-base \ + " # qemu-user-static of <= buster too old to build that # mc:qemuarm64-buster:isar-image-base # mc:qemuarm64-bullseye:isar-image-base @@ -45,6 +55,12 @@ TARGETS_SET_BULLSEYE="\ mc:qemumipsel-bullseye:isar-image-base \ " +TARGETS_CONTAINERS="\ + mc:container-stretch:isar-image-base \ + mc:container-buster:isar-image-base \ + mc:container-bullseye:isar-image-base \ +" + CROSS_TARGETS_SET="\ mc:qemuarm-stretch:isar-image-base \ mc:qemuarm-buster:isar-image-base \ @@ -237,3 +253,14 @@ bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base mv "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup \ ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img + +# Finalize with containerized images, since they remove some not-needed packages from the local.conf +sed -i -e 's/\(IMAGE_INSTALL = .*\) example-module-${KERNEL_NAME}\(.*\)/\1\2/g' conf/local.conf +sed -i -e 's/\(IMAGE_INSTALL = .*\) enable-fsck\(.*\)/\1\2/g' conf/local.conf +bitbake $BB_ARGS $TARGETS_CONTAINERS +while [ -e bitbake.sock ]; do sleep 1; done +# and SDK container image creation +echo 'SDK_FORMATS = "docker-archive"' >> conf/local.conf +bitbake $BB_ARGS -c do_populate_sdk mc:container-stretch:isar-image-base +while [ -e bitbake.sock ]; do sleep 1; done +