From patchwork Tue Jul 2 13:38:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3655 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:38:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcmf0029741 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:48 +0200 Received: by mail-lj1-f191.google.com with SMTP id 38308e7fff4ca-2ec72d14876sf36889831fa.2 for ; Tue, 02 Jul 2024 06:38:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927517; cv=pass; d=google.com; s=arc-20160816; b=gjFFyMXC2mhDxo71OXow8uY3fatbW9OtFzSBimvPe8Wrdq0H+w3cpHIey1iphkFQtq RX8ujxHA/zo9kqel6yaWBmNdGq1EMkIbe5deaOjHuczd0D0kp8wQvr239CRNnb1OcAh3 ionisLJQL3f6Ci7DQ3ed15Yx6q53VQZkhz8VnYRc2MH0FiDBsc/LinRLQgBXEtPszSBI iYBD/KFjK5qqc2EeiUdj83qgS8OlrlDMm9n5An9Aam95R7DpZtnNP22SQshQY433FC4g qiFkw7sPX5c5d78LB5cEAlTL3TAXlCrkp0ouJWrgDp+TnJFpeFYc8ok2ulwdBzptBwdN ifZw== 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=j0CwWCPzTBi+eIi59kS6wOQvB2oatLi7BjMQ9d+3oQs=; fh=FmAzeWNu+p3Le5NEj3Vcf0zIbVyR7K8HvcVq2mcnd9I=; b=Mp6kUXRNRohWZbNI+VEGZepmLNWpp2Ax+IyU2gcY+kTTId0GZNfanxXi5Ci6DcwXmF qFQXXyhabpvZe2wo6MiGPzzkgvgpbLk8jcmJRRkvx2ibWYDl1qNXPeZA/RP3zDK+5SpT QLGft73wIlyryYvWYTSOOoykbX5D6KTWPY+5Rjh4F4ET1YA7bTjvyV+cFRy6U3IfAlvf q4uybi65MpR5p/IDe09ZhW0eCRUHzU9tTW+XAkV3iqHVYfLpnny4OAP+8DcQo3sEafv5 hZcPaqauNFMAWkgv3x2V/Nb+++i6JnlG2eNUT/pqwxpzsInXvBE5sO4iQn55zoVQXj2F e/zg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="lykTAV/o"; spf=pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202407021338333535d6891860004e67-eafMkz@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=1719927517; x=1720532317; 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=j0CwWCPzTBi+eIi59kS6wOQvB2oatLi7BjMQ9d+3oQs=; b=nRWZYRRx02BrMV35/+LKEAC8SCxjAEYUL/AaHbMCIjalQYTaQgzuYnVV2GUwXXfEfp urdJKjBk3HCjBek8AkVhRTmxdTZs4NLyjIjglIOuTLV9iBZZuzZuynZuMhLxkTEvsyFO t4+VCz1IjXhFNDfuB1rV3n8HzBkC4aCf1Wbi7lG2LTbzem4QfeQ8UUM4tewHTb1xt3N4 JtlNPTNC3s7Oa/+Cc4o+ojnL1mk8IZ//DLWX5O54YnDS848DfvjTphAmhbVL6H/btlWM tnj//+n+CemNsdl5IlLADHRQHJ9VGjrO7EJNHpazKPy7+5JEYZ3Y/ixyPSmhL7Sc48du VE7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927517; x=1720532317; 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=j0CwWCPzTBi+eIi59kS6wOQvB2oatLi7BjMQ9d+3oQs=; b=f8Cc9wdD+sviiQplS2jshMkIhVypabGQTrNNKLG2YSWmXsPnBhBkV8C6Aa7G5C8jTZ 4WywggZ+yRWGU7H9aDzPTGGeD1N/irn+AOaMD7ygz6xaA28zEZbIqO3+iH1pkADJwxWE nAaj1eQ/k0tMzFcBOp+ItcFVjMf7UNKPWXJiVKHwH0CgJzFfl46GThx2whfpn6/K4/JI lFRMzYSWhCHg8Q86q+PZPwlrwW0QIZhS11jJBQxtZmWN+Ah0Kz7hBWkT29MepWJHds8p IGGmRl3qQm311u80Z8daaYZ35l66cJFHZCPfWl3BWWpfh4yrMC74LE4MoNLPUSygBQaW j6zg== X-Forwarded-Encrypted: i=2; AJvYcCU6WktS15MiU/crjqTiWHI5niFI2xCy8+YsMUTXvsH8THHcvM36XtJdMu89n/z1gn1ngR0Gs8WGBU48TGXt01qX+D7DVR0= X-Gm-Message-State: AOJu0Yy+N9FXkTN5Vjy0oMjFvlR5C/Qx5ML4ZvQNK5Rm7ifwn7Q+yF2q mkGOLzMgBl5JxpERo4lM2SsDbQidYruKJ66NzEaAcP00ZEjz2C/M X-Google-Smtp-Source: AGHT+IFIbISMtokBlH9K/w5vsuxjx5LpaeScpbfeROonRavJHRO9srLCMDtvKqZtDRFFdNYmcriWtg== X-Received: by 2002:a05:651c:a0b:b0:2ec:55b5:ed51 with SMTP id 38308e7fff4ca-2ee5e337c56mr72056301fa.9.1719927517331; Tue, 02 Jul 2024 06:38:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b4b0:0:b0:2ec:4d9a:63bc with SMTP id 38308e7fff4ca-2ee52fc61afls21158501fa.1.-pod-prod-09-eu; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-Received: by 2002:a05:651c:1a1e:b0:2ec:53ad:457 with SMTP id 38308e7fff4ca-2ee5e6bc2b6mr69448771fa.36.1719927513944; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927513; cv=none; d=google.com; s=arc-20160816; b=m3PyB/P7P07jtfek0hARPYCit0FTuj6qBXwU3o6FeXfT5n8kzVf28MQMhaZyE3hj10 YaqUxWwt2Lan1rpuymJWMfCDnlfGSd/UI3EFoaEjk8GDpP5mTcMB6lt1RdMsRz3huUPA prvnY03ZiCm0LOvUVA3zXXwQvFyrTZmLsTdxLTPbc9EfKs82bWCpjbN7WzqScsawvhd0 wv7CGfvFW57Q4pSAdqnvYvOYqv1Irnajc7aNeZgGu23kQPw9TTWqP3AFmYh46a/bMnnp +4pG1PJoO14fSYKcPZDpj0f2nNxGtWaJtHQCjNv46dxHDaAtP5bzaygzWLO2SpwqHOkU DhwQ== 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=wRN3nktX6j5+m8UyB2Yzk5bA6kV8kMUrwqcel2ydmbo=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=oh8dwapqk74/OHBIaI0x3LJsdmrQwQHj57WmM2oJjRYAOfeXCgHGOmi79g5pUyYMyc wdGXpsLG468mfLrbMNzYGvAp2xCKD792EvXlqojL3jgJ+FsUQ8B7/tYUc3D0kmT7Rgij eVI/94X/bagSU7BN3GKgJP7MgZHSnEzDkYmqKWvUz3bMTG5fXD5lKtBZ/nG0ao6Cx09r iCl0jrowpHO1UD8yxFB+yKNN3j9s3r3S4Ma+jqQh1o8RpW3xA6Ch6GyFtU5KXzP0Br5u Goqv6YBN9jX3rfAUf8cYSW7bzsI9FoSEzIrLBFpdy26AoxXYhzSZ17xUBLVFqQWMr2xh 5w0A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="lykTAV/o"; spf=pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202407021338333535d6891860004e67-eafMkz@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-425788015e4si5278485e9.1.2024.07.02.06.38.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@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 202407021338333535d6891860004e67 for ; Tue, 02 Jul 2024 15:38:33 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 11/17] meta-isar: deploy-image: Fix and enhance image selection dialog Date: Tue, 2 Jul 2024 15:38:25 +0200 Message-ID: <162026333e672018b2286d379fd9e88ea7792ce4.1719927511.git.jan.kiszka@siemens.com> 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="lykTAV/o"; spf=pass (google.com: domain of fm-294854-202407021338333535d6891860004e67-eafmkz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202407021338333535d6891860004e67-eafMkz@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 The dialog was broken because an array of tag/value tuples had to be provided, not just a list of files. Use the chance an also fall back to the dialog if the search for DISK_IMAGE does deliver a result but not a clear one. But only open the dialog if there are entries. Signed-off-by: Jan Kiszka --- .../deploy-image/files/deploy-image-wic.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 81a006ce..35029728 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 @@ -7,16 +7,18 @@ installdata=${INSTALL_DATA:-/install} DISK_IMAGE=$(find "$installdata" -type f -iname "*.wic*" -a -not -iname "*.wic.bmap" -exec basename {} \;) -if [ -z "$DISK_IMAGE" ]; then +if [ -z "$DISK_IMAGE" ] || [ ! -f "$installdata/$DISK_IMAGE" ]; then pushd "$installdata" - shopt -s nullglob - array=(*) - shopt -u nullglob + for f in $(find . -type f); do + array+=("$f" "$f") + done popd - if ! DISK_IMAGE=$(dialog --no-tags \ - --menu "Select image to be installed" 10 60 3 \ - "${array[@]}" --output-fd 1) - exit 0 + if [ ${#array[@]} -gt 0 ]; then + if ! DISK_IMAGE=$(dialog --no-tags \ + --menu "Select image to be installed" 10 60 3 \ + "${array[@]}" --output-fd 1); then + exit 0 + fi fi fi if [ ! -f "$installdata/$DISK_IMAGE" ]; then