diff options
| author | Niels de Vos <ndevos@redhat.com> | 2013-09-11 13:44:10 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-09-12 13:45:40 -0700 |
| commit | 0b608508743baa63220a92361f443af8557a2b9b (patch) | |
| tree | d9ae05242c7e29609bd7daa8bfe3f571cc1380ed /xlators/features/qemu-block | |
| parent | df12400012af69f99dab62774244792b57c5178f (diff) | |
qemu-block: fix building from distribution tarball when glib2-devel is installed
Building RPMs from a 'make dist' tarball fails when qemu-block is
enabled. Enabling is done automatically when the glib2 development files
are available (enabled by ./configure).
Manual building with:
$ ./autogen.sh && ./configure && make dist && rpmbuild -ta *.tar.gz
Building in mock works fine, glib2-devel is not installed by default so
the qemu-block xlator gets disabled. This change also adds glib2-devel
to the BuildRequires in the glusterfs.spec file, causing the qemu-block
xlator to be built by default, and included in the glusterfs RPM.
Change-Id: Ibb73628772586d9e07bbfde7a8ff2fc973489086
BUG: 986775
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/5896
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/features/qemu-block')
| -rw-r--r-- | xlators/features/qemu-block/src/Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am index 484c0f19a2f..1a249bb86fe 100644 --- a/xlators/features/qemu-block/src/Makefile.am +++ b/xlators/features/qemu-block/src/Makefile.am @@ -74,6 +74,7 @@ noinst_HEADERS_qemu = \ $(CONTRIBDIR)/qemu/qmp-commands.h \ $(CONTRIBDIR)/qemu/trace/generated-tracers.h \ $(CONTRIBDIR)/qemu/include/config.h \ + $(CONTRIBDIR)/qemu/include/glib-compat.h \ $(CONTRIBDIR)/qemu/include/qemu-common.h \ $(CONTRIBDIR)/qemu/include/trace.h \ $(CONTRIBDIR)/qemu/include/block/coroutine.h \ @@ -83,8 +84,13 @@ noinst_HEADERS_qemu = \ $(CONTRIBDIR)/qemu/include/block/blockjob.h \ $(CONTRIBDIR)/qemu/include/block/coroutine.h \ $(CONTRIBDIR)/qemu/include/block/coroutine_int.h \ + $(CONTRIBDIR)/qemu/include/block/snapshot.h \ + $(CONTRIBDIR)/qemu/include/exec/cpu-common.h \ + $(CONTRIBDIR)/qemu/include/exec/hwaddr.h \ + $(CONTRIBDIR)/qemu/include/exec/poison.h \ $(CONTRIBDIR)/qemu/include/fpu/softfloat.h \ $(CONTRIBDIR)/qemu/include/migration/migration.h \ + $(CONTRIBDIR)/qemu/include/migration/qemu-file.h \ $(CONTRIBDIR)/qemu/include/migration/vmstate.h \ $(CONTRIBDIR)/qemu/include/monitor/monitor.h \ $(CONTRIBDIR)/qemu/include/monitor/readline.h \ @@ -97,6 +103,7 @@ noinst_HEADERS_qemu = \ $(CONTRIBDIR)/qemu/include/qapi/qmp/qerror.h \ $(CONTRIBDIR)/qemu/include/qapi/qmp/qfloat.h \ $(CONTRIBDIR)/qemu/include/qapi/qmp/qint.h \ + $(CONTRIBDIR)/qemu/include/qapi/qmp/qjson.h \ $(CONTRIBDIR)/qemu/include/qapi/qmp/qlist.h \ $(CONTRIBDIR)/qemu/include/qapi/qmp/qobject.h \ $(CONTRIBDIR)/qemu/include/qapi/qmp/qstring.h \ @@ -117,6 +124,7 @@ noinst_HEADERS_qemu = \ $(CONTRIBDIR)/qemu/include/qemu/notify.h \ $(CONTRIBDIR)/qemu/include/qemu/option.h \ $(CONTRIBDIR)/qemu/include/qemu/option_int.h \ + $(CONTRIBDIR)/qemu/include/qemu/osdep.h \ $(CONTRIBDIR)/qemu/include/qemu/queue.h \ $(CONTRIBDIR)/qemu/include/qemu/sockets.h \ $(CONTRIBDIR)/qemu/include/qemu/thread-posix.h \ |