Commit c3cce7df authored by Eilís Ní Fhlannagáin's avatar Eilís Ní Fhlannagáin

Merge branch 'pbarker/update' into 'master'

Layer updates and minor CI improvements

Closes #25

See merge request !9
parents 526127ea 5e3b509f
Pipeline #60691716 (#249) failed with stage
in 55 minutes and 1 second
......@@ -16,6 +16,33 @@ qemux86:
- build/pub
expire_in: 1 week
qemux86-64:
stage: build
script:
- ./ci/run.py ${CI_BUILD_REF_SLUG}_$(date -I) qemux86-64
artifacts:
paths:
- build/pub
expire_in: 1 week
qemuarm:
stage: build
script:
- ./ci/run.py ${CI_BUILD_REF_SLUG}_$(date -I) qemuarm
artifacts:
paths:
- build/pub
expire_in: 1 week
qemuarm64:
stage: build
script:
- ./ci/run.py ${CI_BUILD_REF_SLUG}_$(date -I) qemuarm64
artifacts:
paths:
- build/pub
expire_in: 1 week
raspberrypi3:
stage: build
script:
......
......@@ -16,6 +16,3 @@
[submodule "meta-raspberrypi"]
path = meta-raspberrypi
url = https://github.com/agherzan/meta-raspberrypi.git
[submodule "meta-yocto"]
path = meta-yocto
url = https://git.yoctoproject.org/git/meta-yocto
bitbake @ 3f2c2eb2
Subproject commit 6065540cb923cde2299b1c16a4e2bb9376186799
Subproject commit 3f2c2eb2f59707828bdcdd6414db837da8dc3b0e
......@@ -13,6 +13,5 @@ BBLAYERS ?= " \
${ORYX_BASE}/meta-openembedded/meta-filesystems \
${ORYX_BASE}/meta-virtualization \
${ORYX_BASE}/meta-raspberrypi \
${ORYX_BASE}/meta-yocto/meta-yocto-bsp \
${ORYX_BASE}/meta-oryx \
"
......@@ -67,7 +67,7 @@ MACHINE ??= "qemux86"
#
# The default is a tmp directory under TOPDIR.
#
TMPDIR = "${TOPDIR}/tmp"
#TMPDIR = "${TOPDIR}/tmp"
#
......@@ -216,7 +216,3 @@ BB_DISKMON_DIRS = "\
CONF_VERSION = "1"
DISTRO = "oryx"
# Generate mirror tarballs for sources fetched from version control systems.
# This helps us to create a full source mirror.
BB_GENERATE_MIRROR_TARBALLS = "1"
......@@ -22,9 +22,11 @@ do_oryx_full() {
}
do_oryx_full qemux86
do_oryx_full qemux86-64
do_oryx_full qemuarm
do_oryx_full qemuarm64
do_oryx_full raspberrypi3
do_oryx_full raspberrypi3-64
do_oryx_full beaglebone-yocto
# Sync the relevant files from the downloads directory into a "sources"
# directory
......
......@@ -7,10 +7,8 @@ import sys
BUILDS = (
# SYSTEM_PROFILE APPLICATION_PROFILE
( 'native' , 'host' ),
( 'native' , 'host-test' ),
( 'guest' , 'minimal' ),
( 'guest' , 'full-cmdline' )
)
N_BUILDS = len(BUILDS)
......
meta-openembedded @ d42cce95
Subproject commit 0248b3ee2b847cfb25aa94018532d1cb1799b2cc
Subproject commit d42cce95a8717c3e5bba3701b71f2f9822c2d00c
Subproject commit 96d33e999ba52c6c126a5bccc957faa80305d398
Subproject commit db4e75332b99280eccfd7be9a6b768312567034b
Subproject commit 1b990fb8e2c21fdfac97c72d471e658087ce7026
Subproject commit 7059c374512f1c1c0df9ecab0703d11438bdf78b
meta-virtualization @ 3038a912
Subproject commit 2a44defc697cdf16521e5c11e894bd93c926f059
Subproject commit 3038a912be24f7586dba4c70ec96d01a6c9f1852
meta-yocto @ b3af711f
Subproject commit b3af711f18429f02998122f6872b7eb67217047c
openembedded-core @ ac64c3b9
Subproject commit afea472cdc5e72e2794b30b00f68e59ffb1e104c
Subproject commit ac64c3b96bdff0b61bb5247fcd2d7ef4be881c09
......@@ -3,10 +3,15 @@
set -e
shopt -s nullglob
REPOLIST="bitbake openembedded-core meta-openembedded meta-raspberrypi meta-virtualization meta-yocto"
PATCHES_DIR=$(realpath $(dirname $0))
REPOLIST="bitbake openembedded-core meta-openembedded meta-raspberrypi meta-virtualization"
PATCHES_DIR="$(realpath $(dirname $0))"
for repo in $REPOLIST; do
gitdir="$(git -C $repo rev-parse --git-dir)"
if [[ -e "$gitdir/rebase-apply" ]]; then
echo "Aborting previous patch application"
rm -rf "$gitdir/rebase-apply"
fi
for p in "$PATCHES_DIR/$repo"/*; do
echo "Applying $p"
git -C $repo am "$p"
......
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