From cdf34be7c94cfbe20c0a944629472e4d8b6362cd Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 13 Nov 2024 14:54:21 +0000 Subject: [PATCH 1/2] guix: remove util-linux --- contrib/guix/manifest.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index e5ebecbf939..28659d6bdaf 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -10,7 +10,7 @@ (gnu packages gawk) (gnu packages gcc) ((gnu packages installers) #:select (nsis-x86_64)) - ((gnu packages linux) #:select (linux-libre-headers-6.1 util-linux)) + ((gnu packages linux) #:select (linux-libre-headers-6.1)) (gnu packages llvm) (gnu packages mingw) (gnu packages moreutils) @@ -493,7 +493,6 @@ inspecting signatures in Mach-O binaries.") bash-minimal which coreutils-minimal - util-linux ;; File(system) inspection file grep From 4d668549825cc2f999b349e8fcd8cc9434c409c3 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 13 Nov 2024 15:51:45 +0000 Subject: [PATCH 2/2] ci: remove util-linux from centos CI --- ci/test/00_setup_env_i686_centos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/00_setup_env_i686_centos.sh b/ci/test/00_setup_env_i686_centos.sh index 5604004d3a1..f63adce6100 100755 --- a/ci/test/00_setup_env_i686_centos.sh +++ b/ci/test/00_setup_env_i686_centos.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export HOST=i686-pc-linux-gnu export CONTAINER_NAME=ci_i686_centos export CI_IMAGE_NAME_TAG="quay.io/centos/amd64:stream9" -export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux e2fsprogs cmake" +export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison e2fsprogs cmake" export PIP_PACKAGES="pyzmq" export GOAL="install" export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]