Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit178c4b1

Browse files
authored
Revert "gnu: fix the build with selinux"
1 parent7cd6876 commit178c4b1

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

‎GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ TEST_NO_FAIL_FAST :=--no-fail-fast
267267
TEST_SPEC_FEATURE := test_unimplemented
268268
else ifeq ($(SELINUX_ENABLED),1)
269269
TEST_NO_FAIL_FAST :=
270-
TEST_SPEC_FEATURE :=selinux
271-
BUILD_SPEC_FEATURE :=selinux
270+
TEST_SPEC_FEATURE :=feat_selinux
271+
BUILD_SPEC_FEATURE :=feat_selinux
272272
endif
273273

274274
defineTEST_BUSYBOX

‎util/build-gnu.sh

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
# `build-gnu.bash` ~ builds GNU coreutils (from supplied sources)
33
#
44

5-
# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW
6-
# spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS
5+
# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo
76

87
set -e
98

@@ -29,7 +28,6 @@ REPO_main_dir="$(dirname -- "${ME_dir}")"
2928

3029
# Default profile is 'debug'
3130
UU_MAKE_PROFILE='debug'
32-
CARGO_FEATURE_FLAGS=""
3331

3432
forargin"$@"
3533
do
@@ -95,20 +93,9 @@ echo "UU_BUILD_DIR='${UU_BUILD_DIR}'"
9593

9694
cd"${path_UUTILS}"&&echo"[ pwd:'${PWD}' ]"
9795

98-
# Check for SELinux support
9996
if ["$(uname)"=="Linux" ];then
100-
#Only attempt to enable SELinux featuresonLinux
97+
#only setonlinux
10198
export SELINUX_ENABLED=1
102-
CARGO_FEATURE_FLAGS="${CARGO_FEATURE_FLAGS} selinux"
103-
fi
104-
105-
# Trim leading whitespace from feature flags
106-
CARGO_FEATURE_FLAGS="$(echo"${CARGO_FEATURE_FLAGS}"| sed -e's/^[[:space:]]*//')"
107-
108-
# If we have feature flags, format them correctly for cargo
109-
if [!-z"${CARGO_FEATURE_FLAGS}" ];then
110-
CARGO_FEATURE_FLAGS="--features${CARGO_FEATURE_FLAGS}"
111-
echo"Building with cargo flags:${CARGO_FEATURE_FLAGS}"
11299
fi
113100

114101
# Set up quilt for patch management
@@ -124,12 +111,7 @@ else
124111
fi
125112
cd -
126113

127-
# Pass the feature flags to make, which will pass them to cargo
128-
"${MAKE}" PROFILE="${UU_MAKE_PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
129-
touch g
130-
echo"stat with selinux support"
131-
./target/debug/stat -c%C g||true
132-
114+
"${MAKE}" PROFILE="${UU_MAKE_PROFILE}"
133115

134116
cp"${UU_BUILD_DIR}/install""${UU_BUILD_DIR}/ginstall"# The GNU tests rename this script before running, to avoid confusion with the make target
135117
# Create *sum binaries

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp