diff options
| author | Peter Portante <peter.portante@redhat.com> | 2013-05-08 21:51:58 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-05-10 11:03:55 -0700 |
| commit | 40d026e10013f533c4fee33b87dabc4ca11c94b3 (patch) | |
| tree | aa6315c23a49288b72424f58a71c3f87d8aca7ff /extras | |
| parent | fef1270fc2d665c67084c4ce06f60fc8faed4d52 (diff) | |
object-storage: final removal of ufo code
See https://git.gluster.org/gluster-swift.git for the new location of
the Gluster-Swift code.
With this patch, no OpenStack Swift related RPMs are constructed.
This patch also removes the unused code that references the
user.ufo-test xattr key in the DHT translator.
Change-Id: I2da32642cbd777737a41c5f9f6d33f059c85a2c1
BUG: 961902 (https://bugzilla.redhat.com/show_bug.cgi?id=961902)
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/4970
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
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 | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 3c867fe275e..09d2f9e4201 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -1,6 +1,5 @@ GFS_TAR = ../../glusterfs-*git.tar.gz -UFO_TAR = ../../gluster-swift-ufo-*git.tar.gz GFS_SPEC = ../../glusterfs.spec .PHONY: all @@ -13,11 +12,8 @@ all: glusterrpms: prep srcrpm rpms -rm -rf rpmbuild -glusterrpmswithoutufo: prep srcrpm rpmswithoutufo - -rm -rf rpmbuild - prep:: - if [ ! -e $(GFS_TAR) -a ! -e $(UFO_TAR) -a ! -e $(GFS_SPEC) ]; then \ + if [ ! -e $(GFS_TAR) -a ! -e $(GFS_SPEC) ]; then \ $(MAKE) -c ../.. dist; \ fi -mkdir -p rpmbuild/SPECS @@ -38,21 +34,6 @@ prep:: cp ../../*.tar.gz ./rpmbuild/SOURCES cp ../../glusterfs.spec ./rpmbuild/SPECS -GRIZZLY_TAR = swift-1.8.0.tar.gz -GRIZZLY_URL = https://launchpad.net/swift/grizzly/1.8.0/+download/$(GRIZZLY_TAR) - -prep:: - @if [ -d /d/cache -a -f /d/cache/$(GRIZZLY_TAR) -a -d ./rpmbuild/SOURCES ]; then \ - echo "copying swift source tarball from local cache..." ; \ - cp /d/cache/$(GRIZZLY_TAR) ./rpmbuild/SOURCES/ ; \ - elif [ -x /usr/bin/curl -a -d ./rpmbuild/SOURCES ]; then \ - echo "fetching swift from launchpad.net..." ; \ - cd ./rpmbuild/SOURCES && /usr/bin/curl -sOL $(GRIZZLY_URL) ; \ - else \ - echo "swift source not fetched, you don't have curl installed!" ; \ - exit 1 ; \ - fi - srcrpm: rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bs rpmbuild/SPECS/glusterfs.spec mv rpmbuild/SRPMS/* . @@ -61,10 +42,6 @@ rpms: rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec mv rpmbuild/RPMS/*/* . -rpmswithoutufo: - rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec --without ufo - mv rpmbuild/RPMS/*/* . - # EPEL-5 does not like new versions of rpmbuild and requires some # _source_* defines |