Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

centos: enable SELinux support on CentOS 7 (2.36) #6277

Merged
merged 3 commits into from Dec 10, 2018
Merged

centos: enable SELinux support on CentOS 7 (2.36) #6277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c5724d
centos: enable SELinux support on CentOS 7
bboozzoo Dec 7, 2018
f6b672b
tests/lib/prepare-restore: smarter copying of built RPMs
bboozzoo Dec 7, 2018
4b7d70e
packaging/fedora: RHEL7 has policycoreutils-python
bboozzoo Dec 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions packaging/fedora/snapd.spec
View file
Open in desktop
Expand Up @@ -90,9 +90,6 @@
%if 0%{?amzn2} == 1
%global with_selinux 0
%endif
%if 0%{?centos} == 7
%global with_selinux 0
%endif

Name: snapd
Version: 2.36.2
Expand Down Expand Up @@ -226,7 +223,11 @@ BuildArch: noarch
BuildRequires: selinux-policy, selinux-policy-devel
Requires(post): selinux-policy-base >= %{_selinux_policy_version}
Requires(post): policycoreutils
%if 0%{?rhel} == 7
Requires(post): policycoreutils-python
%else
Requires(post): policycoreutils-python-utils
%endif
Requires(pre): libselinux-utils
Requires(post): libselinux-utils

Expand Down
6 changes: 1 addition & 5 deletions tests/lib/prepare-restore.sh
View file
Open in desktop
Expand Up @@ -152,11 +152,7 @@ build_rpm() {
-ba \
"$packaging_path/snapd.spec"

cp "$rpm_dir"/RPMS/$arch/snap*.rpm "${GOPATH%%:*}"
if [[ "$SPREAD_SYSTEM" = fedora-* ]]; then
# On Fedora we have an additional package for SELinux
cp "$rpm_dir"/RPMS/noarch/snap*.rpm "${GOPATH%%:*}"
fi
find "$rpm_dir"/RPMS -name '*.rpm' -exec cp -v {} "${GOPATH%%:*}" \;
}

build_arch_pkg() {
Expand Down