74b1de
From f25a92028ecc2018953a6375bba43a21d3a93566 Mon Sep 17 00:00:00 2001
74b1de
From: Mohit Agrawal <moagrawa@redhat.com>
74b1de
Date: Thu, 4 Apr 2019 16:18:51 +0530
74b1de
Subject: [PATCH 42/52] spec: (client|server) Builds are failing on rhel-6
74b1de
74b1de
Problem: 1) For sever-rpm gluster build is throwing an error
74b1de
            undefined reference to `dlcose` on RHEL 6
74b1de
         2) For server-rpm build is throwing reference for
74b1de
            For Not found for rot-13.so and symlink-cache.so
74b1de
         3) For client-rpms build is throwing an error
74b1de
            File Not found for all files with exclude
74b1de
            file in without_server check
74b1de
74b1de
Solution: 1) For server-rpm add LIB_DL link in Makefile
74b1de
             and remove reference for rot.so and symlink-cache.so
74b1de
             from glusterfs.spec.in
74b1de
          2) Remove exclude files list as they are not
74b1de
             being build
74b1de
74b1de
Label: DOWNSTREAM ONLY
74b1de
Change-Id: I2b41604cbc8525b91231b0c5caee588c5d5d6b08
74b1de
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
74b1de
Reviewed-on: https://code.engineering.redhat.com/gerrit/166962
74b1de
Tested-by: RHGS Build Bot <nigelb@redhat.com>
74b1de
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
---
74b1de
 glusterfs.spec.in                     | 54 -----------------------------------
74b1de
 xlators/mgmt/glusterd/src/Makefile.am |  2 +-
74b1de
 2 files changed, 1 insertion(+), 55 deletions(-)
74b1de
74b1de
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
74b1de
index df8d116..7c7f7c0 100644
74b1de
--- a/glusterfs.spec.in
74b1de
+++ b/glusterfs.spec.in
74b1de
@@ -1097,72 +1097,18 @@ exit 0
74b1de
 %{_tmpfilesdir}/gluster.conf
74b1de
 %endif
74b1de
 %if ( 0%{?_without_extra_xlators:1} )
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so
74b1de
 %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so
74b1de
 %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground/template.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so
74b1de
 %endif
74b1de
 %if ( 0%{?_without_regression_tests:1} )
74b1de
 %exclude %{_datadir}/glusterfs/run-tests.sh
74b1de
 %exclude %{_datadir}/glusterfs/tests
74b1de
 %endif
74b1de
 %if 0%{?_without_server:1}
74b1de
-%exclude %{_sysconfdir}/glusterfs/gluster-rsyslog-5.8.conf
74b1de
-%exclude %{_sysconfdir}/glusterfs/gluster-rsyslog-7.2.conf
74b1de
-%exclude %{_sysconfdir}/glusterfs/glusterd.vol
74b1de
-%exclude %{_sysconfdir}/glusterfs/glusterfs-georep-logrotate
74b1de
-%exclude %{_sysconfdir}/glusterfs/glusterfs-logrotate
74b1de
-%exclude %{_sysconfdir}/glusterfs/group-db-workload
74b1de
-%exclude %{_sysconfdir}/glusterfs/group-distributed-virt
74b1de
-%exclude %{_sysconfdir}/glusterfs/group-gluster-block
74b1de
-%exclude %{_sysconfdir}/glusterfs/group-metadata-cache
74b1de
-%exclude %{_sysconfdir}/glusterfs/group-nl-cache
74b1de
-%exclude %{_sysconfdir}/glusterfs/group-virt.example
74b1de
-%exclude %{_sysconfdir}/glusterfs/logger.conf.example
74b1de
-%exclude %{_sysconfdir}/rsyslog.d/gluster.conf.example
74b1de
-%exclude %{_prefix}/bin/glusterfind
74b1de
-%exclude %{_prefix}/lib/firewalld/services/glusterfs.xml
74b1de
-%exclude %{_prefix}/lib/systemd/system/glusterd.service
74b1de
-%exclude %{_prefix}/lib/systemd/system/glusterfssharedstorage.service
74b1de
-%exclude %{_prefix}/lib/tmpfiles.d/gluster.conf
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix-locks.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quotad.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/sdfs.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/selinux.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/thin-arbiter.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
74b1de
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
74b1de
-%exclude %{_libexecdir}/glusterfs/*
74b1de
-%exclude %{_sbindir}/conf.py
74b1de
-%exclude %{_sbindir}/gcron.py
74b1de
-%exclude %{_sbindir}/gf_attach
74b1de
-%exclude %{_sbindir}/gfind_missing_files
74b1de
-%exclude %{_sbindir}/glfsheal
74b1de
-%exclude %{_sbindir}/gluster
74b1de
-%exclude %{_sbindir}/gluster-setgfid2path
74b1de
-%exclude %{_sbindir}/glusterd
74b1de
-%exclude %{_sbindir}/snap_scheduler.py
74b1de
 %if ( 0%{?_with_systemd:1} )
74b1de
 %exclude %{_datadir}/glusterfs/scripts/control-cpu-load.sh
74b1de
 %exclude %{_datadir}/glusterfs/scripts/control-mem.sh
74b1de
 %endif
74b1de
-%exclude %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
74b1de
-%exclude %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
74b1de
-%exclude %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
74b1de
-%exclude %{_sharedstatedir}/glusterd/*
74b1de
 %endif
74b1de
 
74b1de
 %files api
74b1de
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
74b1de
index 6d09e37..c8dd8e3 100644
74b1de
--- a/xlators/mgmt/glusterd/src/Makefile.am
74b1de
+++ b/xlators/mgmt/glusterd/src/Makefile.am
74b1de
@@ -6,7 +6,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
74b1de
 glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) \
74b1de
 	-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\" \
74b1de
 	-DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\"
74b1de
-glusterd_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS)
74b1de
+glusterd_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) $(LIB_DL)
74b1de
 glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c \
74b1de
 	glusterd-op-sm.c glusterd-utils.c glusterd-rpc-ops.c \
74b1de
 	glusterd-store.c glusterd-handshake.c glusterd-pmap.c \
74b1de
-- 
74b1de
1.8.3.1
74b1de