summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2018-11-22 10:14:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 23:35:18 +0000
commitbdda030127f32040df18501ccd95aac631e2335a (patch)
treee99572035edec67555ef0fbbf5d3ca15a57730e7 /meta
parentfea124ae4441e0fdc8bebcc49c5b5594ca998b3a (diff)
downloadpoky-bdda030127f32040df18501ccd95aac631e2335a.tar.gz
terminal: Cope with unreleased versions of tmux
When tmux is built from a non-release Git version, its version number is "next-X" where X appears to be the expected version number for the next release. For example, when built from the current state of master, running "tmux -V" yields: tmux next-2.9 Currently check_tmux_pane_size only checks for the version being less than 1.9, so it seems unfair to fail with an obscure Python error in this case. Let's just use the version number after the "next-" prefix if it is present. (From OE-Core rev: 07b59afd52244410d8d833e6dfe262d952e5e344) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/terminal.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index caeb5e31ec..afbda595db 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -296,6 +296,8 @@ def check_terminal_version(terminalName):
296 vernum = ver.split(' ')[-1] 296 vernum = ver.split(' ')[-1]
297 if ver.startswith('tmux'): 297 if ver.startswith('tmux'):
298 vernum = ver.split()[-1] 298 vernum = ver.split()[-1]
299 if ver.startswith('tmux next-'):
300 vernum = ver.split()[-1][5:]
299 return vernum 301 return vernum
300 302
301def distro_name(): 303def distro_name():