From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7283170684023341056 X-Received: by 2002:a05:6512:250d:b0:4fb:90c6:c31a with SMTP id be13-20020a056512250d00b004fb90c6c31amr9984043lfb.14.1695745318924; 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-Google-Smtp-Source: AGHT+IGo57hDTqUAlVrdb3WRaLxyhGtDCOfKHAhJ7aXf8SVdn27V0zP5ctIHc/cUou0SguNnAQit 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 Return-Path: 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; 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 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230926162156da2fe9bcab032b9fcf for ; Tue, 26 Sep 2023 18:21:56 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=oFmmMYIK4uwAr8bEf/2uYt5opPYZnHBfADPavtK88ig=; b=F/daWOi+VpZaByfdTJTK0/XSPYMdkPvSbQcA5VhnausSdxf5dNpOkGxwaFyRf/B/XEobSZ bOHhe1mWBZTkdKfRZuQ9TdSHuDra6VQPHembFzB2XsoANG0n9kUoU5EIJB9x+ony6IrVP1AU of4CmSnYcTZXxOHGyQCmOfRg0S7Tg=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: 2+Zn8sEitoBg 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}" -- 2.40.1