From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 5 Aug 2024 13:37:46 +0000 (+0200)
Subject: mkosi: Prevent busybox from getting pulled into opensuse images
X-Git-Tag: v257-rc1~734
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=857e4528f5fe556bbe98e32ffcde8932d0d80f83;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
index 1d55a919f05..a9414577c01 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 5fd64663b03..37f6220ea0f 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 9bd40cff379..3d891b8ed0a 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