* [PATCH 0/2] CI build improvements
@ 2019-05-23 5:27 Maxim Yu. Osipov
2019-05-23 5:27 ` [PATCH 1/2] ci_build: Write each command to standard error Maxim Yu. Osipov
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-23 5:27 UTC (permalink / raw)
To: isar-users
Hello,
This patchset addresses issues discussed in the recent
thread regarding CI build.
Regards,
Maxim.
Maxim Yu. Osipov (2):
ci_build: Write each command to standard error
ci_build: Include cross build targets into default build
scripts/ci_build.sh | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ci_build: Write each command to standard error
2019-05-23 5:27 [PATCH 0/2] CI build improvements Maxim Yu. Osipov
@ 2019-05-23 5:27 ` Maxim Yu. Osipov
2019-05-23 12:35 ` Claudius Heine
2019-05-23 5:27 ` [PATCH 2/2] ci_build: Include cross build targets into default build Maxim Yu. Osipov
2019-05-24 13:07 ` [PATCH 0/2] CI build improvements Maxim Yu. Osipov
2 siblings, 1 reply; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-23 5:27 UTC (permalink / raw)
To: isar-users
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
scripts/ci_build.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 9d370ac..7b4bb0e 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -5,6 +5,7 @@
#!/bin/sh
+set -x
set -e
ES_BUG=3
--
2.11.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ci_build: Write each command to standard error
2019-05-23 5:27 ` [PATCH 1/2] ci_build: Write each command to standard error Maxim Yu. Osipov
@ 2019-05-23 12:35 ` Claudius Heine
2019-05-23 13:15 ` Maxim Yu. Osipov
0 siblings, 1 reply; 6+ messages in thread
From: Claudius Heine @ 2019-05-23 12:35 UTC (permalink / raw)
To: Maxim Yu. Osipov, isar-users
On 23/05/2019 07.27, Maxim Yu. Osipov wrote:
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
> scripts/ci_build.sh | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index 9d370ac..7b4bb0e 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -5,6 +5,7 @@
>
> #!/bin/sh
>
> +set -x
> set -e
You can put them in the same line if you want.
Claudius
>
> ES_BUG=3
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ci_build: Write each command to standard error
2019-05-23 12:35 ` Claudius Heine
@ 2019-05-23 13:15 ` Maxim Yu. Osipov
0 siblings, 0 replies; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-23 13:15 UTC (permalink / raw)
To: Claudius Heine, isar-users
On 5/23/19 2:35 PM, Claudius Heine wrote:
> On 23/05/2019 07.27, Maxim Yu. Osipov wrote:
>> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
>> ---
>> scripts/ci_build.sh | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
>> index 9d370ac..7b4bb0e 100755
>> --- a/scripts/ci_build.sh
>> +++ b/scripts/ci_build.sh
>> @@ -5,6 +5,7 @@
>> #!/bin/sh
>> +set -x
>> set -e
>
> You can put them in the same line if you want.
That was made intentionally to see in the output subsequent
'set -e'
Maxim.
> Claudius
>
>> ES_BUG=3
>>
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ci_build: Include cross build targets into default build
2019-05-23 5:27 [PATCH 0/2] CI build improvements Maxim Yu. Osipov
2019-05-23 5:27 ` [PATCH 1/2] ci_build: Write each command to standard error Maxim Yu. Osipov
@ 2019-05-23 5:27 ` Maxim Yu. Osipov
2019-05-24 13:07 ` [PATCH 0/2] CI build improvements Maxim Yu. Osipov
2 siblings, 0 replies; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-23 5:27 UTC (permalink / raw)
To: isar-users
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] CI build improvements
2019-05-23 5:27 [PATCH 0/2] CI build improvements Maxim Yu. Osipov
2019-05-23 5:27 ` [PATCH 1/2] ci_build: Write each command to standard error Maxim Yu. Osipov
2019-05-23 5:27 ` [PATCH 2/2] ci_build: Include cross build targets into default build Maxim Yu. Osipov
@ 2019-05-24 13:07 ` Maxim Yu. Osipov
2 siblings, 0 replies; 6+ messages in thread
From: Maxim Yu. Osipov @ 2019-05-24 13:07 UTC (permalink / raw)
To: isar-users
On 5/23/19 7:27 AM, Maxim Yu. Osipov wrote:
> Hello,
>
> This patchset addresses issues discussed in the recent
> thread regarding CI build.
>
> Regards,
> Maxim.
>
Applied to the 'next'.
> Maxim Yu. Osipov (2):
> ci_build: Write each command to standard error
> ci_build: Include cross build targets into default build
>
> scripts/ci_build.sh | 33 +++++++++++++++++++++------------
> 1 file changed, 21 insertions(+), 12 deletions(-)
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-24 13:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-23 5:27 [PATCH 0/2] CI build improvements Maxim Yu. Osipov
2019-05-23 5:27 ` [PATCH 1/2] ci_build: Write each command to standard error Maxim Yu. Osipov
2019-05-23 12:35 ` Claudius Heine
2019-05-23 13:15 ` Maxim Yu. Osipov
2019-05-23 5:27 ` [PATCH 2/2] ci_build: Include cross build targets into default build Maxim Yu. Osipov
2019-05-24 13:07 ` [PATCH 0/2] CI build improvements Maxim Yu. Osipov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox