From: Michael Ferrari <nekkodroid404@gmail.com>
Date: Sun, 29 Sep 2024 11:12:45 +0000 (+0200)
Subject: Reorder PeAddons= and fix summary name
X-Git-Tag: v25~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5791e24ea413e27a16ac6fae7cab49f402d333e;p=thirdparty%2Fmkosi.git

Reorder PeAddons= and fix summary name
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 83da4e135..9da510dd0 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1588,7 +1588,6 @@ class Config:
     shim_bootloader: ShimBootloader
     unified_kernel_images: ConfigFeature
     unified_kernel_image_format: str
-    pe_addons: list[Path]
     initrds: list[Path]
     initrd_packages: list[str]
     initrd_volatile_packages: list[str]
@@ -1597,6 +1596,7 @@ class Config:
     kernel_modules_include: list[str]
     kernel_modules_exclude: list[str]
     kernel_modules_include_host: bool
+    pe_addons: list[Path]
 
     kernel_modules_initrd: bool
     kernel_modules_initrd_include: list[str]
@@ -2553,15 +2553,6 @@ SETTINGS = (
         # default=
         help="Specify the format used for the UKI filename",
     ),
-    ConfigSetting(
-        dest="pe_addons",
-        long="--pe-addon",
-        metavar="PATH",
-        section="Content",
-        parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
-        recursive_paths=("mkosi.pe-addons/",),
-        help="Configuration files to generate PE addons",
-    ),
     ConfigSetting(
         dest="initrds",
         long="--initrd",
@@ -2623,6 +2614,15 @@ SETTINGS = (
         parse=config_make_list_parser(delimiter=","),
         help="Exclude the specified kernel modules from the image",
     ),
+    ConfigSetting(
+        dest="pe_addons",
+        long="--pe-addon",
+        metavar="PATH",
+        section="Content",
+        parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
+        recursive_paths=("mkosi.pe-addons/",),
+        help="Configuration files to generate PE addons",
+    ),
     ConfigSetting(
         dest="kernel_modules_initrd",
         metavar="BOOL",
@@ -4489,7 +4489,6 @@ def summary(config: Config) -> str:
                     Shim Bootloader: {config.shim_bootloader}
               Unified Kernel Images: {config.unified_kernel_images}
         Unified Kernel Image Format: {config.unified_kernel_image_format}
-        Unified Kernel Image Addons: {line_join_list(config.pe_addons)}
                             Initrds: {line_join_list(config.initrds)}
                     Initrd Packages: {line_join_list(config.initrd_packages)}
            Initrd Volatile Packages: {line_join_list(config.initrd_volatile_packages)}
@@ -4497,6 +4496,7 @@ def summary(config: Config) -> str:
              Kernel Modules Include: {line_join_list(config.kernel_modules_include)}
              Kernel Modules Exclude: {line_join_list(config.kernel_modules_exclude)}
         Kernel Modules Include Host: {yes_no(config.kernel_modules_include_host)}
+                          PE Addons: {line_join_list(config.pe_addons)}
 
               Kernel Modules Initrd: {yes_no(config.kernel_modules_initrd)}
       Kernel Modules Initrd Include: {line_join_list(config.kernel_modules_initrd_include)}