summaryrefslogtreecommitdiffstats
path: root/mkosi.clean
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-07-08 12:59:52 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-07-09 08:07:09 +0200
commit20345a86b7157e229c1c7e3976005548bad159a4 (patch)
tree02021dbcdd2e85a6b62cdbc691d9d51a0ffa179a /mkosi.clean
parentmkosi: policykit-1 was renamed to polkitd (diff)
downloadsystemd-20345a86b7157e229c1c7e3976005548bad159a4.tar.xz
systemd-20345a86b7157e229c1c7e3976005548bad159a4.zip
mkosi: Adapt configuration to take into account configuration rework
In https://github.com/systemd/mkosi/pull/2847, the '@' specifier is removed, CLI arguments take priority over configuration files again and the "main" image is defined at the top level instead of in mkosi.images/. Additionally, not every setting from the top level configuration is inherited by the images in mkosi.images/ anymore, only settings which make sense to be inherited are inherited. This commit gets rid of all the usages of '@', moves the "main" image configuration from mkosi.images/system to the top level and gets rid of various hacks we had in place to deal with quirks of the old configuration parsing logic. We also remove usages of Images= and --append as these options are removed by the mentioned PR.
Diffstat (limited to 'mkosi.clean')
-rwxr-xr-xmkosi.clean5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkosi.clean b/mkosi.clean
new file mode 100755
index 0000000000..64810b7957
--- /dev/null
+++ b/mkosi.clean
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+set -o nounset
+
+rm -f "$OUTPUTDIR"/*.{rpm,deb,pkg.tar}