Merge pull request #2351 from septatrix/feature/oci-output-format

Add support for oci-dir output (fixes #1865)

diff --cc mkosi/__init__.py
index 8ddb0cfe46f10cb6858068cd573c880243434651,1325e5465d4ee13b1b7b25f336744e32312b37fd..dce2952e3b40c16b9426f4c60fb8c8b4cce8af9b
--- 1/mkosi/__init__.py
--- 2/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@@ -76,8 -75,10 +76,9 @@@ from mkosi.util import 
      flock,
      flock_or_die,
      format_rlimit,
+     hash_file,
      make_executable,
      one_zero,
 -    parents_below,
      read_env_file,
      round_up,
      scopedenv,

diff --cc mkosi/config.py
Simple merge

diff --cc mkosi/resources/mkosi.md
Simple merge

diff --cc mkosi/util.py
Simple merge