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:27:36 +00:00
parent bb999a9669
commit 046f1c03ec
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builder/iso_builder.py
View File

@ -219,12 +219,26 @@ def iso_builder_main(
logger.info("=> Updating bootloader configuration (xbps-reconfigure -f linux) in ROOTFS...") 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]
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]
kernel_package_name_for_reconfigure = kernel_info.get('package_name') logger.info(f"=> DEBUG: kernel_type for reconfigure: '{kernel_type}'") # Debug line
if kernel_package_name_for_reconfigure: logger.info(f"=> DEBUG: kernel_info for reconfigure: {kernel_info}")  # Debug line
kernel_package_name_for_reconfigure = kernel_package_name_for_reconfigure.split()[0]
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 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("Failed to obtain kernel package name for reconfiguring. Using 'linux' as default.")