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