From: Michael Ferrari <nekkodroid404@gmail.com>
Date: Sun, 14 Apr 2024 22:30:47 +0000 (+0200)
Subject: Add `mkosi.packages/` for `PackageDirectories=`
X-Git-Tag: v23.1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb0bdd71ba5ee081d1c085e0c38c78a467dd667;p=thirdparty%2Fmkosi.git

Add `mkosi.packages/` for `PackageDirectories=`
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 09a1694c6..cb819b739 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2127,6 +2127,7 @@ SETTINGS = (
         metavar="PATH",
         section="Content",
         parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
+        paths=("mkosi.packages",),
         help="Specify a directory containing extra packages",
     ),
     ConfigSetting(
diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 27c871854..ad3fad545 100644
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -965,7 +965,8 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
 : Specify directories containing extra packages to be made available during
   the build. `mkosi` will create a local repository containing all
   packages in these directories and make it available when installing packages or
-  running scripts.
+  running scripts. If the `mkosi.packages/` directory is found in the local
+  directory it is also used for this purpose.
 
 : Note that this local repository is also made available when running
   scripts. Build scripts can add more packages to the local repository