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

Fix dch to use dynamic distribution from build manifest (#936)

Browse Source 
The dch command was using hardcoded 'bullseye-truenas-unstable' as the
distribution when updating package changelogs. This change reads the
actual Debian release from the build manifest and constructs the
distribution string dynamically (e.g., 'trixie-truenas-unstable' for
Trixie builds), ensuring the changelog entries in built .deb packages
reflect the correct target distribution.
This commit is contained in:
Ameer Hamza
2025-09-30 18:34:42 +05:00
committed by GitHub
parent bd396e334f
commit bcc21e76ff
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scale_build/packages/build.py
View File

@@ -8,7 +8,7 @@ from datetime import datetime
from scale_build.config import BUILD_TIME, VERSION from scale_build.config import BUILD_TIME, VERSION
from scale_build.exceptions import CallError from scale_build.exceptions import CallError
from scale_build.utils.environment import APT_ENV from scale_build.utils.environment import APT_ENV
from scale_build.utils.manifest import get_truenas_train, get_release_code_name, get_secret_env from scale_build.utils.manifest import get_truenas_train, get_release_code_name, get_secret_env, get_manifest
from scale_build.utils.run import run from scale_build.utils.run import run
from scale_build.utils.paths import PKG_DIR from scale_build.utils.paths import PKG_DIR
@@ -108,9 +108,11 @@ class BuildPackageMixin:
if self.generate_version: if self.generate_version:
generate_version_flags = f' -v {datetime.today().strftime("%Y%m%d%H%M%S")}~truenas+1 ' generate_version_flags = f' -v {datetime.today().strftime("%Y%m%d%H%M%S")}~truenas+1 '
debian_release = get_manifest()['debian_release']
distribution = f'{debian_release}-truenas-unstable'
self.run_in_chroot( self.run_in_chroot(
f'cd {self.package_source} && dch -b -M {generate_version_flags}--force-distribution ' f'cd {self.package_source} && dch -b -M {generate_version_flags}--force-distribution '
'--distribution bullseye-truenas-unstable \'Tagged from truenas-build\'', f'--distribution {distribution} \'Tagged from truenas-build\'',
'Failed dch changelog' 'Failed dch changelog'
) )