From 2a0bcc13cd581c3ffa8dbcaa6b6d0fa012c59f9e Mon Sep 17 00:00:00 2001 From: auronandace Date: Wed, 8 Jul 2026 15:03:00 +0100 Subject: [PATCH] update os-test recipe to use uutils-grep --- config/x86_64/ci.toml | 1 + recipes/tests/os-test/recipe.toml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index c5cd0814e..ad87a5252 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -268,6 +268,7 @@ tokei = {} ttf-hack = {} userutils = {} uutils = {} +uutils-grep = {} uutils-procps = {} vim = {} vttest = {} diff --git a/recipes/tests/os-test/recipe.toml b/recipes/tests/os-test/recipe.toml index f1de7947c..84556404d 100644 --- a/recipes/tests/os-test/recipe.toml +++ b/recipes/tests/os-test/recipe.toml @@ -1,6 +1,7 @@ # Due to necessary write permission for compilation the filesystem path of source code installation is an exception # where the package manager can't switch between system-wide and user paths -# TODO remove gnu-grep when extrautils grep supports grep -E +# NOTE extrautils needs to be set to "ignore" not to conflict with grep +# TODO remove uutils-grep when extrautils grep supports grep -E (or just remove grep from extrautils) [source] git = "https://gitlab.com/sortix/os-test" @@ -15,7 +16,7 @@ cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/os-test" dependencies = [ "gcc13", "gnu-binutils", - "gnu-grep", + "uutils-grep", "gnu-make", "libarchive", "sed",