From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 5 Apr 2024 13:28:39 +0000 (+0200)
Subject: Merge pull request #2351 from septatrix/feature/oci-output-format
X-Git-Tag: v23~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88c54bab3c895fa164f2acf193d09f3d2215adac;p=thirdparty%2Fmkosi.git

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

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

88c54bab3c895fa164f2acf193d09f3d2215adac
diff --cc mkosi/__init__.py
index 8ddb0cfe4,1325e5465..dce2952e3
--- a/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,