Skip to content

Commit a8a2ab5

Browse files
oech3oech3
authored andcommitted
build-gnu.sh: freeze deps by --with(out)-selinux
1 parent d20a934 commit a8a2ab5

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/GnuTests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ jobs:
7979
shell: bash
8080
run: |
8181
## Install dependencies
82+
## Check that libselinux is optional for build-gnu.sh by installing libselinux only on lima
8283
sudo apt-get update
83-
sudo apt-get install -y autoconf autopoint bison texinfo gperf gcc g++ gdb python3-pyinotify jq valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev libselinux1-dev attr quilt
84+
sudo apt-get install -y autoconf autopoint bison texinfo gperf gcc g++ gdb python3-pyinotify jq valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
8485
- name: Add various locales
8586
shell: bash
8687
run: |

util/build-gnu.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ echo "UU_BUILD_DIR='${UU_BUILD_DIR}'"
8080
cd "${path_UUTILS}" && echo "[ pwd:'${PWD}' ]"
8181

8282
export SELINUX_ENABLED # Run this script with=1 for testing SELinux
83-
[ "${SELINUX_ENABLED}" = 1 ] && CARGO_FEATURE_FLAGS="${CARGO_FEATURE_FLAGS} selinux"
83+
_configure_selinux=--without-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)