From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6485313282758410240 X-Received: by 10.25.225.217 with SMTP id l86mr491079lfk.19.1509979665319; Mon, 06 Nov 2017 06:47:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.80.71 with SMTP id v7ls1734932ljd.17.gmail; Mon, 06 Nov 2017 06:47:44 -0800 (PST) X-Google-Smtp-Source: ABhQp+QkQ8fpkMd0uf1opJmcuMEyJE0kBQ6pCfZTOAn4FAJ/kyiWiBqlkDjWgHxLtBIYVENzrIyx X-Received: by 10.46.93.83 with SMTP id r80mr676756ljb.32.1509979664908; Mon, 06 Nov 2017 06:47:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509979664; cv=none; d=google.com; s=arc-20160816; b=MjS7IGEf9dE5ZpsvcFIVP64JHlz/U0DUR+q1FTMs1SS2QdPb5uqlJiNPPy1RU9Gkba WsPh0lcHNbewgn4X5MrU/BGuO2AGsrMmJ1gygrn6YbDWsO+fdTTx7pdtr1Vv6XET+HNh uq7XziNDB94weukv2EFHc2iorgu9vMdaEkqpFGR+i6dYmS6VSMpxyGLg5uhh3u0Fwa6B tcCN3yx+9O9bTNjUxDYG3bQwlsDPCThy4G37aJAtoZq2gXLCMiWcmSXXFBC/JQ9dZwcw dMsvNXtJTcDnWqRCZQmVsMbNdymaKK7puGfiHZUEArGuYslDKTodoeY0nS08MevPH3yT Bxnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=3DINTGAgq47F+l2gW+8ARwa2fcdPsnc+VY12lo8PfcI=; b=q1aLYADuIZkiBiZD7TyhjuVi8KZmw/SzTCSXKupmRHTPRjzFzMhtLPxDaK1VxJdGHJ p4+F3wMUa15MTrYWfdl6Wz0H9LzUWA2+LJfvt6wXtzyMyYWfnfbsmMJXiUq6z27RKMSm wsz8IP8IP5gCVh0q/vAmzASpp+LlBlzn1JQGURDoBjwJJ5mDY0KKJpoNDwefk0lt9oEv rh+CyibLvyfVPnnnXxMYl/H8LNxzpXAltMQlzNU7DKLDEy2H/WUMkBiCKZgzsVqgdz+m TE4UQTJFqUZbp/IJHOrHkjNKzDueGJyaFFCUf4+5kukb1gXfXjqv91CGmeHzFJMYcbuU y9TA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id w29si1286644lfc.1.2017.11.06.06.47.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 06:47:44 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id vA6EliTJ007196 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 6 Nov 2017 15:47:44 +0100 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.251]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id vA6Elijh012327; Mon, 6 Nov 2017 15:47:44 +0100 From: Christian Storm To: isar-users@googlegroups.com Cc: Christian Storm Subject: [PATCH] isar-image-base: don't fail on absent qemu-arm-static Date: Mon, 6 Nov 2017 15:46:38 +0100 Message-Id: <20171106144638.15945-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.15.0 X-TUID: nioGQyWz69Me 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(-) diff --git a/meta-isar/recipes-core/images/files/setup.sh b/meta-isar/recipes-core/images/files/setup.sh index 2898d2c..ca8d7f3 100644 --- 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 + bbwarn "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 index b3ca81f..29bcbda 100644 --- 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 + bbwarn "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