From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657888687695593472 X-Received: by 2002:a2e:9109:: with SMTP id m9-v6mr323223ljg.19.1550160508831; Thu, 14 Feb 2019 08:08:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c485:: with SMTP id u127ls179949lff.6.gmail; Thu, 14 Feb 2019 08:08:28 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ1I9RU/q3J0lGd/LAtJgqSHabzuV2u35UxLs47VSX+P/rw3zYLGmNW0X8OEl+Dda3d9Vbh X-Received: by 2002:a19:a411:: with SMTP id q17mr307686lfc.14.1550160508320; Thu, 14 Feb 2019 08:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550160508; cv=none; d=google.com; s=arc-20160816; b=kAQoz/YO+QtnsM/l9mJMzI/f1iZy0sBP8UAkMIF/3RljZBPJtP3K1Fp2z1R6KeX5JA 12CizJ9YH3NHKONr2NYVOviKN1U2ErYKuO9jQFDlekj5MYgZT6AbMqPSLnQN9qIMBqGa pMoi6BMZIkRub0iJOPLgKGIzI7pIv9ZeM/H0Y08qC8ST8i1G99SE7k9z/xteoX3wkR95 ycluLOIlHVmAy83MlamRbQk5aMS1ZQxTPpUujPATQT3iNLSsqAEktsj3VCtRPYGsrrBX UAlwFRUKfB8ph/GqBhPiA0w8LnhG7m+mhehOwxLaSsF45kkMtGheaHvnFe8AXkGX/ctd /2bw== 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:to:from; bh=+R0lTNmwoKBvUuSreTUTr59Y4Cbha0WgAnjPxOeISg4=; b=L54x06YLYUytxyhzEeWkrCvwq3XZPscJLcpAsG/oMio8K18eeN/9vg7grCsPkLStCj 17aRpSK/AC6f6zmVJiSPCtlMSQvFF7CO0ZF7SI0BVb5KqIL2cEy1KT73yslZsPACg3yu LTp7MO9BLivqFdKn8Y/I0F6TnoTdUh9BNj4kPSw1E6ffA7nwNjzrx/aJdyIxNET5c+H8 z2I/cKWiSXEpsYJ9WwTB1SKLczjf182F7vrJnsl6ZlDJXlHLKHiSGBew7DXQlbsC1qup zF0OXRvojGOYSzcWuBJs9RaWIzTrot15HT742/nWSx54h67Vgq/OCgTUZMWSdTUlNW1l wBGw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id h17-v6si184267ljj.0.2019.02.14.08.08.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Feb 2019 08:08:28 -0800 (PST) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x1EG87dm028554 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Feb 2019 17:08:27 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 1/4] ci: Introduce TARGETS_SET variable Date: Thu, 14 Feb 2019 17:08:04 +0100 Message-Id: <20190214160807.31948-2-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190214160807.31948-1-mosipov@ilbers.de> References: <20190214160807.31948-1-mosipov@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED 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-TUID: PrhUk4sorXIo This improves code readibility. Signed-off-by: Maxim Yu. Osipov --- scripts/ci_build.sh | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 1789183..846349f 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -20,6 +20,23 @@ BUILD_DIR=./build BB_ARGS="-v" +TARGETS_SET="\ + multiconfig:qemuarm-jessie:isar-image-base \ + multiconfig:qemuarm-stretch:isar-image-base \ + multiconfig:qemuarm-buster:isar-image-base \ + multiconfig:qemuarm64-stretch:isar-image-base \ + multiconfig:qemui386-jessie:isar-image-base \ + multiconfig:qemui386-stretch:isar-image-base \ + multiconfig:qemui386-buster:isar-image-base \ + multiconfig:qemuamd64-jessie:isar-image-base \ + multiconfig:qemuamd64-stretch:isar-image-base \ + multiconfig:qemuamd64-buster:isar-image-base \ + multiconfig:qemuamd64-buster-tgz:isar-image-base \ + multiconfig:rpi-jessie:isar-image-base" + # qemu-user-static of <= buster too old to build that + # multiconfig:qemuarm64-buster:isar-image-base + + show_help() { echo "This script builds the default Isar images." echo @@ -62,6 +79,10 @@ do ;; -f|--fast) FAST_BUILD="1" + TARGETS_SET="\ + multiconfig:qemuarm-stretch:isar-image-base \ + multiconfig:qemuarm64-stretch:isar-image-base \ + multiconfig:qemuamd64-stretch:isar-image-base" ;; -q|--quiet) BB_ARGS="" @@ -90,34 +111,15 @@ if [ -n "$FAST_BUILD" ]; then # Enforce cross-compilation to speed up the build # Enable use of cached base repository sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf - bitbake $BB_ARGS -c cache_base_repo \ - multiconfig:qemuarm-stretch:isar-image-base \ - multiconfig:qemuarm64-stretch:isar-image-base \ - multiconfig:qemuamd64-stretch:isar-image-base + bitbake $BB_ARGS -c cache_base_repo $TARGETS_SET while [ -e bitbake.sock ]; do sleep 1; done sudo rm -rf tmp sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - bitbake $BB_ARGS \ - multiconfig:qemuarm-stretch:isar-image-base \ - multiconfig:qemuarm64-stretch:isar-image-base \ - multiconfig:qemuamd64-stretch:isar-image-base + bitbake $BB_ARGS $TARGETS_SET else - # Start build for all possible configurations - bitbake $BB_ARGS \ - multiconfig:qemuarm-jessie:isar-image-base \ - multiconfig:qemuarm-stretch:isar-image-base \ - multiconfig:qemuarm-buster:isar-image-base \ - multiconfig:qemuarm64-stretch:isar-image-base \ - multiconfig:qemui386-jessie:isar-image-base \ - multiconfig:qemui386-stretch:isar-image-base \ - multiconfig:qemui386-buster:isar-image-base \ - multiconfig:qemuamd64-jessie:isar-image-base \ - multiconfig:qemuamd64-stretch:isar-image-base \ - multiconfig:qemuamd64-buster:isar-image-base \ - multiconfig:qemuamd64-buster-tgz:isar-image-base \ - multiconfig:rpi-jessie:isar-image-base - # qemu-user-static of <= buster too old to build that - #multiconfig:qemuarm64-buster:isar-image-base + # Start build for the full set of configurations + bitbake $BB_ARGS $TARGETS_SET + fi cp -a "${ISARROOT}/meta/classes/dpkg-base.bbclass" "${ISARROOT}/meta/classes/dpkg-base.bbclass.ci-backup" -- 2.11.0