From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a2e:894e:0:b0:26c:5434:e62b with SMTP id b14-20020a2e894e000000b0026c5434e62bmr9023429ljk.180.1664272334978; Tue, 27 Sep 2022 02:52:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:46da:0:b0:48b:2227:7787 with SMTP id p26-20020ac246da000000b0048b22277787ls376720lfo.3.-pod-prod-gmail; Tue, 27 Sep 2022 02:52:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM69+8b4BuCDnpE5G2Qy54fnudNbny6Bex8RZjxAayS5W+y68VCZZFL5kgc6iDBXYW2s4SNT X-Received: by 2002:a05:6512:12d6:b0:49f:48d4:a1c4 with SMTP id p22-20020a05651212d600b0049f48d4a1c4mr10814172lfg.52.1664272333419; Tue, 27 Sep 2022 02:52:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664272333; cv=none; d=google.com; s=arc-20160816; b=YWcwJbgcpeQr2ul53tT7Ni6QEL7A+TIdc4v0xjj9bf78LGw8kmkZqurg4JtwG69TWf 9aUXkP6TWMFteqvsTK9Ca6EgLiXBlONAj/uyqcsxY8V4zJ6R2b65IAcwo8g2/IwAZtrR SSxeThoA/jxJGiQMI0DPkTpxU/6QppMoB5/oWFjoAR2r78ZjnRb8K/SYiP2ph1hu4CTp cHmYKAZVc4cgmXKVWtor2g1WcXfmSUyr8VRm0hCtW1e1p3dKnrpe54RafB86USliaGA8 hexTUTjH5AKBjp64bofxWiTX4ErSOfcQluM2Jje9PxL+6wEt8imHAmeajrLa3F/z+0Gl zcYA== 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=uV8H1yPgJGhrAAZy6jhPgpEnAvzfFxk9vjfEYnk4n8g=; b=saHPW9s0PeuJf5tDjl+cDFZUu+hfjYrj07zKb2A8afCC2Vf5YFL0jR12L5NG5zv5Do tjUSQkM9cQOSPaZJDcXDJ4NGNQRzojTeVeBxGbmaro4gLz48CPb1sGF20XNGYXfr/UPP VA7LHGpvveh/dgbok0tDKc8QDX+K9W2QMjuqcpMhgzkJUV9po/Ecp2spFJJNzmvKN/d/ TADIfYnOc06euFyakSUnaADFS2EqsV0+FhxyiyITCzpIX0QOlJXrAPS/XTKQegjvZ2lV lxWBonuBxkTQ6eTiT3Up5npL0WtS+ywIRP5KeO+vKq2vZxrumExQAbnIRGOJ0QD6STGw vaIg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FOnwvk0A; spf=pass (google.com: domain of fm-72506-202209270952127b6df5f9d7d18d9c1e-s4wpfg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-202209270952127b6df5f9d7d18d9c1e-S4WpFg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id f1-20020a056512360100b004a1baae2fb1si42573lfs.6.2022.09.27.02.52.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Sep 2022 02:52:13 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209270952127b6df5f9d7d18d9c1e-s4wpfg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FOnwvk0A; spf=pass (google.com: domain of fm-72506-202209270952127b6df5f9d7d18d9c1e-s4wpfg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-202209270952127b6df5f9d7d18d9c1e-S4WpFg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202209270952127b6df5f9d7d18d9c1e for ; Tue, 27 Sep 2022 11:52:12 +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=uV8H1yPgJGhrAAZy6jhPgpEnAvzfFxk9vjfEYnk4n8g=; b=FOnwvk0Anuv3iSbRU0POXaZDhshnyJo5wTcJJUgKj3ojvICimOTqxjraUVySnoBtgD0Sls EgsfU8VYqoTv641fKc543HYjSTPyyNXmvYIZQzs8NRFVnaAaiK3xTx94IulTssEGXmbjcDKu bNcGwP+l4NqOXzhx6frtLvJAMWkpc=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v7 3/6] Revert "wic: move out all files ending on "direct*"" Date: Tue, 27 Sep 2022 11:51:14 +0200 Message-Id: <20220927095117.958474-4-felix.moessbauer@siemens.com> In-Reply-To: <20220927095117.958474-1-felix.moessbauer@siemens.com> References: <20220927095117.958474-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: jXuURn2mPJl3 This reverts commit edc10d9361e79f36c8ea5488b1dab4c468213a8d. --- meta/classes/imagetypes_wic.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index 61a74d4a..81788faf 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -204,11 +204,10 @@ generate_wic_image() { ${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} - 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}" - done + mv -f ${WIC_DIRECT} ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic + mv -f ${WIC_DIRECT}.bmap ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.bmap rm -rf ${BUILDCHROOT_DIR}/${WICTMP} rm -rf ${IMAGE_ROOTFS}/../pseudo } -- 2.30.2