mkosi: Rework how the pkgenv environment variables are set

Instead of including distribution specific files in the subimages,
let's have one common mkosi.pkgenv/ directory that handles all the
matching which is then included in the subimages.

This gives us more control on exactly how we do the matching.

.packit.yml

@@ -19,7 +19,7 @@ actions:
   post-upstream-clone:
     # Use the Fedora Rawhide specfile
     - git clone https://src.fedoraproject.org/rpms/systemd .packit_rpm
-    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | cut -d= -f2)"'
+    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf | cut -d= -f2)"'
     - bash -c 'echo "%bcond upstream 1" > .packit_rpm/systemd.spec.new'
     - bash -c 'echo "%define meson_extra_configure_options --werror" >> .packit_rpm/systemd.spec.new'
     - bash -c 'cat .packit_rpm/systemd.spec >> .packit_rpm/systemd.spec.new'

mkosi/mkosi.conf

@@ -156,3 +156,4 @@ KVM=yes
 [Include]
 Include=%D/mkosi/mkosi.sanitizers
         %D/mkosi/mkosi.coverage
+        %D/mkosi/mkosi.pkgenv

mkosi/mkosi.images/build/mkosi.conf

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Include]
+Include=%D/mkosi/mkosi.pkgenv
+
 [Content]
 Packages=
         clang

mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf

@@ -3,9 +3,6 @@
 [Match]
 Distribution=arch
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
-
 [Content]
 Packages=
         base

mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf

@@ -4,9 +4,6 @@
 Distribution=|centos
 Distribution=|fedora
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
-
 [Content]
 Packages=
         clang-devel

mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf

@@ -4,9 +4,6 @@
 Distribution=|debian
 Distribution=|ubuntu
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
-
 [Content]
 Packages=
         apt

mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf

@@ -3,9 +3,6 @@
 [Match]
 Distribution=opensuse
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
-
 [Content]
 Packages=
         clang

mkosi/mkosi.pkgenv/mkosi.conf.d/arch.conf

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Match]
+Distribution=arch
+
 [Build]
 Environment=
         GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git

mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Match]
+Distribution=|fedora
+Distribution=|centos
+
 [Build]
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git

mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
 [Build]
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git

mkosi/mkosi.pkgenv/mkosi.conf.d/opensuse.conf

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Match]
+Distribution=opensuse
+
 [Build]
 Environment=
         GIT_URL=https://github.com/bmwiedemann/openSUSE

mkosi/mkosi.tools.conf/mkosi.conf

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Include]
+Include=%D/mkosi/mkosi.pkgenv
+
 [Content]
 SyncScripts=%D/mkosi/mkosi.sync
 Packages=

mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf

@@ -3,9 +3,6 @@
 [Match]
 Distribution=arch
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
-
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
 Packages=

mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf

@@ -4,9 +4,6 @@
 Distribution=|fedora
 Distribution=|centos
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
-
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
 Packages=

mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf

@@ -4,9 +4,6 @@
 Distribution=|debian
 Distribution=|ubuntu
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
-
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
 Packages=

mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf

@@ -3,9 +3,6 @@
 [Match]
 Distribution=opensuse
 
-[Include]
-Include=%D/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
-
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
 Packages=

tools/fetch-distro.py

@@ -31,10 +31,13 @@ def parse_args():
         action='store_true',
         default=False,
     )
+    p.add_argument('--profile')
     return p.parse_args()
 
 def read_config(distro: str):
     cmd = ['mkosi', '--json', '-d', distro, 'summary']
+    if args.profile:
+        cmd += ['--profile', args.profile]
     print(f"+ {shlex.join(cmd)}")
     text = subprocess.check_output(cmd, text=True)
 
@@ -53,14 +56,15 @@ def commit_file(distro: str, files: list[Path], commit: str, changes: str):
     subprocess.check_call(cmd)
 
 def checkout_distro(args, distro: str, config: dict):
-    dest = Path(f'pkg/{distro}')
-    if dest.exists():
-        print(f'{dest} already exists.')
-        return
-
     url = config['Environment']['GIT_URL']
     branch = config['Environment']['GIT_BRANCH']
     subdir = config['Environment'].get('GIT_SUBDIR')
+    pkg_subdir = config['Environment']['PKG_SUBDIR']
+
+    dest = Path(f'pkg/{pkg_subdir}')
+    if dest.exists():
+        print(f'{dest} already exists.')
+        return
 
     # Do not checkout the full sources if the package is in a subdirectory,
     # a sparse checkout will be done after
@@ -81,12 +85,12 @@ def checkout_distro(args, distro: str, config: dict):
 
     # Sparse checkout if the package is in a subdirectory
     if subdir is not None:
-        cmd = ['git', '-C', f'pkg/{distro}', 'sparse-checkout', 'set',
+        cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'sparse-checkout', 'set',
                '--no-cone', f'{subdir}']
         print(f"+ {shlex.join(cmd)}")
         subprocess.check_call(cmd)
 
-        cmd = ['git', '-C', f'pkg/{distro}', 'checkout', 'HEAD']
+        cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'checkout', 'HEAD']
         print(f"+ {shlex.join(cmd)}")
         subprocess.check_call(cmd)
 
@@ -96,18 +100,19 @@ def update_distro(args, distro: str, config: dict):
     branch = config['Environment']['GIT_BRANCH']
     subdir = config['Environment'].get('GIT_SUBDIR')
     old_commit = config['Environment']['GIT_COMMIT']
+    pkg_subdir = config['Environment']['PKG_SUBDIR']
 
     if args.fetch:
-        cmd = ['git', '-C', f'pkg/{distro}', 'fetch', 'origin', '-v',
+        cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'fetch', 'origin', '-v',
                f'{branch}:remotes/origin/{branch}']
         print(f"+ {shlex.join(cmd)}")
         subprocess.check_call(cmd)
 
-    cmd = ['git', '-C', f'pkg/{distro}', 'switch', branch]
+    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'switch', branch]
     print(f"+ {shlex.join(cmd)}")
     subprocess.check_call(cmd)
 
-    cmd = ['git', '-C', f'pkg/{distro}', 'log', '-n1', '--format=%H',
+    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'log', '-n1', '--format=%H',
            f'refs/remotes/origin/{branch}']
     if subdir is not None:
         cmd += [f'{subdir}']
@@ -115,10 +120,10 @@ def update_distro(args, distro: str, config: dict):
     new_commit = subprocess.check_output(cmd, text=True).strip()
 
     if old_commit == new_commit:
-        print(f'{distro}: commit {new_commit!s} is still fresh')
+        print(f'{pkg_subdir}: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', f'pkg/{distro}', 'log', '--graph', '--first-parent',
+    cmd = ['git', '-C', f'pkg/{pkg_subdir}', 'log', '--graph', '--first-parent',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     if subdir is not None:
@@ -126,8 +131,8 @@ def update_distro(args, distro: str, config: dict):
     print(f"+ {shlex.join(cmd)}")
     changes = subprocess.check_output(cmd, text=True).strip()
 
-    conf_dir = Path('mkosi/mkosi.conf.d')
+    conf_dir = Path('mkosi/mkosi.pkgenv/mkosi.conf.d')
-    files = conf_dir.glob('**/pkgenv.conf')
+    files = conf_dir.glob('*.conf')
     for file in files:
         s = file.read_text()
         if old_commit in s: