mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
Fix location of SELinux mount during RPM builds
When building RPMs the host kernel cannot be assumed to match the target OS kernel. Thus auto-detecting /selinux vs /sys/fs/selinux based on the host kernel can result in the wrong choice (eg F18 builds on a RHEL6 host kernel) Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
a4fd740561
commit
bd172f1345
@ -1222,6 +1222,15 @@ of recent versions of Linux (and other OSes).
|
|||||||
%if 0%{?enable_autotools}
|
%if 0%{?enable_autotools}
|
||||||
autoreconf -if
|
autoreconf -if
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with_selinux}
|
||||||
|
%if %{?fedora} >= 17 || %{?rhel} >= 7
|
||||||
|
%define with_selinux_mount --with-selinux-mount="/sys/fs/selinux"
|
||||||
|
%else
|
||||||
|
%define with_selinux_mount --with-selinux-mount="/selinux"
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%configure %{?_without_xen} \
|
%configure %{?_without_xen} \
|
||||||
%{?_without_qemu} \
|
%{?_without_qemu} \
|
||||||
%{?_without_openvz} \
|
%{?_without_openvz} \
|
||||||
@ -1254,6 +1263,7 @@ autoreconf -if
|
|||||||
%{?_without_capng} \
|
%{?_without_capng} \
|
||||||
%{?_without_netcf} \
|
%{?_without_netcf} \
|
||||||
%{?_without_selinux} \
|
%{?_without_selinux} \
|
||||||
|
%{?_with_selinux_mount} \
|
||||||
%{?_without_hal} \
|
%{?_without_hal} \
|
||||||
%{?_without_udev} \
|
%{?_without_udev} \
|
||||||
%{?_without_yajl} \
|
%{?_without_yajl} \
|
||||||
|
Loading…
Reference in New Issue
Block a user