Merge pull request #145 from jluebbe/update-labgrid

meta-lxatac-software: python3-labgrid: use devel version with current master
linux-automation · Jun 20, 2024 · 5277344 · 5277344
2 parents f8c2833 + 092ebec
commit 5277344
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf
@@ -45,3 +45,5 @@ BB_HASHSERVE ??= "auto"
 
 # recommend ipk package management - make sure to comment or set it in local.conf.sample
 PACKAGE_CLASSES ?= "package_ipk"
+
+LABGRID_USE_DEVEL_VERSION ?= "1"
diff --git a/...-devtools/python/python3-labgrid/0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch b/...-devtools/python/python3-labgrid/0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch
diff --git a/...evtools/python/python3-labgrid_%.bbappend → ...tools/python/python3-labgrid_git.bbappend b/...evtools/python/python3-labgrid_%.bbappend → ...tools/python/python3-labgrid_git.bbappend
@@ -1,14 +1,10 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/python3-labgrid:" 
 
-SRC_URI:remove = "git://github.com/labgrid-project/labgrid.git;protocol=https;branch=stable-23.0"
-
-SRC_URI += "git://github.com/labgrid-project/labgrid.git;protocol=https;branch=master \
-            file://userconfig.yaml \
+SRC_URI += "file://userconfig.yaml \
             file://labgrid.conf \
-            file://0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch \
             "
 
-SRCREV = "3e1c0df0a3503d6f22e63a50ae45945ed12b69f8"
+SRCREV = "e5ace1a36c4e552b950cf356ce0e34586f776432"
 
 do_install:append() {
     # The userconfig.yaml is migrated via rauc hook between installs.