diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-05-31 22:27:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-01 11:27:07 +0100 |
commit | f5cea254121acd5de1a2906d89a9421cf29296be (patch) | |
tree | dd55318f5814550a31e806005f5b298cb17256d5 /meta/recipes-core | |
parent | 6af19f6b35db9956bbc7722938b4e8060b5ddcea (diff) | |
download | poky-f5cea254121acd5de1a2906d89a9421cf29296be.tar.gz |
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 <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
(From OE-Core rev: b6f4c130e5b2df458bf9d1b2d8edc8ac87fecf12)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.1+20181013.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ | |||
8 | SRCREV = "7a97a7f937762ba342d5b2fd7cd090885a809835" | 8 | SRCREV = "7a97a7f937762ba342d5b2fd7cd090885a809835" |
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" | 10 | EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" |
11 | UPSTREAM_CHECK_GITTAGREGEX = "upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" |