From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 5 Sep 2024 09:43:57 +0000 (+0200)
Subject: Merge pull request #3002 from DaanDeMeyer/cherry-pick
X-Git-Tag: v25~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32c8f393a7e0abd854761dbbb9c8b03db2251c4;p=thirdparty%2Fmkosi.git

Merge pull request #3002 from DaanDeMeyer/cherry-pick

Various commits from #2990
---

a32c8f393a7e0abd854761dbbb9c8b03db2251c4