From 69131eb920b373515b135d837c5a5e7fba5e05d6 Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 29 Apr 2025 12:35:13 +0000 Subject: [PATCH] new commit --- builder/iso_builder.py | 45 ++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/builder/iso_builder.py b/builder/iso_builder.py index 5a67853e..78a9ef0c 100644 --- a/builder/iso_builder.py +++ b/builder/iso_builder.py @@ -217,33 +217,40 @@ def iso_builder_main( repositories_data=repositories ) - logger.info("=> Updating bootloader configuration (xbps-reconfigure -f linux) in ROOTFS...") - -# kernel_package_name_for_reconfigure = None -# if kernels_config and 'kernels' in kernels_config and kernel_type in kernels_config['kernels']: -# kernel_info = kernels_config['kernels'][kernel_type] -# kernel_package_name_for_reconfigure = kernel_info.get('package_name') -# if kernel_package_name_for_reconfigure: -# kernel_package_name_for_reconfigure = kernel_package_name_for_reconfigure.split()[0] + logger.info("=> Updating bootloader configuration...") kernel_package_name_for_reconfigure = None + if kernels_config and 'kernels' in kernels_config and kernel_type in kernels_config['kernels']: kernel_info = kernels_config['kernels'][kernel_type] - logger.info(f"=> DEBUG: kernel_type for reconfigure: '{kernel_type}'") # Debug line - logger.info(f"=> DEBUG: kernel_info for reconfigure: {kernel_info}") # Debug line - - package_name_string_from_yaml = kernel_info.get('package_name') # Get the string - logger.info(f"=> DEBUG: package_name_string_from_yaml: '{package_name_string_from_yaml}'") # Debug line + if isinstance(kernel_info, dict): + package_names_dict = kernel_info.get('package_names', {}) + + if isinstance(package_names_dict, dict): + package_name_string_from_yaml = package_names_dict.get(architecture) + + logger.info(f"=> DEBUG: kernel_type for reconfigure: '{kernel_type}'") + logger.info(f"=> DEBUG: architecture for reconfigure: '{architecture}'") + logger.info(f"=> DEBUG: kernel_info for reconfigure: {kernel_info}") + logger.info(f"=> DEBUG: package_names_dict: {package_names_dict}") + logger.info(f"=> DEBUG: package_name_string_from_yaml: '{package_name_string_from_yaml}'") + + + if package_name_string_from_yaml: + kernel_packages_list_for_reconfigure = package_name_string_from_yaml.split() + if kernel_packages_list_for_reconfigure: + kernel_package_name_for_reconfigure = kernel_packages_list_for_reconfigure[0] + logger.info(f"=> DEBUG: kernel_package_name_for_reconfigure after split: '{kernel_package_name_for_reconfigure}'") + else: + logger.warning(f"YAML 'package_names' string for {kernel_type}/{architecture} is empty.") - if package_name_string_from_yaml: - # Only split if the string is not None or empty - kernel_package_name_for_reconfigure = package_name_string_from_yaml.split()[0] - logger.info(f"=> DEBUG: kernel_package_name_for_reconfigure after split: '{kernel_package_name_for_reconfigure}'") # Debug line if not kernel_package_name_for_reconfigure: - logger.warning("Failed to obtain kernel package name for reconfiguring. Using 'linux' as default.") + logger.warning(f"Failed to obtain kernel package name for reconfiguring {kernel_type}/{architecture} from YAML. Using 'linux' as default.") kernel_package_name_for_reconfigure = 'linux' + logger.info(f"=> Updating bootloader configuration for package: {kernel_package_name_for_reconfigure} in ROOTFS...") + reconfigure_command_list = [ "sudo", "chroot", paths['ROOTFS'], "/usr/bin/xbps-reconfigure", @@ -514,4 +521,4 @@ def main(): print(f"=> Build for {args.desktop}-{args.kernel}-{args.architecture} COMPLETE!") if __name__ == "__main__": - main() \ No newline at end of file + main()