From 1e7f245bb7931bbb4341f35b3e0bdeb4c43f1f7b Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 26 2024 18:33:56 +0000
Subject: Merge remote-tracking branch 'fedora/rawhide' into c9s-sig-hyperscale


---

diff --git a/.gitignore b/.gitignore
index f81fd64..a5e1eb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
 /mkosi-20.1.tar.gz
 /mkosi-21.tar.gz
 /mkosi-22.tar.gz
+/mkosi-23.1.tar.gz
+/mkosi-24.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
new file mode 100644
index 0000000..3a47511
--- /dev/null
+++ b/.packit.yaml
@@ -0,0 +1,19 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+upstream_project_url: https://github.com/systemd/mkosi
+upstream_tag_template: v{version}
+create_sync_note: false
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-rawhide
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-rawhide
diff --git a/add-back-setup.py-file.patch b/add-back-setup.py-file.patch
index b07be30..c8e3f8a 100644
--- a/add-back-setup.py-file.patch
+++ b/add-back-setup.py-file.patch
@@ -26,7 +26,7 @@ index 0000000..077691d
 +
 +setup(
 +    name="mkosi",
-+    version="16",
++    version="24",
 +    description="Build Bespoke OS Images",
 +    url="https://github.com/systemd/mkosi",
 +    maintainer="mkosi contributors",
@@ -34,9 +34,9 @@ index 0000000..077691d
 +    license="LGPLv2+",
 +    python_requires=">=3.9",
 +    packages = find_packages(".", exclude=["tests"]),
-+    package_data = {"": ["repart/**/*", "mkosi.md", "mkosi.1", "mkosi-initrd/**/*", "mkosi-tools/**/*"]},
++    package_data = {"": ["repart/**/*", "mkosi.md", "mkosi.1", "mkosi-initrd/**/*", "mkosi-tools/**/*", "mkosi-initrd.md", "mkosi-initrd.1"]},
 +    include_package_data = True,
-+    entry_points = { "console_scripts": ["mkosi = mkosi.__main__:main"] },
++    entry_points = { "console_scripts": ["mkosi = mkosi.__main__:main", "mkosi-initrd = mkosi.initrd.__main__:main"] },
 +)
 -- 
 2.41.0
diff --git a/mkosi.spec b/mkosi.spec
index 44f9a93..4d45f22 100644
--- a/mkosi.spec
+++ b/mkosi.spec
@@ -1,5 +1,5 @@
 Name:           mkosi
-Version:        22
+Version:        24
 Release:        1.1%{?dist}
 Summary:        Create bespoke OS images
 
@@ -130,6 +130,8 @@ tools/make-man-page.sh
 mkdir -p %{buildroot}%{_mandir}/man1
 ln -s -t %{buildroot}%{_mandir}/man1/ \
          ../../../..%{python3_sitelib}/mkosi/resources/mkosi.1
+ln -s -t %{buildroot}%{_mandir}/man1/ \
+         ../../../..%{python3_sitelib}/mkosi/resources/mkosi-initrd.1
 
 # Install the kernel-install plugin
 install -Dt %{buildroot}%{_prefix}/lib/kernel/install.d/ \
@@ -144,6 +146,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/mkosi-initrd
 %_mandir/man1/mkosi.1*
 
 %files initrd
+%_bindir/mkosi-initrd
+%_mandir/man1/mkosi-initrd.1*
 %_prefix/lib/kernel/install.d/50-mkosi.install
 %ghost %dir %{_prefix}/lib/mkosi-initrd
 %ghost %dir %{_sysconfdir}/mkosi-initrd
diff --git a/sources b/sources
index e8acacd..5ebc512 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mkosi-22.tar.gz) = a2c3b442f00e539cd328571d8f258bb21c9d6953220c36e37f0d71c0430e81cc1246d62d5e42407761ada83888b54d98a84ba7a5f8b1813b64b67e761a51c04f
+SHA512 (mkosi-24.tar.gz) = 20d72eb62712d4a64ab32a6b145c570bcbd07d1dd02777e23fb3bba9a486a42fdf551f5346d5b2a525c20c71570976f3b4f63b07154c1bd7bbf8820eb4e72a15