From patchwork Wed Sep 17 12:35:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 4363 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Sep 2025 14:35:40 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f57.google.com (mail-ej1-f57.google.com [209.85.218.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 58HCZdr4025211 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Sep 2025 14:35:39 +0200 Received: by mail-ej1-f57.google.com with SMTP id a640c23a62f3a-b1b9460dd84sf47042766b.2 for ; Wed, 17 Sep 2025 05:35:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1758112534; cv=pass; d=google.com; s=arc-20240605; b=JCM2XBDjwJCzeFDqsC5lcUx06/uTvlrPskaeWNa7mFzcPPqW0LlaQojf4qSkOcidJh 5p3iksDxq+NfOfkMaeaQP0Z73m/nXlNU/cGkqw4rrydoU/l6zeqB436tNNJCE91Nzvk8 pHmKzBCY3sPvbHRYfFJHvJwj7mh9ajHelYF/0CKwWWiRMhCTRYP01BqmibC0Sl1nT/Bf ra9GQG5tLrTD9Q8g9dRSeAJabbmh/OsXS2+YjY7JJeJt5z9AkRZ2ryKqTlrUGKRgwXyJ rOndEm6c7ca4+No8ohGXADgNZEXO20n6EzEwF+5B6yplkK9jSj6CaZC0QxL7SdYUmz2r Q8hg== 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 :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=VIlyQwI2bzyWbePh1E0suV7G+9kVzCE7g/vuh2c8oNs=; fh=m9gGo10RvmseEmXmvd2ke1FuSzPzLKvO4E8JmikQyp8=; b=b0gdbVrIYKysvt+vEeVJrhIMVSq7KGLTr/Fxt/vYTvQjJOiK0m8rSCWURvpwerDP7k 8/FXvTMQcMBF9OJ2wIDZuWk/0kwjAlNvmkyBnLECDmHVKBqE4OCpLdevkvyedb4++2PV ieK3bjWeWVpG9Pwkrk30MJTykFRXLOsT5szAOHeFODSbKyg+u02+aJ3x7jKPD2Ui9na1 Mdq6S2H8rE7nj+hp4oCchXDQicHxAawFMSgjLlkcMLj4HAvODrZA1tmP0hiNSM3WUu29 BVnrfxyZAT+AH23aUHt+7WNgVP2CqVAadWn6WzUItwZ0fmxHHBEIj98XDrVkM7siqlT0 yBMA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gT6ozjAg; spf=pass (google.com: domain of fm-1330684-20250917123529d4de8e9259000207d9-29xens@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1330684-20250917123529d4de8e9259000207d9-29xenS@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=1758112534; x=1758717334; 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 :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VIlyQwI2bzyWbePh1E0suV7G+9kVzCE7g/vuh2c8oNs=; b=ir9AZUGJPnbPB5mY+aNdBjJmlnYh3wq5PyXF26/OnkRBbPAZh3rgMOP2oabof0/3gl oP1YG0usybXcB1wpv1/28A+f/kcgXkAalagVIX2nkEBxRAgQHP0cMuJEScEpMiVd5ix2 WKMSghezvltl/e98Gsqf7lqKiqKaXP0qbJIJgvuZPKgV1dnuO6AiJXw3U+dr/DBXyXB2 xUFOxnhqsfoOQFQHSxT3WoGF/4jhDgniN3Ra/CB+8WhPJHPXhHQZia+Uiz/jnB9hIxHX tBl7edSnRRqxPIrU1Uep8DAkW9wtLA0elw3ABDb80i1qSvrmQWXXPvYIY2y+bdik3xDE /ssQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758112534; x=1758717334; 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 :content-transfer-encoding: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=VIlyQwI2bzyWbePh1E0suV7G+9kVzCE7g/vuh2c8oNs=; b=qYOngvkRbIFp+uJUvMicFw3rgTN+22WKr6rRDwKyWSvib8g8bAhg7AYaEvO5AWkUgI CyUwRf5BnOowU1hlBVnjqTcXUXVUQ6JKiwUBqxg3eJqfBopShOfAz95S++np5bv+0xvd a9ldknZBOzGfqJXao3AmE6z94Br0qN8mdVxPyS3XZ+cSJivWVHhLiw2/C4juueaskwGe 7z+duTZpTpbfWvoYPbPJTTIhuJSOd7AVgyuOdhhkzJgVdIMaYXtO7tNiDqe3NKj+adJA O4NLC8Udh3PkEFd6IIt4OFZtsDXuEq4WTQfQnjni+Fo7MOThGyLVWnZI6r14AjrX++E7 gYlA== X-Forwarded-Encrypted: i=2; AJvYcCXUDW4XxydNSLZSTm3nO0gFu398SJh5Y/+NtME/o2rPAU8b3ZQyHwRkrsR4gB7wT0fKeC+yDII=@isar-build.org X-Gm-Message-State: AOJu0Yzc9D9Muy7ge61sPCKj8zkCP4vJQBprMAOi7lvS03m2drbH7QW1 E47T73+M+fc5Q6VCLWabECyRlVHNYNMpskAkup+L6kvZOi9ndKaFjR8O X-Google-Smtp-Source: AGHT+IEkODlTkgs6UJbvGfWuTOyxR3mdAgpe1ISo28yNgW67WnReK0zLzJ16gktZkCT2jDPTy3lqYg== X-Received: by 2002:a17:907:1c0f:b0:afe:b2be:6109 with SMTP id a640c23a62f3a-b1bba5d11a3mr240392066b.59.1758112533891; Wed, 17 Sep 2025 05:35:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARHlJd5wNS+KwaA2xcfLWL0JAsVAOvozM2SG4nW5TqCL3VUuNQ== Received: by 2002:a05:6402:23ca:b0:628:46e0:3cd8 with SMTP id 4fb4d7f45d1cf-62ebad1bc7dls4723420a12.0.-pod-prod-02-eu; Wed, 17 Sep 2025 05:35:29 -0700 (PDT) X-Received: by 2002:a05:6402:5046:b0:62f:30e8:3a1d with SMTP id 4fb4d7f45d1cf-62f84221fcemr2077236a12.9.1758112529707; Wed, 17 Sep 2025 05:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1758112529; cv=none; d=google.com; s=arc-20240605; b=JNlouxOtX9DC+1EaCPlBnC2/76BOGkkJKFkSl06xGKqVe6GVw4TUH4E1zDhpXDNpR9 msyyJIzVeQaWw7KeT3vLxcUSzlPAgVYUz/nQ9niib+tSWm9hhrafhMHnqmpZgTPpTA/F Si4CuNNDrtX4hnFQybD0D/f/bX7aBAV+rtTRSUj0ivxtx8p7DocFiFY/AQNuPN3JCSQu PufY3h+qdZFkcH1uwWM9uHE278iPImZQDo2bIX2/0KEjZslOwm291WmOosaT/nYCLWLS d+vixU14dgzHgUqS5SH+54FejX8Kl4H5QNJVkJpdL0Rmsi3Y5qD5rQMzYITKkYW/yH3i kUeQ== 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=JXr6me11vMUIcphzhwtjyPA8CdfM8TbtJOXKTa5KKbU=; fh=jXKJ4NXmcq9ft/CXyj8cp7qMr3n5EHnvR/LYDuogm+g=; b=Vuj2dxhAehzPNoWBts3YXpiyxq6GtxUC8A5ZQaDFsr5p6LixC46hATwvC3JQCH9WTG yhXjpgWmGMEtYzhdbOrQYHNzhFqcgSOGb6IdQne6Ye/3nwMzTGRMwp4zaJpI82vT/wty 5mDI2qi6IRSwCeYX0RGf7y8krd313d+PDtZehUAbFKwvI2EJU366oneJ8VBQD2vCDMNT V2cyr+HocP7FDry3utibIUVdc066zSILbvyE1fWET9GZM5ZoCFritv/IIB/ff7W9t5U3 B+0P07MzuvynczwV1aB+i+eVmi6WRpsld61XK1j1EnzsrY0BaRFDxRgc5AKbxP7yIjQS VmIA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gT6ozjAg; spf=pass (google.com: domain of fm-1330684-20250917123529d4de8e9259000207d9-29xens@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1330684-20250917123529d4de8e9259000207d9-29xenS@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 4fb4d7f45d1cf-62f1bdbc8a4si182777a12.5.2025.09.17.05.35.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Sep 2025 05:35:29 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1330684-20250917123529d4de8e9259000207d9-29xens@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 20250917123529d4de8e9259000207d9 for ; Wed, 17 Sep 2025 14:35:29 +0200 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" To: isar-users@googlegroups.com Cc: quirin.gylstorff@siemens.com, Alexander Heinisch Subject: [RFC] isar-installer: Let bmap resolve bmap filename Date: Wed, 17 Sep 2025 14:35:25 +0200 Message-Id: <20250917123525.488412-1-alexander.heinisch@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1330684:519-21489:flowmailer X-Original-Sender: alexander.heinisch@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gT6ozjAg; spf=pass (google.com: domain of fm-1330684-20250917123529d4de8e9259000207d9-29xens@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1330684-20250917123529d4de8e9259000207d9-29xenS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: alexander.heinisch@siemens.com Reply-To: alexander.heinisch@siemens.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.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_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: Alexander Heinisch The current implementation detects .wic.bmap files only in local /install folder only. That means, bmap is not supported when pulling images from http or similar. from `man 1 bmaptool`: "Unless the bmap file is explicitly specified with the "--bmap" option, bmaptool automatically discovers it by looking for a file with the same basename as IMAGE but with the ".bmap" extension. The bmap file is only looked for in IMAGE's directory (or base URL, in case IMAGE was specified as an URL). If the bmap file is not found, bmaptool fails. To copy without bmap, use the "--nobmap" option." Thus, having `bmaptool copy` auto resolve the bmap file, allows a more robust handling to detect bmap files. Not only on local media, but also when image is pulled via http. The downside is, that it fails in cases we don't provide a bmap file unless --nobmap is specified. (Handling for such is not contained in this patch) Is support for installers without bmap file really a thing? Signed-off-by: Alexander Heinisch --- .../deploy-image/files/usr/bin/deploy-image-wic.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh index 333762f1..3162e9f1 100755 --- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh @@ -31,7 +31,6 @@ if ! $installer_unattended; then dialog --msgbox "Could not find an image to install. Installation aborted." 6 60 exit 1 fi - DISK_BMAP=$(find "$installdata" -type f -iname "${installer_image_uri%.wic*}.wic.bmap") # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh target_device_list="" @@ -117,10 +116,6 @@ if ! $installer_unattended; then # set absolute paths to be compatible with unattended mode installer_image_uri="$installdata/$installer_image_uri" - - if [ -z "$DISK_BMAP" ]; then - DISK_BMAP="$installdata/$DISK_BMAP" - fi fi if ! cmp /dev/zero "$installer_target_dev" -n 1M; then @@ -139,11 +134,6 @@ if ! cmp /dev/zero "$installer_target_dev" -n 1M; then fi fi -bmap_options="" -if [ -z "$DISK_BMAP" ]; then - bmap_options="--nobmap" -fi - if ! $installer_unattended; then clear fi @@ -160,6 +150,7 @@ version_ge() { # Get bmap-tools version bmap_version=$(bmaptool --version | awk '{ print $NF }') +bmap_options="" if version_ge "$bmap_version" "3.6"; then # Create a named pipe for progress communication progress_pipe="/tmp/progress"