On some platforms rpm building will failure with the following
errors:
RPM build errors:
Installed (but unpackaged) file(s) found:
/etc/init.d/lsvcgss
Technically lsvcgss is a server only file so we can just include
it for server builds and only if GSS_KEYRING is set.
Test-Parameters: trivial
Change-Id: I2525916cd10ddea0b99337e1ff4ff967bd9f7f9a
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/31485
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
if test x$enable_zfs = xyes ; then
RPMBINARGS="$RPMBINARGS --with zfs"
fi
if test x$enable_zfs = xyes ; then
RPMBINARGS="$RPMBINARGS --with zfs"
fi
+if test x$enable_gss_keyring == xno ; then
+ RPMBINARGS="$RPMBINARGS --without gss_keyring"
+fi
if test x$enable_iokit != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_iokit"
fi
if test x$enable_iokit != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_iokit"
fi
%bcond_without lustre_iokit
%bcond_without lustre_modules
%bcond_with snmp
%bcond_without lustre_iokit
%bcond_without lustre_modules
%bcond_with snmp
+%bcond_without gss_keyring
%bcond_without manpages
%bcond_without shared
%bcond_without static
%bcond_without manpages
%bcond_without shared
%bcond_without static
%{!?with_servers:--disable-server} \
%{!?with_zfs:--without-zfs} \
%{!?with_snmp:--disable-snmp} \
%{!?with_servers:--disable-server} \
%{!?with_zfs:--without-zfs} \
%{!?with_snmp:--disable-snmp} \
+ %{!?with_gss_keyring:--disable-gss-keyring} \
%{!?with_manpages:--disable-manpages} \
%{!?with_systemd:--with-systemdsystemunitdir=no} \
%{?with_systemd:--with-systemdsystemunitdir=%{_unitdir}} \
%{!?with_manpages:--disable-manpages} \
%{!?with_systemd:--with-systemdsystemunitdir=no} \
%{?with_systemd:--with-systemdsystemunitdir=%{_unitdir}} \
%if %{_vendor}=="redhat"
# The following scripts are Red Hat specific
%if %{with servers}
%if %{_vendor}=="redhat"
# The following scripts are Red Hat specific
%if %{with servers}
+echo '%{_sysconfdir}/init.d/lustre' >>lustre.files
echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files
echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files
+%if %{with gss_keyring}
+echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files
echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files
-echo '%{_sysconfdir}/init.d/lustre' >>lustre.files
%endif
%if %{without systemd}
echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
%endif
%endif
%if %{without systemd}
echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
%endif
-
-echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
%endif
%if %{with servers}
%endif
%if %{with servers}
endif
if RHEL
sysconfigdir = $(sysconfdir)/sysconfig
endif
if RHEL
sysconfigdir = $(sysconfdir)/sysconfig
-sysconfig_DATA = lustre lsvcgss
+sysconfig_DATA = lustre
+if GSS_KEYRING
+sysconfig_DATA += lsvcgss
+endif
if RHEL
initdir = $(sysconfdir)/init.d
if RHEL
initdir = $(sysconfdir)/init.d
if !HAVE_SYSTEMD
init_SCRIPTS += lnet
if !HAVE_SYSTEMD
init_SCRIPTS += lnet
if SERVER
init_SCRIPTS += lustre
if SERVER
init_SCRIPTS += lustre
+if GSS_KEYRING
+init_SCRIPTS += lsvcgss
+endif