]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Fix location of SELinux mount during RPM builds
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 6 Sep 2012 14:22:27 +0000 (15:22 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 7 Sep 2012 12:31:00 +0000 (13:31 +0100)
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>
libvirt.spec.in

index 044b00f60d6aaf4363d4dc3205ccfe2118714265..cd0121937831f4e7a17bec52830763f0c4f66f3b 100644 (file)
@@ -1222,6 +1222,15 @@ of recent versions of Linux (and other OSes).
 %if 0%{?enable_autotools}
 autoreconf -if
 %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} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -1254,6 +1263,7 @@ autoreconf -if
            %{?_without_capng} \
            %{?_without_netcf} \
            %{?_without_selinux} \
+           %{?_with_selinux_mount} \
            %{?_without_hal} \
            %{?_without_udev} \
            %{?_without_yajl} \