From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a2e:3905:0:b0:26c:3550:bc14 with SMTP id g5-20020a2e3905000000b0026c3550bc14mr4856607lja.43.1663586462666; Mon, 19 Sep 2022 04:21:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5e7b:0:b0:48b:2227:7787 with SMTP id a27-20020ac25e7b000000b0048b22277787ls646818lfr.3.-pod-prod-gmail; Mon, 19 Sep 2022 04:21:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6oSjUYwOLjEn84vtYvAIeQHh3yM/R+zZVcQuqFA1bv8Ikm1zTvTioEZwB1wo9Yo6fSWhLD X-Received: by 2002:a05:6512:3502:b0:496:8e:9307 with SMTP id h2-20020a056512350200b00496008e9307mr5660059lfs.504.1663586461127; Mon, 19 Sep 2022 04:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663586461; cv=none; d=google.com; s=arc-20160816; b=pT0YncT2vAp4FVFlEPbaED62yNqFlvn4uvdtsM1PnWama/8oIVnesJ6zrLu+E6u8+S y86eissyJe6ROV2Lteeg1cgRq6CDfin7QcVBfrIdSdFeSDetGGPIq5EMsdQ4g7NuMiZ3 DFGquWFPErMcIwYIehL1Elnzmt4ywU6Qe4Xbl28eXrthZdj4Nlk+I6L2Q2+NeU55eWHP NSgANo5d0WBoRshCXKsoByWF1iArQCA/WyfbMluteqZ7cw5kNqkwWELCM7oyglEdC/xK ooTzaxulDyIIUmfs+4r2VH+cOAzB36lu62wigJHd+U8yJxN/48kSJUsierLEBrYzeKDH tQzg== 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=QfocFUwdUixZMAZPvlTupltPuamSoUtZ8rA9zLLZOzE=; b=cakfYcUe7Y18l+cnqHOiGzoxFEpL0ZNUptvjUctHISpHkUbogst22IkxoJrKdPuANM SAZARIftU19kiF0nHu/8CKeW1M4JNGirBg1b2EwVIrKNnP/tpVSZWL1uR58M7TpW2lmB hxAS7m3kzVrnZoQoqejpegp5iy9uvo8pUlCCwl+h2aguADlSNvMNMW9d4CckNbDLYvbO baDpI1lQZ1pLhskn9P7YmBYQwN88JYvQdwOnL33TBw9aXTHQcVN4JziQo0JvWkQkD0q0 Z1cepaSrqxpl9BIVVVU4KjdzuUb8T1XYUfQckgBMSH8QJ1ipPxgmb9BJnZ285FEko/ug B36w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hBDNwVdJ; spf=pass (google.com: domain of fm-72506-202209191121009cfd9d77f9bfd6ff96-f_pqzk@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202209191121009cfd9d77f9bfd6ff96-f_pqZK@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id z20-20020a05651c11d400b0026c3d772786si266767ljo.3.2022.09.19.04.21.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2022 04:21:01 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209191121009cfd9d77f9bfd6ff96-f_pqzk@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hBDNwVdJ; spf=pass (google.com: domain of fm-72506-202209191121009cfd9d77f9bfd6ff96-f_pqzk@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202209191121009cfd9d77f9bfd6ff96-f_pqZK@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202209191121009cfd9d77f9bfd6ff96 for ; Mon, 19 Sep 2022 13:21:00 +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=QfocFUwdUixZMAZPvlTupltPuamSoUtZ8rA9zLLZOzE=; b=hBDNwVdJZCvVsvVaxq4EyujcuWwpamsoIF4c/d6aV+7L1v05DSV3VjmDVqitaUsapOtx// qH/a09E8shAfT1wto/VbWAPQ1odxlCG6iE4X6YXMDIJJQ+mcK/y7XAfxXa2cINh94y3bbtti fE8vrQJVnyIlRniDXCLHF7XJizq24=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de, Felix Moessbauer Subject: [PATCH v5 3/5] add option to control deploy of raw wic partitions Date: Mon, 19 Sep 2022 13:20:33 +0200 Message-Id: <20220919112035.830233-4-felix.moessbauer@siemens.com> In-Reply-To: <20220919112035.830233-1-felix.moessbauer@siemens.com> References: <20220919112035.830233-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: enhGleKQV8SU 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 | 6 ++++++ meta-isar/conf/local.conf.sample | 3 +++ meta/classes/imagetypes_wic.bbclass | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 621d110e..0c34d9be 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -419,3 +419,9 @@ 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 + +The individual wic partitions (e.g. *.wic.p1) are no longer automatically +copied into the `DEPLOY_DIR_IMAGE`. +To explicitly deploy these files (e.g. for swupdate), set `WIC_DEPLOY_PARTITIONS = "1"`. 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 61a74d4a..ba8aa15c 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 += "\ @@ -205,6 +206,10 @@ generate_wic_image() { sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || true sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} + # only keep partitions if requested (ending with .p) + if [ "${WIC_DEPLOY_PARTITIONS}" -eq "0" ]; then + find ${BUILDCHROOT_DIR}/${WICTMP} -type f -regextype sed -regex ".*\.direct.*\.p[0-9]\{1,\}" -delete + fi find ${BUILDCHROOT_DIR}/${WICTMP} -type f -name "*.direct*" | while read f; do suffix=$(basename $f | sed 's/\(.*\)\(\.direct\)\(.*\)/\3/') mv -f ${f} "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic${suffix}" -- 2.30.2