From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:620a:1720:b0:6ce:7d38:c307 with SMTP id az32-20020a05620a172000b006ce7d38c307mr15735917qkb.149.1663660557662; Tue, 20 Sep 2022 00:55:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:5418:0:b0:35c:b851:7fb4 with SMTP id b24-20020ac85418000000b0035cb8517fb4ls5009605qtq.11.-pod-prod-gmail; Tue, 20 Sep 2022 00:55:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4qree1N5HyVr1zNJAUrQ0+IW6z1F1pIlD16aZzkFSVhCBTcJKEJoAv3ujneuFl0ZKxUsE2 X-Received: by 2002:a05:622a:50:b0:35c:ee8c:c643 with SMTP id y16-20020a05622a005000b0035cee8cc643mr5177731qtw.315.1663660556988; Tue, 20 Sep 2022 00:55:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1663660556; cv=pass; d=google.com; s=arc-20160816; b=ykr8WsC4RUnRq485cXyOHlSoNQNQ5KP9cZ408b/xhNPJbu6+Qjkfi4e9XCKJOBU9LN ix6n75ID8kBsIc/kmRJHtck/P5g+JyFhwvhHZ76mcAmJMVreOUVrABEXE7+zpBAD4eI1 tVQFHmSAiTjuldmfw+GvHCppTkNQMdL1IJ1iRMc+i/jxqAhEdolnQqMPQoInxM/VLh/I FMb2dr514vqgAvlbPO93Fk0DLhgolP6chhyTBeWBEuwYrXBle6KJSsQXF+9hC1WYROlf xWn6eyxyv4FkgRsKuA/7xqLPeOGwGg0XNttuCncwL4whjk2typLMSLql5KrQrEWVrcy4 1IVw== 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=1eSfTlTxzAQvF46gHccQRtu1t2DYAh9LqC9WwjeVivs=; b=N8GDRgaoo10P+0yIrSUNcQ5kt7491NdgHfINkGWFABBUeYdZ9XTuLT/IKPOpbZiCJK cCT27+4eELbtvvkyf0AP8Ski2KWfGeq3kUB29gv8ZPbd7rIpyLUktDjvhARMg4tVWzdJ oJN4gGkDZJi1R0RSv3X6oyxc/tYpayolb7wBmQV2WMJT20goNJfnpBGVwa5HG1iW2+wG kOiiVyBd+/n0Ia2MDBCvKinTCF2srZxAmc9EfduNucgaPeooAYWTLfsP8C9dBAaWTrbt 8DgCsBldttQCdgEd/cI+UYx12rmB98kQjPpVX/POJHaOHzyDUdr2hWAfKr8F25Ped/tm vAWQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=kPWEmYpP; 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.0.43 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 EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00043.outbound.protection.outlook.com. [40.107.0.43]) by gmr-mx.google.com with ESMTPS id m2-20020a05620a220200b006cef2726141si36098qkh.6.2022.09.20.00.55.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2022 00:55:56 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.0.43 as permitted sender) client-ip=40.107.0.43; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=kPWEmYpP; 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.0.43 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=YSjF8gUYkx4KSjA8VY56Tegw07gyxU5u5nNxN5+1NewVkfV7TcfGu4YjecrDhm7+5tMYCgjZ7k6sAhFvlR5cpZ1VCCeFYJHmX8nWndPmmSbW6PA5yVP7HekTOZrD2lIGKNtacVAFCkNKcmkQLr1a5ejvmQLMsCpcHhQ6ah+14K+gG+0ZvFa6Mpw3ueJsoHu6qqymrlfoVmZZEHUuUdvucvpq2Jxyr9E8i7Lgj0BobtC6k+L02/mH3OfbvPD13jcFH5XpSDe8PCn3487pUp7gUflY3Rpasl2JQx72TM9mBbNccS+KDLPATExvwx1ymslJSOk8U5z7VRG4CG11wiyYUQ== 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=1eSfTlTxzAQvF46gHccQRtu1t2DYAh9LqC9WwjeVivs=; b=VNenlgTKnmhMt2gez3r2pkCkf3XMYlb77z58+mwsyKdDwc0JN3VHV83RejULfbubf9/408tSqZTqio8ouMFx7h1kMDXP5ZSZUQh+YFCVcYlL2YkucZWwoZ+Hxdu5DWDAvQaoG+gXuWXmrix7KVQz48Vk4q+FjZ4slCHbkZ2fHLTYxPjCs+bRjs9oXN+RDYquGuojljnaolWY69wwCP5eQwuknVy5alN7DJv2llPnYlBb8Vg+tCL23XhEyZ06rQwMNauaKoHSu65G+kAgarPUEccy7jcCzXvR7yJDsHPV7NychXjOIHVp9NnillOpI7rrAwFx7LqRyg4qjTn+uKSDkQ== 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=1eSfTlTxzAQvF46gHccQRtu1t2DYAh9LqC9WwjeVivs=; b=kPWEmYpPuiyESGKs+Ut0br0okmm9xVPw4qWtfIJGx2iNrxUUvNHnZ926yMDa09mpDcbJa1s4GXYzLQJRGQAAnY1TZOBVghzVKY480GZL8lyVUBTykPSskPhP+cf+qfGNQFez/TazE74pDN6zez7FCzm1nQY2k0RbTgYnhpf+TxENu0MeSW6IE+VwdNsgDmv3Rxm4tQ92ba03uVIyHoYoWlQR7WE3wUlfl3pnr591CK3rXt3OXmIivmGDNrZYDv1VeX/o6/zcDHhtWwpoGVaWnAjorRoLzzc/8Q3a71ACpxl4sTIG7LkCatTak1/bEPnzMZjf/GEdGIRHRS6Bv3fN6g== 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 PRAPR10MB5422.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.18; Tue, 20 Sep 2022 07:55:54 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e4a0:49e4:2152:11b1]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e4a0:49e4:2152:11b1%5]) with mapi id 15.20.5632.021; Tue, 20 Sep 2022 07:55:54 +0000 Date: Tue, 20 Sep 2022 09:55:43 +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: <20220920095543.70da83ab@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: CH2PR07CA0054.namprd07.prod.outlook.com (2603:10b6:610:5b::28) 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_|PRAPR10MB5422:EE_ X-MS-Office365-Filtering-Correlation-Id: 91518d76-fe09-4fe4-c528-08da9add8b12 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: W4YNbvFXyy8DxyDFcAXZGxghbuSR713RZpQBJVGgxqUSqYe1DIsrRTLu2gqs7G9LC+V6QZef0/EOvlBmrfkbrh12/uU0E3jQ/WO4KB/JCWLVq+JU1UmSqceTheiprS/Ps6A4PbtEpyLT11E/86KzFbFxbOiX12vqb9eLz60WriXrCoCK8RHpvNjdVegvby/46Qp4C0u5pYGWE1YF1GZiYFBpF71TVzBqR6bxOXNsZrejz2k+L8KE7mUBHVmbHpevRDZkY/EL3BovTFLwuIs8WjrmkGRsdJiPpvfiLb4RJ3PYm+KDMLiIyfsy/UFThV0C+eZkZRL0G5d/zVaLgGRgOAR969nP92SEPN2JOYOnkRED3SMjo7RBh0ZPCtx4VKaBQ4I83QKvsl8WTuGaEz2MnuVoV0siPhYjDjAuSIezU6jWivqhGmp+6V34dHsfrWiyCduh35gp4yfmD7XKKZMIKzOrW6OYBqTkjhDoa+R05FnjmJPaN6HgpjoY9CM8uvUBJvZcaOOGORMglwlGGuFoe8ZZ/MeHjeEmQW2+Aa6uB4j6V7PLHWMHcJ1MhoWeQIhdp2oPg6Z6pxVK15tnhl+69obBmamUy/fqmqQ8R+GfmNRADeSMYDkdHXQyg5381MZBhS0AJDxc+pUfqNpU2z/A1OphWQh5H4EppaB8C7yHaDWqQ3/hPfSDiwNkIBLTykd34WjUCOT9GfnXlxpSI8/Odrvs96GL1FGW/6BvgIYcY6d9EHDMwJjgujw4bc7rdZw3evkSzGJ8353oxoCe46vxcUcd170vxCS+C8gUm6uQKro= 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)(366004)(396003)(136003)(346002)(376002)(39860400002)(451199015)(6862004)(86362001)(6506007)(6666004)(8936002)(41300700001)(26005)(66476007)(66556008)(6486002)(966005)(478600001)(6636002)(66946007)(1076003)(6512007)(8676002)(186003)(316002)(2906002)(83380400001)(4326008)(82960400001)(38100700002)(9686003)(5660300002)(44832011)(66899012)(403724002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H1kSFAPUgi7nrqoxx5ZS3jRtYZVYd/VtHMZzIAj9FeFd/35mLjHz3PKbOT+U?= =?us-ascii?Q?L9I/k6F7Xk3R4/y830E4Q3lopNx1JQntu7u/ndM0MSXLTwjWDyFF3EjDaAHQ?= =?us-ascii?Q?/qJiB+14rjjsRjAu2i73SBS525hdmxZH/BBlOvtJEGak0bl6DiZy1uXoNHLX?= =?us-ascii?Q?In1HTNlM+d+AAH09fW1JKLwteMiY+MnN5vqfopGoi4hC+KP6EUNqUJGo7lUq?= =?us-ascii?Q?NNHN56xrxrDQllHtjTHOYN3f7JXPntEWKllxN3U1GgkdWQ4pMIqPB+zfOI4Q?= =?us-ascii?Q?X3leHhwRmjlfcA6aCuK0j8iSzYUmbQFRHecM0MalrQKeEV7wJuLfAaIbhHai?= =?us-ascii?Q?OB4MtJMIOFvmDpWfMUyZNyqReBF0pwt3iOp4RgUnCmsXn1zjJsfRZtZdeCh9?= =?us-ascii?Q?qWIIaSInsZmwvMdxQBExncY0Th3jrfaINcbX3TIisIBGVyoiQkB3sy25K28T?= =?us-ascii?Q?gZDXWwvWT2F/rHFoC/zfyi98DDHtEs6C4m5Wq6GlaUJgp30ks8NR2JpsidKm?= =?us-ascii?Q?wSEo8GTJYP34ZEjm3VqHQnM8tm2JxqcOxf0AKF3Pf3AXnM64NjUhlkOZB8ZF?= =?us-ascii?Q?9ac2T5mXgsOUenLrRGzp06Irtjfms/2Vv0iKxPKW4jdOf/JzsqtBetMJVt6L?= =?us-ascii?Q?2hBmMZEP49uPbZkVG8XHcaYZdKWRcDZTxdlY6IK9CSl3YlB9vkGVoQM0RIV6?= =?us-ascii?Q?8e5c1QSNARs1MUvMbD2UwD4uY11/ySG/Ho3r0KEen7MsGFzMCuCtAP3rSpbL?= =?us-ascii?Q?Dg/8rtugl6FJwzYWHybRKrCgYZcZHTC4yfatJzXMQZdS22cvTVILxY6UfiOE?= =?us-ascii?Q?tPZqw/Bt7k69JQ5PAZsyeVEwn5kMBkuO01SKWWJLzaTx4M0ZkMd2Wox1f+oo?= =?us-ascii?Q?nYqtMbYWy2OSGRYomlrV4Gq/GA+qyUoJHos6BYd8t/rekXbtzEHurpNkH/rh?= =?us-ascii?Q?T0VumEoNVNvlfaOC+S0cCOvTq2CnjhakLlxuCxsEhttmvFE2CpSKqgSmXxeV?= =?us-ascii?Q?eaV2h61BfYwbqtP+6vsImBDHCxfW8ZGpoFEInJV3E2t7ABOELWMlKmlpn8VU?= =?us-ascii?Q?NJCI+80Ziy2sRTdfsXkSL9jbg2eD5RtBIfp3sh+3eoWEpLPFZU5qqXtY4pHs?= =?us-ascii?Q?XhXjAihw2yO9Qy/iEZwCriWDZTTigx/ub4H9yM8sSbXfsGJL/vM1HvXq7e3r?= =?us-ascii?Q?UPUfaXIVtWNVhE5shVKxoNV3ZgrjEIUdA24Vz4U8tylz7366mnrPYxf1vbBA?= =?us-ascii?Q?w5ktx8Z+3ljMcOQgRZVcs0wOhFc+IPelRxTG6+I7uQ5vsysrNPA06TpecNXH?= =?us-ascii?Q?CiAqcbrKhRH7JAQFES1F3UnzUx3gPq9ppDNruR4EDrAQ1i4IwsAXmbGP50V+?= =?us-ascii?Q?jwGhd9JfGHK18meBmawmJVjM9cT929cMeH3ijR+EbjPnsL8gGLuPiiWFMknA?= =?us-ascii?Q?hC5+LscVpUXz5Od3fTWtfyRAGoBKnBgkI+HgTKdTUhCxpOUtUEeHjlZuPlQB?= =?us-ascii?Q?y7ld33bATavqppbikWN8sf2Cz9hCXnRIFDZUF05qHEGs1NjQwucJOpI83las?= =?us-ascii?Q?lVUbj4KERhmRGULclTJKMfheeRVpw/L0L4o+HsYboz/0ubO2sUiMftLca/mg?= =?us-ascii?Q?mw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91518d76-fe09-4fe4-c528-08da9add8b12 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 07:55:54.0246 (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: d/9gB53zkiCoAZPHjX0bDC044Cx+/u8XopIzs3vI6EP9xsEaBBZhWU6e+KmZutjT8oLN2LzYA5B7/ulEIz/QqO4lO7rDTyyuOZTMyQOi7uI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAPR10MB5422 X-TUID: 3O9Y3sqTlCj/ 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. I think the deployment of the partitions was an accident and never intended. Cause might be https://github.com/ilbers/isar/commit/edc10d9361e79f36c8ea5488b1dab4c468213a8d which wanted to deal only with compressed images when wic itself is used for compression. We should maybe just sharpen that to not include partitions, instead of inventing a new interface to remove them again. Henning > 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}"