Commit d9f20c28 authored by Enrico Scholz's avatar Enrico Scholz

Merge branch 'sumo' of ../../bsp/template into sumo-next

parents 5fb71894 dfdca2de
Pipeline #129 passed with stage
in 100 minutes and 18 seconds
......@@ -57,23 +57,19 @@ before_script:
build:ubuntu:
<<: *build_generic
<<: *build_image
environment: image/ubuntu-xenial
image: docker/sigma/ci/elito-ubuntu:xenial
image: $CI_REGISTRY/docker/sigma/ci/elito-ubuntu:xenial
.build:ubuntu:sdk:
<<: *build_generic
<<: *build_sdk
environment: sdk/ubuntu-xenial
image: docker/sigma/ci/elito-ubuntu:xenial
image: $CI_REGISTRY/docker/sigma/ci/elito-ubuntu:xenial
build:fedora:
<<: *build_generic
<<: *build_image
environment: image/fedora-28
image: docker/sigma/ci/elito-fedora:25
image: $CI_REGISTRY/docker/sigma/ci/elito-fedora:25
.build:fedora:sdk:
<<: *build_generic
<<: *build_sdk
environment: sdk/fedora-25
image: docker/sigma/ci/elito-fedora:25
image: $CI_REGISTRY/docker/sigma/ci/elito-fedora:25
......@@ -35,6 +35,9 @@ all-images: $(addprefix image-,${MACHINES})
image:
$(call bitbake,$(BUILDDIR),$(IMAGE) $(EXTRA_IMAGE))
_image:
$(call bitbake_machine,$(BUILDDIR),$(IMAGE) $(EXTRA_IMAGE),${MACHINE})
image-%:
$(call bitbake_machine,$(BUILDDIR),$(IMAGE) $(EXTRA_IMAGE),$*)
......@@ -44,6 +47,9 @@ sdk:
bitbake rescue-bitbake:
$(call bitbake,$(BUILDDIR),$R$(if $T, -c $T))
_bitbake:
$(call bitbake_machine,$(BUILDDIR),$R$(if $T, -c $T),${MACHINE})
shell:
$(call init_build_env,$1) && cd $(abspath .) && bash -l
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment