From 3219baab2795ebd91a514f57c773b299818e06c2 Mon Sep 17 00:00:00 2001 From: Grzegorz Kowalski Date: Fri, 8 Mar 2024 20:33:10 +0100 Subject: [PATCH] starter: change SRC_URI to git repo, set preferred version of libtango --- recipes-tools/starter/tango-starter.inc | 7 +++---- recipes-tools/starter/tango-starter_8.3.bb | 11 ++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/recipes-tools/starter/tango-starter.inc b/recipes-tools/starter/tango-starter.inc index 9516ca5..72b7c04 100644 --- a/recipes-tools/starter/tango-starter.inc +++ b/recipes-tools/starter/tango-starter.inc @@ -2,10 +2,9 @@ SUMMARY = "Tango Controls Starter" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "https://gitlab.com/tango-controls/starter/-/archive/Starter-${PV}/starter-Starter-${PV}.tar.gz" - -S = "${WORKDIR}/starter-Starter-${PV}" +SRC_URI = "gitsm://gitlab.com/tango-controls/starter.git;protocol=https;branch=main" +S = "${WORKDIR}/git" DEPENDS = "libtango omniorb" -inherit cmake +inherit cmake pkgconfig diff --git a/recipes-tools/starter/tango-starter_8.3.bb b/recipes-tools/starter/tango-starter_8.3.bb index d5e7ac8..2005daa 100644 --- a/recipes-tools/starter/tango-starter_8.3.bb +++ b/recipes-tools/starter/tango-starter_8.3.bb @@ -1,12 +1,9 @@ require tango-starter.inc -SRC_URI[sha256sum] = "4d6e9b4bc2ab0582c871d167fb6dae4db7d8aeeae5abd0bc0705c58c8b3d0b44" -SRC_URI += "https://gitlab.com/tango-controls/TangoCMakeModules/-/archive/main/TangoCMakeModules-main.tar.gz;name=CMakeModules" -SRC_URI[CMakeModules.sha256sum] = "238d2d1caf26ce217750dec599400c9c207d55c9f086752ec8fac4255eb17954" +# tag Starter-8.3 +SRCREV = "c9905e9bd227e5a077ae859e5f1a02a359a6a0c6" +# patch Linux test for musl SRC_URI += "file://0001-8.3-detect-linux-not-glibc.patch" -do_configure:prepend() { - # Starter 8.3 doesn't include TangoCMakeModules - cp ${WORKDIR}/TangoCMakeModules-main/* ${WORKDIR}/starter-Starter-${PV}/TangoCMakeModules -} +PREFERRED_VERSION_libtango = "9.5.%"