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.

(cherry picked from commit 857e4528f5fe556bbe98e32ffcde8932d0d80f83)

diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
index 1d55a919f05d51287c86ec67d73db6e11abadb79..a9414577c016a21e977797634b73fefa7a5f399c 100644 (file)
--- 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 5fd64663b0338f6248732188642b38944d183611..37f6220ea0f0e1ac60278e54910fbd02cd633f22 100644 (file)
--- 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 9bd40cff379edf1a07d92e9e7e30f1ab4e768a9a..3d891b8ed0af3a057b0a2cfb032402baaae9e39a 100644 (file)
--- 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