From patchwork Wed Mar 12 06:50:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasturi Shekar X-Patchwork-Id: 4091 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 12 Mar 2025 07:50:56 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52C6ot0R019231 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Mar 2025 07:50:55 +0100 Received: by mail-wm1-f64.google.com with SMTP id 5b1f17b1804b1-43cf446681csf16984085e9.1 for ; Tue, 11 Mar 2025 23:50:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1741762250; cv=pass; d=google.com; s=arc-20240605; b=iLSxnXbLDnXQVcS77d/6Lxf8ECe+eQ47gH3dXXHRKkWBOsswkc9qLRpM2M7ff93rVN j7pdX2L50ZtwvMaSKNbob0rZY6eHYLzI53R+kl0qKxg7iNO1g0YvLc5P0XtuIEvPpsQT DhvmxBf6d68rzJ04Go4xA4mbhP3aJl1LX9Vvjm7Ar208y2eznEUBtNE2W31TGyCGVDBz 0eh4L0R4MHEyQ2FvP+L0DLlTP26r+cE7nrhQQeEa8KssJ3zgkvsuUeL8Eeu9uMajTkch 0TzMN/FulmW5E38f9QWzjFTzkAuUi54CUV+KNHJy4/Ii/hTzaPqiDlQaY3Upo34KRtxz qkDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qZR5Qec/9PrRt1O37wSc/HXivQUmFuT8GnICya8jz6g=; fh=eTgTD2FdO+iVDCx6fI9FVZ3mtqVI4hrp4FZAgJcRaD8=; b=UgLLLc0yarKffKVVakcmvFXjme6N7zfWbTN3iJ2Wg7kj3PmkXoJmhgnptQU/w2FNp8 UFlzSjuLalDv4Zfd7y6jhp3kfOMysjDDp5IiQriYPz9bJAp+yzlTzi8J4o8bOiNZDHGH TfnSnN8NnJeMV9ZS6yV3hNAikbWnDw7JCOfwdz1r6jd5gLqiXvCFGa2TJcqOns+Po45J ssXAUvKE1L3HADyoDgx2tES8SB3LiqnGAY8Av/07xU/W8RC9EABwkkjuwrin0Js1XKyd e8bvJlVJYIjIc052CWXDg6dZSB3p9ljJaYS7APmx82NPFaNxa9HfSC7UqXvXu5gi6ROI ftiQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BU0Jsi9b; spf=pass (google.com: domain of fm-1328757-202503120650461db968238fb7440cc2-qjlrrk@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1328757-202503120650461db968238fb7440cc2-QJLRrk@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1741762250; x=1742367050; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qZR5Qec/9PrRt1O37wSc/HXivQUmFuT8GnICya8jz6g=; b=LYZo5WtprbS2ElhrG4+5jWtLW7TPVunIWG6r+6bMRrj2fJy8dICxv+3DIm6sF1PtfN kkdTQstJj/Ywx88q2SQBxcBsVMHHWePrOYGTTU3880c60rKJ1HLAgzq4tQQsfslnZIQc KhB27ishM8VuYGAfhZc7qMBDjlzV4gvZHC0aTBqtjdCQIndEMB41l1SFthffzGnnCmQO X5CvRy08d9QYul+NadEJWnxAcStuQDTX5sbdUTcjq3TD765BNbReDrAb/oHBq+n4E3Y7 l1uNFvioyNJewCbCNTgvqoehmyvcLgMiHjx9NOVOcARoN1ptCR6enS5mtuYLGj5qaBBk cyBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741762250; x=1742367050; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qZR5Qec/9PrRt1O37wSc/HXivQUmFuT8GnICya8jz6g=; b=vbM+l3i/ocZcb4gB8ix40gLDXNcDE7Hwvo9r8VBsUoI6kfKX2BLx7srlpn3pnjUsQL MSgyyS8l3l//OLia341dvzCk3rDaadkE/MVZiZ5cfkAb+wD3YfxDpl2Xv/aW59iAquVA qqwITy34DGEKKh2e9rQWaVsaAWtEozpb0lC7hRhI0+EdvfkvvtOjceIT70CkRAqHvdOL esjOCu0VeZ0rVNh8pcLn28NU6NrxAZLQzDqJBNDLmbGsf+3Oce8A1uGAFjz+/U5mN6mY C4i2/acfsShELiTVvujJdV0XFge+ZyaCp85Q6RN3OJ7y9eFRcSvmvDmsWpYjf494WFDf VXOw== X-Forwarded-Encrypted: i=2; AJvYcCVGx+N6qFydxaCBPFtv/49OD9IqxOXPQTfkJUW6x+WlKNz5K7MZ/RMhnmMlFROpg31Ic2yziwU=@isar-build.org X-Gm-Message-State: AOJu0Yy1S/AxHZJjxtFMPEnp01/44jOg/faIZmLlBOhgEhOjavoGl98c gofNKzwKI3Bd2Uk2saskY0Z64wG9SAlkDCgvTCrmt5y4quJZUYpN X-Google-Smtp-Source: AGHT+IEUkOvJ2i/OsonG15W7SjrnI9jmvK5d4bzbCB6nI9PEM/8JxT2OSGewkfJ/QrviEffIduh4Yg== X-Received: by 2002:adf:cc0f:0:b0:391:2e97:5788 with SMTP id ffacd0b85a97d-39132db5bfdmr10741561f8f.55.1741762249068; Tue, 11 Mar 2025 23:50:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVGR3JSYAv1U0F+kVfBVJ1WRol6MjooWaYeUtRpd2OzAGg== Received: by 2002:a5d:59ae:0:b0:38f:2204:701a with SMTP id ffacd0b85a97d-39129603ce7ls3412608f8f.2.-pod-prod-08-eu; Tue, 11 Mar 2025 23:50:47 -0700 (PDT) X-Received: by 2002:a5d:47a7:0:b0:391:29f:4f87 with SMTP id ffacd0b85a97d-39132da905cmr14004380f8f.49.1741762246818; Tue, 11 Mar 2025 23:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741762246; cv=none; d=google.com; s=arc-20240605; b=FUqdGN3GMLP7IZFthi8YsLlTBVWZ/+INJiTv32dNfnSH6bCHXw586n6vWHJvYZP9P1 HiInfYJGiV2huWo+ZGZu4DFBf8fo5CsvYTeVXjB+LldWdB02r70JIotWYQyUUDQHxqiC n8j0WDtle4vFRdFMXE6lXoF9H+rqsRD2OkflmbQL/v6+zqtAq+ou15lo6hRU7FIp8Uii EAhND/nA+YWW+4embQU1FgK4C/jWpSnA8ThJXg6AXf9NsYuTARNjy3GPGJsgBsS1BHJy s++RTXAWyDRk5Hk0xYRHUwLDK/mEheBCHPbtzIPLtDLs52wmRypdL8HyA1O9uW/bGIzH 7E0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=FrjGDRQxj87cjtbAztBtPJqCTw41mOCv2HakXpieaqQ=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=eM536jgwjs6OOLPNFdYviniXUmf/IdA8GZ0WtfEro1bfp2myT1702qEmt+/W/hOB+B fLTi0RplMkrLF3e3jbhtd1n6IuaT7TwSUSFxAwIHE6bwCauo0wdLEcqWdrdvEOJuywTU qEMIJGYgHW/ik+89O1ePNUH4GW+ap1+tB9ChnW5RbpY8S4OLzIyZe24uZVVQ/9h+mP9G GgoZFTez8girfZvItFbR+UulzjO+d6Rj7QOHgJlRvbx6duLX2bVbQ4u3wKSzVWC7P7M4 WYzRg0Pw4ihzODsz+lQosKqZBm41656vww3/CmFpcX7Hc420SaMRiwR9BEPmFoPtlpET aE9w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BU0Jsi9b; spf=pass (google.com: domain of fm-1328757-202503120650461db968238fb7440cc2-qjlrrk@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1328757-202503120650461db968238fb7440cc2-QJLRrk@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43d03e24477si2550005e9.1.2025.03.11.23.50.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2025 23:50:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-202503120650461db968238fb7440cc2-qjlrrk@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202503120650461db968238fb7440cc2 for ; Wed, 12 Mar 2025 07:50:46 +0100 X-Patchwork-Original-From: "'Kasturi Shekar' via isar-users" From: Kasturi Shekar To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH v2] bmap-tools: Fix --psplash functionality with bmap-tools 3.6 (bookworm) Date: Wed, 12 Mar 2025 12:20:27 +0530 Message-Id: <20250312065027.566489-1-kasturi.shekar@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328757:519-21489:flowmailer X-Original-Sender: kasturi.shekar@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BU0Jsi9b; spf=pass (google.com: domain of fm-1328757-202503120650461db968238fb7440cc2-qjlrrk@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1328757-202503120650461db968238fb7440cc2-QJLRrk@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Kasturi Shekar Reply-To: Kasturi Shekar 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=-2.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_PSBL, 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?= - Fixed the issue where the --psplash-pipe flag was not working in bmap-tools version 3.6 (Bookworm). - Added a patch to ensure the correct handling of the --psplash-pipe flag and avoid skipping the _psplash_pipe section when _progress_file is null. - With this fix, psplash can now be used with bmap-tools(v3.6) to properly display progress updates. Signed-off-by: Kasturi Shekar --- .../bmap-tools/bmap-tools.bb | 21 +++++ ...er-passing-error-of-set_psplash_pipe.patch | 28 +++++++ ...e-part-was-skipped-when-_progress_fi.patch | 78 +++++++++++++++++++ .../deploy-image/deploy-image_0.1.bb | 1 + 4 files changed, 128 insertions(+) create mode 100644 meta-isar/recipes-installer/bmap-tools/bmap-tools.bb create mode 100644 meta-isar/recipes-installer/bmap-tools/files/0001-Fix-path-parameter-passing-error-of-set_psplash_pipe.patch create mode 100644 meta-isar/recipes-installer/bmap-tools/files/0002-Fix-_psplash_pipe-part-was-skipped-when-_progress_fi.patch diff --git a/meta-isar/recipes-installer/bmap-tools/bmap-tools.bb b/meta-isar/recipes-installer/bmap-tools/bmap-tools.bb new file mode 100644 index 00000000..376ab433 --- /dev/null +++ b/meta-isar/recipes-installer/bmap-tools/bmap-tools.bb @@ -0,0 +1,21 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2025 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +SRC_URI = "apt://${BPN}" +PN = "bmap-tools" +CHANGELOG_V="+isar" + +SRC_URI += "file://0001-Fix-path-parameter-passing-error-of-set_psplash_pipe.patch;apply=no \ + file://0002-Fix-_psplash_pipe-part-was-skipped-when-_progress_fi.patch;apply=no" + +do_prepare_build:append() { + deb_add_changelog + + cd ${S} + quilt import -f ${WORKDIR}/*.patch + quilt push -a +} diff --git a/meta-isar/recipes-installer/bmap-tools/files/0001-Fix-path-parameter-passing-error-of-set_psplash_pipe.patch b/meta-isar/recipes-installer/bmap-tools/files/0001-Fix-path-parameter-passing-error-of-set_psplash_pipe.patch new file mode 100644 index 00000000..a45bcbc4 --- /dev/null +++ b/meta-isar/recipes-installer/bmap-tools/files/0001-Fix-path-parameter-passing-error-of-set_psplash_pipe.patch @@ -0,0 +1,28 @@ +From 06fa51d0270f84d9553c044bd7391f01459a70e8 Mon Sep 17 00:00:00 2001 +From: Jason +Date: Wed, 26 Jan 2022 16:26:47 +0800 +Subject: [PATCH] Fix path parameter passing error of set_psplash_pipe function + +--- + bmaptools/BmapCopy.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bmaptools/BmapCopy.py b/bmaptools/BmapCopy.py +index c6a2603..dba24a5 100644 +--- a/bmaptools/BmapCopy.py ++++ b/bmaptools/BmapCopy.py +@@ -228,11 +228,11 @@ def set_psplash_pipe(self, path): + a best effort. + """ + +- if os.path.exists(pipe) and stat.S_ISFIFO(os.stat(pipe).st_mode): +- self._psplash_pipe = pipe ++ if os.path.exists(path) and stat.S_ISFIFO(os.stat(path).st_mode): ++ self._psplash_pipe = path + else: + _log.warning("'%s' is not a pipe, so psplash progress will not be " +- "updated" % pipe) ++ "updated" % path) + + def set_progress_indicator(self, file_obj, format_string): + """ diff --git a/meta-isar/recipes-installer/bmap-tools/files/0002-Fix-_psplash_pipe-part-was-skipped-when-_progress_fi.patch b/meta-isar/recipes-installer/bmap-tools/files/0002-Fix-_psplash_pipe-part-was-skipped-when-_progress_fi.patch new file mode 100644 index 00000000..bf17a7d1 --- /dev/null +++ b/meta-isar/recipes-installer/bmap-tools/files/0002-Fix-_psplash_pipe-part-was-skipped-when-_progress_fi.patch @@ -0,0 +1,78 @@ +From 163a49259d025e220e9de4fc2a6296c2c3053500 Mon Sep 17 00:00:00 2001 +From: Jason +Date: Mon, 7 Feb 2022 17:55:16 +0800 +Subject: [PATCH] Fix _psplash_pipe part was skipped when _progress_file is + null + +--- + bmaptools/BmapCopy.py | 56 +++++++++++++++++++++---------------------- + 1 file changed, 27 insertions(+), 29 deletions(-) + +diff --git a/bmaptools/BmapCopy.py b/bmaptools/BmapCopy.py +index dba24a5..ca22aba 100644 +--- a/bmaptools/BmapCopy.py ++++ b/bmaptools/BmapCopy.py +@@ -396,36 +396,34 @@ def _update_progress(self, blocks_written): + else: + _log.debug("wrote %d blocks" % blocks_written) + +- if not self._progress_file: +- return +- +- if self.mapped_cnt: +- progress = '\r' + self._progress_format % percent + '\n' +- else: +- # Do not rotate the wheel too fast +- now = datetime.datetime.now() +- min_delta = datetime.timedelta(milliseconds=250) +- if now - self._progress_time < min_delta: +- return +- self._progress_time = now +- +- progress_wheel = ('-', '\\', '|', '/') +- progress = '\r' + progress_wheel[self._progress_index % 4] + '\n' +- self._progress_index += 1 +- +- # This is a little trick we do in order to make sure that the next +- # message will always start from a new line - we switch to the new +- # line after each progress update and move the cursor up. As an +- # example, this is useful when the copying is interrupted by an +- # exception - the error message will start form new line. +- if self._progress_started: +- # The "move cursor up" escape sequence +- self._progress_file.write('\033[1A') # pylint: disable=W1401 +- else: +- self._progress_started = True ++ if self._progress_file: ++ if self.mapped_cnt: ++ progress = '\r' + self._progress_format % percent + '\n' ++ else: ++ # Do not rotate the wheel too fast ++ now = datetime.datetime.now() ++ min_delta = datetime.timedelta(milliseconds=250) ++ if now - self._progress_time < min_delta: ++ return ++ self._progress_time = now ++ ++ progress_wheel = ('-', '\\', '|', '/') ++ progress = '\r' + progress_wheel[self._progress_index % 4] + '\n' ++ self._progress_index += 1 ++ ++ # This is a little trick we do in order to make sure that the next ++ # message will always start from a new line - we switch to the new ++ # line after each progress update and move the cursor up. As an ++ # example, this is useful when the copying is interrupted by an ++ # exception - the error message will start form new line. ++ if self._progress_started: ++ # The "move cursor up" escape sequence ++ self._progress_file.write('\033[1A') # pylint: disable=W1401 ++ else: ++ self._progress_started = True + +- self._progress_file.write(progress) +- self._progress_file.flush() ++ self._progress_file.write(progress) ++ self._progress_file.flush() + + # Update psplash progress when configured. This is using a best effort + # strategy to not affect the writing process when psplash breaks, is diff --git a/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb b/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb index 242ca88e..54e521b5 100644 --- a/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb +++ b/meta-isar/recipes-installer/deploy-image/deploy-image_0.1.bb @@ -10,6 +10,7 @@ inherit dpkg-raw SRC_URI = "file://usr/bin/deploy-image-wic.sh \ file://usr/lib/deploy-image-wic/handle-config.sh \ " +DEPENDS:bookworm += "bmap-tools" DEBIAN_DEPENDS = "bmap-tools, pv, dialog, util-linux, parted, fdisk, gdisk, pigz, xz-utils, pbzip2, zstd" do_install[cleandirs] = "${D}/usr/bin/ \ ${D}/usr/lib/deploy-image-wic \