Merge pull request #1262 from c-po/kernel-build-improvements

Kernel: T9181: modernize packaging and remove redundant work

1 files changed, 8 insertions, 6 deletions

diff --git a/scripts/package-build/linux-kernel/build.py b/scripts/package-build/linux-kernel/build.py
index a5094914..46a6a2ba 100755
--- a/scripts/package-build/linux-kernel/build.py
+++ b/scripts/package-build/linux-kernel/build.py
@@ -137,7 +137,7 @@ def build_package(package: dict, dependencies: list,
 
         # Execute the build command
         if package['build_cmd'] == 'build_kernel':
-            source_dir = build_kernel(package['kernel_version'])
+            source_dir = build_kernel(package['kernel_version'], package['kernel_flavor'])
             if linux_kernel_tarball is not None:
                 linux_kernel_tarball.clear()
                 linux_kernel_tarball['package_name'] = package['name']
@@ -191,7 +191,7 @@ def merge_dicts(defaults, package):
     return {**defaults, **package}
 
 
-def build_kernel(kernel_version) -> str:
+def build_kernel(kernel_version, kernel_flavor) -> str:
     """Build the Linux kernel"""
     source_dir = 'linux' # Git source repo name - preferred over TAR
     if not os.path.exists(source_dir):
@@ -205,7 +205,9 @@ def build_kernel(kernel_version) -> str:
         source_dir = f'linux-{kernel_version}'
         os.symlink(source_dir, 'linux')
 
-    run(['./build-kernel.sh'], check=True)
+    # kernel_flavor is only known here (merged from data/defaults.toml); pass it down
+    # via the environment so build-kernel.sh doesn't need to re-read defaults.toml itself.
+    run(['./build-kernel.sh'], check=True, env={**os.environ, 'KERNEL_FLAVOR': kernel_flavor})
     return(source_dir)
 
 
@@ -242,17 +244,17 @@ def build_mellanox_ofed():
 
 def build_realtek_r8126():
     """Build Realtek r8126"""
-    run(['./build-realtek-r8126.py'], check=True)
+    run(['./build-realtek-r8126.sh'], check=True)
 
 
 def build_realtek_r8152():
     """Build Realtek r8152"""
-    run(['./build-realtek-r8152.py'], check=True)
+    run(['./build-realtek-r8152.sh'], check=True)
 
 
 def build_jool():
     """Build Jool"""
-    run(['echo y | ./build-jool.py'], check=True, shell=True)
+    run(['echo y | ./build-jool.sh'], check=True, shell=True)
 
 def build_ipt_netflow(commit_id, scm_url):
     """Build ipt_NETFLOW"""