subject:"\[libvirt\] \[PATCH sandbox 1\/3\] Support lzma and gzip compressed kernel modules"

Re: [libvirt] [PATCH sandbox 1/3] Support lzma and gzip compressed kernel modules

2015-06-16 Thread Cedric Bosdonnat

On Tue, 2015-06-16 at 12:25 +0100, Daniel P. Berrange wrote:
 Modern distros like Fedora have started to compress their
 kernel module files, so we can't simply read the file contents
 and load the module. We have to first do a decompression step,
 as the kernel won't do that itself.  While Fedora uses lzma,
 upstream kernels are also capable of using gzip.
 
 This links in the lzma and gzip libraries to handle
 decompression. NB the static versions of lzma/gzip
 are required since libvirt-sandbox-init-qemu must be
 statically linked.
 ---
  configure.ac |   4 +
  libvirt-sandbox.spec.in  |   2 +
  libvirt-sandbox/Makefile.am  |   7 ++
  libvirt-sandbox/libvirt-sandbox-builder-initrd.c |  35 +++---
  libvirt-sandbox/libvirt-sandbox-init-qemu.c  | 143 
 ++-
  5 files changed, 173 insertions(+), 18 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index cd3745a..4f53c94 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -17,6 +17,8 @@ LIBVIRT_GCONFIG_REQUIRED=0.1.8
  LIBVIRT_GLIB_REQUIRED=0.1.7
  LIBVIRT_GOBJECT_REQUIRED=0.1.7
  GOBJECT_INTROSPECTION_REQUIRED=0.10.8
 +LZMA_REQUIRED=5.0.0
 +ZLIB_REQUIRED=1.2.0
  
  LIBVIRT_SANDBOX_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
  LIBVIRT_SANDBOX_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'`
 @@ -78,6 +80,8 @@ PKG_CHECK_MODULES(LIBVIRT, libvirt = $LIBVIRT_REQUIRED)
  PKG_CHECK_MODULES(LIBVIRT_GLIB, libvirt-glib-1.0 = 
 $LIBVIRT_GOBJECT_REQUIRED)
  PKG_CHECK_MODULES(LIBVIRT_GOBJECT, libvirt-gobject-1.0 = 
 $LIBVIRT_GOBJECT_REQUIRED)
  PKG_CHECK_MODULES(LIBVIRT_GCONFIG, libvirt-gconfig-1.0 = 
 $LIBVIRT_GCONFIG_REQUIRED)
 +PKG_CHECK_MODULES(ZLIB, zlib = $ZLIB_REQUIRED)
 +PKG_CHECK_MODULES(LZMA, liblzma = $LZMA_REQUIRED)

Would be great to have some check for the presence of the static libs we
need here. rkeene pointed to this example doing similar thing:
http://kitcreator.rkeene.org/fossil/info/b344f06840acf86cbd6b6fdc1bd45dd649db9ad2?ln=113-154
 

Even if not in this commit, would be good to have later.

