mkosi: pull in gnu coreutils for Ubuntu 26.04 and newer

The default coreutils in Ubuntu 26.04 moved to uutils, which is broken in many subtle and annoying ways, breaking various tests. It's also a giant monolithic megabinary which makes the minimal image size go up and break other tests. Force the gnu coreutils to be pulled in all images.
2026-03-27 23:08:35 +00:00
parent f737b38977
commit 1d6585f218
23 changed files with 103 additions and 3 deletions
@@ -90,7 +90,6 @@ Packages=
        attr
        bash-completion
        binutils
-        coreutils
        cpio
        curl
        diffutils
@@ -17,6 +17,7 @@ Packages=
        bind
        bpf
        btrfs-progs
+        coreutils
        cryptsetup
        dbus-broker
        dbus-broker-units
@@ -23,6 +23,7 @@ VolatilePackages=
 Packages=
        bind-utils
        bpftool
+        coreutils
        cryptsetup
        device-mapper-event
        device-mapper-multipath
@@ -8,4 +8,5 @@ Release=testing

 [Content]
 Packages=
+        coreutils
        linux-perf
@@ -35,6 +35,7 @@ Packages=
        bind-utils
        bpftool
        btrfs-progs
+        coreutils
        cryptsetup
        device-mapper
        dhcp-server
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# avoid pulling in the uutils package which is the default and is broken in several ways
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=
+        coreutils-from-gnu
+        coreutils-from-uutils-
+        rust-coreutils-
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=jammy
+Release=noble
+
+[Content]
+Packages=
+        coreutils
@@ -15,7 +15,6 @@ CleanPackageMetadata=yes

 Packages=
        bash
-        coreutils
        grep
        socat
        util-linux
@@ -6,6 +6,7 @@ Distribution=arch
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 Packages=
+        coreutils
        inetutils
        iproute
        nmap
@@ -7,6 +7,7 @@ Distribution=|fedora
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 Packages=
+        coreutils
        hostname
        iproute
        iproute-tc
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+
+[Content]
+Packages=
+        coreutils
@@ -6,6 +6,7 @@ Distribution=opensuse
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
+        coreutils
        diffutils
        grep
        hostname
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# avoid pulling in the uutils package which is the default and is broken in several ways
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=
+        coreutils-from-gnu
+        coreutils-from-uutils-
+        rust-coreutils-
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=jammy
+Release=noble
+
+[Content]
+Packages=
+        coreutils
@@ -12,7 +12,6 @@ Environment=SYSTEMD_REQUIRED_DEPS_ONLY=1
 ExtraTrees=%D/mkosi/mkosi.extra.common

 Packages=
-        coreutils
        findutils
        grep
        sed
@@ -7,6 +7,7 @@ Distribution=arch
 PrepareScripts=%D/mkosi/mkosi.conf.d/arch/systemd.prepare
 Packages=
        btrfs-progs
+        coreutils
        tpm2-tools

 VolatilePackages=
@@ -7,6 +7,7 @@ Distribution=|fedora
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/centos-fedora/systemd.prepare
 Packages=
+        coreutils
        swtpm-tools
        tpm2-tools

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+
+[Content]
+Packages=
+        coreutils
@@ -7,6 +7,7 @@ Distribution=opensuse
 PrepareScripts=%D/mkosi/mkosi.conf.d/opensuse/systemd.prepare
 Packages=
        btrfs-progs
+        coreutils
        kmod
        tpm2.0-tools

@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# avoid pulling in the uutils package which is the default and is broken in several ways
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!jammy
+Release=!noble
+
+[Content]
+Packages=
+        coreutils-from-gnu
+        coreutils-from-uutils-
+        rust-coreutils-
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=jammy
+Release=noble
+
+[Content]
+Packages=
+        coreutils