From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6948695923079774208 X-Received: by 2002:a05:6512:214c:: with SMTP id s12mr2136461lfr.619.1617869344284; Thu, 08 Apr 2021 01:09:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5081:: with SMTP id f1ls1190018lfm.2.gmail; Thu, 08 Apr 2021 01:09:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqXFDv780i+TCT5pc/wX/MyaL4o42/j2WlqW011HaSDG1XmZO1NdhelWzNqP02OeEdqUN4 X-Received: by 2002:a05:6512:207:: with SMTP id a7mr5225001lfo.393.1617869343170; Thu, 08 Apr 2021 01:09:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617869343; cv=none; d=google.com; s=arc-20160816; b=vPZJwC3uClpF5XvSUl/Ctpn1RStt1JOtCRY7i1Hu5HpqPOc7c9oQvZ3TXZC5I/AtdB vEl2J84YwFdrR4McsEA7doBJ5qKituemE4OPvaBvVqCMKKB/aEh2tzDd1ejFXTO2JXnr T3I8jem12iwlz0lGVC8mhRgcEcmnDaxgt3E823pv4KE07HPgWgBHL+cJXtCS1kmS4QGD z6NnDjHrQx4KKnp0BvZw9CZZ+iAb7CWikKGc/E1jgiEXgVjB4W9J3TURolI/S+fYuRwm tTAqbx73KHqGBE+GIUGqUzY1sztV7M8Th7Nq3EBbLqOIsCd7hqMxj66At23F0EL22wFT uOEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=zy4TIW271Cm7HH/L/PsWDISo62GCmrDxuJd8fsbiS+o=; b=izVVwD0AmWiialx9vWXzoxC4407iBXCUSlhw8vBvgfJXLOWs+dXPkEgtj94szSdD19 DLtrPtI640UalUpYGX9flAP650zccIvbKmzUq5U3CMgsB6fKMEljJOxf1JfUr/49A0en DU/Kc5Qgxx0+X0yWrVDjfjYjUOgYHrpgf9eIIi4dtDE4ggbYGzez/3uBxPpLIC6RLuGx 0LhB9cqaM1vCNf4o0HU2TT8Qc34484JMvBr//LbJyjR71W/cYNl3bX/16CzuzFvlnAQN g2ALiAEvYBI3gt5a0qZQZ/ffkeBKZjM6XCRO+4FkQr+5RkNg3xfzCofndAR4QMm1gVTg bntw== 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 z2si2051731ljm.0.2021.04.08.01.09.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Apr 2021 01:09:03 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 1388925D014916 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 Apr 2021 10:09:02 +0200 Received: from localhost.localdomain ([167.87.8.3]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13885OXf027128; Thu, 8 Apr 2021 10:05:24 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH] wic: move out all files ending on "direct*" Date: Thu, 8 Apr 2021 10:05:21 +0200 Message-Id: <20210408080521.32000-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: K+GfoyUka0S0 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 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 } -- 2.26.3