From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 28 Oct 2024 13:36:32 +0000 (+0100)
Subject: Delete empty firmware subdirectories
X-Git-Tag: v25~204^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3142%2Fhead;p=thirdparty%2Fmkosi.git

Delete empty firmware subdirectories

Fixes #3124
---

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index 6ba873fbe..734914107 100644
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -242,5 +242,7 @@ def process_kernel_modules(
             p = root / fw
             if p.is_file() or p.is_symlink():
                 p.unlink()
+                if p.parent != root / firmwared and not any(p.parent.iterdir()):
+                    p.parent.rmdir()
             else:
                 p.rmdir()