Skip to content

Commit 070559d

Browse files
oech3oech3
authored andcommitted
resolve conflict
1 parent 41801e3 commit 070559d

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

.github/workflows/GnuTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
run: |
8181
## Install dependencies
8282
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 attr quilt
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
8484
- name: Add various locales
8585
shell: bash
8686
run: |

util/build-gnu.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ else
130130
fi
131131
cd -
132132

133-
# While we support system missing libselinux, we still tun tests for runcon
134-
cargo build --profile="${UU_MAKE_PROFILE}" -p uu_runcon
135133
# Pass the feature flags to make, which will pass them to cargo
136134
"${MAKE}" PROFILE="${UU_MAKE_PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
137135
touch g

0 commit comments

Comments
 (0)