andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: do not install service related files when building --without-server

Browse Source 
It seems that glusterfs-6 disables building the server (./configure
--without-server) on el6 and hence the installed but unpackaged files
should not get installed in the first place.

Backport of commit 30f358bb6b69b8c31da550608a4996a84e8b420b:
> Change-Id: I7bea08202dd59ac309de8bc861da920ed3600bc6
> Fixes: bz#1680587
> Signed-off-by: Niels de Vos <ndevos@redhat.com>

Change-Id: I7bea08202dd59ac309de8bc861da920ed3600bc6
Fixes: bz#1680586
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2019-02-25 12:32:21 +01:00
parent 0419d9ab93
commit 3d7cd3d0f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glusterfs.spec.in
View File

@ -727,13 +727,13 @@ make check
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%if ( 0%{!?_without_server:1} )
%if ( 0%{_for_fedora_koji_builds} )
install -D -p -m 0644 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
install -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
%else
%if ( 0%{!?_without_server:1} )
install -D -p -m 0644 extras/glusterd-sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
%endif
@ -781,9 +781,11 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
%endif
# Install glusterfsd .service or init.d file
%if ( 0%{!?_without_server:1} )
%if ( 0%{_for_fedora_koji_builds} )
%service_install glusterfsd %{glusterfsd_svcfile}
%endif
%endif
install -D -p -m 0644 extras/glusterfs-logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs