Skip to content

Commit 285207c

Browse files
abutscherabutscher
authored
Merge pull request #6 from Elektrobit/next
meta-elos-0.20.3 release
2 parents 2ca338d + ca108db commit 285207c

File tree

10 files changed

+133
-41
lines changed

10 files changed

+133
-41
lines changed

‎.github/workflows/build-elos-minimal.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- uses: actions/checkout@v4
1313
- name: Install Build Dependencies
@@ -28,7 +28,7 @@ jobs:
2828
locales \
2929
lz4 \
3030
python3 \
31-
python3-distutils \
31+
python3-setuptools \
3232
wget \
3333
zstd
3434
@@ -44,13 +44,14 @@ jobs:
4444
. poky/oe-init-build-env
4545
4646
- name: Setup meta-elos
47+
env:
48+
PROJECT_LAYER_DIR: $YOCTO_BUILD_PATH
4749
run: |
48-
echo 'MACHINE = "qemux86"' >> $YOCTO_BUILD_PATH/build/conf/local.conf
49-
echo 'PACKAGECONFIG:append:pn-elos = " daemon"' >> $YOCTO_BUILD_PATH/build/conf/local.conf
50-
echo 'IMAGE_INSTALL += "elos-daemon"' >> $YOCTO_BUILD_PATH/build/conf/local.conf
51-
echo 'BBLAYERS += "' $YOCTO_BUILD_PATH/meta-elos/ '"' >> $YOCTO_BUILD_PATH/build/conf/bblayers.conf
50+
cp $YOCTO_BUILD_PATH/meta-elos/ci/local.conf $YOCTO_BUILD_PATH/build/conf/local.conf
51+
cp $YOCTO_BUILD_PATH/meta-elos/ci/bblayers.conf $YOCTO_BUILD_PATH/build/conf/bblayers.conf
5252
echo "########### local.conf to build ###################"
5353
cat $YOCTO_BUILD_PATH/build/conf/bblayers.conf
54+
cat $YOCTO_BUILD_PATH/build/conf/local.conf
5455
5556
5657
- name: create image

‎ci/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN apt-get update \
99
&& apt-get install -y \
1010
build-essential \
1111
cpio \
12+
curl \
1213
diffstat chrpath \
1314
file \
1415
gawk wget \
@@ -46,10 +47,13 @@ USER $USER
4647
ENV LC_ALL=en_US.UTF-8
4748
ENV DOCKERBUILD=1
4849
ENV BBCACHE="/home/ci/bbcache"
50+
ENV PROJECT_LAYER_DIR="/home/$USER/layers"
4951

50-
RUN git clone --depth 1 -b kirkstone git://git.yoctoproject.org/poky.git /home/$USER/layers/poky/
51-
RUN git clone --depth 1 -b kirkstone git://git.openembedded.org/meta-openembedded /home/$USER/layers/meta-openembedded/
52+
RUN git clone --depth 1 -b kirkstone git://git.yoctoproject.org/poky.git ${PROJECT_LAYER_DIR}/poky/
53+
RUN git clone --depth 1 -b kirkstone git://git.openembedded.org/meta-openembedded ${PROJECT_LAYER_DIR}/meta-openembedded/
54+
RUN ln -s /base ${PROJECT_LAYER_DIR}/meta-elos
5255

53-
RUN echo ". /home/$USER/layers/poky/oe-init-build-env /base/build >/dev/null" >> /home/$USER/.bashrc
56+
RUN echo ". /home/$USER/layers/poky/oe-init-build-env /base/build" >> /home/$USER/.bashrc \
57+
&& echo 'export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} PROJECT_LAYER_DIR"' >> /home/$USER/.bashrc
5458

5559
CMD /bin/bash

‎ci/bblayers.conf‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ POKY_BBLAYERS_CONF_VERSION = "2"
44

55
BBPATH = "${TOPDIR}"
66
BBFILES ?= ""
7+
PROJECT_LAYER_DIR ?= "${TOPDIR}/.."
78

89
BBLAYERS ?= " \
9-
/home/ci/layers/poky/meta \
10-
/home/ci/layers/poky/meta-poky \
11-
/home/ci/layers/poky/meta-yocto-bsp \
12-
/home/ci/layers/meta-openembedded/meta-oe/ \
13-
/home/ci/layers/meta-openembedded/meta-python/ \
14-
/home/ci/layers/meta-openembedded/meta-networking/ \
15-
/base/ \
10+
${PROJECT_LAYER_DIR}/meta-elos \
11+
${PROJECT_LAYER_DIR}/poky/meta \
12+
${PROJECT_LAYER_DIR}/poky/meta-poky \
13+
${PROJECT_LAYER_DIR}/poky/meta-yocto-bsp \
14+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-oe/ \
15+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-python/ \
16+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-networking/ \
1617
"

