diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-04-04 07:49:28 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-04-05 16:53:38 -0700 |
| commit | 862b1164525b8a6d4f8d49b3049093847533f819 (patch) | |
| tree | d9e6b5729906bc8050bf60744891a432c8c8639a /extras | |
| parent | 24ee79345fc7346ef78b8adf54008ae77524026b (diff) | |
object-storage: rebase Swift to 1.8.0 (grizzly)
Change-Id: I24265c12a45eac4cec761748096118c9647440be
BUG: 948039
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/4779
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index cfbe429df01..38d14cda76c 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -39,20 +39,21 @@ prep:: cp ../../*.tar.gz ./rpmbuild/SOURCES cp ../../glusterfs.spec ./rpmbuild/SPECS -# Remember to change folsom to grizzly when we rebase to grizzly -SWIFT_TARBALL = $(shell grep -v gluster ./rpmbuild/SOURCES/sources | cut -d ' ' -f 3) -SWIFT_MD5SIG = $(shell grep -v gluster ./rpmbuild/SOURCES/sources | cut -d ' ' -f 1) -SWIFT_VERS = $(shell echo $(SWIFT_TARBALL) | grep -o 1\.[0-9]\.[0-9]) -SWIFT_URL = https://launchpad.net/swift/folsom/$(SWIFT_VERS)/+download/$(SWIFT_TARBALL) +FOLSOM_TAR = swift-1.7.4.tar.gz +FOLSOM_URL = https://launchpad.net/swift/folsom/1.7.4/+download/$(FOLSOM_TAR) +GRIZZLY_TAR = swift-1.8.0.tar.gz +GRIZZLY_URL = https://launchpad.net/swift/grizzly/1.8.0/+download/$(GRIZZLY_TAR) prep:: - @if [ -e /d/cache/$(SWIFT_TARBALL) -a -d ./rpmbuild/SOURCES ]; then \ + @if [ -d /d/cache -a -f /d/cache/$(FOLSOM_TAR) -a -f /d/cache/$(GRIZZLY_TAR) -a -d ./rpmbuild/SOURCES ]; then \ echo "copying swift source tarball from local cache..." ; \ - cp /d/cache/$(SWIFT_TARBALL) ./rpmbuild/SOURCES/ ; \ + cp /d/cache/swift-*.tar.gz ./rpmbuild/SOURCES/ ; \ touch /d/cache/.swift ; \ elif [ -x /usr/bin/curl -a -d ./rpmbuild/SOURCES ]; then \ echo "fetching swift from launchpad.net..." ; \ - cd ./rpmbuild/SOURCES && /usr/bin/curl -sOL $(SWIFT_URL) ; \ + cd ./rpmbuild/SOURCES && \ + /usr/bin/curl -sOL $(FOLSOM_URL) && \ + /usr/bin/curl -sOL $(GRIZZLY_URL) ; \ else \ echo "swift source not fetched, you don't have curl installed!" ; \ exit 1 ; \ |