TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2025-12-20 02:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove kernel module usages

Browse Source
This commit is contained in:
Waqar Ahmed
2023-05-10 01:12:13 +04:00
parent e63cd5b38d
commit 13c2b4014c
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scale_build/packages/build.py
View File

@@ -64,13 +64,6 @@ class BuildPackageMixin:
if os.path.exists(os.path.join(self.dpkg_overlay_packages_path, 'Packages.gz')):
self.run_in_chroot('apt update')
if self.kernel_module:
self.logger.debug('Installing truenas linux headers')
self.run_in_chroot('apt install -y /packages/linux-headers-truenas-production-amd64_*.deb')
self.run_in_chroot('apt install -y /packages/linux-headers-truenas-debug-amd64_*.deb')
self.run_in_chroot('apt install -y /packages/linux-image-truenas-production-amd64_*.deb')
self.run_in_chroot('apt install -y /packages/linux-image-truenas-debug-amd64_*.deb')
self.execute_pre_depends_commands()
self.run_in_chroot(f'cd {self.package_source} && mk-build-deps --build-dep', 'Failed mk-build-deps')

3
scale_build/packages/package.py
View File

@@ -108,10 +108,9 @@ class Package(BootstrapMixin, BuildPackageMixin, BuildCleanMixin, GitPackageMixi
cp = run([DEPENDS_SCRIPT_PATH, control_file_path], log=False)
info = json.loads(cp.stdout)
default_dependencies = {'kernel', 'kernel-dbg'} if self.kernel_module else set()
self.build_depends = set(
normalize_build_depends(info['source_package']['build_depends'])
) | default_dependencies
) | self.explicit_deps
self.source_package = info['source_package']['name']
for bin_package in info['binary_packages']:
self._binary_packages.append(BinaryPackage(