summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorAnders Blomdell <anders.blomdell@control.lth.se>2014-07-08 15:36:45 +0200
committerNiels de Vos <ndevos@redhat.com>2014-07-30 08:07:11 -0700
commite8a1fc34ad3891e8b739278a909dbd91c56b9f4e (patch)
tree5f0b788f4609c140115972806c13fe5fcd82c912 /extras
parentbb385390a945fe755a302a011aa7a2ec05941fad (diff)
Make RPM's with current git tag
1. clear autom4te.cache 2. autogen.sh 3. configure --with-previous-options Change-Id: I90c1820d22207d18b1bb367444b21918467baea5 BUG: 1117921 Signed-off-by: Anders Blomdell <anders.blomdell@control.lth.se> Reviewed-on: http://review.gluster.org/8293 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/LinuxRPM/Makefile.am17
-rwxr-xr-xextras/LinuxRPM/make_glusterrpms9
2 files changed, 21 insertions, 5 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am
index b82c65f02c4..64b6f2a90eb 100644
--- a/extras/LinuxRPM/Makefile.am
+++ b/extras/LinuxRPM/Makefile.am
@@ -6,15 +6,22 @@ GFS_TAR = ../../glusterfs-$(VERSION).tar.gz
all:
@echo "To build RPMS run 'make glusterrpms'"
-.PHONY: glusterrpms prep srcrpm testsrpm clean
+.PHONY: glusterrpms glusterrpms_without_autogen
+.PHONY: autogen prep srcrpm testsrpm clean
-glusterrpms: prep srcrpm rpms
+glusterrpms: autogen glusterrpms_without_autogen
+
+glusterrpms_without_autogen: prep srcrpm rpms
-rm -rf rpmbuild
+autogen:
+ cd /../.. \
+ && rm -rf autom4te.cache \
+ && ./autogen.sh \
+ && ./configure --with-previous-options
+
prep:
- if [ ! -e $(GFS_TAR) ]; then \
- $(MAKE) -C ../.. dist; \
- fi
+ $(MAKE) -C ../.. dist;
-mkdir -p rpmbuild/BUILD
-mkdir -p rpmbuild/SPECS
-mkdir -p rpmbuild/RPMS
diff --git a/extras/LinuxRPM/make_glusterrpms b/extras/LinuxRPM/make_glusterrpms
new file mode 100755
index 00000000000..3156af97870
--- /dev/null
+++ b/extras/LinuxRPM/make_glusterrpms
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+(
+ cd $(realpath $(dirname $0))/../.. || exit 1
+ rm -rf autom4te.cache
+ ./autogen.sh || exit 1
+ ./configure --with-previous-options || exit 1
+)
+make -C $(realpath $(dirname $0)) glusterrpms_without_autogen