Skip to contentSkip to conversation

ccache: fix upstream version check

PATCH New Alexander Kanavin 1 participant 2 messages May 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ccache: fix upstream version check

---
 meta/recipes-devtools/ccache/ccache.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/ccache/ccache.inc +1 -0
index a31acada578..dcbbf0ca7a5 100644
@@ -10,6 +10,7 @@ LICENSE = "GPLv3+"
 DEPENDS = "zlib"
 
 SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
+UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
 
 inherit autotools
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 Revert "ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX"

This reverts commit 91227184b59df30222e45abf2edf13e4e65164a1.

Instead of fixing incorrect regex, the commit actually broke the correct one.

Before the reverted commit:

alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses                   6.1             6.1+20181013    Hongxu Jia <[email protected]> 7a97a7f937762ba342d5b2fd7cd090885a809835

After the reverted commit:

alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses                   6.1             UNKNOWN_BROKEN  Hongxu Jia <[email protected]>

The code in bitbake/lib/bb/fetch2/git.py actually splits each tag with '/' as separator and takes only the last part for some reason, so the "debian/" or "upstream/" prefixes are never a part of the string that is matched against regex:
https://salsa.debian.org/debian/ncurses/tags

---
 meta/recipes-core/ncurses/ncurses_6.1+20181013.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ncurses/ncurses_6.1+20181013.bb +1 -1
index 928c47742ce..ef6ca9879bc 100644
@@ -8,4 +8,4 @@ SRC_URI += "file://0001-tic-hang.patch \
 SRCREV = "7a97a7f937762ba342d5b2fd7cd090885a809835"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache"
-UPSTREAM_CHECK_GITTAGREGEX = "upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
Signature · 1 line
2.17.1