Merge "chore: remove monolithic coreutils requirement" into main

doc/manual/change-authors.yml

@@ -141,6 +141,11 @@ valentin:
   display_name: Valentin Gagarin
   github: fricklerhandwerk
 
+vigress8:
+  display_name: Vigress
+  forgejo: vigress8
+  github: vigress8
+
 winter:
   forgejo: winter
   github: winterqt

doc/manual/rl-next/remove-mono-coreutils-dependency.md

@@ -0,0 +1,8 @@
+---
+synopsis: "Dependency on monolithic coreutils removed"
+category: Development
+cls: [2108]
+credits: vigress8
+---
+
+Previously, the build erroneously depended on a `coreutils` binary, which requires `coreutils` to be built with a specific configuration. This was only used in one test and was not required to be a single binary. This dependency is removed now.

meson.build

@@ -358,7 +358,6 @@ endif
 #
 # Build-time tools
 #
-coreutils = find_program('coreutils', native : true)
 dot = find_program('dot', required : false, native : true)
 pymod = import('python')
 python = pymod.find_installation('python3')

tests/functional/bash-profile.sh

@@ -1,6 +1,6 @@
 source common.sh
 
-sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh
+sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh
 
 user=$(whoami || echo -n nixbld)
 rm -rf $TEST_HOME $TEST_ROOT/profile-var

tests/functional/common/vars-and-functions.sh.in

@@ -44,7 +44,6 @@ DAEMON_PATH="$PATH"
 if [[ -n "${NIX_DAEMON_PACKAGE:-}" ]]; then
   DAEMON_PATH="${NIX_DAEMON_PACKAGE}/bin:$DAEMON_PATH"
 fi
-coreutils=@coreutils@
 lsof=@lsof@
 
 export dot=@dot@

tests/functional/config.nix.in

@@ -10,7 +10,7 @@ in
 rec {
   shell = "@bash@";
 
-  path = "@coreutils@";
+  path = "@ls@";
 
   system = "@system@";
 

tests/functional/meson.build

@@ -1,6 +1,8 @@
+ls = find_program('ls', native : true)
+
 test_confdata = {
   'bindir': bindir,
-  'coreutils': fs.parent(coreutils.full_path()),
+  'ls': fs.parent(ls.full_path()),
   'lsof': lsof.full_path(),
   'dot': dot.found() ? dot.full_path() : '',
   'bash': bash.full_path(),