14f8ab
From 37555b6c83d3a979033111a754ee1728dab254f5 Mon Sep 17 00:00:00 2001
14f8ab
From: Hari Gowtham <hgowtham@redhat.com>
14f8ab
Date: Wed, 18 Sep 2019 17:38:52 +0530
14f8ab
Subject: [PATCH 297/297] rpmbuild: fixing the build errors with 2a905a8ae
14f8ab
14f8ab
Label: DOWNSTREAM ONLY
14f8ab
14f8ab
Have added a Makefile inside extras/quota to remove the
14f8ab
No rule to make target error for quota/log_accounting.sh
14f8ab
14f8ab
Change-Id: Ia3f6b3fa21a0de7eb3bdb31b3d205139df412aca
14f8ab
fixes: bz#1719171
14f8ab
Signed-off-by: Hari Gowtham <hgowtham@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/181326
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Aravinda Vishwanathapura Krishna Murthy <avishwan@redhat.com>
14f8ab
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
---
14f8ab
 configure.ac             | 1 +
14f8ab
 extras/Makefile.am       | 6 +-----
14f8ab
 extras/quota/Makefile.am | 8 ++++++++
14f8ab
 3 files changed, 10 insertions(+), 5 deletions(-)
14f8ab
 create mode 100644 extras/quota/Makefile.am
14f8ab
14f8ab
diff --git a/configure.ac b/configure.ac
14f8ab
index f597b86..327733e 100644
14f8ab
--- a/configure.ac
14f8ab
+++ b/configure.ac
14f8ab
@@ -232,6 +232,7 @@ AC_CONFIG_FILES([Makefile
14f8ab
                 extras/hook-scripts/reset/pre/Makefile
14f8ab
                 extras/python/Makefile
14f8ab
                 extras/snap_scheduler/Makefile
14f8ab
+                extras/quota/Makefile
14f8ab
                 events/Makefile
14f8ab
                 events/src/Makefile
14f8ab
                 events/src/eventsapiconf.py
14f8ab
diff --git a/extras/Makefile.am b/extras/Makefile.am
14f8ab
index 8cbfda1..31ccdf5 100644
14f8ab
--- a/extras/Makefile.am
14f8ab
+++ b/extras/Makefile.am
14f8ab
@@ -12,7 +12,7 @@ EditorMode_DATA = glusterfs-mode.el glusterfs.vim
14f8ab
 
14f8ab
 SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
14f8ab
           $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python \
14f8ab
-		  ganesha
14f8ab
+		  ganesha quota
14f8ab
 
14f8ab
 confdir = $(sysconfdir)/glusterfs
14f8ab
 if WITH_SERVER
14f8ab
@@ -30,14 +30,11 @@ endif
14f8ab
 
14f8ab
 scriptsdir = $(datadir)/glusterfs/scripts
14f8ab
 scripts_SCRIPTS = thin-arbiter/setup-thin-arbiter.sh
14f8ab
-scripts_SCRIPTS += quota/log_accounting.sh
14f8ab
 scripts_SCRIPTS += collect-system-stats.sh
14f8ab
 scripts_SCRIPTS += identify-hangs.sh
14f8ab
 if WITH_SERVER
14f8ab
 scripts_SCRIPTS += post-upgrade-script-for-quota.sh \
14f8ab
 	pre-upgrade-script-for-quota.sh stop-all-gluster-processes.sh
14f8ab
-scripts_SCRIPTS += quota/quota_fsck.py
14f8ab
-scripts_SCRIPTS += quota/xattr_analysis.py
14f8ab
 if USE_SYSTEMD
14f8ab
 scripts_SCRIPTS += control-cpu-load.sh
14f8ab
 scripts_SCRIPTS += control-mem.sh
14f8ab
@@ -56,7 +53,6 @@ EXTRA_DIST = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.co
14f8ab
 	stop-all-gluster-processes.sh clang-checker.sh mount-shared-storage.sh \
14f8ab
 	control-cpu-load.sh control-mem.sh group-distributed-virt \
14f8ab
 	thin-arbiter/thin-arbiter.vol thin-arbiter/setup-thin-arbiter.sh \
14f8ab
-	quota/xattr_analysis.py quota/quota_fsck.py quota/log_accounting.sh \
14f8ab
 	collect-system-stats.sh identify-hangs.sh
14f8ab
 
14f8ab
 if WITH_SERVER
14f8ab
diff --git a/extras/quota/Makefile.am b/extras/quota/Makefile.am
14f8ab
new file mode 100644
14f8ab
index 0000000..cdb6be1
14f8ab
--- /dev/null
14f8ab
+++ b/extras/quota/Makefile.am
14f8ab
@@ -0,0 +1,8 @@
14f8ab
+scriptsdir = $(datadir)/glusterfs/scripts
14f8ab
+scripts_SCRIPTS =  log_accounting.sh
14f8ab
+
14f8ab
+if WITH_SERVER
14f8ab
+scripts_SCRIPTS += xattr_analysis.py quota_fsck.py
14f8ab
+endif
14f8ab
+
14f8ab
+EXTRA_DIST = log_accounting.sh xattr_analysis.py quota_fsck.py
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab