diff --git a/coreutils.spec b/coreutils.spec index 719195930be1ad22f927a8fb425b7a6bd2f98128..f8531b891fa35d0aa66675900be88f6caa7958d3 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,6 +1,6 @@ Name: coreutils Version: 8.31 -Release: 4 +Release: 5 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -20,6 +20,7 @@ Patch4: coreutils-df-direct.patch Patch5: bugfix-remove-usr-local-lib-from-m4.patch Patch6: bugfix-dummy_help2man.patch Patch7: bugfix-selinux-flask.patch +Patch8: skip-the-tests-that-require-selinux-if-selinux-is-di.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -130,6 +131,9 @@ fi %{_mandir}/man*/* %changelog +* Thu Apr 30 2020 openEuler Buildteam - 8.31-5 +- Judge if selinux is enabled for the tests that requires selinux + * Sat Mar 14 2020 openEuler Buildteam - 8.31-4 - Add build requires of gdb diff --git a/skip-the-tests-that-require-selinux-if-selinux-is-di.patch b/skip-the-tests-that-require-selinux-if-selinux-is-di.patch new file mode 100644 index 0000000000000000000000000000000000000000..3146424528883018247cfb1d8d0e6d3e386f3833 --- /dev/null +++ b/skip-the-tests-that-require-selinux-if-selinux-is-di.patch @@ -0,0 +1,30 @@ +From 797f2ff278fd7f0f0448b94350baa05f6752936b Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Thu, 30 Apr 2020 09:44:03 +0800 +Subject: [PATCH] skip the tests that require selinux if selinux is disabled + +no-context.sh context.sh install-C-selinux.sh +These three tests requires selinux, and we need to judge if selinux +is enabled, if not, just skip these tests. + +--- + init.cfg | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/init.cfg b/init.cfg +index 739ba33..d536dec 100644 +--- a/init.cfg ++++ b/init.cfg +@@ -114,6 +114,9 @@ require_selinux_() + grep 'selinuxfs$' /proc/filesystems > /dev/null \ + || skip_ "this system lacks SELinux support" + ++ # Judge the selinux is enabled or not ++ selinuxenabled; [ $? = 1] && skip_ "SELinux is disabled" ++ + # Independent of whether SELinux is enabled system-wide, + # the current file system may lack SELinux support. + # Also the current build may have SELinux support disabled. +-- +1.8.3.1 +