Skip to content

Commit ecd8d25

Browse files
authored
Merge pull request #65 from hnez/labgrid-v25.0-stable
python3-labgrid: update to version 25.0
2 parents 28874f1 + a6f0cf5 commit ecd8d25

File tree

6 files changed

+11
-36
lines changed

6 files changed

+11
-36
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ jobs:
4646
echo 'INHERIT += "rm_work"' >> conf/auto.conf
4747
fi
4848
echo 'DISTRO_FEATURES:remove = "alsa bluetooth usbgadget usbhost wifi nfs zeroconf pci 3g nfc x11 opengl ptest wayland vulkan"' >> conf/local.conf
49-
- name: Build autobahn
50-
run: |
51-
source poky/oe-init-build-env build
52-
bitbake python3-autobahn
5349
- name: Build labgrid
5450
run: |
5551
source poky/oe-init-build-env build

recipes-devtools/python/python3-labgrid-24.0+git/labgrid-exporter.service

Lines changed: 0 additions & 15 deletions
This file was deleted.

recipes-devtools/python/python3-labgrid.inc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c0e9407a08421b8c72f578433434f0bd"
55

66
RDEPENDS:${PN} = " \
77
coreutils \
8-
ser2net \
98
libgpiod \
109
python3-ansicolors \
11-
python3-attrs \
1210
python3-asyncio \
13-
python3-autobahn \
11+
python3-attrs \
12+
python3-graphviz \
13+
python3-grpcio \
14+
python3-grpcio-channelz \
15+
python3-grpcio-reflection \
1416
python3-jinja2 \
1517
python3-multiprocessing \
1618
python3-pexpect \
@@ -21,7 +23,7 @@ RDEPENDS:${PN} = " \
2123
python3-pyyaml \
2224
python3-requests \
2325
python3-xmodem \
24-
python3-graphviz \
26+
ser2net \
2527
"
2628

2729
SRC_URI = " \
@@ -30,7 +32,6 @@ SRC_URI = " \
3032
file://environment \
3133
"
3234

33-
SRCREV = "ba15037ff7fb2cd0748aa404c6cf6dcff6c3b143"
3435
S = "${WORKDIR}/git"
3536

3637
DEPENDS += "python3-setuptools-scm-native"

recipes-devtools/python/python3-labgrid/labgrid-exporter.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Wants=network-online.target
66
[Service]
77
Environment="PYTHONUNBUFFERED=1"
88
EnvironmentFile=/etc/labgrid/environment
9-
ExecStart=/usr/bin/labgrid-exporter -x ws://${LABGRID_COORDINATOR_IP}:${LABGRID_COORDINATOR_PORT}/ws /etc/labgrid/configuration.yaml
9+
ExecStart=/usr/bin/labgrid-exporter --coordinator ${LABGRID_COORDINATOR_IP}:${LABGRID_COORDINATOR_PORT} /etc/labgrid/configuration.yaml
1010
Restart=on-failure
1111
RestartForceExitStatus=100
1212
RestartSec=30

recipes-devtools/python/python3-labgrid_23.0.5.bb renamed to recipes-devtools/python/python3-labgrid_25.0.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ require python3-labgrid.inc
22

33
SRC_URI += "git://github.com/labgrid-project/labgrid.git;protocol=https;branch=${SRCBRANCH}"
44

5-
SRCBRANCH = "stable-23.0"
6-
SRCREV = "7a63be1682f174ff29584bf178c3fa077c582dcb"
5+
SRCBRANCH = "stable-25.0"
6+
SRCREV = "6d8febb7263f772bb5d0b4aed85f268f7968412e"

recipes-devtools/python/python3-labgrid_git.bb

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,9 @@ require python3-labgrid.inc
33
SRC_URI += "git://github.com/labgrid-project/labgrid.git;protocol=https;branch=${SRCBRANCH}"
44

55
SRCBRANCH = "master"
6-
SRCREV = "5f0ae27f62692cd703052a3c649f19d2f9abed0c"
6+
SRCREV = "6d8febb7263f772bb5d0b4aed85f268f7968412e"
77

8-
PV = "24.0+git"
9-
10-
RDEPENDS:${PN} += " \
11-
python3-grpcio \
12-
python3-grpcio-reflection \
13-
python3-grpcio-channelz \
14-
"
15-
RDEPENDS:${PN}:remove = "python3-autobahn"
8+
PV = "25.0+git"
169

1710
LABGRID_USE_DEVEL_VERSION[doc] = "Global switch to enable labgrid development (git) version"
1811
LABGRID_USE_DEVEL_VERSION ??= "-1"

0 commit comments

Comments
 (0)