‎ci/bblayers.conf.minimal‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ POKY_BBLAYERS_CONF_VERSION = "2"
44

55
BBPATH = "${TOPDIR}"
66
BBFILES ?= ""
7+
PROJECT_LAYER_DIR ?= "${TOPDIR}/.."
78

89
BBLAYERS ?= " \
9-
/home/ci/layers/poky/meta \
10-
/home/ci/layers/poky/meta-poky \
11-
/home/ci/layers/poky/meta-yocto-bsp \
12-
/home/ci/layers/meta-openembedded/meta-oe/ \
13-
/base/ \
10+
${PROJECT_LAYER_DIR}/meta-elos \
11+
${PROJECT_LAYER_DIR}/poky/meta \
12+
${PROJECT_LAYER_DIR}/poky/meta-poky \
13+
${PROJECT_LAYER_DIR}/poky/meta-yocto-bsp \
14+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-oe/ \
1415
"

‎ci/bblayers.conf.smoketest‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ POKY_BBLAYERS_CONF_VERSION = "2"
44

55
BBPATH = "${TOPDIR}"
66
BBFILES ?= ""
7+
PROJECT_LAYER_DIR ?= "${TOPDIR}/.."
78

89
BBLAYERS ?= " \
9-
/home/ci/layers/poky/meta \
10-
/home/ci/layers/poky/meta-poky \
11-
/home/ci/layers/poky/meta-yocto-bsp \
12-
/home/ci/layers/meta-openembedded/meta-oe/ \
13-
/home/ci/layers/meta-openembedded/meta-python/ \
14-
/home/ci/layers/meta-openembedded/meta-networking/ \
15-
/base/ \
10+
${PROJECT_LAYER_DIR}/meta-elos \
11+
${PROJECT_LAYER_DIR}/poky/meta \
12+
${PROJECT_LAYER_DIR}/poky/meta-poky \
13+
${PROJECT_LAYER_DIR}/poky/meta-yocto-bsp \
14+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-oe/ \
15+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-python/ \
16+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-networking/ \
1617
"

‎ci/bblayers.conf.utest‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ POKY_BBLAYERS_CONF_VERSION = "2"
44

55
BBPATH = "${TOPDIR}"
66
BBFILES ?= ""
7+
PROJECT_LAYER_DIR ?= "${TOPDIR}/.."
78

89
BBLAYERS ?= " \
9-
/home/ci/layers/poky/meta \
10-
/home/ci/layers/poky/meta-poky \
11-
/home/ci/layers/poky/meta-yocto-bsp \
12-
/home/ci/layers/meta-openembedded/meta-oe/ \
13-
/home/ci/layers/meta-openembedded/meta-python/ \
14-
/home/ci/layers/meta-openembedded/meta-networking/ \
15-
/base/ \
10+
${PROJECT_LAYER_DIR}/meta-elos \
11+
${PROJECT_LAYER_DIR}/poky/meta \
12+
${PROJECT_LAYER_DIR}/poky/meta-poky \
13+
${PROJECT_LAYER_DIR}/poky/meta-yocto-bsp \
14+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-oe/ \
15+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-python/ \
16+
${PROJECT_LAYER_DIR}/meta-openembedded/meta-networking/ \
1617
"

