Merge pull request #47 from ejoerns/update-split-labgrid

Split and Update labgrid Recipe (master / v23.0.5)
labgrid-project · Jun 3, 2024 · c3edddc · c3edddc
2 parents 110ef6c + e816a57
commit c3edddc
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 48 deletions.
diff --git a/recipes-devtools/python/python3-labgrid.inc b/recipes-devtools/python/python3-labgrid.inc
@@ -0,0 +1,51 @@
+DESCRIPTION = "Embedded systems control library for development, testing and installation"
+HOMEPAGE = "https://github.com/labgrid-project"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c0e9407a08421b8c72f578433434f0bd"
+
+RDEPENDS:${PN} = " \
+    coreutils \
+    ser2net \
+    libgpiod \
+    python3-ansicolors \
+    python3-attrs \
+    python3-asyncio \
+    python3-autobahn \
+    python3-jinja2 \
+    python3-multiprocessing \
+    python3-pexpect \
+    python3-pyserial \
+    python3-pytest \
+    python3-pyudev \
+    python3-pyusb \
+    python3-pyyaml \
+    python3-requests \
+    python3-xmodem \
+    python3-graphviz \
+"
+
+SRC_URI = " \
+    file://configuration.yaml \
+    file://labgrid-exporter.service \
+    file://environment \
+    "
+
+SRCREV = "ba15037ff7fb2cd0748aa404c6cf6dcff6c3b143"
+S = "${WORKDIR}/git"
+
+DEPENDS += "python3-setuptools-scm-native"
+DEPENDS += "python3-pytest-runner-native"
+
+inherit python_setuptools_build_meta systemd
+
+SYSTEMD_SERVICE:${PN} = "labgrid-exporter.service"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/labgrid
+    install -m 0644 ${WORKDIR}/configuration.yaml ${D}${sysconfdir}/labgrid
+    install -m 0644 ${WORKDIR}/environment ${D}${sysconfdir}/labgrid
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${WORKDIR}/labgrid-exporter.service ${D}${systemd_system_unitdir}/
+}
+
+FILES:${PN} += "${sysconfdir} ${systemd_system_unitdir}"
diff --git a/recipes-devtools/python/python3-labgrid_23.0.5.bb b/recipes-devtools/python/python3-labgrid_23.0.5.bb
@@ -0,0 +1,5 @@
+require python3-labgrid.inc
+
+SRC_URI += "git://github.com/labgrid-project/labgrid.git;protocol=https;branch=stable-23.0"
+
+SRCREV = "7a63be1682f174ff29584bf178c3fa077c582dcb"
diff --git a/recipes-devtools/python/python3-labgrid_git.bb b/recipes-devtools/python/python3-labgrid_git.bb
@@ -1,52 +1,11 @@
-DESCRIPTION = "Embedded systems control library for development, testing and installation"
-HOMEPAGE = "https://github.com/labgrid-project"
-LICENSE = "LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c0e9407a08421b8c72f578433434f0bd"
+require python3-labgrid.inc
 
-RDEPENDS:${PN} = " \
-    coreutils \
-    ser2net \
-    libgpiod \
-    python3-ansicolors \
-    python3-attrs \
-    python3-asyncio \
-    python3-autobahn \
-    python3-jinja2 \
-    python3-multiprocessing \
-    python3-pexpect \
-    python3-pyserial \
-    python3-pytest \
-    python3-pyudev \
-    python3-pyusb \
-    python3-pyyaml \
-    python3-requests \
-    python3-xmodem \
-    python3-graphviz \
-"
+SRC_URI += "git://github.com/labgrid-project/labgrid.git;protocol=https;branch=master"
 
-SRC_URI = " \
-    git://github.com/labgrid-project/labgrid.git;protocol=https;branch=stable-23.0 \
-    file://configuration.yaml \
-    file://labgrid-exporter.service \
-    file://environment \
-    "
+SRCREV = "91c7e9cb044e1227f657a0db983d48c857c21b16"
 
-SRCREV = "ba15037ff7fb2cd0748aa404c6cf6dcff6c3b143"
-S = "${WORKDIR}/git"
+PV = "23+git"
 
-DEPENDS += "python3-setuptools-scm-native"
-DEPENDS += "python3-pytest-runner-native"
-
-inherit python_setuptools_build_meta systemd
-
-SYSTEMD_SERVICE:${PN} = "labgrid-exporter.service"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/labgrid
-    install -m 0644 ${WORKDIR}/configuration.yaml ${D}${sysconfdir}/labgrid
-    install -m 0644 ${WORKDIR}/environment ${D}${sysconfdir}/labgrid
-    install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/labgrid-exporter.service ${D}${systemd_system_unitdir}/
-}
-
-FILES:${PN} += "${sysconfdir} ${systemd_system_unitdir}"
+LABGRID_USE_DEVEL_VERSION[doc] = "Global switch to enable labgrid development (git) version"
+LABGRID_USE_DEVEL_VERSION ??= "-1"
+DEFAULT_PREFERENCE ??= "${LABGRID_USE_DEVEL_VERSION}"