Drop empty directories

Instead, let's declare them in the config and they'll get created
as needed.

diff --git a/.gitignore b/.gitignore
index c7b97382eda1ea50dbe73d2b3a101044c6c5e27d..81da653a2beffea33300181466fd7cca4d0da989 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@
 /dist
 /mkosi.build
 /mkosi.egg-info
+/mkosi.cache
+/mkosi.output
 /mkosi.extra
 !mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
 !mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service

diff --git a/mkosi.cache/.gitignore b/mkosi.cache/.gitignore
deleted file mode 100644 (file)
index 120f485..0000000
--- a/mkosi.cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!/.gitignore

diff --git a/mkosi.conf b/mkosi.conf
index 9f7a5553ef5a0cd1aae096d824503eca916699eb..3973bd7ca7cc5e3f9dae99bc7aa4931654a8c504 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -5,6 +5,7 @@
 # default to directory output where disk space isn't a problem.
 @Format=directory
 @CacheDirectory=mkosi.cache
+@OutputDirectory=mkosi.output
 
 [Content]
 Autologin=yes

diff --git a/mkosi.output/.gitignore b/mkosi.output/.gitignore
deleted file mode 100644 (file)
index 120f485..0000000
--- a/mkosi.output/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!/.gitignore