| Message ID | 1430135516-32438-1-git-send-email-mjt@msgid.tls.msk.ru |
|---|---|
| State | New |
| Headers | show |
On 27/04/2015 13:51, Michael Tokarev wrote: > dmg can optionally utilize libbz2, make it modular > > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > --- > block/Makefile.objs | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/block/Makefile.objs b/block/Makefile.objs > index db2933e..179e71d 100644 > --- a/block/Makefile.objs > +++ b/block/Makefile.objs > @@ -1,4 +1,4 @@ > -block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o > +block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o > block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o > block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o > block-obj-y += qed-check.o > @@ -37,6 +37,7 @@ gluster.o-libs := $(GLUSTERFS_LIBS) > ssh.o-cflags := $(LIBSSH2_CFLAGS) > ssh.o-libs := $(LIBSSH2_LIBS) > archipelago.o-libs := $(ARCHIPELAGO_LIBS) > +block-obj-m += dmg.o > dmg.o-libs := $(BZIP2_LIBS) > qcow.o-libs := -lz > linux-aio.o-libs := -laio > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Am 27.04.2015 um 13:51 hat Michael Tokarev geschrieben: > dmg can optionally utilize libbz2, make it modular > > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Thanks, applied to the block branch. Kevin
diff --git a/block/Makefile.objs b/block/Makefile.objs index db2933e..179e71d 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,4 +1,4 @@ -block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o +block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-obj-y += qed-check.o @@ -37,6 +37,7 @@ gluster.o-libs := $(GLUSTERFS_LIBS) ssh.o-cflags := $(LIBSSH2_CFLAGS) ssh.o-libs := $(LIBSSH2_LIBS) archipelago.o-libs := $(ARCHIPELAGO_LIBS) +block-obj-m += dmg.o dmg.o-libs := $(BZIP2_LIBS) qcow.o-libs := -lz linux-aio.o-libs := -laio
dmg can optionally utilize libbz2, make it modular Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> --- block/Makefile.objs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)