From: Ross Burton Date: Mon, 28 Jun 2021 16:04:45 +0000 (+0100) Subject: cantarell-fonts: fix SRC_URI X-Git-Tag: uninative-3.3~348 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=dddafd5a4fd50b332a4bd3b0abefb32d315d87ab;p=openembedded-core.git cantarell-fonts: fix SRC_URI Since oe-core fa8950d0c the logic to turn a version into a directory name doesn't work for versions which are too short. Solve this by overriding gnome_verdir() to return the version as-is, as that is what the directory is called. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb index 8dc4ceb399..b0ce56127d 100644 --- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb @@ -20,3 +20,8 @@ HASHEQUIV_HASH_VERSION .= ".2" EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" + +# This isn't a GNOME-style version do gnome_verdir fails. Just return the +# version as that is how the directory is structured. +def gnome_verdir(v): + return v