public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: claudius.heine.ext@siemens.com
To: isar-users@googlegroups.com
Cc: Claudius Heine <ch@denx.de>
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	[thread overview]
Message-ID: <20190523113949.20080-6-claudius.heine.ext@siemens.com> (raw)
In-Reply-To: <20190523113949.20080-1-claudius.heine.ext@siemens.com>

From: Claudius Heine <ch@denx.de>

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 <ch@denx.de>
---
 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 <asmirnov@ilbers.de>
 # 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


  parent reply	other threads:[~2019-05-23 11:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-23 11:39 [PATCH 0/6] Fixing base-apt and ci claudius.heine.ext
2019-05-23 11:39 ` [PATCH 1/6] sdkchroot: remove 'copy-package-cache' from ROOTFS_FEATURES claudius.heine.ext
2019-05-23 11:39 ` [PATCH 2/6] bitbake: added DISTRO to REPO_BASE_{DB_}DIR claudius.heine.ext
2019-05-23 11:39 ` [PATCH 3/6] isar-bootstrap: fix DISTRO_APT_PREMIRRORS regex in case of cached build claudius.heine.ext
2019-05-23 11:39 ` [PATCH 4/6] base-apt: fix issues with creating and using the base-apt repository claudius.heine.ext
2019-05-23 11:39 ` claudius.heine.ext [this message]
2019-05-23 11:39 ` [PATCH 6/6] ci_build.sh/repro: disable build of non-cached targets claudius.heine.ext
2019-05-23 11:59 ` [PATCH 0/6] Fixing base-apt and ci Maxim Yu. Osipov
2019-05-23 12:21   ` Claudius Heine
2019-05-23 12:26     ` Maxim Yu. Osipov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190523113949.20080-6-claudius.heine.ext@siemens.com \
    --to=claudius.heine.ext@siemens.com \
    --cc=ch@denx.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox