From patchwork Thu Jul 4 11:10:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adithya Balakumar X-Patchwork-Id: 3660 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 04 Jul 2024 13:11:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f58.google.com (mail-oo1-f58.google.com [209.85.161.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 464BBeOZ009996 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 4 Jul 2024 13:11:40 +0200 Received: by mail-oo1-f58.google.com with SMTP id 006d021491bc7-5c41551a445sf457261eaf.3 for ; Thu, 04 Jul 2024 04:11:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720091493; cv=pass; d=google.com; s=arc-20160816; b=t9Mou1WJnNssRlUXiLXK2bh/qTe8/4ZcvcpomiTmcUkX2VPGsNCqG35DBDOOHx5cub bKQjpIbovqVRlP7KPTJrBoDYksysw8rPDc5UPsOtYIkXDGzsWraY5+VoNxNciIwcpTwx IFBvIevyJSVNdwQB4MG+QAEpiKerctBmFgtgi7G3+LdBos+jI3qKru7UekQ+r7TiS93G YCKajcPxjoejfeka0TEn6+DjS3318Ur3k2Bn0Bay7n2LYxk2+RQxMicNozmg7s0f4hCy BDpasNYFnbcg94B0jUxGS6LtHSV4o564z9nwGLz2+1rf5dmgY7F1KBuEENQZk2Bqtt9e p2dg== 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=XJwp+uPS3+Di5FdSzqnjqF1z7FSB/zzp3WgJGPTvJVg=; fh=1JyhLF/T9Vym8QOTRPJW3qN2jMxPN4BqHU3jZzmy8vo=; b=EjtuNtuO8O4TNnadxmHYu7Qr7g9LT3/iWsmouBW1UyYXp6D12VM86zGfgAdTF0ilhD 3SJmHlRPlM3xzuvyOMs5qiMN0jHfpiQo4Q0a9pdQaXSf6Q8GGycHHGIlRuCR7Oij/HS8 Jv8YPSQ0mf2jKqnoOdUG7ZpaQ0yKmEPedfu/gtu2e1VcEQR2AivejxPx13E/5gNZRsaI bi2f2fYzYy/83By9lAG4RAcDd7dsfoRBxOiHSJZBYBaDUaWcDZstvv5GmI+tiS8jQvNf WVx43nHidE56hjuw7OI4Re6vGbbutwsMZqEgtvC25m6nU6vapAs5vSAupnCNn+zuvUWN dIwA==; 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=1720091493; x=1720696293; 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=XJwp+uPS3+Di5FdSzqnjqF1z7FSB/zzp3WgJGPTvJVg=; b=GyB1SFXY2Bqcl4dB9OfxPJchz/NJWptwxlKTLEbHMfOOlFBi4ZIRlGnUpy4Nz2Jqee XmMzjkvHz++gca8L0Ss9guAPSOghBYYEt5h7adfgXccRENTG33NSIMkQExlgmTyseIhl QgV1FalCjta5yXrpJ85pV/Zgeh8W8sRuXL5GDhwqIq41R3PnfEWOjEy+su8UGRGDghee FyWXn2xK62EpRf60qioKw50A5FsW6azPSNK0Kh6vaEn0cO7iosZOYaoQLdtg3/oGIfv4 aqqAxaQnGnxwKR8mMujZGQehVumcLIG8HQ0GOkj/ZS2U2ThISJ8ywNeC44j96YmKoicT Xcqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720091493; x=1720696293; 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=XJwp+uPS3+Di5FdSzqnjqF1z7FSB/zzp3WgJGPTvJVg=; b=jMludo3L18KFkZfrsjLQ/TBaKAqct14gJljQ8OgbIonLKN2i5akUXDr/pydhop/kr/ 4RjoddC7uNR0WjJozlEqUdHpbj1UszAHgWnQLGqdk+cvhyU3tHbxH1vanbvg8RlHqdBd /jTrSuC3mzC9EBGLHqcR0F04w/7bJSy+aEJSI6JeMsUcM0BRYb4MglE98mBQCgHPRwWg 8+VGR3JY2vF6xnrLkCk0gvz/PKlhQSBgWKrAfrl02twfv91UM4XA1EoSLhDp9q3rVl5q cGTa8a4x6qPaCzpIzkcSj+E0WyC77d6qYKlB4k199U4Cpq3cdZT0oGRhbzHKdPNJ/RWY HrBw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVgCDT6g3FTMWX32qY77PNoM/kL0Lh0d9n5Cv02YJGiMWnYu+xOQUqJ43QrvwilV/mKTaIwwquqV8lf4Kyw8ItmAb2SssQ= X-Gm-Message-State: AOJu0Yz6WJ5TtPXOd8ioLVYGYUMV8+7tkbLMqQ4LCpSkyHNHX6nOrH2S 84C8iFKFZIsaV6qrHHLqPam0gM5AfUaHjQUs3ckNyhw3E+5yzbjO X-Google-Smtp-Source: AGHT+IEiOmO/1gP3Djfz/XEdRiwD/cqAVExHLp8eQgETUGgV+lpgUJhUvSzB2EsH4xqyyTaCmc4n3g== X-Received: by 2002:a05:6870:9619:b0:25e:1532:fa96 with SMTP id 586e51a60fabf-25e2b8cf1demr1054723fac.10.1720091493558; Thu, 04 Jul 2024 04:11:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:a693:b0:25e:624:afb6 with SMTP id 586e51a60fabf-25e2852949fls793011fac.1.-pod-prod-09-us; Thu, 04 Jul 2024 04:11:33 -0700 (PDT) X-Received: by 2002:a05:6871:109:b0:25e:24a0:4c99 with SMTP id 586e51a60fabf-25e2beacd64mr1177328fac.39.1720091492808; Thu, 04 Jul 2024 04:11:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720091492; cv=none; d=google.com; s=arc-20160816; b=Hw3GTEZyTIY7IV1Uxa4hNr+qR5y0X3/vlyDprGJii+Ti4KPedhpGjc5TXBi9EBpjUO Fu476rTFuGUMVAa0l5McYUJFnFoDQ+BvfbPbE7BEl7DKLMgXCj5livyssnRxnxmHbLo+ T0qJvt+GYTwuBQZCtCujoYi9IXElC4Au+YTPdotxXuAwbqt30eF6PmSfFg6eSwtmUa1N ZprXFL8hwOWcMDGTj+sPSNyFgjmfVI+f3MoOJXx37k1bCB6wsBIsFmoU3PN8Gv+Z25C6 KXD36CnIvvFfcGWM/xp54nm/neewq5x6nWlaf+SgMRpKqat+vof/7QXSApfr0F1+Qbjp sfcQ== 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=fn9BMkgf40O+DHmJ4wuWBrCAB/1BdIJApHNhNVq13IPdfocWIrJThXx9h5wUgIlTus MKJYvAiXnCO6QXDdiM9Ba+3Y56tbOLyXjIgRJJqS3yzZqjrNVo0ljFqU/kA+Z/BC4PTu NWOZXbtWArqzdhzBzDPMPVFb4HjAYeSZMlyF5Eo1l8wXVQSt5Fk+l9dnICUs6bLC9sse QjVZ2M93CbX/9Nj93qAo/t1Wn1d3opxuhpcTeCzX6aP8QHOPdw+vEj7JFygRDfUglM8G bur6hc0FhvTzqNGa+ak2c2Nal4m2kKqHKGOEefFOri8Y9Whv+wNNs/XvoOANkEQyv444 oMJA==; 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 586e51a60fabf-25df857bbc8si337282fac.1.2024.07.04.04.11.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 04:11:32 -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 464BBTBf153806; Thu, 4 Jul 2024 20:11:29 +0900 X-Iguazu-Qid: 2yAaeREVCjVBAi3O42 X-Iguazu-QSIG: v=2; s=0; t=1720091489; q=2yAaeREVCjVBAi3O42; m=2aF5q3SYHVbk8IoA0qm/vP9/aI5UifggGWMhWV6CLjs= Received: from imx2-a.toshiba.co.jp (imx2-a.toshiba.co.jp [106.186.93.35]) by relay.securemx.jp (mx-mr1801) id 464BBS403970258 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 4 Jul 2024 20:11:28 +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 v2 1/1] wic/partition.py: Set hash_seed for empty ext partition Date: Thu, 4 Jul 2024 16:40:53 +0530 X-TSB-HOP2: ON Message-Id: <20240704111053.1647620-2-Adithya.Balakumar@toshiba-tsip.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240704111053.1647620-1-Adithya.Balakumar@toshiba-tsip.com> References: <20240704111053.1647620-1-Adithya.Balakumar@toshiba-tsip.com> MIME-Version: 1.0 X-OriginalArrivalTime: 04 Jul 2024 11:11:26.0661 (UTC) FILETIME=[E9AE1F50:01DACE02] 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_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 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)