diff options
Diffstat (limited to 'extras/LinuxRPM')
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 52 | ||||
| -rwxr-xr-x | extras/LinuxRPM/make_glusterrpms | 9 |
2 files changed, 30 insertions, 31 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 91e707bf346..f02853798c0 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -1,52 +1,42 @@ -GFS_TAR = ../../glusterfs-3git.tar.gz -UFO_TAR = ../../gluster-swift-ufo-3git.tar.gz -GFS_SPEC = ../../glusterfs.spec +GFS_TAR = ../../glusterfs-$(VERSION).tar.gz .PHONY: all -all: +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 -prep:: - if [ ! -e $(GFS_TAR) -a ! -e $(UFO_TAR) -a ! -e $(GFS_SPEC) ]; then \ - $(MAKE) -c ../.. dist; \ - fi +autogen: + cd ../.. && \ + rm -rf autom4te.cache && \ + ./autogen.sh && \ + ./configure --enable-gnfs --with-previous-options + +prep: + $(MAKE) -C ../.. dist; + -mkdir -p rpmbuild/BUILD -mkdir -p rpmbuild/SPECS -mkdir -p rpmbuild/RPMS -mkdir -p rpmbuild/SRPMS - -rm -rf rpmbuild/SOURCES - cd rpmbuild && git clone http://pkgs.fedoraproject.org/cgit/glusterfs.git > /dev/null && mv glusterfs SOURCES - cp ../../*.tar.gz rpmbuild/SOURCES - cp ../../glusterfs.spec rpmbuild/SPECS - -# openstack/launchpad 'hides' source tarballs behind javascript glorp, -# and curl will fail to fetch it using their download URL; we're forced -# to fetch it from somewhere else. -# maybe someone with better awk and sed skills than I have can suggest -# something better here. -SWIFT_URL = http://pkgs.fedoraproject.org/repo/pkgs/glusterfs/$(shell grep -v gluster rpmbuild/SOURCES/sources | cut -d ' ' -f 3)/$(shell grep -v gluster rpmbuild/SOURCES/sources | cut -d ' ' -f 1)/$(shell grep -v gluster rpmbuild/SOURCES/sources | cut -d ' ' -f 3) - -prep:: - @if [ -x /usr/bin/curl -a ! -e rpmbuild/SOURCES/swift-1.7.4.tar.gz ]; then \ - echo "fetching swift..." ; \ - cd rpmbuild/SOURCES && /usr/bin/curl -s -O $(SWIFT_URL) ; \ - elif [ ! -x /usr/bin/curl ]; then \ - echo "you don't have curl installed, swift source not fetched" ; \ - exit 1 ; \ - fi + -mkdir -p rpmbuild/SOURCES + -rm -rf rpmbuild/SOURCES/* + cp ../../*.tar.gz ./rpmbuild/SOURCES + cp ../../glusterfs.spec ./rpmbuild/SPECS srcrpm: rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bs rpmbuild/SPECS/glusterfs.spec mv rpmbuild/SRPMS/* . rpms: - rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec + rpmbuild --define '_topdir $(shell pwd)/rpmbuild' --with gnfs -bb rpmbuild/SPECS/glusterfs.spec mv rpmbuild/RPMS/*/* . # EPEL-5 does not like new versions of rpmbuild and requires some 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 |