From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6485313282758410240 X-Received: by 10.28.190.24 with SMTP id o24mr1045538wmf.12.1509981540596; Mon, 06 Nov 2017 07:19:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.21.85 with SMTP id 82ls2410087wmv.0.canary-gmail; Mon, 06 Nov 2017 07:19:00 -0800 (PST) X-Google-Smtp-Source: ABhQp+RYpjSVRDTJv8qMhi8U/ESosCc/FDfEyOYzVz6t9M5p2T7zxtZHNGThzOJoPycBcaWuS6IX X-Received: by 10.28.107.65 with SMTP id g62mr956488wmc.32.1509981540161; Mon, 06 Nov 2017 07:19:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509981540; cv=none; d=google.com; s=arc-20160816; b=vByAQJaA2auoqYR7voxUrdGlmkPI9OVU6EdBHjNzkNZcT6QwcQRiKRdgOjkt+5I9rY dj1qmgSb0e0yXoK0VvG22J6EZtT22b9aGMzmQ6TmFyqsFM62oPss6+QdtedHfs+oCyVi Vbnpm6WfdOQ6xf28usj4l6qxfmzlReFwvhCx6ZfZTFUsBFoC2GYhcuR3R4qH7jPmH7EV NulrPhnUm33a2qH3wSRo6si/vbGqhr5bzDO0JvRaAdG274iUW7EtbmJzijMge2OO4Dgk IXcBCrg6oe5Y/VkK7ZyIpliZN7zgnnlNfqyrvbxjhCPepzb+QTMYpgRlz/iGvv7HLVH0 rfRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=nfAb7g+tTO+NkVRze8BHg8qoGXyoKJvHPk1Bhn4KZEk=; b=GbmIDlNqk0P3RTis8MRsgLjPyzM3F5BlHLznG0c+bck2zV1sV+59D8eVucwfR3kjzf Vq4OrJ/VNBav6ay8naRzvQ1Q7Mr4+TqbqSWgbAMJXYnOW1d2PP148W6IJg3+8T0fr+ws 32OXreCmoHhWXAY8NNOcTPLQKJ2Bm09tTwklVWZE3sosQTzVAp9zv7HOPbOzGKnVXeC6 Wk+P/Uba2mc1zwIh2GI/hLyAAUPHx13+AHf6MbiewG0P+65aoCpRad6b+wUbERXIKPlb 27fMfIJYsDJHsOFgMpDyRSRlyPZHoJW4fJ52WJUa7UU5SmjVmY45s5yNj04xxoCw724q yuXQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id j13si1344518wmh.1.2017.11.06.07.19.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 07:19:00 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id vA6FIx4i021724 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 6 Nov 2017 16:18:59 +0100 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.251]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id vA6FIxfg005309; Mon, 6 Nov 2017 16:18:59 +0100 From: Christian Storm To: isar-users@googlegroups.com Cc: Christian Storm Subject: [PATCH v2] isar-image-base: don't fail on absent qemu-arm-static Date: Mon, 6 Nov 2017 16:17:59 +0100 Message-Id: <20171106151759.25269-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171106144638.15945-1-christian.storm@siemens.com> References: <20171106144638.15945-1-christian.storm@siemens.com> X-TUID: ucLNNDj73z9s multistrap fails unobtrusively if the qemu-arm-static binary is absent. Hence, only copy qemu-arm-static if it's present. If absent, issue a warning to make diagnosis easier. Fixes #26 Signed-off-by: Christian Storm --- meta-isar/recipes-core/images/files/setup.sh | 6 +++++- meta/recipes-devtools/buildchroot/files/setup.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) mode change 100644 => 100755 meta-isar/recipes-core/images/files/setup.sh mode change 100644 => 100755 meta/recipes-devtools/buildchroot/files/setup.sh diff --git a/meta-isar/recipes-core/images/files/setup.sh b/meta-isar/recipes-core/images/files/setup.sh old mode 100644 new mode 100755 index 2898d2c..39b828c --- a/meta-isar/recipes-core/images/files/setup.sh +++ b/meta-isar/recipes-core/images/files/setup.sh @@ -57,7 +57,11 @@ EOF fi # Install QEMU emulator to execute ARM binaries -sudo cp /usr/bin/qemu-arm-static ${TARGET}/usr/bin +if [ ! -x /usr/bin/qemu-arm-static ]; then + echo "qemu-arm-static binary not present, unable to execute ARM binaries" +else + sudo cp /usr/bin/qemu-arm-static ${TARGET}/usr/bin +fi # Set hostname echo "isar" > $TARGET/etc/hostname diff --git a/meta/recipes-devtools/buildchroot/files/setup.sh b/meta/recipes-devtools/buildchroot/files/setup.sh old mode 100644 new mode 100755 index b3ca81f..21c004e --- a/meta/recipes-devtools/buildchroot/files/setup.sh +++ b/meta/recipes-devtools/buildchroot/files/setup.sh @@ -55,7 +55,11 @@ EOF fi # Install QEMU emulator to execute ARM binaries -sudo cp /usr/bin/qemu-arm-static ${TARGET}/usr/bin +if [ ! -x /usr/bin/qemu-arm-static ]; then + echo "qemu-arm-static binary not present, unable to execute ARM binaries" +else + sudo cp /usr/bin/qemu-arm-static ${TARGET}/usr/bin +fi # Set hostname echo "isar" > $TARGET/etc/hostname -- 2.15.0