diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-01-16 20:07:25 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-01-16 20:09:33 +0100 |
| commit | edce2aed3aa93b84f7b4c70412bdb665da2977b0 (patch) | |
| tree | 6953215eb2e65cc79c417fb5d1d6923ef5a2a9a0 /Makefile.am | |
| parent | 49bb233bb734536b9617d838f09a7bf9b8336003 (diff) | |
import: support importing qcow2 images
With this change the import tool will now unpack qcow2 images into
normal raw disk images, suitable for usage with nspawn.
This allows has the benefit of also allowing importing Ubuntu Cloud
images for usage with nspawn.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index ee73598cb1..f91c78658d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5233,19 +5233,43 @@ systemd_import_SOURCES = \ src/import/curl-util.c \ src/import/curl-util.h \ src/import/aufs-util.c \ - src/import/aufs-util.h + src/import/aufs-util.h \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h systemd_import_CFLAGS = \ $(AM_CFLAGS) \ $(LIBCURL_CFLAGS) \ - $(XZ_CFLAGS) + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) systemd_import_LDADD = \ libsystemd-internal.la \ libsystemd-label.la \ libsystemd-shared.la \ $(LIBCURL_LIBS) \ - $(XZ_LIBS) + $(XZ_LIBS) \ + $(ZLIB_LIBS) + +endif + +if HAVE_ZLIB +manual_tests += \ + test-qcow2 + +test_qcow2_SOURCES = \ + src/import/test-qcow2.c \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +test_qcow2_CFLAGS = \ + $(AM_CFLAGS) \ + $(ZLIB_CFLAGS) + +test_qcow2_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(ZLIB_LIBS) endif endif |