From mboxrd@z Thu Jan 1 00:00:00 1970 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:27:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52C6RdlC019020 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Mar 2025 07:27:39 +0100 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-43ced8c2eb7sf26079725e9.1 for ; Tue, 11 Mar 2025 23:27:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1741760853; cv=pass; d=google.com; s=arc-20240605; b=N31utpnG0w5atLnKhIsHB62I11rrUfLXoCfrzxK6GYQn8BMIo8FdczM9GI7cgpINa9 20Ia1YJ6X4+APg+CrG78IKGYo+Af6Wg7xcGYa+2z8CAijGSrNMJcGe+VpGVNjc+oQM/o xpFRTSnGyLHRhSda9PvFHiL8GpYBwf/Tg27J1xoU7oMTaQVfyz2R4YftF5yfhFarXAgV WXxj9x9NAe9Vg0BKbKcDsPiw5Gkuzno+CNLYcepIghbBKw14VmkfoWd2Df4LvngEj5cR iBFgxM2kfC1bq9xwwvJm4Z4d1qNjVW+HJ0Y7xwZcsO6WctScgxSB7lj8pzOTEbfTDYaK T+oA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=tpzA/eWlMERT5gUUaChjP4WlvM6vReD6Y5HBIsONRIw=; fh=1qRCfWWRZQvddRDcFOLiW2lCv13LGK+8iBCgYTwllDg=; b=W5P0YAqD6+VTnn/UCSem3Zfp5FVfzXpHKQ6NwS69PGuFDRwyqnK0BpfIavDwat20eg LUdeTNrX4+/EwE6mGq0/ELNNb5DWEKs2j24kWRksZU1WnJlwtcUShB7Pdv9f0GBDkUuL l3yJgZkcPqRDHRoPNUy+/skXHgocenZWNSz0syXVpCyM5lHsJo5atbAdLALJ5Jhi7a5d 09SBmiqj3XgQEIElEGxxtfdc4IPoK3tJ6ihY/RMbODGLh0RVzbgfbMb2v3mhHtV2M3Qk fFg7uyMYvRr0fHN1OaOXAIL1kPz1tNsmnb5oVv2PDKigIrXeWEBx+VuhpDPJAv2w+2En ZYYw==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eDFe26aX; spf=pass (google.com: domain of fm-1328757-2025031206272954e9957529e94de245-yko_qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328757-2025031206272954e9957529e94de245-YkO_qs@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=1741760853; x=1742365653; darn=ilbers.de; 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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=tpzA/eWlMERT5gUUaChjP4WlvM6vReD6Y5HBIsONRIw=; b=dbgP95CFys2PES/iR6IkSl3NnQ/np0cp7YykTdhOaZhCR6CevzFZp6akf9c93NuEEp SKUZHBEuqGvAeh2fyySomExbXCcCb+VCKIVl6Tt68IwzGqhxNygZiWAmaCD613+w5tCx wGSqe9i6nZ+m3DBrIDRTZf6gtaK1YJjnGbTfam+qFWUPRWW5+i6594plsQlnK+Fte3oL ZGx8GUy3LrtnUzKNyjCLxFaT8YB24Ea7BXQEtBFgzDSd4/pcCgMZn5xkL296mNmpoE4P hTDwsniLQMBAlY1OCHDs1uzb2Y8SmT6hGaUbmkEYrctyfwnArgLMVBWi05LzE6OIzebT AaTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741760853; x=1742365653; 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:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tpzA/eWlMERT5gUUaChjP4WlvM6vReD6Y5HBIsONRIw=; b=ZOBzNHQ3U0FchjWPGM9s+dAg8tEfvo180DNtVOwHfxB6UcEBb0gF+MmXRJfLrc0I7P QJen+p3CgFgzx17ZBkzwcwo/VNXGsQfDb5oIDcxm4yaMH6EelosL8bNt6BDo9CZcTMW9 tM257NWli8+FHWhZdG5lRWAsrtCtMgJ9i/SvDDpSm7kVpV4pUgTHdHJblg4OL3ZO3SKX unZwSnWSGyGS+ZLNiQ9jraCNvNEgTtgAs3ASs2zXtLLxJFGDP8SNMdXnhuVqJXdsGQTA /TRUxNra05QdivrUx4QFx/sXUBQdT6XhVETH96OM44NLzKXJ61tDeTjOfZqYkmaS5e2f BhbA== X-Forwarded-Encrypted: i=2; AJvYcCXYsJGEkT7vZEQ1rlcKoJm2tCNcIv7aZ0C328EmNGXX2quuE/2y49MlVe7TQcUk2FLg7gUY@ilbers.de X-Gm-Message-State: AOJu0Yy8IIZrZaQLhVs5ViQjdHSrAjVHp7JKRHPjVWTrOMvcW8lWpv5R P/1R3vRFwawIpSQcv2S37bWMEkjcxR4OhbWdu/d3qyw7uy0l6RGU X-Google-Smtp-Source: AGHT+IGwdtFPSUIn/7f0JW1/xfARUse5NTuTN/cGkm2WRC9C2hj+ObfYsUbGsu6YqQMuaMmEeAh7iw== X-Received: by 2002:a05:600c:3b21:b0:43c:fee3:2bce with SMTP id 5b1f17b1804b1-43cfee32d16mr65966315e9.26.1741760852765; Tue, 11 Mar 2025 23:27:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVFwdOJMOp2riq6h/FAjNb34SbSva79ZOa/4RCHpuUvGlQ== Received: by 2002:a7b:c3d9:0:b0:43c:ee6a:ee86 with SMTP id 5b1f17b1804b1-43cee6aefafls3207585e9.0.-pod-prod-07-eu; Tue, 11 Mar 2025 23:27:30 -0700 (PDT) X-Received: by 2002:a05:600c:4fcc:b0:43c:fcb1:528a with SMTP id 5b1f17b1804b1-43cfcb1544bmr87731145e9.6.1741760850494; Tue, 11 Mar 2025 23:27:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741760850; cv=none; d=google.com; s=arc-20240605; b=dt6XAVCa2DXNRHQ93QTqy8Cbuxp1h93D+DtghIku8UUmPVtjNsXy2nWj18Bprjk+oN sR16/aJ2vSReHsUWRXl5efh173h0W9Ty2kh4fank3SHXS6drV0zD3+nfom9C20e5Yvbt 8rl2B0axY1EIQ1PdIy8hsECsMgDxm8D8L1+/gCDKGOvJGlycvhepYXrfGTf+rGU7ANaw 0QqA1mUB3DMahJTjBau+Eqk7JuTbBOfF6CNLj4DuOAWvoLiog19v+J6wC0fNBWPppmZa ND4T0b8uabWnlTIUKHpYq/I0AryPG1CpKmMPzZjBKG/49DAuezrCHQ0+pFAG73o86oFv TPRg== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=ncxan5DEPYhlXQ0bsuNvaAtyw/n0mfkOsexBQRsqOyc=; fh=pR4tJPO4NbHlIB/rP4bIo54Z1zh5hd/ksAGQ0tcKkYM=; b=UZzty+x9lW6zF5u8iMAfHXtiYkQiOFBEsu1kNE4eectLSD4fqTQmbNL+Fa2YBVc3o9 EiICKpgYyJuBnLN8vcrsBlppngSfkxpkIJByuXTHh3p/4ajh19tx9ECycbh60Z+zz15G MVEPF2eMfj4ESiF9svUU11Nu9K6EQTPCCHCJyLoYu+kIPgNzKMx0n+3Uf3rgEyc733gv W2t3SeF7sxahs76uqdHRAf6Rp7eqNJljUKnoQeyq5FPFGdMgH645UDAbdPsAMesW2Qo3 gqHIiaxXkpLwd5bP95OxtlAzMdR7sT8BDOPE7sxtLidCc7iuZ9Sf3hR364MdDLLycno/ +kzw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=eDFe26aX; spf=pass (google.com: domain of fm-1328757-2025031206272954e9957529e94de245-yko_qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328757-2025031206272954e9957529e94de245-YkO_qs@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43d08b96d78si1535725e9.0.2025.03.11.23.27.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2025 23:27:30 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328757-2025031206272954e9957529e94de245-yko_qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2025031206272954e9957529e94de245 for ; Wed, 12 Mar 2025 07:27:30 +0100 From: "'Kasturi Shekar' via isar-users" To: isar-users@googlegroups.com Cc: Kasturi Shekar Subject: [PATCH] bmap-tools: Fix --psplash functionality with bmap-tools 3.6 (bookworm) Date: Wed, 12 Mar 2025 11:57:12 +0530 Message-Id: <20250312062712.566301-1-kasturi.shekar@siemens.com> 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=eDFe26aX; spf=pass (google.com: domain of fm-1328757-2025031206272954e9957529e94de245-yko_qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328757-2025031206272954e9957529e94de245-YkO_qs@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 Content-Type: text/plain; charset="UTF-8" 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.9 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_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-TUID: 3ec5NOcTq/Mt - 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 | 33 ++++++++ ...e-part-was-skipped-when-_progress_fi.patch | 82 +++++++++++++++++++ .../deploy-image/deploy-image_0.1.bb | 1 + 4 files changed, 137 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..7d1bfb47 --- /dev/null +++ b/meta-isar/recipes-installer/bmap-tools/files/0001-Fix-path-parameter-passing-error-of-set_psplash_pipe.patch @@ -0,0 +1,33 @@ +From ce558782978405da344627f77e06f0292b6ff5b8 Mon Sep 17 00:00:00 2001 +From: Kasturi Shekar +Date: Tue, 11 Mar 2025 12:14:47 +0530 +Subject: [PATCH 1/2] Fix path parameter passing error of set_psplash_pipe + function + +Signed-off-by: Kasturi Shekar +--- + 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 @@ class BmapCopy(object): + 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): + """ +-- +2.39.5 + 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..734b189e --- /dev/null +++ b/meta-isar/recipes-installer/bmap-tools/files/0002-Fix-_psplash_pipe-part-was-skipped-when-_progress_fi.patch @@ -0,0 +1,82 @@ +From e085dfaae160c93db80ef041f6dbe19ed36e8c47 Mon Sep 17 00:00:00 2001 +From: Kasturi Shekar +Date: Tue, 11 Mar 2025 12:19:41 +0530 +Subject: [PATCH 2/2] Fix _psplash_pipe part was skipped when _progress_file is + null + +Signed-off-by: Kasturi Shekar +--- + 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 @@ class BmapCopy(object): + 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 +-- +2.39.5 + 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 \ -- 2.39.5 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250312062712.566301-1-kasturi.shekar%40siemens.com.