ACK for the rest.
--
Cedric

  LIBVIRT_SANDBOX_CAPNG
  LIBVIRT_SANDBOX_GETTEXT
 diff --git a/libvirt-sandbox.spec.in b/libvirt-sandbox.spec.in
 index 7deadb2..1ec6e27 100644
 --- a/libvirt-sandbox.spec.in
 +++ b/libvirt-sandbox.spec.in
 @@ -27,6 +27,8 @@ BuildRequires: /usr/bin/pod2man
  BuildRequires: intltool
  BuildRequires: libselinux-devel
  BuildRequires: glib2-devel = 2.32.0
 +BuildRequires: xz-devel = 5.0.0, xz-static
 +BuildRequires: zlib-devel = 1.2.0, zlib-static
  Requires: rpm-python
  # For virsh lxc-enter-namespace command
  Requires: libvirt-client = %{libvirt_version}
 diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am
 index 96302cb..30c9ebf 100644
 --- a/libvirt-sandbox/Makefile.am
 +++ b/libvirt-sandbox/Makefile.am
 @@ -139,6 +139,7 @@ libvirt_sandbox_1_0_la_CFLAGS = \
   -DLOCALEDIR=\$(datadir)/locale\ \
   $(COVERAGE_CFLAGS) \
   -I$(top_srcdir) \
 + -I$(top_builddir) \
   $(GIO_UNIX_CFLAGS) \
   $(LIBVIRT_GLIB_CFLAGS) \
   $(LIBVIRT_GOBJECT_CFLAGS) \
 @@ -172,6 +173,7 @@ libvirt_sandbox_init_common_CFLAGS = \
   -DLOCALEDIR=\$(datadir)/locale\ \
   $(COVERAGE_CFLAGS) \
   -I$(top_srcdir) \
 + -I$(top_builddir) \
   $(GIO_UNIX_CFLAGS) \
   $(LIBVIRT_GLIB_CFLAGS) \
   $(LIBVIRT_GOBJECT_CFLAGS) \
 @@ -196,6 +198,7 @@ libvirt_sandbox_init_lxc_CFLAGS = \
   -DLIBEXECDIR=\$(libexecdir)\ \
   -DSANDBOXCONFIGDIR=\$(sandboxconfigdir)\ \
   -I$(top_srcdir) \
 + -I$(top_builddir) \
   $(GIO_UNIX_CFLAGS) \
   $(LIBVIRT_GLIB_CFLAGS) \
   $(LIBVIRT_GOBJECT_CFLAGS) \
 @@ -217,11 +220,15 @@ libvirt_sandbox_init_qemu_SOURCES = 
 libvirt-sandbox-init-qemu.c
  libvirt_sandbox_init_qemu_CFLAGS = \
   -DLIBEXECDIR=\$(libexecdir)\ \
   -DSANDBOXCONFIGDIR=\$(sandboxconfigdir)\ \
 + $(ZLIB_CFLAGS) \
 + $(LZMA_CFLAGS) \
   $(WARN_CFLAGS) \
   $(NULL)
  libvirt_sandbox_init_qemu_LDFLAGS = \
   -all-static \
   $(COVERAGE_CFLAGS:-f%=-Wc,f%) \
 + $(ZLIB_LIBS) \
 + $(LZMA_LIBS) \
   $(WARN_CFLAGS) \
   $(NULL)
  
 diff --git a/libvirt-sandbox/libvirt-sandbox-builder-initrd.c 
 b/libvirt-sandbox/libvirt-sandbox-builder-initrd.c
 index 95f05e2..59a03e6 100644
 --- a/libvirt-sandbox/libvirt-sandbox-builder-initrd.c
 +++ b/libvirt-sandbox/libvirt-sandbox-builder-initrd.c
 @@ -232,7

[libvirt] [PATCH sandbox 1/3] Support lzma and gzip compressed kernel modules

2015-06-16 Thread Daniel P. Berrange

Modern distros like Fedora have started to compress their
kernel module files, so we can't simply read the file contents
and load the module. We have to first do a decompression step,
as the kernel won't do that itself.  While Fedora uses lzma,
upstream kernels are also capable of using gzip.

This links in the lzma and gzip libraries to handle
decompression. NB the static versions of lzma/gzip
are required since libvirt-sandbox-init-qemu must be
statically linked.
---
 configure.ac |   4 +
 libvirt-sandbox.spec.in  |   2 +
 libvirt-sandbox/Makefile.am  |   7 ++
 libvirt-sandbox/libvirt-sandbox-builder-initrd.c |  35 +++---
 libvirt-sandbox/libvirt-sandbox-init-qemu.c  | 143 ++-
 5 files changed, 173 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index cd3745a..4f53c94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,8 @@ LIBVIRT_GCONFIG_REQUIRED=0.1.8
 LIBVIRT_GLIB_REQUIRED=0.1.7
 LIBVIRT_GOBJECT_REQUIRED=0.1.7
 GOBJECT_INTROSPECTION_REQUIRED=0.10.8
+LZMA_REQUIRED=5.0.0
+ZLIB_REQUIRED=1.2.0
 
 LIBVIRT_SANDBOX_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
 LIBVIRT_SANDBOX_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'`
@@ -78,6 +80,8 @@ PKG_CHECK_MODULES(LIBVIRT, libvirt = $LIBVIRT_REQUIRED)
 PKG_CHECK_MODULES(LIBVIRT_GLIB, libvirt-glib-1.0 = $LIBVIRT_GOBJECT_REQUIRED)
 PKG_CHECK_MODULES(LIBVIRT_GOBJECT, libvirt-gobject-1.0 = 
$LIBVIRT_GOBJECT_REQUIRED)
 PKG_CHECK_MODULES(LIBVIRT_GCONFIG, libvirt-gconfig-1.0 = 
$LIBVIRT_GCONFIG_REQUIRED)
+PKG_CHECK_MODULES(ZLIB, zlib = $ZLIB_REQUIRED)
+PKG_CHECK_MODULES(LZMA, liblzma = $LZMA_REQUIRED)
 
 LIBVIRT_SANDBOX_CAPNG
 LIBVIRT_SANDBOX_GETTEXT
