sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

target: a valid sha1 must be concatenated with the kernel version

Browse Source 
Some SoC vendors add several sha's to the kernel version string. This is
problematic for the KernelVersion class, which might identify the wrong one.

Fixing this issue by matching the following "git describe" pattern:

  <version>.<major>.<minor>-<rc>-<commits>-g<sha1>

Where commits is the number of commits on top of the tag, which is now a
member of the class.

Prior to this patch:

>> KernelVersion("4.14.111-00001-gd913f26_audio-00003-g3ab4335").sha1
3ab4335
>>> KernelVersion("4.14.111_audio-00003-g3ab4335").sha1
3ab4335

With the modified regex:

>> KernelVersion("4.14.111-00001-gd913f26_audio-00003-g3ab4335").sha1
d913f26
>>> KernelVersion("4.14.111_audio-00003-g3ab4335").sha1
None
This commit is contained in:
Vincent Donnefort 2020-02-28 10:10:23 +00:00 committed by Marc Bonnici
parent 1ddbb75e74
commit 37a6b4f96d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devlib/target.py
View File

@ -65,7 +65,7 @@ ANDROID_SCREEN_ROTATION_REGEX = re.compile(r'orientation=(?P<rotation>[0-3])')
DEFAULT_SHELL_PROMPT = re.compile(r'^.*(shell|root|juno)@?.*:[/~]\S* *[#$] ', DEFAULT_SHELL_PROMPT = re.compile(r'^.*(shell|root|juno)@?.*:[/~]\S* *[#$] ',
re.MULTILINE) re.MULTILINE)
KVERSION_REGEX = re.compile( KVERSION_REGEX = re.compile(
r'(?P<version>\d+)(\.(?P<major>\d+)(\.(?P<minor>\d+)(-rc(?P<rc>\d+))?)?)?(.*-g(?P<sha1>[0-9a-fA-F]{7,}))?' r'(?P<version>\d+)(\.(?P<major>\d+)(\.(?P<minor>\d+)(-rc(?P<rc>\d+))?)?)?(-(?P<commits>\d+)-g(?P<sha1>[0-9a-fA-F]{7,}))?'
) )
GOOGLE_DNS_SERVER_ADDRESS = '8.8.8.8' GOOGLE_DNS_SERVER_ADDRESS = '8.8.8.8'
@ -1806,6 +1806,8 @@ class KernelVersion(object):
:type minor: int :type minor: int
:ivar rc: Release candidate number (e.g. 3 for Linux 4.9-rc3). May be None. :ivar rc: Release candidate number (e.g. 3 for Linux 4.9-rc3). May be None.
:type rc: int :type rc: int
:ivar commits: Number of additional commits on the branch. May be None.
:type commits: int
:ivar sha1: Kernel git revision hash, if available (otherwise None) :ivar sha1: Kernel git revision hash, if available (otherwise None)
:type sha1: str :type sha1: str
@ -1830,6 +1832,7 @@ class KernelVersion(object):
self.minor = None self.minor = None
self.sha1 = None self.sha1 = None
self.rc = None self.rc = None
self.commits = None
match = KVERSION_REGEX.match(version_string) match = KVERSION_REGEX.match(version_string)
if match: if match:
groups = match.groupdict() groups = match.groupdict()
@ -1839,6 +1842,8 @@ class KernelVersion(object):
self.minor = int(groups['minor']) self.minor = int(groups['minor'])
if groups['rc'] is not None: if groups['rc'] is not None:
self.rc = int(groups['rc']) self.rc = int(groups['rc'])
if groups['commits'] is not None:
self.commits = int(groups['commits'])
if groups['sha1'] is not None: if groups['sha1'] is not None:
self.sha1 = match.group('sha1') self.sha1 = match.group('sha1')