From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 18 Feb 2024 14:48:59 +0000 (+0100)
Subject: Make sure to include the /usr/lib/firmware directory
X-Git-Tag: v21~46^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de4209ee62ce1d3cdc03e06c24cb64cc7793a22d;p=thirdparty%2Fmkosi.git

Make sure to include the /usr/lib/firmware directory

When creating a cpio, all parent directories have to be included
separately as well. We already did this properly for the parent
directories of the kernel modules directory but not yet for
/usr/lib/firmware which this commit fixes.

Fixes #2399
---

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index 9b2eeeb45..3d8cba725 100644
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -164,6 +164,9 @@ def gen_required_kernel_modules(
     yield modulesd
     yield modulesd / "kernel"
 
+    if (root / "usr/lib/firmware").exists():
+        yield root / "usr/lib/firmware"
+
     for d in (modulesd, root / "usr/lib/firmware"):
         for p in (root / d).rglob("*"):
             if p.is_dir():