From c55d1c59ee751c37cb1b4eeb3d8b883a89097160 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 13 Jul 2024 15:38:30 +0200 Subject: [PATCH] Make volatile packages available in local repository earlier By making the volatile packages available earlier, we can query, install and cache their dependencies in a prepare script. --- mkosi/__init__.py | 3 ++- mkosi/resources/mkosi.md | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index ab76677b4..23c9dad37 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -3870,6 +3870,8 @@ def build_image(context: Context) -> None: context.config.distribution.setup(context) with createrepo(context): install_package_directories(context, context.config.package_directories) + install_package_directories(context, context.config.volatile_package_directories) + install_package_directories(context, [context.package_dir]) if not cached: install_skeleton_trees(context) @@ -3892,7 +3894,6 @@ def build_image(context: Context) -> None: return with createrepo(context): - install_package_directories(context, context.config.volatile_package_directories) install_package_directories(context, [context.package_dir]) install_volatile_packages(context) diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md index b47f60f33..8606f7ca1 100644 --- a/mkosi/resources/mkosi.md +++ b/mkosi/resources/mkosi.md @@ -772,10 +772,9 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, `VolatilePackageDirectories=`, `--volatile-package-directory=` -: Like `PackageDirectories=`, but the packages in these directories - are only made available in the local repository just before volatile - packages are installed. Specifically, if `Incremental=` is enabled, - the packages from these directories will not be cached. +: Like `PackageDirectories=`, but any changes to the packages in these + directories will not invalidate the cached images if `Incremental=` + is enabled. Additionally, build scripts can add more packages to the local repository by placing the built packages in `$PACKAGEDIR`. The -- 2.47.2