From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:651c:4c9:b0:26c:79cd:2819 with SMTP id e9-20020a05651c04c900b0026c79cd2819mr7915750lji.159.1664272339848; Tue, 27 Sep 2022 02:52:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc06:0:b0:26b:ff81:b7cb with SMTP id b6-20020a2ebc06000000b0026bff81b7cbls351893ljf.6.-pod-prod-gmail; Tue, 27 Sep 2022 02:52:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM46qXdDCfrvPjhUA8/HIbhsCdiT9EX6TpjQ97MMeeGL9apX+lt1rSFLvGwzhzRnHrtsC/3q X-Received: by 2002:a2e:9c8c:0:b0:26c:7bab:666e with SMTP id x12-20020a2e9c8c000000b0026c7bab666emr6811890lji.300.1664272338178; Tue, 27 Sep 2022 02:52:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664272338; cv=none; d=google.com; s=arc-20160816; b=wT+t2Jj361A4qUPUkkilerqqzVi9Io8EMKy6Qs6XQoXyeO896fYahgB9M8mSK+ztZ4 U/spyFaLl3Kj9xyLCoow/xk/E1GtA4piL+i4sHlyCTaqG1Rh9Ztp/GggeYLYR0yg9eSk I/PBK9Vtew3RPuonYLVnoC9sK2nfkUNJe0Ig2tPBEU0Dc87E4IBv7zq6IPQmvll72C9h tWtNMicHSIH/E0lnl1jeZZfqy4JbeLxSLYDHGzXEatZ+eN1r4rmSe/TZ5ny67zqQy3e8 MZMhX1FYSTg2GvNbwCZcW50OrBTmMpQ4m4e0w8JskVFY/9tltwjkUIlAMd1DQLvCHQqu wGhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=qrWPim1PPHJFJ3lPEfvumdO6afTZ1+ouf6BW67Fh2rc=; b=zR7M1JarV+X65yZNYPvtEBLhVlnnTJDzfs4oLuoG9q3xwU+lDz34j6wvNiUSIozmgD tiPZ20WMgLY5YAUKnlXSkptzgJMO/Mhe/kK7E0taXyGeqQiUtvcPib/P8lCzFduhPguG 59ZSOmQt4c8/vMBsFVF9BjDk0j1OBqT+ZY0Ex3ngKIuuPDwIXfKyTEwBqF+G4ucKZGEw uhod8F++zPeqQQGbpCPnTZLxM/jcNYwUWLNlA9HjiG3Cayph5i5z/+6TSUq5mYlnNond BVNu/xJvTGOXW4K3xc47c8NS2JVeSYvL+dmXIfgNhFH2QShqx/Dsa3ad5VFdXBE9EaJz tJdw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="SoM/Jiis"; spf=pass (google.com: domain of fm-72506-202209270952170ef154c045a9ddd331-vacuu4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-202209270952170ef154c045a9ddd331-VaCUu4@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id g9-20020ac25389000000b0048b224551b6si46775lfh.12.2022.09.27.02.52.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Sep 2022 02:52:18 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209270952170ef154c045a9ddd331-vacuu4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="SoM/Jiis"; spf=pass (google.com: domain of fm-72506-202209270952170ef154c045a9ddd331-vacuu4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-202209270952170ef154c045a9ddd331-VaCUu4@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202209270952170ef154c045a9ddd331 for ; Tue, 27 Sep 2022 11:52:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=qrWPim1PPHJFJ3lPEfvumdO6afTZ1+ouf6BW67Fh2rc=; b=SoM/Jiisl9/GtOzWctPJ03KOS/E4rV5OHZHFBeAqKIPXsaPOBjvpumw+aFnoiMgf5SbexQ hKQqCBJD0F/mIBvO6Y5rginXHCRqa8CZGk2zDVppeeLjKcG97R7dusZWIOpk4lHH3wUuksV2 HKc9MSEhRWLDOtS75iVWEb2YcPYfc=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v7 4/6] add option to control deploy of raw wic partitions Date: Tue, 27 Sep 2022 11:51:15 +0200 Message-Id: <20220927095117.958474-5-felix.moessbauer@siemens.com> In-Reply-To: <20220927095117.958474-1-felix.moessbauer@siemens.com> References: <20220927095117.958474-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: C44/QE0Q1g+l This patch adds the WIC_DEPLOY_PARTITIONS option to control if the raw partition files are deployed by wic. We also set the default to not deploy to be closer to OE and to optimize for the average case. In addition, this significantly reduces the disk size required to run the CI. An API changelog entry is added. Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 9 +++++++++ meta-isar/conf/local.conf.sample | 3 +++ meta/classes/imagetypes_wic.bbclass | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 621d110e..a5f5abee 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -419,3 +419,12 @@ packages and will be lost after a given build session finishes. Any package build requirements for the rootfs should be satisfied in the Debian way via package dependencies. + +### Individual WIC partitions are no longer automatically deployed + +We used to copy all temporary WIC files, like the partitions, into the deploy directory. +That was intended actually only for compressed wic images where wic itself would do the compression. +It was never intended to also deploy those partitions, so that will also not be done (automatically) anymore. +To explicitly deploy the individual partition files (e.g. for swupdate), set `WIC_DEPLOY_PARTITIONS = "1"`. + +For compressed wic images `IMAGE_FSTYPES` should simply be extended with a compressed wic format, like "wic.xz". diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index ce7b58ee..57d06202 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -246,6 +246,9 @@ USER_isar[flags] += "clear-text-password" # Uncomment the below line to debug WIC. # WIC_CREATE_EXTRA_ARGS += "-D" +# Uncomment this to also deploy each wic partition as separate file (e.g. for swupdate) +#WIC_DEPLOY_PARTITIONS = "1" + # Uncomment this to use ccache for custom packages #USE_CCACHE = "1" # Uncomment and set own top level ccache directory to share between builds diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index 81788faf..c0f3429a 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -98,6 +98,7 @@ RECIPE_SYSROOT_NATIVE ?= "/" BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}" WIC_CREATE_EXTRA_ARGS ?= "" +WIC_DEPLOY_PARTITIONS ?= "0" # taken from OE, do not touch directly WICVARS += "\ @@ -208,6 +209,14 @@ generate_wic_image() { sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} mv -f ${WIC_DIRECT} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic mv -f ${WIC_DIRECT}.bmap ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.bmap + # deploy partition files if requested (ending with .p) + if [ "${WIC_DEPLOY_PARTITIONS}" -eq "1" ]; then + # locate *.direct.p partition files + find ${BUILDCHROOT_DIR}/${WICTMP} -type f -regextype sed -regex ".*\.direct.*\.p[0-9]\{1,\}" | while read f; do + suffix=$(basename $f | sed 's/.*\.direct\(.*\)/\1/') + mv -f ${f} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic${suffix} + done + fi rm -rf ${BUILDCHROOT_DIR}/${WICTMP} rm -rf ${IMAGE_ROOTFS}/../pseudo } -- 2.30.2