[oe-commits] [openembedded-core] 16/19: Revert "ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX"

git at git.openembedded.org git at git.openembedded.org
Fri May 31 21:24:55 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 2b165aaf4e19c928b798126e696661df24374d8e
Author: Alexander Kanavin <alex.kanavin at gmail.com>
AuthorDate: Fri May 31 22:27:10 2019 +0200

    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 at alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
    INFO: ncurses                   6.1             6.1+20181013    Hongxu Jia <hongxu.jia at windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835
    
    After the reverted commit:
    alexander at alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
    INFO: ncurses                   6.1             UNKNOWN_BROKEN  Hongxu Jia <hongxu.jia at windriver.com>
    
    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 <alex.kanavin at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/ncurses/ncurses_6.1+20181013.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb b/meta/recipes-core/ncurses/ncurses_6.1+20181013.bb
index 928c477..ef6ca98 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<pver>\d+(\.\d+)+(\+\d+)*)"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list