From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6694090043825324032 X-Received: by 2002:a5d:6b49:: with SMTP id x9mr2257762wrw.170.1558589293665; Wed, 22 May 2019 22:28:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:97ca:: with SMTP id t10ls1176977wrb.10.gmail; Wed, 22 May 2019 22:28:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxKoNE07h822ywUg+P9uT0G7BboP6+LhWiSZkV8CnaZw5O1odSbPEAxcHucRV3cdGw4Vky X-Received: by 2002:a5d:6a81:: with SMTP id s1mr56815690wru.85.1558589293318; Wed, 22 May 2019 22:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558589293; cv=none; d=google.com; s=arc-20160816; b=R4oab88l4pKNkGHO2+76L9I0QpunIA2wXzmvfX8t+Ja0vqZQYALJSGHDnmn8sYXp9y 0s3r0sYLlhgb1gj/9SnrXASsKrrWP4M/GAeS7lB328GtgHC13gNbuSb83/1wTLFUxGJE JEeJPj7ZRdAqtr8l13UYy97rlWoLsEQR3EQ7PrkrRn4XANk0nstDxVuAvYGerW+uHScb M1DUMwGZvTaQhyiqmzmrSgnoml9Z1cwaY4J3jm/5uIx/VqJQK+7Kmc+GUerHovSG3965 wAf5JIZv/yQ+/bs/oqS0aARNifH5D9COHxWqqBH/lxvPcgcT0ZC2ffqqj2zZh+NWZkag 3YOQ== 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:to:from; bh=sPf/+w3D+tRIaviIuyBeufPz8Vxucvr0DWThyF/8wf4=; b=RlOcLbuxAh17Sb8A+LPvSW+tNz7AbC6dE9mOh0T7/hxc7c7CGRzts3QuINEBlnNSFk ANSwD3fqxYGJAcqF7YHY8jw15UZNus4rP23EvIqk84vFgyNEHNWk6MSe/spxGp9su5Zg 4/hX5Gt7bjXTFpTKAe27Xz3GsNE1C5AatimIFPZZ+FHNry0JW8Tqmlp5J+MPqzGRzBqP rWQa3EOzzrum6ltQYhaUk10Y6GmMTPHuOLFuFgpzE6uP5nF8QEITxf1ux8aEZX28lNsC QDlEhUnAfEG5L2f/YIjvf8mq6DJPSYmW83Vwv0iwu3CiuwgIAUcWpe8g7K1Ae8vUS2+G AbCg== 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 i17si571245wrn.5.2019.05.22.22.28.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 May 2019 22:28:13 -0700 (PDT) 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 x4N5Rnuc007784 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 May 2019 07:28:12 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 2/2] ci_build: Include cross build targets into default build Date: Thu, 23 May 2019 07:27:47 +0200 Message-Id: <20190523052747.2796-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523052747.2796-1-mosipov@ilbers.de> References: <20190523052747.2796-1-mosipov@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: F4r8KfVHHjzw Signed-off-by: Maxim Yu. Osipov --- scripts/ci_build.sh | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 7b4bb0e..314d9f2 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -35,6 +35,14 @@ TARGETS_SET="\ # qemu-user-static of <= buster too old to build that # multiconfig:qemuarm64-buster:isar-image-base +CROSS_TARGETS_SET="\ + multiconfig:qemuarm-stretch:isar-image-base \ + multiconfig:qemuarm-buster:isar-image-base \ + multiconfig:qemuarm64-stretch:isar-image-base \ + multiconfig:qemuamd64-stretch:isar-image-base \ + multiconfig:de0-nano-soc-stretch:isar-image-base \ + multiconfig:rpi-stretch:isar-image-base" + REPRO_TARGETS_SET="\ multiconfig:qemuarm-stretch:isar-image-base \ multiconfig:qemuarm64-stretch:isar-image-base \ @@ -86,13 +94,6 @@ do # Enforce cross-compilation to speed up the build FAST_BUILD="1" CROSS_BUILD="1" - TARGETS_SET="\ - multiconfig:qemuarm-stretch:isar-image-base \ - multiconfig:qemuarm-buster:isar-image-base \ - multiconfig:qemuarm64-stretch:isar-image-base \ - multiconfig:qemuamd64-stretch:isar-image-base \ - multiconfig:de0-nano-soc-stretch:isar-image-base \ - multiconfig:rpi-stretch:isar-image-base" ;; -q|--quiet) BB_ARGS="" @@ -132,12 +133,19 @@ if [ -n "$REPRO_BUILD" ]; then sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf fi -# Start build for the defined set of configurations -bitbake $BB_ARGS $TARGETS_SET - +# Start cross build for the defined set of configurations +sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf +bitbake $BB_ARGS $CROSS_TARGETS_SET +while [ -e bitbake.sock ]; do sleep 1; done # In addition test SDK creation -if [ -n "$FAST_BUILD" ]; then - bitbake $BB_ARGS -c do_populate_sdk multiconfig:qemuarm-stretch:isar-image-base +bitbake $BB_ARGS -c do_populate_sdk multiconfig:qemuarm-stretch:isar-image-base +while [ -e bitbake.sock ]; do sleep 1; done + +if [ ! -n "$FAST_BUILD" ]; then + # Cleanup and disable cross build + sudo rm -rf tmp + sed -i -e 's/ISAR_CROSS_COMPILE ?= "1"/ISAR_CROSS_COMPILE ?= "0"/g' conf/local.conf + 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