From patchwork Tue Jul 2 13:38:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3658 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Jul 2024 15:51:40 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dpds0030556 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:51:40 +0200 Received: by mail-lf1-f57.google.com with SMTP id 2adb3069b0e04-52e71284e6bsf4682057e87.3 for ; Tue, 02 Jul 2024 06:51:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719928294; cv=pass; d=google.com; s=arc-20160816; b=NehlnVy3bTXRg2lfsjlEuLXWnJ99T779W3kBPwDMDdk5QykwPGFTycfM6M757MoRTf OxADL2af50Z1HAFkRFwK20Yv5NLOEPGtkaWNV88gSxHW3nK+rfEBlCU9ysSkn81X1aGc y14a9mR6yRjWk4dLX1erR2wqvqaKSPOHZVjfLgHtkQ34PTv/IC4b3+YWmBxSbzhWpJ/r ZRUkqYB1ltr4fCNeJT0+zz/srB3ruvONudfvBDeGmlA1H5OK+xCfSu5v7mHYYkr0PqRv GjPTmcujYxwWRPQI7B2OpPQo7hx71927wuXCUOAst1GWKvEFCdUmZxl3Df23I/CXGZs7 8OsA== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vcp3MKVPinm+0nf0nqvbRMguU0jlAlvKfQ+Kl1ic84c=; fh=dC0qpp0m/MKbgN/PqoVGKtZXZ1ayAfrm0UilP9LpX3k=; b=TEhAdNMhb5dh7vsFtEVjIup8t0nL4MftmDQAw+1dtYnee2wLhoEFbJC73xezH4aX2t x5ne1X4hXKOMw4CPp7Y3aj152fi4BAzWmbhMt4R1sg9SVsVBDMkU0tascAyPnA/0jPme hiQdsD1QheFIm1KFIuIexIlCS7z9DGt15MU9mIaOCuQ1Eaf+wE/jwLkUICoCHAkk6BiL 5JHheBwWs16wSHcr2KBh2cW3u/+nKGfExu5k2T7XUf02phzgOEBx6WbMmfZVYl3kqSWd /cXGfHjffdaeXoJtQdTFc8UlXAtgEIV1UN2NamBo+nI0QwqdgQck+4Xo0jRUbOmF4it0 iNtw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Q6+uYZgo; spf=pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832006860980d3dfaac72-deZnxk@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=1719928294; x=1720533094; 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=vcp3MKVPinm+0nf0nqvbRMguU0jlAlvKfQ+Kl1ic84c=; b=RkHqhCQRV8P23buOw2JqCjkASOh7IZ1wVUxtQrHbwqbZVZjUEvPTThpLW1oG7pVOsq gVlY7ghBBk5X6LxNISSyY6tl0ur0hYdff2L/+e36kDYy7gqCMHpY1D+dlqE8AHWDSH00 mQBeWQ3BZXGsLpI74eUoCHZfZcQu7oggPUTnxzFHKfb50RU8JFpOpUhSoq0uc9Iwv5Fj kG2eb/D5UFzSjfrHiLSQyu4qbt94cEnfFghLXDaHtNm84Eo4k0ArefoNKPcyonMlcqDZ gc2/AxO5SASZP9AZETuT8L7VUllu9MHYYiP8vsfQ4P4QtVCmdwXztDHVYQRDwfdA5tED G/Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719928294; x=1720533094; 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=vcp3MKVPinm+0nf0nqvbRMguU0jlAlvKfQ+Kl1ic84c=; b=MiWb18vQXVPrAV25HZycAQxWmJAu46BI4bfsfbyl3DN9vvrIDIn0MQDLAFZqmtIfjw Tm7xS5ySObK3Kgi9r6Jg3IU/YIrXjwpJu9z06lEUvRw4h+jWupXxK1U3ZVOTz7MpdzT7 JtMAK2zsCnjElkvsNVARlqoyVOeAO09RmqU6pWXu33gYiJUh1DEHK4fpEH8Xc+kGypRH hZVqCXk/ZVP+WgKBMNDoPdcOCp9ArVreXm8KQomIFiGRJ1AVo4QIR5FIqPi4GAyRREdE oadwWgNE6xy+lc9gLRYMzlDGiBBK/fRsN8uEf1cNK2W1AlFLqjpEZs+5LvO6l5QlcJE0 /bGA== X-Forwarded-Encrypted: i=2; AJvYcCWGcHoo4gTFrzjV62fdvJ9kfqTxeVKyEuTTpnATXuOmMA8QrYBJK6iN1pcqekMOhYJGpR4anhDu/TUS2tQAQxjeBoRVp9Y= X-Gm-Message-State: AOJu0YwwSC0eQ8XhwCxz+6sokJ7NUMB37vJtX8v8S0h7zsgTWc9WiHGT C2y62lGySkmUKb1RW5ySWwsTWpc20p8XvBO1ETGs/AWZcWh/qrr5 X-Google-Smtp-Source: AGHT+IHRPKvvwNCJ+mvhrWXgdxBQwaxFnm2MzBClgObwOECQqwtJl3m7JFvKGsxZICQQtbWWpdawpg== X-Received: by 2002:a05:600c:2150:b0:424:a4ab:444f with SMTP id 5b1f17b1804b1-4257a02f1bdmr55059835e9.33.1719927515222; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d16:b0:421:ad3c:1cd1 with SMTP id 5b1f17b1804b1-4256bbf8cd5ls18715805e9.1.-pod-prod-06-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:4f52:b0:424:aa64:e9b3 with SMTP id 5b1f17b1804b1-4257a02b701mr55711295e9.29.1719927513007; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=yYj3YbtmrzETWEFWnGTkOlibjo8M2nW5Dlap9w3+t4Tf/HDLoszYXQ/Edrh+UxMlQ8 63VkILniRU4UyzFqAYjsWA4jiyl+Eo0DB7m+TqogBw42I7r3mohiWj7lydt7HhGD9otH y3L6jjZOIHIqWgkpjY3A8gKICoiJmD5smTAqOT0R2rQYdtvOQMNd1OOcNts+yBBuFrtU qokdSF1DxNVREv4WKVF396o4KKBib3W1oAGHGhcLvmItLnLoaQNdR3g4FpwNbkLBtXWW x7Qa+CVja5lrto+9nZ8g+5xDZXHGkcdL+MTxztMVoOGhLG1NRV8fxufn58EUe2r6Hzzk 2/+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=AzbDf9OME3ALzAePu9V93MBDRj69k+TftArM78xHzqE=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=eQ+kRtlI9SSOjIFOjEux4KZZt1GexVzKLrbeij0CMXl8eFE9vbehpzZJS4ts96Te1h SPkLj8GX1+0Mh156Cxt1T24szC3u+pSUb0qLgi82FByHZyhO8yeViVgC+iS8djsIOHhr C9fcXGxWOiwLk3ZI6BYmPWZ040OtXxVjzC6mzj3Giyr+9QZS50Ogius56Og1SpLjTSI2 srF9Go1G9OI2j+gmGg5AYt0wwjCkvfZt7aSMrLoXdAiSTd8DgOXQqv3eWtd04e8Dj+6y NBmGRHMuA+43uUCRF9oW6zsmW9RSqvM7VzG06yY7+aheGyw8RQ6sU56SZQZNLuz0DZT/ Y03g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Q6+uYZgo; spf=pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832006860980d3dfaac72-deZnxk@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-425788015e4si5278465e9.1.2024.07.02.06.38.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240702133832006860980d3dfaac72 for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 05/17] meta-isar: deploy-image: Fix bmap support Date: Tue, 2 Jul 2024 15:38:19 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Q6+uYZgo; spf=pass (google.com: domain of fm-294854-20240702133832006860980d3dfaac72-deznxk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240702133832006860980d3dfaac72-deZnxk@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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_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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka If the to-be-installed image was compressed, its corresponding .bmap file was not found. Fix that and also ensure that bmaptool is correctly invoked if --nobmap does not have to be inserted. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh index 9a1fa651..d27a0189 100644 --- a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh @@ -6,7 +6,7 @@ installdata=${INSTALL_DATA:-/install} -DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap") +DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) if [ -z "$DISK_IMAGE" ]; then pushd "$installdata" shopt -s nullglob @@ -17,11 +17,11 @@ if [ -z "$DISK_IMAGE" ]; then "${array[@]}" --output-fd 1) popd fi -if [ ! -f "$DISK_IMAGE" ]; then +if [ ! -f "$installdata/$DISK_IMAGE" ]; then dialog --msgbox "Could not find an image to install. Installation aborted." 7 60 exit 1 fi -DISK_BMAP=$(find "$installdata" -type f -iname "$DISK_IMAGE.bmap") +DISK_BMAP=$(find "$installdata" -type f -iname "${DISK_IMAGE%.wic*}.wic.bmap") # inspired by poky/meta/recipes-core/initrdscripts/files/install-efi.sh target_device_list="" @@ -95,7 +95,7 @@ if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" fi clear -if ! bmaptool copy "${bmap_options}" "$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then +if ! bmaptool copy ${bmap_options} "$installdata/$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then exit 1 fi