From patchwork Tue Jul 16 11:29:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adithya Balakumar X-Patchwork-Id: 3697 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 16 Jul 2024 13:27:16 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f189.google.com (mail-yw1-f189.google.com [209.85.128.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46GBRES2012365 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 16 Jul 2024 13:27:15 +0200 Received: by mail-yw1-f189.google.com with SMTP id 00721157ae682-65be82a3241sf100395227b3.0 for ; Tue, 16 Jul 2024 04:27:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1721129229; cv=pass; d=google.com; s=arc-20160816; b=wh8VPWZsEvddLAgl4nU0bH4bKJDboOVKfBBRN90zJuGmyiMXYCuZwCXUnTfHqRvuxc K+I/yrD3WiLeg9Gx1/bzQ8LLYBl5AY2GvRb4gAtlIFgXsQD9ekgjBXmZqsWe2AXfo9l6 Y5ThGfatzpwLBTs6xUWGVgmaA0lw2CgnWMqTtyNHe1Iq1JLbGG4kx0og5E3gY0NxSYZE Lk10CItzx4WRqD0YGtewhhqA9TUHWjQLbZ+1jTvutpXcl8RJ4+KD/8DX6VG0mb57z1k4 H+UE6Htne7lBX2XXPu20EpPs1WrqBj4bNJz4EhbS1P+iDSIOehRaZfWhzz/zIDq4LACj dIUw== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=2/gPrOuBDkTLOZBW3VMz5NH8WRfXSnU8O17KIoohqxo=; fh=VHE2fp96ZbcdC05sc+tZXOg+BEe+sDJt4UApLG32x5U=; b=rA7+W9tUWtlP8r/gdHh7b7eaUQKKa/lj20uT2l5mpJwkczKYnIdLS6s7CdtKJkBZwZ XZXTTM9lhnImaNe4GhWJibTY/kT6Lmg3xI4Lp1BPHv9mGoQsGPBeH6UCL77KSp+4y0Et UDrg0kdcFu3G1aZqDxZK0HPxAgZqz3dfgqa6pUZXRZTU6Msg5gVSS8+oF/xPPL1lvwBi RUDtrYxMaNrN1DcGc7Z1K414cLpBQdOhPuWWU9IXzTuZ1fx4mvH24w9xNBisqtuNs6KG D1YhCLcp5S7ieam+TOpn8wsB2zOy4K9Y2vDtk+H2Dg3CI2H4U4LjtBR374VX02ZQmzl2 Xkjg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adithya.balakumar@toshiba-tsip.com designates 210.130.202.134 as permitted sender) smtp.mailfrom=Adithya.Balakumar@toshiba-tsip.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1721129229; x=1721734029; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=2/gPrOuBDkTLOZBW3VMz5NH8WRfXSnU8O17KIoohqxo=; b=lkBvtiAmw34JjFugT/AxgOKCiciqC2LrU4XzMpE5hy4WXwQEfGWg3cBasZO50KYewC dVTOSgr8OEvSyEt449Cy+pI3Sxi96/bt15krMjbBV61PLfkAUZDmsbBa8G5eLqjqx6x6 BHjZDA/Gc9F0wQRAsKEqPZK9i/xCw4KToA1W0+BVRwBY2mZe/vDijbvQpURasf7hc8bN ZtSAqUEAaJ6FFTVMsLLEKVJ0MOwrbGjw+Szvfuax9iKY0wvcnqvSW9gfKEfFYHEHixKi TqBNE2IYq9AcqFK5KyRlfMLl6ioq/N0nzbFcZfP46x3b9gpcKJwGJQNzvLWnOo02l3hY ZywA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721129229; x=1721734029; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=2/gPrOuBDkTLOZBW3VMz5NH8WRfXSnU8O17KIoohqxo=; b=HwRyaY6V7u9EwMzJQLMQ5Uywj0ehgC4ZqV/NCsL7JzhkfsZFqGwpDDYTJgHpoVsWAW REr6k21BjjjO6LP4nG2GQotKvE9EhN31WXwcWN+7dbPEoB5lqtYfu/4w42R/+qP0Wv1c 7WTrwakpof6R++XqHlM0CCYpm7IKHj8Ilw9QbItspoGG1iIEZXoqvqOftlJZAZI+Z0XG zg8Z2zhFL28saOl4Wr4xyr4UxxmklJyH6PbKTsMJ5WhiGszVz5JMCJHCyIplB37H14uM kUISL/x97Itp+s49224KA1pnP3c0R2L7JFILZd78Kv6FM6gOcLQqh+z/0KSHxpT0KE2l +5ow== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUN1lCYrWP+iGSDQfGvebMuLbq+9K00ayOm7IVVP6z+C8cqScKSPhkbipRkJjWJ+PPcfgwByLwVfzuWZ9yoAMU80uoKeOs= X-Gm-Message-State: AOJu0Yz89pztEHozM89C96CTYtVulpZh0FFYfMSc6W8r/YjHWnxqGKfi eBsI6mP2xbAEUcXKJ7wZQ5Lskz/sinbNWAgBLeMsZJ2s9uqdC/Nj X-Google-Smtp-Source: AGHT+IGwHxNOxCHN85YOaLpTQdGa/fIZVIz1FiMtgbGaDdcTIA3KTqFf1nqPRdnWpU+d+ThZzVNEwQ== X-Received: by 2002:a05:6902:1894:b0:dfa:4ad7:19d0 with SMTP id 3f1490d57ef6-e05d567a571mr2145584276.2.1721129228899; Tue, 16 Jul 2024 04:27:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6902:72b:b0:dfe:f69f:99 with SMTP id 3f1490d57ef6-e057923dcd6ls7619329276.2.-pod-prod-02-us; Tue, 16 Jul 2024 04:27:08 -0700 (PDT) X-Received: by 2002:a0d:f8c7:0:b0:649:b0ca:2c9b with SMTP id 00721157ae682-663816df1a5mr19543207b3.40.1721129227923; Tue, 16 Jul 2024 04:27:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721129227; cv=none; d=google.com; s=arc-20160816; b=Zmuwr6ANOE/rQUFaTqJ2rywY1Uj5FRmWUHhcfqMfnW0n67jpMBqyvW/UtHKUzUjZ5Y PEWqvaZJ47jwW3lYQX7uQmqeH8QlbrdtlqMiZPXjgS9nIrYLE4iqygy2T9EoH1dpz03T s5uOyKUDpA3WlcSPSf3oQ/CIxhE72UlsVcoUxQQdOgICFnMXO3FMQFzxYfy7gZVuoM2p yCokARP1EEjblSaY1qLPemB0Gx2AEhQ+5GhqY5Y5CGqNBDEKigDt9MjE8dVQQ+JJ6nzu xP+N8cf0xutgQmgS1ExUTHLTKobTsycEwcWs27g1Bsg13gXG71MLnDkRqAtzpLbj7YUk frQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=nO8qssuOWWyNj9Yxgw5cruYvc6I8CouD+9S6YoSoC6U=; fh=ku1u2q9nE5SFzy2/v7VJ69LfN7v8KCqSwQS86yltLTk=; b=yCDYPKuwT6S7TobHAIwYdEXLWRYcHV1a6qIRPxL2ZCU75KkmaddT6YteR999G9kSgh 3VadTssY8ukDAKh54uAXZRbvGcnlYkwCl18X2a/FGZs6F4SJ1t79MwzqjjHZQf8MBmyY cQmDD50koe//bUNN65ikb6bsFDf2oFHmrtZRKxOBmbtybwn3bHFeV8yNlF2IzHCLCQY9 kyt7XpdFoyIQ1cwFRlpq+pgimtrdGYopH9aQZhymNzpuc1S/5EsWsm5ZAoqz6UDKquP8 Ow9Yeyf9ORHZIILLbuSJVQ9OCXltN8Ocdxdl1ncUpUezNcW93D5PBbpNRwDrtdu0VjyD kVfw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adithya.balakumar@toshiba-tsip.com designates 210.130.202.134 as permitted sender) smtp.mailfrom=Adithya.Balakumar@toshiba-tsip.com Received: from mo-csw.securemx.jp (mo-csw1800.securemx.jp. [210.130.202.134]) by gmr-mx.google.com with ESMTPS id 00721157ae682-65fd80cf3f0si2867457b3.1.2024.07.16.04.27.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 04:27:07 -0700 (PDT) Received-SPF: pass (google.com: domain of adithya.balakumar@toshiba-tsip.com designates 210.130.202.134 as permitted sender) client-ip=210.130.202.134; Received: by mo-csw.securemx.jp (mx-mo-csw1800) id 46GBR4u93774198; Tue, 16 Jul 2024 20:27:04 +0900 X-Iguazu-Qid: 2yAag3vsoK2ADHrZXn X-Iguazu-QSIG: v=2; s=0; t=1721129224; q=2yAag3vsoK2ADHrZXn; m=HGbtP2rK5n66BWhDZJ60Y687GwNrjvcyoGzv7dyItlY= Received: from imx12-a.toshiba.co.jp ([38.106.60.135]) by relay.securemx.jp (mx-mr1803) id 46GBR3OD2466430 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 16 Jul 2024 20:27:04 +0900 From: Adithya Balakumar To: isar-users@googlegroups.com, amikan@ilbers.de Cc: Adithya Balakumar , jan.kiszka@siemens.com, kazuhiro3.hayashi@toshiba.co.jp, dinesh.kumar@toshiba-tsip.com, shivanand.kunijadar@toshiba-tsip.com, sai.sathujoda@toshiba-tsip.com Subject: [PATCH v3 1/1] wic: Update to the latest revision of wic in scarthgap Date: Tue, 16 Jul 2024 16:59:59 +0530 X-TSB-HOP2: ON Message-Id: <20240716112959.2441845-2-Adithya.Balakumar@toshiba-tsip.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240716112959.2441845-1-Adithya.Balakumar@toshiba-tsip.com> References: <20240716112959.2441845-1-Adithya.Balakumar@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 16 Jul 2024 11:27:01.0932 (UTC) FILETIME=[141A26C0:01DAD773] X-Original-Sender: adithya.balakumar@toshiba-tsip.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adithya.balakumar@toshiba-tsip.com designates 210.130.202.134 as permitted sender) smtp.mailfrom=Adithya.Balakumar@toshiba-tsip.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-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: Adithya Balakumar Updates wic revision to a4e7334a4b87f1bb1947f6b10f71ddb445c91d0c from the scarthgap branch of oe-core This change sets hash_seed when deploying an empty ext partition. Although this is handled for the rootfs plugin case, but its missed when deploying an empty ext partition. Signed-off-by: Adithya Balakumar --- scripts/lib/wic/partition.py | 37 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 795707ec..bf2c34d5 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -284,19 +284,8 @@ class Partition(): extraopts = self.mkfs_extraopts or "-F -i 8192" - if os.getenv('SOURCE_DATE_EPOCH'): - sde_time = int(os.getenv('SOURCE_DATE_EPOCH')) - if pseudo: - pseudo = "export E2FSPROGS_FAKE_TIME=%s;%s " % (sde_time, pseudo) - else: - pseudo = "export E2FSPROGS_FAKE_TIME=%s; " % sde_time - - # Set hash_seed to generate deterministic directory indexes - namespace = uuid.UUID("e7429877-e7b3-4a68-a5c9-2f2fdf33d460") - if self.fsuuid: - namespace = uuid.UUID(self.fsuuid) - hash_seed = str(uuid.uuid5(namespace, str(sde_time))) - extraopts += " -E hash_seed=%s" % hash_seed + # use hash_seed to generate reproducible ext4 images + (extraopts, pseudo) = self.get_hash_seed_ext4(extraopts, pseudo) label_str = "" if self.label: @@ -344,6 +333,23 @@ class Partition(): self.check_for_Y2038_problem(rootfs, native_sysroot) + def get_hash_seed_ext4(self, extraopts, pseudo): + if os.getenv('SOURCE_DATE_EPOCH'): + sde_time = int(os.getenv('SOURCE_DATE_EPOCH')) + if pseudo: + pseudo = "export E2FSPROGS_FAKE_TIME=%s;%s " % (sde_time, pseudo) + else: + pseudo = "export E2FSPROGS_FAKE_TIME=%s; " % sde_time + + # Set hash_seed to generate deterministic directory indexes + namespace = uuid.UUID("e7429877-e7b3-4a68-a5c9-2f2fdf33d460") + if self.fsuuid: + namespace = uuid.UUID(self.fsuuid) + hash_seed = str(uuid.uuid5(namespace, str(sde_time))) + extraopts += " -E hash_seed=%s" % hash_seed + + return (extraopts, pseudo) + def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir, native_sysroot, pseudo): """ @@ -437,13 +443,16 @@ class Partition(): extraopts = self.mkfs_extraopts or "-i 8192" + # use hash_seed to generate reproducible ext4 images + (extraopts, pseudo) = self.get_hash_seed_ext4(extraopts, None) + label_str = "" if self.label: label_str = "-L %s" % self.label mkfs_cmd = "mkfs.%s -F %s %s -U %s %s" % \ (self.fstype, extraopts, label_str, self.fsuuid, rootfs) - exec_native_cmd(mkfs_cmd, native_sysroot) + exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) self.check_for_Y2038_problem(rootfs, native_sysroot)