TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly map dependencies of debug packages

Browse Source
This commit is contained in:
Waqar Ahmed
2023-05-05 07:03:51 +04:00
parent 19cf5c9d12
commit b0ec59c0f5
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scale_build/packages/package.py
View File

@@ -1,3 +1,4 @@
import contextlib
import json
import logging
import os
@@ -98,23 +99,38 @@ class Package(BootstrapMixin, BuildPackageMixin, BuildCleanMixin, GitPackageMixi
self._binary_packages.append(BinaryPackage(self.name, self.build_depends, self.name, self.name, set()))
return self._binary_packages
cp = run([DEPENDS_SCRIPT_PATH, self.debian_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.source_package = info['source_package']['name']
for bin_package in info['binary_packages']:
self._binary_packages.append(BinaryPackage(
bin_package['name'], self.build_depends, self.source_package, self.name,
set(normalize_bin_packages_depends(bin_package['depends'] or ''))
))
if self.name == 'truenas':
self._binary_packages[-1].build_dependencies |= self._binary_packages[-1].install_dependencies
with (self.build_dir() if self.depscmd else contextlib.nullcontext()):
if self.depscmd:
self.setup_control_file_for_dependency_ordering()
control_file_path = os.path.join(self.package_source_with_chroot, 'debian/control')
else:
control_file_path = self.debian_control_file_path
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.source_package = info['source_package']['name']
for bin_package in info['binary_packages']:
self._binary_packages.append(BinaryPackage(
bin_package['name'], self.build_depends, self.source_package, self.name,
set(normalize_bin_packages_depends(bin_package['depends'] or ''))
))
if self.name == 'truenas':
self._binary_packages[-1].build_dependencies |= self._binary_packages[-1].install_dependencies
return self._binary_packages
def setup_control_file_for_dependency_ordering(self):
self.execute_pre_depends_commands()
for dependency_command in self.depscmd:
self.logger.debug('Running depscmd: %r', dependency_command)
self.run_in_chroot(
f'cd {self.package_source} && {dependency_command}', 'Failed to execute depscmd command'
)
def build_time_dependencies(self, all_binary_packages=None):
if self._build_time_dependencies is not None:
return self._build_time_dependencies