Skip to content

Commit a9b4ea0

Browse files
committed
qemu: Look for kernel.release in current directory also
1 parent 47cb6f0 commit a9b4ea0

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

lib/utils.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,12 @@ def get_vmlinux():
7878

7979

8080
def get_expected_release():
81-
path = os.environ.get('KERNEL_RELEASE_PATH', None)
82-
if path is None:
83-
# Assume we're running in the kernel build directory
84-
path = 'include/config/kernel.release'
85-
msg = f"Couldn't read {path}, export KERNEL_RELEASE_PATH"
81+
env = os.environ.get('KERNEL_RELEASE_PATH', None)
82+
for path in [env, 'include/config/kernel.release', 'kernel.release']:
83+
if path and os.path.isfile(path):
84+
break
8685
else:
87-
msg = f"Couldn't read KERNEL_RELEASE_PATH {path}"
88-
89-
if not os.path.isfile(path):
90-
logging.error(msg)
86+
logging.error(f"Couldn't find kernel.release, export KERNEL_RELEASE_PATH")
9187
return None
9288

9389
expected_release = open(path).read().strip()

0 commit comments

Comments
 (0)