mkosi: Mark minimal images as Incremental=relaxed

Building these over and over again is extremely wasteful. Let's just
build them once and not touch them again unless -ff is specified or
their cache is out-of-date, which is exactly what Incremental=relaxed
does.

This means mkosi.extra/ and such changes won't be picked up for these
anymore unless -ff is used, but that slight annoyance is totally
outweighed by the time saved building the images.

diff --git a/mkosi/mkosi.images/minimal-0/mkosi.conf b/mkosi/mkosi.images/minimal-0/mkosi.conf
index 5d6717f897bd3bf493ea872b4740ba6147cc66a3..0d55105c70faf0552c2d4c3cbe05b9ba877c40b2 100644 (file)
--- a/mkosi/mkosi.images/minimal-0/mkosi.conf
+++ b/mkosi/mkosi.images/minimal-0/mkosi.conf
@@ -9,6 +9,7 @@ SplitArtifacts=yes
 
 [Build]
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
+Incremental=relaxed
 
 [Content]
 BaseTrees=%O/minimal-base

diff --git a/mkosi/mkosi.images/minimal-1/mkosi.conf b/mkosi/mkosi.images/minimal-1/mkosi.conf
index 5d6717f897bd3bf493ea872b4740ba6147cc66a3..0d55105c70faf0552c2d4c3cbe05b9ba877c40b2 100644 (file)
--- a/mkosi/mkosi.images/minimal-1/mkosi.conf
+++ b/mkosi/mkosi.images/minimal-1/mkosi.conf
@@ -9,6 +9,7 @@ SplitArtifacts=yes
 
 [Build]
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
+Incremental=relaxed
 
 [Content]
 BaseTrees=%O/minimal-base

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf
index 0a5f342c9e68a40177efb43e1cc275abf9b0193b..8e57cd032dfea14dc6b24c2c2d9c4832ca177271 100644 (file)
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf
@@ -5,6 +5,7 @@ Format=directory
 
 [Build]
 Environment=SYSTEMD_REQUIRED_DEPS_ONLY=1
+Incremental=relaxed
 
 [Content]
 Bootable=no

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
index c7a1db67a8617bb86abffe1e230c4b1bffecb417..6d77d2305d13bc0d1ae6ce5dae2bebdaf12048e8 100644 (file)
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
@@ -10,9 +10,6 @@ Packages=
         iproute
         nmap
 
-VolatilePackages=
-        systemd-libs
-
 RemoveFiles=
         # Arch Linux doesn't split their gcc-libs package so we manually remove
         # unneeded stuff here to make sure it doesn't end up in the image.

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
index 33388242725af2d770155197b2446b1d21f61379..53cc68d794768672daec6129f37ffe5cc345832c 100644 (file)
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
@@ -11,6 +11,3 @@ Packages=
         iproute
         iproute-tc
         nmap-ncat
-
-VolatilePackages=
-        systemd-libs

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
index acbcea7cd272a2e39adea5a77e8c454896391d9a..8b148d8422151824fc6c009bcbf6290afc0aa86b 100644 (file)
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
@@ -12,7 +12,3 @@ Packages=
         iproute2
         mount
         ncat
-
-VolatilePackages=
-        libsystemd0
-        libudev1

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
index 811b49276e0a39f9248ab269593e3d29afa9a2d7..8b38a769a1eb3a0e6ba863f74bf0e49adf7320ca 100644 (file)
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
@@ -15,7 +15,3 @@ Packages=
         patterns-base-minimal_base
         sed
         xz
-
-VolatilePackages=
-        libsystemd0
-        libudev1