From patchwork Tue Sep 26 16:21:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3135 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 26 Sep 2023 18:22:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f61.google.com (mail-ed1-f61.google.com [209.85.208.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 38QGM5LZ019747 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Sep 2023 18:22:05 +0200 Received: by mail-ed1-f61.google.com with SMTP id 4fb4d7f45d1cf-51e535b143fsf1270676a12.1 for ; Tue, 26 Sep 2023 09:22:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695745320; cv=pass; d=google.com; s=arc-20160816; b=Go1vOUrEB3bLqkHOL9zGnkrbGNqPjY8NMki+MJoysMqQMr35Vy4YrOHidnOKGkehlZ 95bSLEIdBCisp/Rd5Pipe1MseIBsyC80AaQEpPirD1LP//DNkHpe/80bVJzggjCXWAgA Tiz3/ZxhBRKFIR6DLkFvLQ63Fwdq2twYdDp8HCXXf81tcimQU3Ce4SPrTyG1B0QLDJRw 1liF2Do4M2gUyHkTVeDDHmFmTRVW1G8e//GcaziHfOpCz3h9WuvzY2X712kQmyGeD596 ljgjOVxryvyOhGsM5Waa0wsN0QkXYFxIAl2sK2zh8sUH1M8mHEZF8kSR75OF1DNH8WVx K4Ag== 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:reply-to:feedback-id:mime-version :message-id:date:subject:to:from:dkim-signature; bh=Xplf2g8yFohgmWBClcLMSGzd307vU1wmyCaIhjhf5iU=; fh=F8ghUjd7l+d6RY0z/G+7P+un5eTKNHDgL80RosEZgDQ=; b=YryCfgJOm+rGqZ0MKEYZGWB8fWxt+KXnm/ZPeRl5ac8IsEw7ljh3ABXil7WwAEZ306 vUv4jUNdPQnWcp4w70bN4MyVtEF1/YFl8/8KsNgI81bKpr+TsqA0nJrEL5pHBrImAJkm MahOONqnzlbe3kulW7e9rEmItERel24XkWtf/pgaHlQwbq6JNscGUACBfLt4dQ5iW9Tz FAIhVmrt9i4UDtHu/fRImcT0noQi3kWV1/j35f2WQW721XaLFycgMNIx2t8mOO1fGPSN vGsy8irz6AlWTfthTnrjpoZOchN2xCu8TRokxxus+mDmCMirE3ZF1rBHw1W1M0CMztCP jBYQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="F/daWOi+"; spf=pass (google.com: domain of fm-51332-20230926162156da2fe9bcab032b9fcf-3wog28@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-20230926162156da2fe9bcab032b9fcf-3WOg28@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1695745320; x=1696350120; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Xplf2g8yFohgmWBClcLMSGzd307vU1wmyCaIhjhf5iU=; b=BqC5NteY/u5Q1F9oNL6t7S1UpmSDxaYQe4w64vQc0Hcy2PA+1TLKswTO3XvzIId6ME f2k+mNuxgyhR2wogLJAchCSHkySVF5OuJYid7lNC/Djy9Tpjr+2ZIpuMct9Hj+FnXY4G 7zsex6BZdFZx8F98Pj3+ua+5gKa2OpJbFPzhZwERfj84qqsulZPq8aJQZc5qVgwzhGVB /RK+7yixQQTXwig3VewdD8bzivYQDyW1OYBheaRPZbctLKgs0wxPeg6N3maNrzIgF21s eHUUcdAyRY1LfYOisAwGQizRJ3Q1wL0hbzHIaYyiOHgKT461TXNDMpLCMqo8WWzZHchx /sRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695745320; x=1696350120; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Xplf2g8yFohgmWBClcLMSGzd307vU1wmyCaIhjhf5iU=; b=KKCowOuYJeAPZDSeS5Wp1iG61kj1BqhmQx3o+iBcMPJySvRd20IbqdaAZISED7L7RQ vmLTaiqVTaoyl8yRLdvY3ujVyInRC9G+iojwlFA7erwi2O2j0l9AHIIK7OqSlyCTVuZg VBM2WlxZXnZ3HRwhDAwJd2ssjFRzV570LmM8Bz1UecjYmi6YEXPcM6T6F003nbX96+rj wMnFzYa8irQqaoYEFcQrith/j2Y+PUQIOjwT5YMhuxtkduCA7CI0vyomV3NS7ojt9oJj lxSVX8o9A16y0u14J2zEdJYZ4ROtF2aCaN4xYwoHnhzuCsGyjV0pnx+MVVngTqHkTHG3 t6EQ== X-Gm-Message-State: AOJu0YzJgljBdDg/5N55zBSX7WP1YL1IIrEevg29EbSI/1TPs96MdKTN WeO4wT9GAmtIonB0+J9BrII= X-Google-Smtp-Source: AGHT+IE7OF9lOQZUucRqUE1h1HvoHrELIsM9pr5pwSr2U/TAZdpSqpgaVzvEXZiIEEUfp5V5S5XpFw== X-Received: by 2002:a05:6402:34d3:b0:51d:cfeb:fc3b with SMTP id w19-20020a05640234d300b0051dcfebfc3bmr9249441edc.1.1695745318805; Tue, 26 Sep 2023 09:21:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1d9a:b0:533:df5c:6dc with SMTP id dk26-20020a0564021d9a00b00533df5c06dcls418320edb.0.-pod-prod-07-eu; Tue, 26 Sep 2023 09:21:56 -0700 (PDT) X-Received: by 2002:a17:906:18b1:b0:9ae:6d0:84f7 with SMTP id c17-20020a17090618b100b009ae06d084f7mr7773997ejf.32.1695745316837; Tue, 26 Sep 2023 09:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695745316; cv=none; d=google.com; s=arc-20160816; b=YuB2Falfbl9BwU6hUEVQCL9IifHeVObAky98BxYXg9b4/8hIqSLb+du4DoBjSJrpL1 O559LrQPMXlspDOsZhOlip869iWzxksk724Jpb6+RAYPcxcUg4YWRtwF/RFDCdBSxroE rcby1iW2htviEyBP6nKqmyOEtbd/siEuHN85AMjzSgO0rRuVH1o5kho0kLFHBk+raUQ8 T6o7rM+10cbeNQl98om0GiFUScFgHdvpm8C0acO5MVDyAInseMm6/THAAtdEKqj+pbnQ wHbvwi009powt/F/ZaqEwpUy/Srq5XaeGbiESYrKWS+nxCeMLnwVMp08NKSnco4wgNmN tkOg== 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:message-id:date :subject:to:from:dkim-signature; bh=oFmmMYIK4uwAr8bEf/2uYt5opPYZnHBfADPavtK88ig=; fh=F8ghUjd7l+d6RY0z/G+7P+un5eTKNHDgL80RosEZgDQ=; b=M54AnZ+p5o38TpDFNR0U9/tOAJT45wfCPmIG7/k+7VCY7ynn8qjirPRg4Gdo+T15tI ixzlHbX3iGX7A+0hWrYEmgpqid3b1qtbJtzGXwfdXutl0xFpfvWMKK0DtYIJjh3FrAn4 3UOn6i40IQ7J124UFqW+PIZDp2x7E0VlflOclHOPikuE+uXdR66MyxBIoq+0FuHtunD7 A+M0T8mXBeiFKJu7ivhoL7kK1+K1h+u3V1vP1I0MJmejDNjvGM4P1E5X9N+5bJHtb0ya aTe7SmGxQZxkADUsw9vDvFvF8nnvotEENuFdt2JfNcY0E68t8z4STrgx0xSyRNlt1x4K i8ew== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="F/daWOi+"; spf=pass (google.com: domain of fm-51332-20230926162156da2fe9bcab032b9fcf-3wog28@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-20230926162156da2fe9bcab032b9fcf-3WOg28@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id he43-20020a1709073dab00b009a1ed579113si786197ejc.1.2023.09.26.09.21.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Sep 2023 09:21:56 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-20230926162156da2fe9bcab032b9fcf-3wog28@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230926162156da2fe9bcab032b9fcf for ; Tue, 26 Sep 2023 18:21:56 +0200 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: jan.kiszka@siemens.com, srinuvasan_a@mentor.com, isar-users@googlegroups.com, amikan@ilbers.de, adriaan.schmidt@siemens.com, florian.bezdeka@siemens.com Subject: [PATCH] classes/imagetypes: Fix image tarball by removing first level directory Date: Tue, 26 Sep 2023 18:21:54 +0200 Message-Id: <20230926162154.2346564-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="F/daWOi+"; spf=pass (google.com: domain of fm-51332-20230926162156da2fe9bcab032b9fcf-3wog28@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-51332-20230926162156da2fe9bcab032b9fcf-3WOg28@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff 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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Quirin Gylstorff Commit be7f0f('meta/classes/sdk.bbclass: add --transform in TAR_OPTIONS') broke the usage of rootfs tarballs directly, e.g. as NFS root in LAVA, by adding rootfs as the first level directory. The patch adds the variable TAR_TRANSFORM to adjust the tarball structure as necessary. The default replaces `rootfs` with `.` which restores the old layout in the tarball. Signed-off-by: Quirin Gylstorff --- meta/classes/imagetypes.bbclass | 4 ++-- meta/classes/sdk.bbclass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass index 6b612386..a3be0a1d 100644 --- a/meta/classes/imagetypes.bbclass +++ b/meta/classes/imagetypes.bbclass @@ -5,8 +5,8 @@ #image type: tar IMAGER_INSTALL:tar = "tar" -TAR_OPTIONS ?= "" - +TAR_TRANSFORM = "--transform='s|rootfs|.|'" +TAR_OPTIONS:append = " ${TAR_TRANSFORM}" IMAGE_CMD:tar() { ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvSf \ ${IMAGE_FILE_CHROOT} --one-file-system -C ${PP} rootfs diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 3d650a18..216213ac 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -53,7 +53,7 @@ ROOTFS_MANIFEST_DEPLOY_DIR:class-sdk = "${DEPLOY_DIR_SDKCHROOT}" ROOTFS_DPKGSTATUS_DEPLOY_DIR:class-sdk = "${DEPLOY_DIR_SDKCHROOT}" IMAGE_FSTYPES:class-sdk = "${SDK_FORMATS}" -TAR_OPTIONS:append:class-sdk = " --transform="s|rootfs|${IMAGE_FULLNAME}|"" +TAR_TRANSFORM:class-sdk = " --transform='s|rootfs|${IMAGE_FULLNAME}|'" # bitbake dependencies SDKDEPENDS += "sdk-files ${SDK_INSTALL}"