From 4e5fdfc4231772521e281b76fac0baf9108d31f6 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Fri, 27 Dec 2024 11:56:06 +0100 Subject: [PATCH] imagemagick: refactor so devtool upgrade works * move version part after dash to PV * set git tag regex Signed-off-by: Peter Marko Signed-off-by: Khem Raj --- .../{imagemagick_7.1.1.bb => imagemagick_7.1.1-26.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/imagemagick/{imagemagick_7.1.1.bb => imagemagick_7.1.1-26.bb} (99%) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-26.bb similarity index 99% rename from meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb rename to meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-26.bb index 5407c4e400..78cbb9ddea 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-26.bb @@ -9,8 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \ # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" -BASE_PV := "${PV}" -PV .= "-26" +BASE_PV = "${@d.getVar('PV').split('-')[0]}" +UPSTREAM_CHECK_GITTAGREGEX = "(?P([0-9][\.|_|-]?)+)" + SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2"