diff --git a/libvirt-sandbox.spec.in b/libvirt-sandbox.spec.in
index 7deadb2..1ec6e27 100644
--- a/libvirt-sandbox.spec.in
+++ b/libvirt-sandbox.spec.in
@@ -27,6 +27,8 @@ BuildRequires: /usr/bin/pod2man
 BuildRequires: intltool
 BuildRequires: libselinux-devel
 BuildRequires: glib2-devel = 2.32.0
+BuildRequires: xz-devel = 5.0.0, xz-static
+BuildRequires: zlib-devel = 1.2.0, zlib-static
 Requires: rpm-python
 # For virsh lxc-enter-namespace command
 Requires: libvirt-client = %{libvirt_version}
diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am
index 96302cb..30c9ebf 100644
--- a/libvirt-sandbox/Makefile.am
+++ b/libvirt-sandbox/Makefile.am
@@ -139,6 +139,7 @@ libvirt_sandbox_1_0_la_CFLAGS = \
-DLOCALEDIR=\$(datadir)/locale\ \
$(COVERAGE_CFLAGS) \
-I$(top_srcdir) \
+   -I$(top_builddir) \
$(GIO_UNIX_CFLAGS) \
$(LIBVIRT_GLIB_CFLAGS) \
$(LIBVIRT_GOBJECT_CFLAGS) \
@@ -172,6 +173,7 @@ libvirt_sandbox_init_common_CFLAGS = \
-DLOCALEDIR=\$(datadir)/locale\ \
$(COVERAGE_CFLAGS) \
-I$(top_srcdir) \
+   -I$(top_builddir) \
$(GIO_UNIX_CFLAGS) \
$(LIBVIRT_GLIB_CFLAGS) \
$(LIBVIRT_GOBJECT_CFLAGS) \
@@ -196,6 +198,7 @@ libvirt_sandbox_init_lxc_CFLAGS = \
-DLIBEXECDIR=\$(libexecdir)\ \
-DSANDBOXCONFIGDIR=\$(sandboxconfigdir)\ \
-I$(top_srcdir) \
+   -I$(top_builddir) \
$(GIO_UNIX_CFLAGS) \
$(LIBVIRT_GLIB_CFLAGS) \
$(LIBVIRT_GOBJECT_CFLAGS) \
@@ -217,11 +220,15 @@ libvirt_sandbox_init_qemu_SOURCES = 
libvirt-sandbox-init-qemu.c
 libvirt_sandbox_init_qemu_CFLAGS = \
-DLIBEXECDIR=\$(libexecdir)\ \
-DSANDBOXCONFIGDIR=\$(sandboxconfigdir)\ \
+   $(ZLIB_CFLAGS) \
+   $(LZMA_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
 libvirt_sandbox_init_qemu_LDFLAGS = \
-all-static \
$(COVERAGE_CFLAGS:-f%=-Wc,f%) \
+   $(ZLIB_LIBS) \
+   $(LZMA_LIBS) \
$(WARN_CFLAGS) \
$(NULL)
 
diff --git a/libvirt-sandbox/libvirt-sandbox-builder-initrd.c 
b/libvirt-sandbox/libvirt-sandbox-builder-initrd.c
index 95f05e2..59a03e6 100644
--- a/libvirt-sandbox/libvirt-sandbox-builder-initrd.c
+++ b/libvirt-sandbox/libvirt-sandbox-builder-initrd.c
@@ -232,7 +232,7 @@ static GList *gvir_sandbox_builder_initrd_find_files(GList 
*modnames,
 if (strstr(thisname, .ko)) {
 GList *tmp = modnames;
 while (tmp) {
-if (g_str_equal(thisname, tmp-data)) {
+if (g_str_has_prefix(thisname, tmp-data)) {
 modfiles = g_list_append(modfiles, child);
 child = NULL;
 }
@@

Re: [libvirt] [PATCH sandbox 1/3] Support lzma and gzip compressed kernel modules

[libvirt] [PATCH sandbox 1/3] Support lzma and gzip compressed kernel modules

2 matches

Site Navigation

Mail list logo

Footer information