From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6948695923079774208 X-Received: by 2002:a2e:8002:: with SMTP id j2mr4909743ljg.31.1617870972132; Thu, 08 Apr 2021 01:36:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:6c2:: with SMTP id u2ls4247919lff.3.gmail; Thu, 08 Apr 2021 01:36:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFM5IcVOQFcPiJj8/S/aUz6iZZJpkuCnYspEhSp5ia3dC5qj+FxIE6F3ITieOXICRvlF9+ X-Received: by 2002:ac2:521c:: with SMTP id a28mr5467980lfl.456.1617870971020; Thu, 08 Apr 2021 01:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617870971; cv=none; d=google.com; s=arc-20160816; b=dPuNuO8lX2tvKpaT4ajnX4372Rpi1u0rs2qLsz/y43fylhVif3GbKdklfpPc1QzY9b gkq9kYYpPbBwNNNU+7SBJDYKMhfPFlUn3MnW0hnFXhCByezcZApfliJKh7GfrZf1bgc4 yEZR+BSpRR3n+OihA6tE9u41ii0mAenZCzJRFvFpl0/8iY6+h8QdJ4o2/OImPZFZ1LoR n3oYSakmQ3Uup0qpkaq4Y85hYeH39Qh/qT0io+2PphcTeLZcBNG+LcjXz7hymPEEIU83 D91DMOpW1+XOOrrF0eRoUy+8efoDJbTqI66eP14AhTVe3JYzLuZjBJCivD0YqAVSvg0h SDUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=o8nNJw5kudZupVdk3x0FIeG64LN05LueZGkal3+z3fw=; b=kVMwtTkjNGA5meVEdzRMpWAzAqBNn8XBWRDOPwOneV0LnQ4V2GxsPn5+S8jRW4iwY2 zMCcJUS3yI9tJfKtQGFQpFGEVCxvmwUaqxA9ayt2OfBnXVK9cZmwAirehqLSsQ8LSgjE MIJPQ9mUOpiOWJnsbFRIeAR/3u9WjiBAN9HharPjSuKO/0aIJ/JQUjcTOSq2dQjXG27Q 0Srst1lt2uoMFf70b3kbt+xCQBUuegwtDT76y5i8ATU23lJRPoiARbInOfjPE1Ih3MWK knvZEsU3ccFDOAGWjcw4MlrL1ETdx4QoOBj+XEhfiXq6iX+36hNPcKlmw2tYKVkZs8XN 7B+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id y128si787877lfc.9.2021.04.08.01.36.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Apr 2021 01:36:10 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1388aAG8016619 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 Apr 2021 10:36:10 +0200 Received: from [167.87.250.28] ([167.87.250.28]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1388WWa5023623; Thu, 8 Apr 2021 10:32:32 +0200 Subject: Re: [PATCH] wic: move out all files ending on "direct*" To: "[ext] Henning Schild" , isar-users@googlegroups.com, Quirin Gylstorff References: <20210408080521.32000-1-henning.schild@siemens.com> From: Jan Kiszka Message-ID: <67595044-d3cc-54e8-65dc-b19038f485c1@siemens.com> Date: Thu, 8 Apr 2021 10:32:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210408080521.32000-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 0UJsl3Wiz3xt 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? 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 > } > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux