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: Update kernel version parsing for Android GKI kernels

Browse Source 
Android GKI kernels have versions such as:
5.15.110-android14-11-ga6d7915820a0-ab10726252

Update the parsing regex to include:
* gki_abi: 10726252 in this example
* android_version: 14 in this example

This also allows parsing the git sha1 correctly, which otherwise is
broken on a version like that.

Fixes https://github.com/ARM-software/devlib/issues/654
This commit is contained in:
Douglas Raillard 2023-10-18 18:26:03 +01:00 committed by Marc Bonnici
parent 90973cac08
commit 5104002f1a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devlib/target.py
View File

@ -75,7 +75,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+))?)?)?(-(?P<commits>\d+)-g(?P<sha1>[0-9a-fA-F]{7,}))?' r'(?P<version>\d+)(\.(?P<major>\d+)(\.(?P<minor>\d+))?(-rc(?P<rc>\d+))?)?(-android(?P<android_version>[0-9]+))?(-(?P<commits>\d+)-g(?P<sha1>[0-9a-fA-F]{7,}))?(-ab(?P<gki_abi>[0-9]+))?'
) )
GOOGLE_DNS_SERVER_ADDRESS = '8.8.8.8' GOOGLE_DNS_SERVER_ADDRESS = '8.8.8.8'
@ -2527,6 +2527,10 @@ class KernelVersion(object):
:type commits: int :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
:ivar android_version: Android version, if available (otherwise None)
:type android_version: int
:ivar gki_abi: GKI kernel abi, if available (otherwise None)
:type gki_abi: str
:ivar parts: Tuple of version number components. Can be used for :ivar parts: Tuple of version number components. Can be used for
lexicographically comparing kernel versions. lexicographically comparing kernel versions.
@ -2550,6 +2554,8 @@ class KernelVersion(object):
self.sha1 = None self.sha1 = None
self.rc = None self.rc = None
self.commits = None self.commits = None
self.gki_abi = None
self.android_version = None
match = KVERSION_REGEX.match(version_string) match = KVERSION_REGEX.match(version_string)
if match: if match:
groups = match.groupdict() groups = match.groupdict()
@ -2563,6 +2569,10 @@ class KernelVersion(object):
self.commits = int(groups['commits']) 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')
if groups['gki_abi'] is not None:
self.gki_abi = match.group('gki_abi')
if groups['android_version'] is not None:
self.android_version = int(match.group('android_version'))
self.parts = (self.version_number, self.major, self.minor) self.parts = (self.version_number, self.major, self.minor)