From 092ebecfbdfacdcd7a7c216b204fc98e0d4b6d86 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Thu, 20 Jun 2024 16:12:42 +0200 Subject: [PATCH] meta-lxatac-software: python3-labgrid: use devel version with current master The dropped patch was merged in the meantime. Signed-off-by: Jan Luebbe --- meta-lxatac-software/conf/distro/tacos.conf | 2 ++ ...udev-add-new-USB-ID-for-IMXUSBLoader.patch | 26 ------------------- ....bbappend => python3-labgrid_git.bbappend} | 8 ++---- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 meta-lxatac-software/recipes-devtools/python/python3-labgrid/0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch rename meta-lxatac-software/recipes-devtools/python/{python3-labgrid_%.bbappend => python3-labgrid_git.bbappend} (63%) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index f493ae3f..60a0abd5 100644 --- 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/meta-lxatac-software/recipes-devtools/python/python3-labgrid/0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch b/meta-lxatac-software/recipes-devtools/python/python3-labgrid/0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch deleted file mode 100644 index 9bdf04e9..00000000 --- a/meta-lxatac-software/recipes-devtools/python/python3-labgrid/0001-resource-udev-add-new-USB-ID-for-IMXUSBLoader.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5b98d86bf4424a81472469238b28aae9e490dce9 Mon Sep 17 00:00:00 2001 -From: Christian Hemp -Date: Wed, 21 Feb 2024 12:05:33 +0100 -Subject: [PATCH] resource: udev: add new USB ID for IMXUSBLoader - -Add USB ID for i.MX93 SoC to IMXUSBLoader. - -Upstream-Status: Accepted - -Signed-off-by: Christian Hemp ---- - labgrid/resource/udev.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/labgrid/resource/udev.py b/labgrid/resource/udev.py -index eaaed1a..00410d9 100644 ---- a/labgrid/resource/udev.py -+++ b/labgrid/resource/udev.py -@@ -280,6 +280,7 @@ class IMXUSBLoader(USBResource): - ("1fc9", "0128"), ("1fc9", "0126"), - ("1fc9", "012b"), ("1fc9", "0134"), - ("1fc9", "013e"), ("1fc9", "0146"), -+ ("1fc9", "014e"), - ("1b67", "4fff"), ("0525", "b4a4"), # SPL - ("3016", "1001"), - ]: diff --git a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend similarity index 63% rename from meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend rename to meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend index 403a6d95..f70acc8f 100644 --- a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend +++ b/meta-lxatac-software/recipes-devtools/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.