Skip to content

Commit 2de9a81

Browse files
author
oech3
committed
GnuTests.yml: Freeze libselinux dep
1 parent ceeacf4 commit 2de9a81

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

util/build-gnu.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ echo "UU_BUILD_DIR='${UU_BUILD_DIR}'"
7979

8080
cd "${path_UUTILS}" && echo "[ pwd:'${PWD}' ]"
8181

82+
_configure_selinux=--without-selinux
8283
export SELINUX_ENABLED # Run this script with=1 for testing SELinux
83-
[ "${SELINUX_ENABLED}" = 1 ] && CARGO_FEATURE_FLAGS="${CARGO_FEATURE_FLAGS} selinux"
84+
[ "${SELINUX_ENABLED}" = 1 ] && CARGO_FEATURE_FLAGS="${CARGO_FEATURE_FLAGS} selinux" _configure_selinux=--with-selinux
8485

8586
# Trim leading whitespace from feature flags
8687
CARGO_FEATURE_FLAGS="$(echo "${CARGO_FEATURE_FLAGS}" | sed -e 's/^[[:space:]]*//')"
@@ -140,7 +141,7 @@ else
140141
# Change the PATH to test the uutils coreutils instead of the GNU coreutils
141142
sed -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk
142143
./bootstrap --skip-po
143-
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references
144+
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references ${_configure_selinux}
144145
#Add timeout to to protect against hangs
145146
sed -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
146147
sed -i 's| tr | /usr/bin/tr |' tests/init.sh

0 commit comments

Comments
 (0)