From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:6638:3a10:b0:356:703d:2ce5 with SMTP id cn16-20020a0566383a1000b00356703d2ce5mr7846147jab.112.1663589001721; Mon, 19 Sep 2022 05:03:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:9617:0:b0:688:2a60:82fb with SMTP id w23-20020a5d9617000000b006882a6082fbls575406iol.10.-pod-prod-gmail; Mon, 19 Sep 2022 05:03:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79shxwzDbmHQkN+X3ctvOWiUhxXZPMvhe7XkupQftnpQj8/qqqdtoqtXtQhrVIQneIlvlZ X-Received: by 2002:a5d:8a02:0:b0:6a2:250e:a800 with SMTP id w2-20020a5d8a02000000b006a2250ea800mr7067712iod.153.1663589001013; Mon, 19 Sep 2022 05:03:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1663589001; cv=pass; d=google.com; s=arc-20160816; b=uHZdKrB2v7N0A5NxMR4CH7DS8bMBIE0XjrmUTi0uWCAenvdohYNndBUDhLHJEtKVte 3+QfBTs5M2l2FzWKzd68+kTHT88iEcNNzIDy5ZIQlwO5FPuQsnUbSkNDOMVxOglXDTJ/ kwpkOFaxgKYhql6X72+OZrJpt8a+c24RzkBeyxxG6fSTCHFW1YSzo6oGOrkn84oGUobL V4cYMYrp5CbkQ/dv20gnRqv2cPheqgDQduxHW4OBWVtw6YGP/blpSand+e1VI05/mjD5 vL8S1WxHVj8zNV/h3ulJuD6IyACpVhEEG/CspWs6Jo2H+lc0S1hP30kbPmRVkTBdFgra 1BQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=G0xTp03xJ/uN3ZFf/09x5VE6fSs1cc1egzZIoD/vlok=; b=qdnEZrzt5EAkRzWtaVWxOUIInT+Qn9CJAYfRUndWOZad0T1V1TVIuxAqyOY5bvHsuW iB5fKvN5P7++YSmgMGxh4WwEv26Uee1eJJrqjms5l127iNAr7212Yf/wTdMNb9tkMzIB +60XHV8Q68//zpWkvRBCnsgODQsDeGus5JK+UVcgeUFnK1FJCORwL3lVFm90RZdinSMV grfbDR6UATYwxYVxJ7IUPUBj2aKkmnMw4Ne3T6IDjWN9b01S8CQ5TovRv6xgZCS36AfN cgTbIMvCWaBdgX9GkxsQ9gXbnSGRcE6UwdBXfPpTKBFAV5Z46H7wAiY3aOGN+eol474w S9/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=FObuJXAH; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.57 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2057.outbound.protection.outlook.com. [40.107.21.57]) by gmr-mx.google.com with ESMTPS id d22-20020a6b6e16000000b00688ede7086dsi1383815ioh.3.2022.09.19.05.03.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2022 05:03:20 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.57 as permitted sender) client-ip=40.107.21.57; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=FObuJXAH; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.57 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W7HqQTCnQ/StyLz3hpUwirefQI5/lLgonE8SC91v8iJZlwbdStt7CJv5oDG4Iyk8JXEGiXIGfCYYyTFUs0YDww9qbGdYuj9eeaPsuh1BkGPw6e6IV4hIv4uhhYMmGXx3VRx1GUuMjqrqtwxPCOfywrYTKCJl2J1N20xx0I9l/dIsr+25DDNUTLr9idoPqENyxm65tR/sYd3yZLj96HpaYgV3LN5SvGBeuOetysxA3vJkwYEzafP7snaLHj07TJ/hlVAEykBHX4iLXEgbh/ibyaU7hhnE1bb0fMKTwt0JEAj9oxqwAHo2CgU57PfSK0DbnUCQaMssRUlUA2rehUoghg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=G0xTp03xJ/uN3ZFf/09x5VE6fSs1cc1egzZIoD/vlok=; b=S+XrmdiOsFUgBsd4i2HHfZm/hIj+7PgydrYOLs+w89sAt7Lig6fVRhEJZ5ni1XN8m56DKmvjJSZ3Fd+8xfGQ4pxOt84C5Z4UY4FpB6OAThFBZ/Ru4KYFKzmRXckv4ClR0Lzk4eW8FOc82ub/Dgt2/RaaMtn6W4dfSM5RngsSZcaWeiNN0sXTuSgCT2DofsVtj+Obc8WoCk7IVJGL8Lx70O0hYkCiE11gxUi4jqcNEMCJdfpE1vAyJELvDyiuzjvRxx5CKu0e5yeSgoR4aq7306PFhWcDcMARwalmetBsoVnEFsNUZh4TVcz+IHQ+wAh9KJ92ZlqJ6u1b1D/apxxujw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G0xTp03xJ/uN3ZFf/09x5VE6fSs1cc1egzZIoD/vlok=; b=FObuJXAHhj3M9ashnIBc6mgIFcnW6hUYsLX27Z2HTIVinxB4WWwtBmPd73W1yrB/f/MUfJ1m4hcJl5i/f1KLiHdK++Y7um90zlErj+CBE2TsUBxBr6POhIBns6/0q1zUm0KcqEptiEPCb2Kfu98EemautIVlFClLdJGNPmjZ2NSwvwOWsyVPV8Yil0RR891JGZV+LuCbNWne7uRLM0kcXboA/Kh88iXCa/k/n1xJhFItfJcfhw5xd9tN5v2kjMVKYW38ko5rLnxAicFwD8Dvxd1ODpLkpnmRg6PSKM4Ok1RRMf/vHaywOwjOJAaoXFd+410QoeUL1etwsTSXK2qAsg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by DU0PR10MB5704.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:313::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Mon, 19 Sep 2022 12:03:18 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e4dc:ecc7:ddca:6051]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e4dc:ecc7:ddca:6051%4]) with mapi id 15.20.5632.015; Mon, 19 Sep 2022 12:03:18 +0000 Date: Mon, 19 Sep 2022 14:03:13 +0200 From: Henning Schild To: Felix Moessbauer Cc: isar-users@googlegroups.com, adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de Subject: Re: [PATCH v5 3/5] add option to control deploy of raw wic partitions Message-ID: <20220919140313.5e6574e9@md1za8fc.ad001.siemens.net> In-Reply-To: <20220919112035.830233-4-felix.moessbauer@siemens.com> References: <20220919112035.830233-1-felix.moessbauer@siemens.com> <20220919112035.830233-4-felix.moessbauer@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0114.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::16) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|DU0PR10MB5704:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f371a71-016a-4b12-dd26-08da9a36f068 X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CA1npvj0LU01C8P2/OPz/tANPivdL/JIW7+ZxVwmm6QmRH2YK2lHGzVsqbjo+leugWuo7Aq5+EvKQdj9cHsnSnr7J1k2SJ+7Jvudxu8QhfT9FGusQb67FKehOvqybLId6AqK4QFLsueyv3lS5SuU+xEXCCULaDMaaqPN6W5AD5Pz7yiWAKOj4usuvp7z1lrySNCvJuMoV+QJ8hzM7rodQxAXKmK188hNI0ItV1fM7vYEHxbF60O7WxrPXMFp969OglSyiRZcZjp3qBQTwdyQaC0OFZtgcPQTPUAmM2gwgmN9B0ePDHs7R8NrNJ9P0AVpMm92TfOflGJ/erXq1M8YBcoj7nAW4bxOuCE9ay7qdNL+a4U6uaQn8rNwNzGB7u4PHhxk9OgkmLYwW7EDzxDx83cbdeZnTWLAsoGsrFOCokEIPC07XZSH7bdeE0yjk4AhNk/ih4OLZrrwRjirtw5uieekOkyDXjYaWRQO+/ecTCO6MCEmpgUOXiSx6P2J+4BqiiBNH6Nl2S9uOhjzzdpdZu2t0XKmdDqEurw+jYE+tIXua/kWr37TLEDwcZAFL5Dtp1KPaifwF65YCT38gIAk0F8X/ciC4I1Xy3u/vp3Z61PX1I8344IVw8XaMyT97l28jrxJGk4Jch/pCb9xDM04N18Nu4BCVul0gRejaVOkYaTO9L33TmXTM6f607nAItVv5TZWC/pCVdn4mzHxpduCRy/AAMwlWFXc695e39kDiXmbyZmwy/xA0LizWEdSzMS0xp4iURji2XlLg7jiP1+6+w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(346002)(366004)(396003)(376002)(136003)(451199015)(44832011)(2906002)(5660300002)(6862004)(8936002)(4326008)(66946007)(8676002)(66476007)(66556008)(82960400001)(6486002)(86362001)(83380400001)(6636002)(316002)(1076003)(186003)(478600001)(26005)(9686003)(6512007)(41300700001)(38100700002)(6506007)(6666004)(403724002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gtnsCmX08oOs3PCs1pgjn+u0ueha9LLiHH9L+JI8NacY5xgUiF62CF0LeXZr?= =?us-ascii?Q?LQbp3SynQ6qGepBvqm6Oy3zHSeCZizHLU9S6M8b8IitXrxaTyqJtCQ5EaodV?= =?us-ascii?Q?PgEWzG4iuvzthgv4BhaNQZWsdVCSozoHftNAnu9M6187Vkeunze/Iqmiyzh1?= =?us-ascii?Q?f4wUAtbQ9+3sfeDT2Hl/ZGwooUsPS4U+QzlSbx0d2be1Bb4h2R39FlOZJ7GF?= =?us-ascii?Q?NkMwQSuSJyHCzo7lADhiG34tia3miRjRJzoG5aROhzgULN5EoUhFvEiCHFW8?= =?us-ascii?Q?ErOI3EWioIEfW/iH9g2tWjUbLWImBbl++ILbO2tCaApmG3qLHcGAtMfpJ8VE?= =?us-ascii?Q?NVJ4ppsLA/QM0qClKGqfGDWfr+9Cf1cvxlRXoX+yqeyX+YbP4l5MK9JlDvsw?= =?us-ascii?Q?2AeRnde5O4/uNHxZ2DU59SLTrDVX0/DCottFaX2fL5Kt731e0OuWosX2SLCZ?= =?us-ascii?Q?4j7bETM4sdI8xcjN8D3voQ1rfOmWfN+ugfdQccWBpLCWWNxGfXTjFqRO0kQQ?= =?us-ascii?Q?nQeVJRuWfsEmCgG4phBIEkAzQwzNM0rWqZbqk4tEuZErkRJR621ojBGZL3zt?= =?us-ascii?Q?KLY5PUEe4Ba6LFxYPf6KkEUFPN95znSvZtI6WjGikOD8+BuyfjePqe4qTTHh?= =?us-ascii?Q?UZzwctlv6iwP3yAMH3I+Eb2u9Eaou8nw3kcho4Lg6lvqGPeT8tYX+KntjeV3?= =?us-ascii?Q?rK4hmdp9SH0lahU+6oHUijt7TfNnkseKh583r8qQ/T/2He5C3NFCMfLQWVNI?= =?us-ascii?Q?8lZgJ0Zy2CiW0QQskvRQaLmb6hx0wu/J1Tqj5jkoGAxkZ+QtUB+KtkNimKqw?= =?us-ascii?Q?PoBPa9SjWlRAbuVQzM30mN8Nh8mvm4qBWl83p/rtizfgXbCgKv3E8GMcvQJV?= =?us-ascii?Q?+XP9lLqo7PsZ86d1l3Pgy0+Yjap/Onb8+IViwp0JEkMOONpQFP1NnT7o25Xg?= =?us-ascii?Q?ju1I20SFtJcUHqbK4QUXjb8UuqwUb3QqtAECqxqglMjaUpQoqx0mT+B3zOyk?= =?us-ascii?Q?NbowottH0Bw8ZnF29OHecDa+qOlPjMJ7jwUQKq+HDNFZu+0v3FNQjRQQY8xZ?= =?us-ascii?Q?M3FPjEzkUyThUPgWkd76g4AhKIHgOpgmJTPEeRnKpwzojXUWlMWsnAihPR6/?= =?us-ascii?Q?nk+ddBZcg900PIYzehLwArGd/OVzYMwOb3dJz4HNxGyGhyHcNxh6aRM4wrYc?= =?us-ascii?Q?dAOjfBXv3x9o9XPTY1kO2EGSnU+fhDNxmn1Il+w2T6IW5jq1fq+R345vd5D3?= =?us-ascii?Q?vQw7FiT9I+XoPIo1Eylc0+XUhrOfgurP9Srt9SQiVdv5uWwf0CKGsXGRd3/1?= =?us-ascii?Q?xpoeWG7R6rI6Zwd/9LlP7tfcfB2BgA/xN7Vtx9dqiP78Gy34M4nahgt3eARx?= =?us-ascii?Q?CDNN3R/ADccD4k54jnhNs8UG1sTWq3jFgEU9kt6aRL+s90xlM654pCb/wBa0?= =?us-ascii?Q?4IbXYRWJ9uGOCsCX3FZI3c1q/KF5MKQFpojkPrM2qL5Uzsmi7o9UF1PwDTuJ?= =?us-ascii?Q?4crIXaK0pzyo1yYsXASWx+ZtJSV18rtzoCXtMaXszEt2DTsFvOXeJHn9awZE?= =?us-ascii?Q?Wv2KAPWZ/JUsNUBC+q/G+vUpvUbftQXqbuXGaMnU3o00CA+NrxakLThxbBhn?= =?us-ascii?Q?Mg=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f371a71-016a-4b12-dd26-08da9a36f068 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2022 12:03:17.9755 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GLrRh3jhpmeDcvXbTrV7rsxGLuhRBd1ZVK9HXUyvyz+jeetCRby5qwxCwLzbNCyNRKFl/PMbjMspUNVS7SD6zcUDIGzLsFB96pxdK2qDRPo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB5704 X-TUID: 099DTtswOCsL Am Mon, 19 Sep 2022 13:20:33 +0200 schrieb Felix Moessbauer : > 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 I just had a look at OE and they seem to do things differently. They call wic with a -w "temporary workdir to use for intermediate files" and later move only the ".direct" to DEPLOY/.wic So i would suggest to do that as well, and not delete valid files that maybe a second run or another tool might end up missing. Say you generate a .wic.xz and a .swu that swu will maybe need the partition image where the .wic.xz itself would not deploy it. Henning > + 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}"