summaryrefslogtreecommitdiffstats
path: root/mkosi.images
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-08-05 15:37:46 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-08-05 16:20:55 +0200
commit857e4528f5fe556bbe98e32ffcde8932d0d80f83 (patch)
treea72ed581f6bd97ff46bdd8308fdd4f8fb3220b88 /mkosi.images
parentsystemd-analyze: Add svg scaling options (diff)
downloadsystemd-857e4528f5fe556bbe98e32ffcde8932d0d80f83.tar.xz
systemd-857e4528f5fe556bbe98e32ffcde8932d0d80f83.zip
mkosi: Prevent busybox from getting pulled into opensuse images
OpenSUSE's busybox has a bunch of Provides for basic tools that cause it to get pulled into images unless the corresponding tool is explicitly installed so let's add explicit tools to make sure we don't get busybox.
Diffstat (limited to 'mkosi.images')
-rw-r--r--mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf7
-rw-r--r--mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf4
-rw-r--r--mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf4
3 files changed, 14 insertions, 1 deletions
diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
index 1d55a919f0..a9414577c0 100644
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
@@ -11,8 +11,13 @@ Environment=
PKG_SUBDIR=opensuse
Packages=
- gcc-c++
+ diffutils
erofs-utils
+ gcc-c++
git-core
+ grep
+ gzip
patterns-base-minimal_base
rpm-build
+ sed
+ xz
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf b/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf
index 5fd64663b0..37f6220ea0 100644
--- a/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf
@@ -5,7 +5,11 @@ Distribution=opensuse
[Content]
Packages=
+ diffutils
+ grep
patterns-base-minimal_base
+ sed
+ xz
VolatilePackages=
libsystemd0
diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf b/mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf
index 9bd40cff37..3d891b8ed0 100644
--- a/mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf
@@ -5,10 +5,14 @@ Distribution=opensuse
[Content]
Packages=
+ diffutils
+ grep
hostname
iproute2
ncat
patterns-base-minimal_base
+ sed
+ xz
VolatilePackages=
libsystemd0