From patchwork Tue Jun 25 06:50:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adithya Balakumar X-Patchwork-Id: 3630 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 25 Jun 2024 08:51:10 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f190.google.com (mail-qt1-f190.google.com [209.85.160.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45P6p9sn024197 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jun 2024 08:51:10 +0200 Received: by mail-qt1-f190.google.com with SMTP id d75a77b69052e-44046fcc6f1sf84966811cf.3 for ; Mon, 24 Jun 2024 23:51:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719298264; cv=pass; d=google.com; s=arc-20160816; b=qVqYfoJ1UuXKA7pwKR6QkLgPabTkm9mWoLFnE7LPRMlIhCS/cOteDQ9dDKbBFWMCke uATXo5E3D6uKGuJECDrhDd/wxTQ6S1V5csWRlnS+nu/X0MKQIiFsqD6rFAFLhjyn/6YI xmRIsaM9JlEQPujZs65mlTDbD2u6jNe8s/ghyGYSAPWPlLWTzKQwaBns0U27UR0JrZgW oopOHpD68jGS1crTE1izmfpskQkkJlM2bNhhagY5H1Q6JKxeCgao37yThpXuvwFJfvNQ ifC1ndn5qMELQ8vg9CRKyudNDne3GATLKg+5t1sGOI5P08CJC51Gt+oLY3ZRcyXOxQkU Ua0Q== 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=Hm4VOt0DNbKjcGERlc65pNyWIyMCYSyW1wOYoj/dt4c=; fh=vEH0D74YWDkloq0lnRdUSYJnUx2OGRnk9ipezU79cI0=; b=FZDcrzrLL8MbJooK+449X5daCS9JhpU+DhQPunWeOA+tlcmKZbCZ3vwy7stgU7nUJZ Mv2/3HAg5fietN8mZYQ7vuOJGjoZMw3EmhVIvS3VWcC15itV5diDcRcJkgXFC0qtMVxw vzOBh6DQ4Z0EN24reUUpc7S3bp0S9Gkm51fY9cEb+VWJuESFybzMVQkWccjS0b/D2yO5 bZooyJj7O2fPFdVd5H1Y8mOXG+6JPGCUCWi6nQDt03YgpTaWAeNPdlep7ejB6eFIpRSy 34bg6kP7ZYnQCEz0FqDosW932urNLQqt1z66/G9cMOQ32RZxtoaA1mkY2q+Vf1tQXKyk gOCw==; 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.152 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=1719298264; x=1719903064; 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=Hm4VOt0DNbKjcGERlc65pNyWIyMCYSyW1wOYoj/dt4c=; b=Sm1vXiJj8WBFp9AEa/hYBVZl+x9Zi7izYADmTv4EJJ4LjSN0Q4gRwY5ht8XdibZpgs 4R4/kS9TjCA4v8CTZdTcYOEJCUCDOK7ceAqvHK9ffePJnKEycY41/dsmrA56bUa+r1Ce YVHL6O2k7D+8vAhfx9rN60Ja5mg4G+UFXh0qr1TRlyQZb/nhTOxqWTRaFfYCV+bugu14 zoNtaTGZ5q2m49BgTA7AD7BaKbivUoeZT6E/POVK8TJCKaK12NoUEskdcBcep05ZcyQw JZHYEBO+UsPB6FcSVzBmC9DoUIX32t96Wb9xNxavQj+BAWx0SgKdK3XhvgUzPmXXJw0Z fF1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719298264; x=1719903064; 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=Hm4VOt0DNbKjcGERlc65pNyWIyMCYSyW1wOYoj/dt4c=; b=lIQsVx6U7DflsOwHDW/4fcFoSpgzOoAABTcM3rh2ssPuhEOByntxm6Tf4bryjJvZpq Sx4SdT/N+SKvIUChzUak85E3GBay268brwr1MjZNDrIHUQe0k8vlV/ZJRCp8l+R1hvGk Jn1iQo2c/1sGWUMDhkXDpoy5/ZJeOdic8zu8nONN8DenDgrLZwyTnmTOpOnDhW/o7cem edXdbDSTI+FdZ9p36Bhe5vhAnh/yiRusuG1/HbK/4uexvX3MEeAQF8lTC8sI1Be3jhHU D7enu11q8UqRRUUfZCPamX3nqIDWhfNEmRwGONrM0ad5o2thmDUzQdpidW6XCoQKSS0w ywrA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWwSigJzMisUoGBh0LetlR0vXy9YZzpWW7rdJ2Z5JQ4m/x6GQPg2jCoTzw0lWOFJCxyU/54yftxS+QwrAfrVc/UCdongPE= X-Gm-Message-State: AOJu0YyMnk8G1h2L+zHujb+zLeKWDx4ir8LRp3fez8wJ7myEyn8UW4Oj JTvHNbH3yezFT60fdakz1qFsEshEByHe5UrEMymJPk71bH37TwiV X-Google-Smtp-Source: AGHT+IHFQXByD+2maKkA0GfCtHX9j6/AdR0+y+tYkKyUMFDSMub39ZRPtHMAjVxwmt8RQzvtdlZ/qA== X-Received: by 2002:a05:6214:1630:b0:6b2:c840:7a2 with SMTP id 6a1803df08f44-6b540aa8879mr67550186d6.45.1719298263648; 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-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 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; 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 X-OriginalArrivalTime: 25 Jun 2024 06:50:56.0059 (UTC) FILETIME=[0765C8B0:01DAC6CC] 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.152 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_H3,RCVD_IN_MSPIKE_WL, 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 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)