mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

dist/redhat: don't redefine __debug_install_post on Fedora27 or later

Browse Source 
Redefining _debug_install_post does not work on Fedora27 or later,
it seems because of debuginfo generation process had been changed:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/ITJHJTUO2WFEAYIHANSM6AMAB5SIFASI/

To prevent the build error, move scylla-gdb.py to scylla-server package on
Fedora 27 or later.

Fixes #3313

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <1521735371-29408-1-git-send-email-syuu@scylladb.com>
This commit is contained in:
Takuya ASADA
2018-03-23 01:16:11 +09:00
committed by Avi Kivity
parent 879c9f1bf8
commit 81fbcbf6bc
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/redhat/scylla.spec.in vendored
View File

@@ -64,10 +64,14 @@ Conflicts: abrt
%description server
This package contains ScyllaDB server.
%if 0%{?fedora} >= 27
# Does not able to build with redifning __debug_install_post, disable it
%else
%define __debug_install_post \
%{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}";\
cp scylla-gdb.py ${RPM_BUILD_ROOT}/usr/src/debug/%{name}-%{version}/;\
%{nil}
%endif
%build
@@ -162,6 +166,9 @@ cp -r api/api-doc $RPM_BUILD_ROOT%{_prefix}/lib/scylla/api
cp -r tools/scyllatop $RPM_BUILD_ROOT%{_prefix}/lib/scylla/scyllatop
cp -r scylla-housekeeping $RPM_BUILD_ROOT%{_prefix}/lib/scylla/scylla-housekeeping
cp -P dist/common/sbin/* $RPM_BUILD_ROOT%{_sbindir}/
%if 0%{?fedora} >= 27
install -m755 scylla-gdb.py $RPM_BUILD_ROOT%{_prefix}/lib/scylla/
%endif
%pre server
getent group scylla || /usr/sbin/groupadd scylla 2> /dev/null || :
@@ -243,6 +250,9 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/lib/scylla/scylla_config_get.py
%{_prefix}/lib/scylla/scylla_lib.sh
%{_prefix}/lib/scylla/scylla_util.py
%if 0%{?fedora} >= 27
%{_prefix}/lib/scylla/scylla-gdb.py
%endif
%attr(0755,scylla,scylla) %dir %{_sharedstatedir}/scylla/
%attr(0755,scylla,scylla) %dir %{_sharedstatedir}/scylla/data
%attr(0755,scylla,scylla) %dir %{_sharedstatedir}/scylla/commitlog