From b6f4c130e5b2df458bf9d1b2d8edc8ac87fecf12 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 31 May 2019 22:27:10 +0200 Subject: 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 7a97a7f937762ba342d5b2fd7cd090885a809835 After the reverted commit: alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses INFO: ncurses 6.1 UNKNOWN_BROKEN Hongxu Jia 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 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses_6.1+20181013.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/ncurses') diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb index 928c47742c..ef6ca9879b 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb @@ -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\d+(\.\d+)+(\+\d+)*)" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- cgit 1.2.3-korg