‎ci/list_upstream_versions.sh‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
#!/bin/bash
2+
###############################################################################
3+
print_info() {
4+
echo "
5+
List latest release versions of upstream packages
6+
7+
Usage: ${0} [-h|--help]
8+
9+
-h|--help: print this help
10+
11+
Examples:
12+
${0}
13+
"
14+
}
15+
###############################################################################
16+
set -e -u -o pipefail
17+
18+
VERBOSE=""
19+
PARAM=""
20+
while [ $# -gt 0 ]; do
21+
case ${1} in
22+
-h | --help)
23+
print_info
24+
exit 0
25+
;;
26+
-v | --verbose)
27+
VERBOSE="yes"
28+
;;
29+
-*)
30+
echo "error: unknown option: $1"
31+
print_info
32+
exit 1
33+
;;
34+
*)
35+
PARAM="$PARAM ${1}"
36+
;;
37+
esac
38+
shift
39+
done
40+
41+
# shellcheck disable=SC2086 # intended splitting of $PARAM
42+
set -- $PARAM
43+
44+
function get_latest_version {
45+
local repo="https://api.github.com/repos/Elektrobit/${1}"
46+
local release_info
47+
release_info=$(curl -s "${repo}/releases/latest")
48+
49+
if [ "${VERBOSE}" = "yes" ]; then
50+
echo "${release_info}"
51+
fi
52+
53+
local version
54+
local tag
55+
local tag_info
56+
local commit_hash
57+
version=$(echo "${release_info}" | grep -o '"tag_name": "[^"]*' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
58+
tag=$(echo "${release_info}" | grep -o '"tag_name": "[^"]*' | sed 's/"tag_name": "//')
59+
tag_info=$(curl -s "${repo}/git/ref/tags/${tag}")
60+
commit_hash=$(echo "${tag_info}" | grep -o '"sha": "[^"]*' | sed 's/"sha": "//')
61+
62+
if [ -z "${version}" ]; then
63+
echo "No releases found for repository: ${repo}"
64+
return 1
65+
fi
66+
67+
printf "%s %s" "${version}" "${commit_hash}"
68+
}
69+
70+
PROJECT_LIST="\
71+
elos \
72+
samconf \
73+
safu \
74+
cmocka_extensions \
75+
cmocka_mocks \
76+
elos_systemmonitoring \
77+
elos-netifd-scanner \
78+
"
79+
for project in ${PROJECT_LIST}; do
80+
echo "${project} latest release version: $(get_latest_version "${project}")"
81+
done

‎recipes-core/elos/elos_git.bb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ DEPENDS += "\
1919

2020
ELOS_SRC_REPO ?= "${META_ELOS_SRC_REPO_BASE}/elos.git${META_ELOS_SRC_REPO_PROTOCOL_PARAM}"
2121

22-
SRC_VERSION = "1.25.9"
22+
SRC_VERSION = "1.27.23"
2323
PV = "${SRC_VERSION}+git${SRCPV}"
2424
SRC_GITREF = "branch=main"
2525
SRC_URI = "\
2626
${ELOS_SRC_REPO};${SRC_GITREF} \
2727
"
28-
SRCREV = "6612ba4b6be14005305579d0b5b1437b5565219a"
28+
SRCREV = "b64299e95e56dd4ccb9e09c87aac324d1ac538cf"
2929

3030
S = "${WORKDIR}/git"
3131

@@ -178,6 +178,8 @@ FILES:${PN}-demos = "\
178178
${bindir}/demo_eventbuffer \
179179
${bindir}/demo_libelos_v2 \
180180
${bindir}/demo_scanner_shmem \
181+
${bindir}/elos_dlt_bin_log_parser \
182+
${datadir}/elos/elos_dlt_bin_log_parser/sample_log.dlt \
181183
${bindir}/elosMon \
182184
${bindir}/elos_log4c_demo \
183185
${bindir}/elosc-cpp \

‎recipes-core/samconf/samconf_git.bb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ HOMEPAGE = "https://elos-logger.org"
77
LICENSE = "MIT"
88
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
99

10-
SRC_VERSION = "0.75.4"
10+
SRC_VERSION = "0.75.8"
1111
SRC_GITREF = "branch=main"
12-
SRCREV = "bbf0d89efec292b25e1fd0ccce8b7039ceb1c5a9"
12+
SRCREV = "c4a5b93b8dab6b9ab5c6f354c0fdc345783a64ef"
1313

1414
SAMCONF_SRC_REPO ?= "${META_ELOS_SRC_REPO_BASE}/samconf.git${META_ELOS_SRC_REPO_PROTOCOL_PARAM}"
1515

‎recipes-test/cmocka/cmocka-mocks.bb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ DESCRIPTION = "cmocka mocks for common system libraries - used in the elos integ
44
LICENSE = "MIT"
55
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
66

7-
SRC_VERSION = "0.56.0"
7+
SRC_VERSION = "0.56.1"
88
SRC_GITREF = "branch=main"
9-
SRCREV = "52f6b5939be7fc26a055d64a2f996e3180371bd8"
9+
SRCREV = "c372f8e447d02e1cfd43acde569af5107ae5dd4d"
1010

1111
CMOCKA_MOCKS_SRC_REPO ?= "${META_ELOS_SRC_REPO_BASE}/cmocka_mocks.git${META_ELOS_SRC_REPO_PROTOCOL_PARAM}"
1212

0 commit comments

Comments
 (0)