From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6694185840921280512 X-Received: by 2002:a1c:680a:: with SMTP id d10mr11678482wmc.145.1558611598763; Thu, 23 May 2019 04:39:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:544d:: with SMTP id w13ls1439044wrv.16.gmail; Thu, 23 May 2019 04:39:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLqaoR43/V/Y0XWO5IrVt6dDFqhCZdH8QgoSyt3y8oUi7X1HOaW9MkiC0JN593v2ewZl/g X-Received: by 2002:a05:6000:1250:: with SMTP id j16mr2922895wrx.200.1558611598510; Thu, 23 May 2019 04:39:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558611598; cv=none; d=google.com; s=arc-20160816; b=O64y+oE2xIzFVD1srUjAHa26WdCasZKQ2RMOBr9rnPkkoj37DbyhCG+EN53gzs33ps GFAroccxDhsZnHEafjJn7EmmSbsH+H+1fj7RniMg/iMO86/TFF+2uGGF55ZoLU91+J8r aU+Zd+lG0eck+AnUDvUoq5MbxqrkXsvyifacT4AACx/igqi2X0n/D6g3uUWUF4/c3Gol T8yRtma06k8hVkoAfGfe/jpe6fVj4CmpxWZ4TRLSXSO3D36g+jKLI6JP/Ziuvizkbejb rLOondlOu7nooIDaY1sqOQS0CCE4G50KvOeGMy82T5rrmcEdpgvhry5GesfUcFvd3nzr qyeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=wEHmiMxYwOhG1JIHaoSxSnvFdc86335iRLLPHGC/0Is=; b=uYYtoxMUvyPri5hQ/IfmBXASVKfLjT0aPnzvaohkgh7tFFhUAWVXjH30dJhtKeNAWM 3Dppp4r0Vx2LgVUOXOdKuMjDJIti6r9npNrI5kK3B4CWNR/Dv2/Ar41k0q28R9d4K7XN Ide89nNkK9xr3Sgw70aXUnrlgLht06tZYQ7auEymKu/ljetw0MbrltlBAOtITnqkna7M iHu1uH2Z/xzbWo/AK1wTGJ4jpHV/ZTWAlCuttyBKdirIZa//v6sSPiBXa94Hi1H7f/Eq OR6zZGtw9W/LO9blhknSHT+i762qG4Zi6no+Bj+yy0zxquOUzNrLzTQ8wKS6Btqaxd0Y XFww== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id i17si619297wrn.5.2019.05.23.04.39.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 04:39:58 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x4NBdwqT026673 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 May 2019 13:39:58 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x4NBdvWJ032541; Thu, 23 May 2019 13:39:57 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH 5/6] ci_build.sh: Remove rpi-stretch if CROSS_BUILD and REPRO_BUILD Date: Thu, 23 May 2019 13:39:48 +0200 Message-Id: <20190523113949.20080-6-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523113949.20080-1-claudius.heine.ext@siemens.com> References: <20190523113949.20080-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: WKQsHn1UBCuK From: Claudius Heine Contains also a fix to the shebang. It needs to be on the first line and since it already uses bashisms it was changed from sh to bash. Signed-off-by: Claudius Heine --- scripts/ci_build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index a38e2b7..b8a504d 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -1,10 +1,9 @@ +#!/usr/bin/env bash # Script for CI system build # # Alexander Smirnov # Copyright (c) 2016-2018 ilbers GmbH -#!/bin/sh - set -e ES_BUG=3 @@ -114,6 +113,10 @@ if [ -n "$CROSS_BUILD" ]; then fi if [ -n "$REPRO_BUILD" ]; then + if [ -n "$CROSS_BUILD" ]; then + # remove rpi-stretch, since that is currently incompatible + TARGETS_SET="${TARGETS_SET//multiconfig:rpi-stretch:isar-image-base/}" + fi # Enable use of cached base repository bitbake $BB_ARGS -c cache_base_repo $TARGETS_SET while [ -e bitbake.sock ]; do sleep 1; done -- 2.20.1