manuel/builder_peppermint_void
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new commit

Browse Source
This commit is contained in:
Manuel 2025-04-29 12:35:13 +00:00
parent 589ba2415f
commit 69131eb920
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
builder/iso_builder.py
View File

@ -217,33 +217,40 @@ def iso_builder_main(
repositories_data=repositories repositories_data=repositories
) )
logger.info("=> Updating bootloader configuration (xbps-reconfigure -f linux) in ROOTFS...") 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]
# 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]
kernel_package_name_for_reconfigure = None kernel_package_name_for_reconfigure = None
if kernels_config and 'kernels' in kernels_config and kernel_type in kernels_config['kernels']: if kernels_config and 'kernels' in kernels_config and kernel_type in kernels_config['kernels']:
kernel_info = kernels_config['kernels'][kernel_type] kernel_info = kernels_config['kernels'][kernel_type]
logger.info(f"=> DEBUG: kernel_type for reconfigure: '{kernel_type}'") # Debug line if isinstance(kernel_info, dict):
logger.info(f"=> DEBUG: kernel_info for reconfigure: {kernel_info}") # Debug line package_names_dict = kernel_info.get('package_names', {})
package_name_string_from_yaml = kernel_info.get('package_name') # Get the string if isinstance(package_names_dict, dict):
logger.info(f"=> DEBUG: package_name_string_from_yaml: '{package_name_string_from_yaml}'") # Debug line 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: 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' kernel_package_name_for_reconfigure = 'linux'
logger.info(f"=> Updating bootloader configuration for package: {kernel_package_name_for_reconfigure} in ROOTFS...")
reconfigure_command_list = [ reconfigure_command_list = [
"sudo", "chroot", paths['ROOTFS'], "sudo", "chroot", paths['ROOTFS'],
"/usr/bin/xbps-reconfigure", "/usr/bin/xbps-reconfigure",