Skip to content

Commit 6445ed7

Browse files
blucakeszybz
authored andcommitted
mkosi: update SUSE package list to fix build error
Problem: busybox-diffutils-1.36.1-30.2.noarch conflicts with diffutils provided by diffutils-3.10-1.5.x86_64 Solution 1: deinstallation of busybox-diffutils-1.36.1-30.2.noarch Solution 2: do not install diffutils-3.10-1.5.x86_64 (cherry picked from commit 9edc143)
1 parent d5f36ae commit 6445ed7

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

mkosi.conf.d/opensuse/10-opensuse.conf

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ Distribution=opensuse
88
Release=tumbleweed
99

1010
[Content]
11+
# We install gawk, gzip, grep, xz, sed, rsync and docbook-xsl-stylesheets here explicitly so that the busybox
12+
# versions don't get installed instead.
1113
Packages=
14+
device-mapper
15+
diffutils
16+
distribution-release
17+
docbook-xsl-stylesheets
18+
gawk
19+
grep
20+
gzip
1221
btrfs-progs
1322
dbus-1
1423
f2fs-tools
@@ -38,6 +47,15 @@ Packages=
3847
libxkbcommon0
3948
pam
4049
python3-pefile
50+
shadow
51+
libtss2-esys0
52+
libtss2-mu0
53+
libtss2-rc0
54+
libtss2-tcti-device0
55+
# Workaround for CI issue with our stub getting overwritten
56+
systemd-boot
57+
rsync
58+
sed
4159
tpm2-0-tss
4260
vim
4361

@@ -46,7 +64,6 @@ BuildPackages=
4664
audit-devel
4765
bpftool
4866
dbus-1-devel
49-
docbook-xsl-stylesheets
5067
dwarves
5168
fdupes
5269
fuse-devel

0 commit comments

Comments
 (0)