[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 2/2] Revert "ncurses: fix incorrect UPSTREAM_CHECK_GITTAGREGEX"
From:       Alexander Kanavin <alex.kanavin () gmail ! com>
Date:       2019-05-31 20:27:10
Message-ID: 20190531202710.98718-2-alex.kanavin () gmail ! com
[Download RAW message or body]

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 \
<hongxu.jia@windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835

After the reverted commit:
alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses                   6.1             UNKNOWN_BROKEN  Hongxu Jia \
<hongxu.jia@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@gmail.com>
---
 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 928c47742ce..ef6ca9879bc \
                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+)*)"
-- 
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[prev in list] [next in list] [prev in thread] [next in thread]