From patchwork Thu Apr 8 00:05:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 404 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp336642oor; Thu, 8 Apr 2021 01:09:05 -0700 (PDT) X-Received: by 2002:ac2:4ac8:: with SMTP id m8mr1367611lfp.303.1617869345003; Thu, 08 Apr 2021 01:09:05 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1617869344; cv=pass; d=google.com; s=arc-20160816; b=R7QAKUxJn01oEBXd7dN5VlEOwv5y4RTRzf65swYhbAb9YuMj2eD27jjzgQBWaZNiX4 y/nFlGqeUEvsU/3tflSOXqnSWqMLQ9CkF0c9pEwGAAFSwXv3WOlGXDphAeHJBbEKJkWU 1smk98MX32X+b1lOh6juf+jYXsSN+3xr8n02X8B3dSmveVeF6yCGr9+ehZAmsDUSsIma 1M72aLidfpMWuLEsddzqvPofgkbeIwRnzBCXm0EoWjME4+dPuVzHj7RQK24oMqYG22wK 5I9p0uQVA0dhAUu2lLmd+/lDEX2zGiPeF0+mz+N2m/W01fUHZw7ZM4yz5rrnnobXG+E9 KFZg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=cs5gjGOAxtRJOAVpNtGufxDNFPs24p0L5iMFxQkwYEU=; b=SnaFrZOTFKjkpmAU6QBAtzC9y+Qj+4QaVUlAmFoAsk3AYGyrqtt8mLiT55apjt6JLp DvBYasWoZe60nBXYz10aml5OQ9uYSjETa5RASOtifUa4HPe/4hgGLzSnvnUZS/HjcQPQ F/Ujt3V84Q+zdurd7TncW9rvQFpubsmvKxb0ZUNAHPIpCAd33fd43OFqnyxN3AC/bxHN esJPAi9Md95AahEjiSDBAlogM+QBkmcrvNv9Ki/dlgCh6OzUzhOQwcQpNdUQ0IRpF4Lz 6fUPaNd3H0QofIczfKCoYIzs8OiqJke5eUDzIf9uKnTqOYjFfLcAtFcm2hWeYOuMHCiM qiPQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=sXwn6BDU; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbihuxkbqmgqe366r5fq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBIHUXKBQMGQE366R5FQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id s18sor10411126ljd.61.2021.04.08.01.09.04 (Google Transport Security); Thu, 08 Apr 2021 01:09:04 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbihuxkbqmgqe366r5fq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=sXwn6BDU; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbihuxkbqmgqe366r5fq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBIHUXKBQMGQE366R5FQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1617869344; cv=pass; d=google.com; s=arc-20160816; b=jibkUGYbQ5fu3nnjUyxLmckDX/YsfAqI4OzvQNtVFLQP0T6KxjX4gDOQ1rKP4fAg4+ Hx/XMExpHkJbEbu088O/GhHf4nlx+4DVGiYZ9T4C3H8wxKjT21cfVvbi0Qzs5xFFpT7E IRktSJ4EMnwLNTuyq0Ki9O66NeFWPbIrIOy9P0wrTyqLQsCWEElCQPD3dEyJP3DLxxFU wRZMbc6BcgSoLr3xciuwqPZRSgbsFXCsmplhYEqTyxnm75qmnSFyp2eRw5nLZTLZjyuq +QJ4yCkMsDhMaH42e5zCTAsgw4T0JN1K89OR9qLOKFX8rkHeg9K5ppu8Js5eKeDWG/cO R+iw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=cs5gjGOAxtRJOAVpNtGufxDNFPs24p0L5iMFxQkwYEU=; b=HwHdtW+7L8zW6iCErFSZzcJRwxBxrly8aV6GM5RtllZXo9zV3ydGe3197ph5aT6jtD gJWNKeveqohP6oYHRMa73N8oTDqq6loVLI2kgwwvTRaX1J0++By3KwranN2eP9Y6idER zRJdYI2b+jXPNszLpsx6z9jtRdHqBWFHT1brQKy5xYbSHKVb4Wt6fYuVkGcuaAr576US 6q5VprT0PaVl+E2Jle1KcnQMm/iZrLilAPiY83OLmOfvyvGX78fgvnvX0wrgmVg9np7Z sTNe6MDH8SnURw0cl1fpOicLejFHtWlPpo/1kPQSQcROuIj6qpOcjzrY7sXwop/tu3oA hJ7w== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cs5gjGOAxtRJOAVpNtGufxDNFPs24p0L5iMFxQkwYEU=; b=sXwn6BDUHxKFuIwSodTputkQe1ixNQ0dmMXl0oJt9Pu/YUjCswSyXjzU3VIw5115Ez svpkbtZB6jWhu9qP3mKWCqWmNtk/FCiUHIifPAsowGpuAxoIDqZHXxgS9SmQu1pFT3tP 3El93tvXvT794uk2JCS6wALdPLuehDt7JH1tHuuHpd0j5p3OY0dcjjwvkgwsAESuxOXr fN+U59FiXs4TMPzzZbbXi/GkYot570kY4cUph5ii25xeQCYUXmukT3YcwE+gCBy6BooB tjhOPpwEw7osKF6x+atdJesTt3IllX6VlSaG+QNfK+shwmmA+ZpgGE/coGmW8ZhOTDxL vZlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=cs5gjGOAxtRJOAVpNtGufxDNFPs24p0L5iMFxQkwYEU=; b=jdt13kd5JRFQ2RwIpq+rOMhtXG4N1ALoWIX0f5wjTOo7cRo+0a0uIWxYxvGqGSVJPE qkS4RVr1f+WsEim/KMbv6v2CAjUVG8M6zEtnCZIzKl2wFIvKFMtrGIFM7t3hwnpOA9o9 ULWKK22ZGQTGpP3Y5q+oOmHcE1/i0p9iHYurPMUJpfb3jdSl21fIGpO+vGDZzsWEE2YN ANk9+gGB0zz+Hnpy8j1HKp9VlW3dDSsULxgBOWhvXkMcZpI7/wgeeNc2lKTXk5K0+x8X qkRODMQSmRYFgtpvo5K39Zr2PVpADmyZ4DgJyTbJ6+gtnUouRwLdYAVVIxZ/Gom08mfB bahw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533MG9eEkrHBwvFBMTPdCMDks10w7dS2O3eD2IuhXii76ZZN/tKo u2dTCw5+6OVCJepUyj2KX9c= X-Google-Smtp-Source: ABdhPJxHWbf5Puiyg7Nu/xHP21j81hcJsEB+b48q7bc24qHBczM0kXP8ohMFdugJ9URS7PXubBN8Ew== X-Received: by 2002:a2e:99d2:: with SMTP id l18mr3144698ljj.39.1617869344196; 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-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 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; 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 X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1696458966525588373?= X-GMAIL-MSGID: =?utf-8?q?1696458966525588373?= 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 }