From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6948695923079774208 X-Received: by 2002:a17:906:3b81:: with SMTP id u1mr9149528ejf.49.1617871463974; Thu, 08 Apr 2021 01:44:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:515:: with SMTP id m21ls203517edv.1.gmail; Thu, 08 Apr 2021 01:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaY688+y+Kd1nMgfFd17/3Vo4M/uHURs2JbV0L9ZUhnEiAowBoQfpAhRy5gxDyUP6XhBnv X-Received: by 2002:aa7:db4f:: with SMTP id n15mr9806230edt.12.1617871463167; Thu, 08 Apr 2021 01:44:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617871463; cv=none; d=google.com; s=arc-20160816; b=EttmOSFouEwDGTIt4Iqp7RKuNtcsB4skF8TU2BmdH3bP8h9beExcEVkb0AVLLE1Slc juBIAgSS935IUu9f1s/JVfhK29OIVQa7Y3U3rzrCgBt4cu1dYzsy8zWM7Hhb9U0mQwdN QkIOaDwWQ35DhMKu0HoRWvkL1JLFhj3Fa9gMvRjVtKaiI6TkwOBLzd+kq8SQeR3soNx0 cSRJhZHJwvJrmz60MTpIUxrci+YMMm9rQJldd5aKU/Zn2WBLtBYq59mGY6wAaLZZXk9F jYQLR6bF9iDugQcmXiJ5GFYKK2vextEDMAFJ0qdOBMOLvTsF+6jj7pK6kXy+oiYJdec8 8qwQ== 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:subject:cc:to:from:date; bh=77HiNtEyR6mgFI7Mc2qHYnIFrz2sll4/I66vn9Kj9q0=; b=gFsLdlJ2DrVeOeN1kP8m2FMtRUIxru8Hn4QXyI/dLeplCGRBhmk0T14vlqbUV5YBCj pDVZIG7rdNFahjoxsKEDzaOkU3f1v0IOq1LDTu+Tq+BLeiFk95pN/MZ/jolQSzdkhzvg 6RjoJktOwU1a0K6aE7hhpCvY4v1IMbtcHzPEEiBHb09X5oYfVi29yh0DECofC8SiQCU1 rjOLei6tdrijADB8LYJQCRqKjZthK6oaY4D6gLC9Y6VtJMJU2RXGkIC1atCslneyKvS2 y38od9jDQb/lByH08TbmrWoq2oIOOIPK1pVGgaupxsvEh9EINb3gbJXsvECv5CkygkkC Sgeg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y16si509621edq.2.2021.04.08.01.44.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Apr 2021 01:44:23 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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 1388iMDf025976 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 Apr 2021 10:44:22 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.8.3]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 1388iMJH000487; Thu, 8 Apr 2021 10:44:22 +0200 Date: Thu, 8 Apr 2021 10:44:21 +0200 From: Henning Schild To: Jan Kiszka Cc: , Quirin Gylstorff Subject: Re: [PATCH] wic: move out all files ending on "direct*" Message-ID: <20210408104421.64504371@md1za8fc.ad001.siemens.net> In-Reply-To: <67595044-d3cc-54e8-65dc-b19038f485c1@siemens.com> References: <20210408080521.32000-1-henning.schild@siemens.com> <67595044-d3cc-54e8-65dc-b19038f485c1@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: PU3SPurlJ8Wh Am Thu, 8 Apr 2021 10:32:32 +0200 schrieb Jan Kiszka : > On 08.04.21 10:05, [ext] Henning Schild wrote: > > wic can compress images, in which case they would have a suffix > > plus our new version of wic keeps individual partitions that might > > be valuable to some, they also have a suffix we used to not move out > > > > I vaguely recall some partition extraction classes for SWUpdate > scenarios - room for improvements, Quirin? Or are we using that > feature already? I know, with swupdate we often wanted those single partitions but did not have them because wic did not keep them. Now wic seems to keep them, which might make later extraction not needed anymore. I have compression as a separate task in some layers, when i wanted to finally upstream it i found that wic supports it already. i.e. bz2 compression is really good to shrink artifacts in CI, and https://www.balena.io/etcher/ can uncompress that. Which means Mac and Windows users can flash with a mouse what comes out of CI. Henning > Jan > > > Signed-off-by: Henning Schild > > --- > > meta/classes/wic-img.bbclass | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/meta/classes/wic-img.bbclass > > b/meta/classes/wic-img.bbclass index 59dcd2b7c124..76606f882e79 > > 100644 --- a/meta/classes/wic-img.bbclass > > +++ b/meta/classes/wic-img.bbclass > > @@ -193,10 +193,11 @@ EOSUDO > > ${WIC_CREATE_EXTRA_ARGS} > > > > sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) > > ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || true > > - WIC_DIRECT=$(ls -t -1 > > ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head > > -1) sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} > > - mv -f ${WIC_DIRECT} ${WIC_IMAGE_FILE} > > - mv -f ${WIC_DIRECT}.bmap ${WIC_IMAGE_FILE}.bmap > > + find ${BUILDCHROOT_DIR}/${WICTMP} -type f -name "*.direct*" | > > while read f; do > > + suffix=$(basename $f | sed > > 's/\(.*\)\(\.direct\)\(.*\)/\3/') > > + mv -f ${f} ${WIC_IMAGE_FILE}${suffix} > > + done > > rm -rf ${BUILDCHROOT_DIR}/${WICTMP} > > rm -rf ${IMAGE_ROOTFS}/../pseudo > > } > > >