From 4ba2973515173b4f3c66534af06f3e7b3bbf5cd2 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 5 Aug 2024 15:37:46 +0200
Subject: [PATCH] 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)
---
 mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf     | 7 ++++++-
 mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf       | 4 ++++
 mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

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