yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
958e1b
From 6c1152b03b7ba00048ca46c424064aab14b2a18d Mon Sep 17 00:00:00 2001
958e1b
From: Kevin Wolf <kwolf@redhat.com>
958e1b
Date: Thu, 20 Nov 2014 13:47:21 +0100
958e1b
Subject: [PATCH 2/5] Revert "Build ceph/rbd only for rhev"
958e1b
958e1b
Message-id: <1416491244-20209-2-git-send-email-kwolf@redhat.com>
958e1b
Patchwork-id: 62496
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH v2 1/4] Revert "Build ceph/rbd only for rhev"
958e1b
Bugzilla: 1140742
958e1b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
958e1b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
RH-Acked-by: Max Reitz <mreitz@redhat.com>
958e1b
958e1b
This reverts commit 5d5af5b18e07ef4c97a45feeaad3fe493d38f427.
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
958e1b
Conflicts:
958e1b
	configure
958e1b
	redhat/qemu-kvm.spec.template
958e1b
958e1b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
958e1b
---
958e1b
 block/Makefile.objs           |  2 +-
958e1b
 configure                     | 11 -----------
958e1b
 redhat/qemu-kvm.spec.template |  6 ------
958e1b
 3 files changed, 1 insertion(+), 18 deletions(-)
958e1b
958e1b
diff --git a/block/Makefile.objs b/block/Makefile.objs
958e1b
index dd01fb3..6b578d9 100644
958e1b
--- a/block/Makefile.objs
958e1b
+++ b/block/Makefile.objs
958e1b
@@ -13,7 +13,7 @@ ifeq ($(CONFIG_POSIX),y)
958e1b
 block-obj-y += nbd.o sheepdog.o
958e1b
 block-obj-$(CONFIG_LIBISCSI) += iscsi.o
958e1b
 block-obj-$(CONFIG_CURL) += curl.o
958e1b
-block-obj-$(CONFIG_CEPH_SUPPORT) += rbd.o
958e1b
+block-obj-y += rbd.o
958e1b
 block-obj-$(CONFIG_GLUSTERFS) += gluster.o
958e1b
 block-obj-$(CONFIG_LIBSSH2) += ssh.o
958e1b
 endif
958e1b
diff --git a/configure b/configure
958e1b
index ca8b107..8db9dbe 100755
958e1b
--- a/configure
958e1b
+++ b/configure
958e1b
@@ -248,7 +248,6 @@ tpm="no"
958e1b
 libssh2=""
958e1b
 live_block_ops="yes"
958e1b
 live_block_migration="no"
958e1b
-ceph_support="yes"
958e1b
 vhdx=""
958e1b
 
958e1b
 # parse CC options first
958e1b
@@ -959,10 +958,6 @@ for opt do
958e1b
   ;;
958e1b
   --enable-live-block-migration) live_block_migration="yes"
958e1b
   ;;
958e1b
-  --disable-ceph-support) ceph_support="no"
958e1b
-  ;;
958e1b
-  --enable-ceph-support) ceph_support="yes"
958e1b
-  ;;
958e1b
   --enable-vhdx) vhdx="yes"
958e1b
   ;;
958e1b
   --disable-vhdx) vhdx="no"
958e1b
@@ -1245,8 +1240,6 @@ echo "  --disable-live-block-ops disable live block operations support"
958e1b
 echo "  --enable-live-block-ops  enable live block operations support"
958e1b
 echo "  --disable-live-block-migration disable live block migration"
958e1b
 echo "  --enable-live-block-migration  enable live block migration"
958e1b
-echo "  --disable-ceph-support   disable support for rbd block driver support"
958e1b
-echo "  --enable-ceph-support    enable support for rbd block driver support"
958e1b
 echo "  --disable-vhdx           disables support for the Microsoft VHDX image format"
958e1b
 echo "  --enable-vhdx            enable support for the Microsoft VHDX image format"
958e1b
 echo ""
958e1b
@@ -4105,10 +4098,6 @@ if test "$live_block_migration" = "yes" ; then
958e1b
   echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
958e1b
 fi
958e1b
 
958e1b
-if test "$ceph_support" = "yes"; then
958e1b
-  echo "CONFIG_CEPH_SUPPORT=y" >> $config_host_mak
958e1b
-fi
958e1b
-
958e1b
 if test "$vhdx" = "yes" ; then
958e1b
   echo "CONFIG_VHDX=y" >> $config_host_mak
958e1b
 fi
958e1b
-- 
958e1b
1.8.3.1
958e1b