From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7384329803878367232 X-Received: by 2002:a0c:e387:0:b0:6b2:d51f:f53 with SMTP id 6a1803df08f44-6b5409a5024mr65296176d6.5.1719298263853; Mon, 24 Jun 2024 23:51:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:4383:b0:6b5:1dc9:d595 with SMTP id 6a1803df08f44-6b51dc9dae1ls53104246d6.2.-pod-prod-06-us; Mon, 24 Jun 2024 23:51:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLM6DIDFeHtBzBdLtF0KbrfmKyAvCoKPMdeFMb8YQLqlvopyMWAiFtKE1VbKJ4KgguGVX+ X-Received: by 2002:a05:6122:1827:b0:4ec:f4ea:6495 with SMTP id 71dfb90a1353d-4ef6d895f2amr5313337e0c.11.1719298262832; Mon, 24 Jun 2024 23:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719298262; cv=none; d=google.com; s=arc-20160816; b=bgzS71hXsIaZtU/x2/0lWwujN/TEyws9pUxtRyTVFLa3LZ2yeDuSLgvfP/hx4XsV3O x+sFJzNKgQZ7pNNtbt4H1YfO6Oc7zOQdVjb+A7rlklJGkcWONeY03KKlfOfhoJM85B9w 8+W/hmAw+372qmhJdkADYiCMqEollrvrgt0nJEyrCNdyKEkYwDIzLIiVR/9Fq0XoVnBl Ev+AkXL5uK9p7GydVK04pyeZsKbJQl/BWcHXxBLUReEM3kGGwt00sQ+3xDj/sPVnLurs sNLQwAzRg66daSmLF8q4qKdTDDufrozEuXUpEyWBg6lrLgPq3OnjZDOlZkJ8BULFddOm xF8Q== 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=8cqg/WGBH8xSYjemHgWpaVVVeTbR+H7Na6AWiOOblKU=; fh=ku1u2q9nE5SFzy2/v7VJ69LfN7v8KCqSwQS86yltLTk=; b=ccLj/6ynYkmqJL+drxSsXHg5YCct+QAraJ7PAqvMMrT1hJgvvy1UzQC59pu5tmUZTr ql/PHayxRTfr1JV9GyNYVFg4wBQ4pKptowQ5Y0oDUEERhV9l721t3WGDB8QMWHJu+b+4 n9UpWt69CyeRVsU+rN57Lzg9bBvK+qSRaHq7j7TZTQmC58ajA10KCXMLxD+vpMSOJbyE 04yCgY9VbjI1lX2qe5fpuyLtJYGHp5cCoCjBgjDUvfndaMUQSXK1nS+LRY81o0stqPp4 UmIg2vKmBCEg5nHRIE5pyx95c9qsfrFTjGKvtUQk1Ay5/WJLQpkDv0cZdoGoYgsie5dI lGpw==; 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.152 as permitted sender) smtp.mailfrom=Adithya.Balakumar@toshiba-tsip.com Return-Path: Received: from mo-csw.securemx.jp (mo-csw1802.securemx.jp. [210.130.202.152]) by gmr-mx.google.com with ESMTPS id 71dfb90a1353d-4ef580afb01si498555e0c.4.2024.06.24.23.51.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 23:51:02 -0700 (PDT) Received-SPF: pass (google.com: domain of adithya.balakumar@toshiba-tsip.com designates 210.130.202.152 as permitted sender) client-ip=210.130.202.152; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adithya.balakumar@toshiba-tsip.com designates 210.130.202.152 as permitted sender) smtp.mailfrom=Adithya.Balakumar@toshiba-tsip.com Received: by mo-csw.securemx.jp (mx-mo-csw1802) id 45P6oxeo2685957; Tue, 25 Jun 2024 15:51:00 +0900 X-Iguazu-Qid: 2yAbXhlxPMKQ8lufFD X-Iguazu-QSIG: v=2; s=0; t=1719298259; q=2yAbXhlxPMKQ8lufFD; m=A4yQQGfEf7Usl08qBtQCv+XrO8vpE+Yitd+zYEcdmhk= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1800) id 45P6oxVe1104744 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 25 Jun 2024 15:50:59 +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 v1 1/1] wic/partition.py: Set hash_seed for empty ext partition Date: Tue, 25 Jun 2024 12:20:32 +0530 X-TSB-HOP2: ON Message-Id: <20240625065032.595783-2-Adithya.Balakumar@toshiba-tsip.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240625065032.595783-1-Adithya.Balakumar@toshiba-tsip.com> References: <20240625065032.595783-1-Adithya.Balakumar@toshiba-tsip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-OriginalArrivalTime: 25 Jun 2024 06:50:56.0059 (UTC) FILETIME=[0765C8B0:01DAC6CC] X-TUID: QOrip/pQqpwT From: Adithya Balakumar Although setting hash_seed is handled for the rootfs plugin case, but this is 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) -- 2.39.2