tumblweed config: merge patch for bash-sh from DimStar

openSUSE · Nov 25, 2021 · 7372c4c · 7372c4c
1 parent 03ce690
commit 7372c4c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/configs/tumbleweed.conf b/configs/tumbleweed.conf
@@ -2,13 +2,13 @@
 # Workaround https://bugzilla.opensuse.org/show_bug.cgi?id=1125775#c9 - until firewalld is fixed.
 Ignore: firewall-macros:firewalld
 
-%define gcc_version 10
+%define gcc_version 11
 
 # testing new cycle algorithm
 BuildFlags: genmetaalgo:1
 
 ExpandFlags: preinstallexpand
-Preinstall: rpm
+Preinstall: rpm bash-sh
 
 ExpandFlags: kiwi-nobasepackages
 ExpandFlags: docker-nobasepackages
@@ -134,6 +134,7 @@ Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel
 Prefer: -moonjit-devel
 
 FileProvides: /bin/bash bash
+FileProvides: /bin/sh bash-sh
 FileProvides: /bin/csh tcsh
 FileProvides: /bin/hostname hostname busybox-hostname
 FileProvides: /usr/bin/hostname hostname busybox-hostname