From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:6000:188a:b0:22a:e4b7:c2f4 with SMTP id a10-20020a056000188a00b0022ae4b7c2f4mr13195032wri.446.1663745661714; Wed, 21 Sep 2022 00:34:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d20c:0:b0:228:ddd7:f40e with SMTP id j12-20020adfd20c000000b00228ddd7f40els6244617wrh.3.-pod-prod-gmail; Wed, 21 Sep 2022 00:34:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5GwfwGX7vyHMQrRCE3AAgjXtylx7F0gErg311EQC9ALHtwEi9HLug8f3gpub259iNeSdeL X-Received: by 2002:a5d:64e8:0:b0:22a:bb78:1e44 with SMTP id g8-20020a5d64e8000000b0022abb781e44mr17474355wri.378.1663745660522; Wed, 21 Sep 2022 00:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663745660; cv=none; d=google.com; s=arc-20160816; b=oRtSGFELTxrdce7ITdBA+IgaXIyuL4BZOmEFlIpnxo51ajH1/zVSpqfHZs6J3sb0Vn ZlR+cdjsERGJHRRoXESWkjOQoEFjq24oJtFf7JxrA9vR26YCa584gvdLzZZYFkbwICl1 9S8bjZYB4CMx3380i860mM3ORDeJGiAfVQHyn+Fla/c31XRQ2A5YzWQdPeopTgq+ICp5 rwB6U5iQnJU5XFf027qAA5KIlKY4ucOBlBciEXJ2rj8eFsoeID5IIpREi0CQHvYrC17C SKwwwosBxZNpZtnz4/wz1KOFKXnCppnTuNCBZSc0KxLq006fbVWr1qQKzdESZyJ78ly3 HbUA== 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=UR+YlB456rAlKZ0JhRYGIBhUFElqPN+Nh4RVCcv58/1U5KhjmgrbBZJkBQRKKrBs9m sNIArKgNgNkweKPI7/6NVvCWuIqkBT0u59U25vA6lMl6TtMpF49P0tLa9yJYtEVKsg88 PkEoIBAiG91zfNsB/CMsWsrn8NThSyBbgc9NjN8f4DOPPo/YtN3aDlE7dWKA092Et/t8 ggpZVk12w632rTBfnp0v3JR8QfUuaVXgQoVY42FP7bEz65hqyUTHKBGAy0l33HxnR/rO 4PbuPqaEAB3osxH4ec3LbXqxzXBVvvpugYaBOny7x6xRnJ9HmOUMtbuibsrRDhef8AiC gIOg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HGIt2UQH; spf=pass (google.com: domain of fm-72506-2022092107342050212b02083755c81d-lvqw51@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-2022092107342050212b02083755c81d-lvqW51@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id n24-20020a7bcbd8000000b003a5ce2af2c7si129645wmi.1.2022.09.21.00.34.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2022 00:34:20 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-2022092107342050212b02083755c81d-lvqw51@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HGIt2UQH; spf=pass (google.com: domain of fm-72506-2022092107342050212b02083755c81d-lvqw51@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-2022092107342050212b02083755c81d-lvqW51@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2022092107342050212b02083755c81d for ; Wed, 21 Sep 2022 09:34:20 +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=HGIt2UQHVx6529S9aM3ysTPlnac5h5oZ9ThNYtWhx51QH+8JE+bfGnuJ2RL9GjrJQuGXeN RFs755IM8J0+FVaaLTvWO5THqk/5b68eRm2UdDnxSUQ4qdcKSdiRjyZ88mIEECmf7JW2+CRx lWtiS1LlZxo7/8ntrOwa4KWO9zbXo=; 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 v6 3/6] Revert "wic: move out all files ending on "direct*"" Date: Wed, 21 Sep 2022 09:33:45 +0200 Message-Id: <20220921073348.169965-4-felix.moessbauer@siemens.com> In-Reply-To: <20220921073348.169965-1-felix.moessbauer@siemens.com> References: <20220921073348.169965-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: fPxxPh1NMQ6t 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