From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:600c:4fc5:b0:424:a578:fc7 with SMTP id 5b1f17b1804b1-4257a009bc5mr58309955e9.3.1719927515308; 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-Google-Smtp-Source: AGHT+IFMoSTRUU29heNOM++WrDlsUTU5zTsYK3khjZre3bIl6siZuaJw93aTd49IoYHb4su0tPnO 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 Return-Path: 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; 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 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240702133832006860980d3dfaac72 for ; Tue, 02 Jul 2024 15:38:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=AzbDf9OME3ALzAePu9V93MBDRj69k+TftArM78xHzqE=; b=Q6+uYZgoiQHqXdBwKDWuGEEnvWrS2l0yfM9F1LmLAmgS58t1FDqEcD6qcNuoXhtdQQyNxv JEAI8O6DcXGcnG75kIyuWSbqwo0sk0HMHm7in5AkBlSgYlyPXd2mq4b4QwODCiEtwyU8zJUL XrGX/VeqMWvLia+pNEQpXUfMmNajc=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: PrWTQSXsUyjz 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 -- 2.43.0