new commit
This commit is contained in:
parent
69131eb920
commit
dded952a79
@ -109,26 +109,38 @@ def copy_kernel_image(rootfs_path, boot_path, iso_build_config):
|
||||
return kernel_path_in_boot
|
||||
|
||||
def get_kernel_version_in_chroot(rootfs_path, iso_build_config):
|
||||
logger.info("=> DEBUG: Entering get_kernel_version_in_chroot...") # Debug line
|
||||
|
||||
# >>> DEBUG: Verificar target_arch recebido <<<
|
||||
target_arch = iso_build_config.get('rootfs', {}).get('target_arch', 'x86_64').lower()
|
||||
logger.info(f"=> DEBUG: get_kernel_version_in_chroot using target_arch: '{target_arch}'") # Debug line
|
||||
|
||||
boot_dir = os.path.join(rootfs_path, 'boot')
|
||||
logger.info(f"=> DEBUG: get_kernel_version_in_chroot checking directory: '{boot_dir}'") # Debug line
|
||||
|
||||
try:
|
||||
boot_files = os.listdir(boot_dir)
|
||||
logger.info(f"=> DEBUG: get_kernel_version_in_chroot found files: {boot_files}") # Debug line
|
||||
except FileNotFoundError:
|
||||
logger.error(f"=> ERROR: /boot directory not found at: {boot_dir}")
|
||||
return None
|
||||
|
||||
kernel_version = None
|
||||
for filename in boot_files:
|
||||
logger.info(f"=> DEBUG: Checking filename: '{filename}'") # Debug line
|
||||
if target_arch.startswith('i686') or target_arch == 'x86_64':
|
||||
if filename.startswith('vmlinuz-'):
|
||||
logger.info(f"=> DEBUG: Matched vmlinuz pattern for x86/i686: '{filename}'") # Debug line
|
||||
kernel_version = filename.replace('vmlinuz-', '')
|
||||
break
|
||||
elif target_arch == 'aarch64':
|
||||
if filename.startswith('vmlinux-'):
|
||||
logger.info(f"=> DEBUG: Matched vmlinux pattern for aarch64: '{filename}'") # Debug line
|
||||
kernel_version = filename.replace('vmlinux-', '')
|
||||
break
|
||||
break # Correct break for inner if
|
||||
|
||||
# >>> DEBUG: Verificar valor de kernel_version após o loop <<<
|
||||
logger.info(f"=> DEBUG: kernel_version after loop: '{kernel_version}'") # Debug line
|
||||
|
||||
if not kernel_version:
|
||||
logger.error(f"=> ERROR: Kernel image not found in: {boot_dir}")
|
||||
@ -140,6 +152,7 @@ def get_kernel_version_in_chroot(rootfs_path, iso_build_config):
|
||||
'version_final_part': kernel_version,
|
||||
'version_major_minor': ".".join(kernel_version.split('.')[:2])
|
||||
}
|
||||
logger.info(f"=> DEBUG: kernel_versions_dict: {kernel_versions_dict}") # Debug line
|
||||
return kernel_versions_dict
|
||||
|
||||
def get_kernel_module_dir_in_chroot(rootfs_path, kernel_version):
|
||||
|
Loading…
Reference in New Issue
Block a user