[blfs] branch trunk updated: kernel-config: Correctly handle empty comment lines

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository blfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new 3385c7ddc5 kernel-config: Correctly handle empty comment lines
3385c7ddc5 is described below

commit 3385c7ddc5164f67f59e284074459f3f3713ec55
Author: Zeckmathederg <[email protected]>
AuthorDate: Fri May 22 12:30:45 2026 -0600

    kernel-config: Correctly handle empty comment lines
    
    Credit to tox-wtf: https://github.com/glfs-book/glfs/pull/449.
    
    With the previous logic, the script would generate whitespace when
    comment lines were empty. Now, if they are empty, such whitespace (about
    4-5 spaces, or a tab) are/is eliminated from the generated XML.
    
    Also, the grub-setup.toml file has been deleted since we no longer
    handle UEFI in BLFS (moved to LFS). So keeping it around broke
    kernel-config.
---
 kernel-config/kernel-config.py                             |  2 +-
 .../postlfs/filesystems/uefi-bootloaders/grub-setup.toml   | 12 ------------
 x/installing/mesa-kernel.xml                               | 14 +++++++-------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/kernel-config/kernel-config.py b/kernel-config/kernel-config.py
index a30c5fb0f0..c008fa1db5 100755
--- a/kernel-config/kernel-config.py
+++ b/kernel-config/kernel-config.py
@@ -284,7 +284,7 @@ for i0, val, i1, title, arrow, key, menu, comment in r:
     if type(comment) == str:
         comment = [comment]
     if comment:
-        comment = '\n'.join([' ' * i0 + ('# ' if line else '') + line for line in comment])
+        comment = '\n'.join([' ' * i0 + '# ' + line if line else '' for line in comment])
         buf += [escape(comment) + ':']
 
     if not menu and buf:
diff --git a/kernel-config/postlfs/filesystems/uefi-bootloaders/grub-setup.toml b/kernel-config/postlfs/filesystems/uefi-bootloaders/grub-setup.toml
deleted file mode 100644
index 38e436912f..0000000000
--- a/kernel-config/postlfs/filesystems/uefi-bootloaders/grub-setup.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-# forced by !EXPERT
-BLOCK = { value = '*', forced = true }
-EFI='*'
-EFI_STUB='*'
-PARTITION_ADVANCED='* '
-EFI_PARTITION="*"
-VFAT_FS="*M"
-EFIVAR_FS="*M"
-# forced by both ACPI and PCI on a typical x86 desktop/server system
-NLS = { value = "*", forced = "*" }
-NLS_CODEPAGE_437="*M"
-NLS_ISO8859_1="*M"
diff --git a/x/installing/mesa-kernel.xml b/x/installing/mesa-kernel.xml
index e649841267..473b111f0a 100644
--- a/x/installing/mesa-kernel.xml
+++ b/x/installing/mesa-kernel.xml
@@ -7,31 +7,31 @@
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt;*/M&gt;   <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-    
+
     # For r300 or r600:
     &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>TI Radeon                                              [DRM_RADEON]
-    
+
     # For radeonsi:
     &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD GPU                                                 [DRM_AMDGPU]
     [*]       <emphasis role='blue'>E</emphasis>nable amdgpu support for SI parts                 [DRM_AMDGPU_SI]
     [*]       <emphasis role='blue'>E</emphasis>nable amdgpu support for CIK parts               [DRM_AMDGPU_CIK]
       <emphasis role='blue'>D</emphasis>isplay Engine Configuration ---&gt;
       [*]   <emphasis role='blue'>A</emphasis>MD DC - Enable new display engine                      [DRM_AMD_DC]
-    
+
     # For nouveau:
     &lt; /*/M&gt; N<emphasis role='blue'>o</emphasis>uveau (NVIDIA) cards                                 [DRM_NOUVEAU]
-    
+
     # For i915, crocus, or iris:
     &lt; /*/M&gt; <emphasis role='blue'>I</emphasis>ntel 8xx/9xx/G3x/G4x/HD Graphics                         [DRM_I915]
-    
+
     # For iris:
     &lt; /*/M&gt; <emphasis role='blue'>I</emphasis>ntel Xe2 Graphics                                          [DRM_XE]
     [*]       <emphasis role='blue'>E</emphasis>nable display support                            [DRM_XE_DISPLAY]
     (*)       <emphasis role='blue'>F</emphasis>orce probe xe for selected Intel hardware IDs
                                                        ...  [DRM_XE_FORCE_PROBE]
-    
+
     # For llvmpipe or softpipe:
     &lt; /*&gt;   <emphasis role='blue'>V</emphasis>irtual GEM provider                                      [DRM_VGEM]
-    
+
     # For svga:
     &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>RM driver for VMware Virtual GPU                       [DRM_VMWGFX]</screen>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page