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

Update debootstrap changes for trixie

Browse Source
This commit is contained in:
Waqar Ahmed
2025-08-29 16:54:43 +05:00
parent 93ebdfc2bc
commit 7a7731267f
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scale_build/bootstrap/bootstrapdir.py
View File

@@ -30,9 +30,17 @@ class BootstrapDir(CacheMixin, HashMixin):
def debootstrap_debian(self):
manifest = get_manifest()
# Debootstrap needs binary format key, convert ASCII-armored to binary
keyring_path = os.path.join(BUILDER_DIR, 'keys/truenas.gpg')
binary_keyring = '/tmp/truenas-binary.gpg'
# Convert ASCII-armored key to binary format for debootstrap
with open(keyring_path, 'r') as f:
run(['gpg', '--dearmor', '-o', binary_keyring], input=f.read().encode())
run(
['debootstrap'] + self.deopts + [
'--keyring', os.path.join(BUILDER_DIR, 'keys/truenas.gpg'),
'--keyring', binary_keyring,
manifest['debian_release'],
self.chroot_basedir, get_apt_repos(check_custom=True)['url']
]
@@ -157,9 +165,17 @@ class RootfsBootstrapDir(BootstrapDir):
def debootstrap_debian(self):
manifest = get_manifest()
# Debootstrap needs binary format key, convert ASCII-armored to binary
keyring_path = os.path.join(BUILDER_DIR, 'keys/truenas.gpg')
binary_keyring = '/tmp/truenas-binary.gpg'
# Convert ASCII-armored key to binary format for debootstrap
with open(keyring_path, 'r') as f:
run(['gpg', '--dearmor', '-o', binary_keyring], input=f.read().encode())
run(
['debootstrap'] + self.deopts + [
'--foreign', '--keyring', os.path.join(BUILDER_DIR, 'keys/truenas.gpg'),
'--foreign', '--keyring', binary_keyring,
manifest['debian_release'],
self.chroot_basedir, get_apt_repos(check_custom=True)['url']
]