From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 17 Feb 2025 17:30:23 +0000 (+0100)
Subject: Switch over to the new glob syntax
X-Git-Tag: v26~316^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2afb307ee04d5fb1ceb19e7d119be079600aaeca;p=thirdparty%2Fmkosi.git

Switch over to the new glob syntax

This creates the following difference:
-usr/lib/modules/6.14.0-0.rc1.15.fc42.x86_64/kernel/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/ch_ipsec.ko.xz
-usr/lib/modules/6.14.0-0.rc1.15.fc42.x86_64/kernel/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/ch_ktls.ko.xz

In the previous syntax, we included those modules accidentally because
'inline_crypto/' matches 'crypto/'.
---

diff --git a/mkosi.conf b/mkosi.conf
index 42c20e8b0..b44fd515c 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -47,8 +47,7 @@ KernelCommandLine=
         printk.devkmsg=on
         systemd.early_core_pattern=/core
 
-KernelModulesInitrdExclude=.*
-KernelModulesInitrdInclude=default
+KernelInitrdModules=default
 
 [Runtime]
 RAM=4G
diff --git a/mkosi/addon.py b/mkosi/addon.py
index cf388f7ec..1ee734e1c 100644
--- a/mkosi/addon.py
+++ b/mkosi/addon.py
@@ -54,7 +54,6 @@ def main() -> None:
             "--extra-tree",
             f"/usr/lib/modules/{args.kernel_version}:/usr/lib/modules/{args.kernel_version}",
             "--extra-tree=/usr/lib/firmware:/usr/lib/firmware",
-            "--kernel-modules-exclude=.*",
         ]  # fmt: skip
 
         if args.debug:
diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index cd9df7bf5..b1e0bcf5d 100644
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -279,7 +279,6 @@ def main() -> None:
             f"--extra-tree=/usr/lib/modules/{args.kernel_version}:/usr/lib/modules/{args.kernel_version}",
             "--extra-tree=/usr/lib/firmware:/usr/lib/firmware",
             "--remove-files=/usr/lib/firmware/*-ucode",
-            "--kernel-modules-exclude=.*",
             "--build-sources=",
             "--include=mkosi-initrd",
         ]  # fmt: skip
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf
index 63667a7a2..8098e70e8 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf
@@ -40,93 +40,94 @@ Locale=C.UTF-8
 WithDocs=no
 
 # Make sure various core modules are always included in the initrd.
-KernelModulesInclude=
-                    /ahci.ko
-                    /amd_atl.ko
-                    /amd-pmc.ko
-                    /amd64_edac.ko
-                    /autofs4.ko
-                    /binfmt_misc.ko
-                    /btrfs.ko
-                    /cdrom.ko
-                    /cfg80211.ko
-                    /configfs.ko
-                    /crc-ccitt.ko
-                    /dm-crypt.ko
-                    /dm-integrity.ko
-                    /dm-mod.ko
-                    /dm-multipath.ko
-                    /dm-raid.ko
-                    /dm-verity.ko
-                    /dmi-sysfs.ko
-                    /drm_buddy.ko
-                    /drm_display_helper.ko
-                    /edac_mce_amd.ko
-                    /efi-pstore.ko
-                    /efivarfs.ko
-                    /erofs.ko
-                    /evdev.ko
-                    /ext4.ko
-                    /hid-generic.ko
-                    /i2c-algo-bit.ko
-                    /i2c_hid_acpi.ko
-                    /i2c-mux.ko
-                    /i2c-smbus.ko
-                    /intel-gtt.ko
-                    /intel_rapl_common.ko
-                    /intel-uncore-frequency-common.ko
-                    /intel[-_]vsec.ko
-                    /kvm.ko
-                    /libphy.ko
-                    /loop.ko
-                    /mdio_devres.ko
-                    /mei.ko
-                    /mxm-wmi.ko
-                    /nvme.ko
-                    /nvmet-tcp.ko
-                    /overlay.ko
-                    /parport.ko
-                    /pmt_telemetry.ko
-                    /qemu_fw_cfg.ko
-                    /raid[0-9]*.ko
-                    /rapl.ko
-                    /scsi_mod.ko
-                    /sd_mod.ko
-                    /serio.ko
-                    /sg.ko
-                    /skx_edac_common.ko
-                    /snd-intel-dspcfg.ko
-                    /snd-soc-hda-codec.ko
-                    /squashfs.ko
-                    /thunderbolt_net.ko
-                    /ttm.ko
-                    /typec_ucsi.ko
-                    /ucsi_acpi.ko
-                    /usbhid.ko
-                    /usb-storage.ko
-                    /uvc.ko
-                    /vfat.ko
-                    /video.ko
-                    /videobuf2-v4l2.ko
-                    /videobuf2-vmalloc.ko
-                    /virtio_balloon.ko
-                    /virtio_blk.ko
-                    /virtio_console.ko
-                    /virtio_dma_buf.ko
-                    /virtio_mmio.ko
-                    /virtio_net.ko
-                    /virtio_pci.ko
-                    /virtio_scsi.ko
-                    /virtio-rng.ko
-                    /virtiofs.ko
-                    /vmd.ko
-                    /vmw_vsock_virtio_transport.ko
-                    /vsock.ko
-                    /watchdog.ko
-                    /wmi.ko
-                    /wmi-bmof.ko
-                    /x_tables.ko
-                    /xfs.ko
-                    /xhci-pci-renesas.ko
-                    ^fs/nls/
-                    crypto/
+KernelModules=
+        ahci
+        amd_ctl
+        amd-pmc
+        amd64_edac
+        autofs4
+        binfmt_misc
+        btrfs
+        cdrom
+        cfg80211
+        configfs
+        crc-ccitt
+        dm-crypt
+        dm-integrity
+        dm-mod
+        dm-multipath
+        dm-raid
+        dm-verity
+        dmi-sysfs
+        drm_buddy
+        drm_display_helper
+        edac_mce_amd
+        efi-pstore
+        efivarfs
+        erofs
+        evdev
+        ext4
+        hid-generic
+        i2c-algo-bit
+        i2c_hid_acpi
+        i2c-mux
+        i2c-smbus
+        intel-gtt
+        intel_rapl_common
+        intel-uncore-frequency-common
+        intel-vsec
+        kvm
+        libphy
+        loop
+        mdio_devres
+        mei
+        mxm-wmi
+        nvme
+        nvmet-tcp
+        overlay
+        parport
+        pmt_telemetry
+        qemu_fw_cfg
+        raid[0-9]*
+        rapl
+        scsi_mod
+        sd_mod
+        serio
+        sg
+        skx_edac_common
+        snd-intel-dspcfg
+        snd-soc-hda-codec
+        squashfs
+        thunderbolt_net
+        ttm
+        typec_ucsi
+        ucsi_acpi
+        usbhid
+        usb-storage
+        uvc
+        vfat
+        video
+        videobuf2-v4l2
+        videobuf2-vmalloc
+        virtio_balloon
+        virtio_blk
+        virtio_console
+        virtio_dma_buf
+        virtio_mmio
+        virtio_net
+        virtio_pci
+        virtio_scsi
+        virtio-rng
+        virtiofs
+        vmd
+        vmw_vsock_virtio_transport
+        vsock
+        watchdog
+        wmi
+        wmi-bmof
+        x_tables
+        xfs
+        xhci-pci-renesas
+        /fs/nls/
+        crypto/
+