From patchwork Wed May 8 14:38:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3537 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 08 May 2024 16:38:25 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 448EcNmF000310 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 May 2024 16:38:23 +0200 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-417bf71efb4sf5129025e9.0 for ; Wed, 08 May 2024 07:38:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715179098; cv=pass; d=google.com; s=arc-20160816; b=k02GvBAuYzZQcfgam+VuwffCnzxRGPlgxgXA0j7sYzh4U5sxsd25u0c3epwcKGaQOz 5vZLtUrDn81xCXlwqWi8yBDv7/h2HJrxvpSWuDs6I1JEMrOiLggd2iVf7/cO3fpx8NSI +DzXaWFTpUo7e/UTl4E1wpK+G/ThVY+JXMPCM6gQuqlEomfeJoN6EioRauH8h8MntxRR ZtlfMqWioorUOQA5feno6El6MuOOKxIz3InDudORWA5vwsrIIFmPsjTm6WRjdQ4sJS2J SW2Rj78wv4aXcWOTFEUWNTwA6Kgm6I7DOq66SzIDVbNi6MHkeaSRB2PZ413A2e9BqcLR 5ePQ== 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=GCflxeeiZDXIAIu+cV6AHOwkJCQyJCMJxn3/46NLbh4=; fh=jjF3QdE5twuIoLRU4gWF3dcQtjG7baHHnkWl32fEz2Q=; b=VEjTD2/UqUTFQEUZeG8DvxKcFLgdy6Bto5Duz1afYtK1av/K7bSSYmFu4oFB8Cx4SI NpsH074VZjVvNSGLu99e6v1BRYtrPyQ4v/JDesQCyzjhCLoDC8JeblH66yUSuDlSrMYj OBiq4MvLbZCjjFuCYEwIL+WVmOwQxtJ1HPhlEcGvI9Bf3LmpUygvnpGH6VD89tpvpcTc 5hc9vkySbaPIEeK2VsCDQd5etC7Nly1KU6G42KyynwfpTWksGo5liJ3qmuD698jcz+hv K0K01zBSUacruo+rVxO92v1zrzmGBzighfPL+VD0SGDf79anWYCqxQG6Olwan7xSpDq8 Yahw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715179098; x=1715783898; 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=GCflxeeiZDXIAIu+cV6AHOwkJCQyJCMJxn3/46NLbh4=; b=FNcg6zCMRSlxMY6vJEgi4JvSB438ndD2ZMULTY8S+vd2L8zijPN17KSC3evN+x0Oxp UzHHPhCREMmOthIximRAgnEbbcTKCCnoRe/Cs+kZPOfBZgl+5uV4iI7HmwQ1kAW8gHnp 6T4xM0P59dl3taiUnee11xBo1JDjnyx81Uuh8r+zSVCUS0td78HmhFYuFD+aTKlRSbNq /c41NRG7DapqckMNdJG/5r166+V27Q6xn5bv2gnx5hoGoW5kjoF431sKSlAREG3lv4eD qryCNuZOMkigAVw9dNFtQwSmxjo8kwtRuKixme3hodMcOjqbkzhf4UwkbGV+W4G1iCnM E6lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715179098; x=1715783898; 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=GCflxeeiZDXIAIu+cV6AHOwkJCQyJCMJxn3/46NLbh4=; b=KeW8Sr4cK9mDeKt2S5BeOrnOGEVFv3WTaGWFBoLhioJrnJC1UXa4m3NhYGSaITydsd XOSTfR1956UnZ0UVHiC/GL7BNBc4vc8kRpESp6OrllWpekKGm3fT+ihlfQ5mB1jZv8Ik +2z7JOfMOKg9ytri1KrnkSXKlhuE0017Tvsw1r9GiIY5DN92cmyCFef7qM534at8EAgC jByBUqP04fFfhN7e9VOs4Gk56GqATbwSibsLz7zCAZPLuF1tPf8S6dRrC8k3ib49KYmK 1tYZEwQlEKEtpRSvjoBaaZpGSgDQ7u4tS/gvxGDbV5FhMiz9TWR845xkpQwLt4rd0CdP GaVA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVPNJOmgDym/wyOEe+96kJM/2Fc8HZfJdjJkujNG0IbCCGLNHCc9OntsuR69m95eS/XIYN/ot2sa6JFZMzRmiuP8E16Ffo= X-Gm-Message-State: AOJu0YxfLTMTrcweV+G7h1akRraSAjmaYzKHyN7e/JKeB+48GjS3JmNq 2W0JOdOQV1L52WeTvrE/MzzNuyl9hM0fcQOgNst0pyZuYEeopEgj X-Google-Smtp-Source: AGHT+IHnuF0QXFIN22rtK36GynlNtCDn3VG7fReL7M1wtXEGxrmzBF5FbuyaMpjEbDWVwix4hTASVw== X-Received: by 2002:a05:600c:4fc8:b0:419:f4d6:463b with SMTP id 5b1f17b1804b1-41f2da2d4d4mr56217955e9.14.1715179097672; Wed, 08 May 2024 07:38:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:580a:b0:41e:d958:747 with SMTP id 5b1f17b1804b1-41f7b874173ls2788215e9.1.-pod-prod-00-eu-canary; Wed, 08 May 2024 07:38:16 -0700 (PDT) X-Received: by 2002:a05:600c:45d3:b0:41c:66:18c2 with SMTP id 5b1f17b1804b1-41f2d440081mr50662975e9.4.1715179095631; Wed, 08 May 2024 07:38:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715179095; cv=none; d=google.com; s=arc-20160816; b=CQln570o5nbLuV07j3cCzEaK0P7y9+bSUv1e3uZwZ/IV9ny2ZDrf3gGPALaa51Y3b+ 9aoFtJ7IDPBrjQ64cTSrkeWH/NNAYpQiUuPpQ1Ic0Z0usoU6EOpc0hAowyj/I8PZ3tWQ NbYD4memrm9Fr//N8cWE2i2uLI6i9uHfADniK4gZIscpMQtHOZ8BPoEzn5zDlXj0MTYR UAzJPnyC/Gn4HHuF0grC7tVtbvbDb6MijGHVFfgb/aJWPJOqxVjf3B/ORcsfNQhAk5fP HrgtG+ddiYWz/bRfC0OdMJNImPwwHcJz+zd9182Ox59NjiTDwT+8QQB4itFULwmVe51s 3iPQ== 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=EWhABrc1pmo7/iAWDosg2wG5qUslz0NgDbCOfZlH3Gs=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=GkYz7FqcVIBjElObXFQiQD7jv0h6i3SS6cxvv1323NuCySngND+4vyHCWEWqdPb8Vb wu1M2IgnKgZ0rzLpoEUjLNqKF9b5CUwj2PVvoDFTo5c+3L2vqHXq9mZXZPrMnUhWIfmy 0CwXKYwFJjfIGB0ewRJWpgN7MG0s6feGUPU7UOpPFvVrun0hPlKmmeVMOOe8qsP23irk +dOcFChd5RxiSG/NYNmN16kWc02c+7vxOFyvjHyOoaL4/DUafu2Fj/qzp4i7UPtQZHE5 Szv5BAMjqiuxst4cQ5qxWjoZ581R77zALZergWtqrv9SO5+CMn7OKJ2Dd4F+11iMdCMW 0NMA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-41f43080137si2512975e9.0.2024.05.08.07.38.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 May 2024 07:38:15 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 448EcAtn032711 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 May 2024 16:38:15 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 4/4] wic: Restore compatibility with old distros Date: Wed, 8 May 2024 17:38:01 +0300 Message-Id: <20240508143801.557383-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240508143801.557383-1-amikan@ilbers.de> References: <20240508143801.557383-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 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,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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= After update of WIC it requires sfdisk to support --disk-id command, which is false for Debian Buster and Ubuntu Focal. Do not try to set disk identifier for those distro versions to keep them buildable but with lack of reproducibility. This hack should be removed after deprecation of Buster and Focal. Signed-off-by: Anton Mikanovich --- scripts/lib/wic/plugins/imager/direct.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 33a869ec..a65ae36a 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -530,6 +530,13 @@ class PartitionedImage(): exec_native_cmd("parted -s %s mklabel %s" % (device, ptable_format), self.native_sysroot) + def _sfdisk_supports_disk_id(self): + ret, help_out = exec_native_cmd("sfdisk --help", self.native_sysroot) + if 'disk-id' not in help_out: + logger.warn("Current sfdisk version DOES NOT support changing disk ID") + return False + return True + def _write_disk_guid(self): if self.ptable_format in ('gpt', 'gpt-hybrid'): if os.getenv('SOURCE_DATE_EPOCH'): @@ -537,6 +544,11 @@ class PartitionedImage(): else: self.disk_guid = uuid.uuid4() + # Backport compatibility for Debian Buster and Ubuntu Focal + if not self._sfdisk_supports_disk_id(): + logger.warn("Disk identifier can't be set, reproducibility is broken!") + return + logger.debug("Set disk guid %s", self.disk_guid) sfdisk_cmd = "sfdisk --disk-id %s %s" % (self.path, self.disk_guid) exec_native_cmd(sfdisk_cmd, self.native_sysroot)