diff --git a/scale_build/packages/build.py b/scale_build/packages/build.py index 1e76861..8b9f707 100644 --- a/scale_build/packages/build.py +++ b/scale_build/packages/build.py @@ -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') diff --git a/scale_build/packages/package.py b/scale_build/packages/package.py index fd22957..66de433 100644 --- a/scale_build/packages/package.py +++ b/scale_build/packages/package.py @@ -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(