From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Thu, 19 Sep 2024 14:59:24 +0000 (+0200)
Subject: cli: add back mkosi-initrd and mkosi-tools to mkosi.resources
X-Git-Tag: v25~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a0f509b2b9d4fc8b5b6d3e50ef960c436f7bc5c;p=thirdparty%2Fmkosi.git

cli: add back mkosi-initrd and mkosi-tools to mkosi.resources

Otherwise these resources are not packaged and cannot be included.

E.g., `mkosi-initrd` fails because it adds `--include=mkosi-initrd`:

```
$ mkosi-initrd
Traceback (most recent call last):
  File "/usr/lib/python3.11/site-packages/mkosi/run.py", line 64, in uncaught_exception_handler
    yield
  File "/usr/lib64/python3.11/contextlib.py", line 81, in inner
    return func(*args, **kwds)
           ^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/site-packages/mkosi/__main__.py", line 30, in main
    args, images = parse_config(sys.argv[1:], resources=resources)
                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/site-packages/mkosi/config.py", line 3907, in parse_config
    context.parse_new_includes()
  File "/usr/lib/python3.11/site-packages/mkosi/config.py", line 3575, in parse_new_includes
    st = path.stat()
         ^^^^^^^^^^^
  File "/usr/lib64/python3.11/pathlib.py", line 1013, in stat
    return os.stat(self, follow_symlinks=follow_symlinks)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/tmp/tmpyqqy4ttp/resources/mkosi-initrd'
```

Fixes 9f48afa4a76b6002edc90ac976a2d1e8fd01f793
---

diff --git a/pyproject.toml b/pyproject.toml
index 76fbeb5ed..fa296ce2d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,13 @@ packages = [
 ]
 
 [tool.setuptools.package-data]
-"mkosi.resources" = ["repart/**/*", "man/*", "completion.*"]
+"mkosi.resources" = [
+    "completion.*",
+    "man/*",
+    "mkosi-initrd/**/*",
+    "mkosi-tools/**/*",
+    "repart/**/*",
+]
 
 [tool.isort]
 profile = "black"