[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-109-g3c336e1

Mon Apr 1 18:12:16 UTC 2013

The following commit has been merged in the master branch:
commit e3f8bb75318a16d93e8ba6c0751300e493026247
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Mar 7 22:08:50 2013 +0100

    Added patches for building/installing libguestfs-make-fixed-appliance, replaced Ruby build patch with the version that has been committed to upstream master

diff --git a/debian/patches/0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch b/debian/patches/0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
similarity index 52%
rename from debian/patches/0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
rename to debian/patches/0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
index 9ffb97c..218d3b1 100644
--- a/debian/patches/0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
+++ b/debian/patches/0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
@@ -1,14 +1,13 @@
 From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 17 Feb 2013 23:05:12 +0100
-Subject: ruby: Move checks for symbols from configure.ac to extconf.rb; add
- extra check for rb_alloc_func_t
+Date: Thu, 7 Mar 2013 19:59:26 +0100
+Subject: Move Ruby-related checks from autoconf to extconf.rb; add extra
+ check for rb_alloc_func_t
 
 ---
  configure.ac                   |    8 --------
- generator/ruby.ml              |    5 +++--
- ruby/ext/guestfs/_guestfs.c    |    5 +++--
+ generator/ruby.ml              |    3 +++
  ruby/ext/guestfs/extconf.rb.in |    4 ++++
- 4 files changed, 10 insertions(+), 12 deletions(-)
+ 3 files changed, 7 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 9d73c67..6e9a1c4 100644
@@ -30,19 +29,10 @@ index 9d73c67..6e9a1c4 100644
              AC_MSG_RESULT([not found])
          ])
 diff --git a/generator/ruby.ml b/generator/ruby.ml
-index db16e2a..ba02fd1 100644
+index db16e2a..6065875 100644
 --- a/generator/ruby.ml
 +++ b/generator/ruby.ml
-@@ -35,8 +35,6 @@ let rec generate_ruby_c () =
-   generate_header CStyle LGPLv2plus;
- 
-   pr "\
--#include <config.h>
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
-@@ -688,6 +686,9 @@ Init__guestfs (void)
+@@ -688,6 +688,9 @@ Init__guestfs (void)
    e_Error = rb_define_class_under (m_guestfs, \"Error\", rb_eStandardError);
  
  #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -52,41 +42,18 @@ index db16e2a..ba02fd1 100644
    rb_define_alloc_func (c_guestfs, (rb_alloc_func_t) ruby_guestfs_create);
  #endif
  
-diff --git a/ruby/ext/guestfs/_guestfs.c b/ruby/ext/guestfs/_guestfs.c
-index 29e9feb..ad7e74e 100644
---- a/ruby/ext/guestfs/_guestfs.c
-+++ b/ruby/ext/guestfs/_guestfs.c
-@@ -20,8 +20,6 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
--#include <config.h>
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
-@@ -23466,6 +23464,9 @@ Init__guestfs (void)
-   e_Error = rb_define_class_under (m_guestfs, "Error", rb_eStandardError);
- 
- #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-+#ifndef HAVE_TYPE_RB_ALLOC_FUNC_T
-+#define rb_alloc_func_t void*
-+#endif
-   rb_define_alloc_func (c_guestfs, (rb_alloc_func_t) ruby_guestfs_create);
- #endif
- 
 diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in
-index d03ae64..07a2d4f 100644
+index d03ae64..d3ea165 100644
 --- a/ruby/ext/guestfs/extconf.rb.in
 +++ b/ruby/ext/guestfs/extconf.rb.in
-@@ -33,6 +33,10 @@ $CFLAGS =
-   "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE=1 " <<
-   "@WARN_CFLAGS@"
+@@ -29,6 +29,10 @@ unless have_library("guestfs", "guestfs_create", "guestfs.h")
+   raise "libguestfs not found"
+ end
  
 +have_func("rb_hash_lookup")
 +have_func("rb_define_alloc_func")
 +have_type("rb_alloc_func_t")
 +
- create_header
- create_makefile(extension_name, "@abs_srcdir@")
- 
+ $CFLAGS =
+   "#{$CFLAGS} @CFLAGS@ -DGUESTFS_PRIVATE=1 " <<
+   "@WARN_CFLAGS@"
diff --git a/debian/patches/0011-Change-conditional-build-disable-appliance-still-bui.patch b/debian/patches/0011-Change-conditional-build-disable-appliance-still-bui.patch
new file mode 100644
index 0000000..5bd5f03
--- /dev/null
+++ b/debian/patches/0011-Change-conditional-build-disable-appliance-still-bui.patch
@@ -0,0 +1,52 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 7 Mar 2013 21:41:51 +0100
+Subject: Change conditional build: --disable-appliance still builds the
+ libguestfs-specific parts of the appliance.
+
+---
+ Makefile.am           |    2 --
+ appliance/Makefile.am |   14 +++++++++++---
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 842008a..a069223 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,9 +30,7 @@ SUBDIRS += tests/data generator src examples po
+ if ENABLE_DAEMON
+ SUBDIRS += daemon
+ endif
+-if ENABLE_APPLIANCE
+ SUBDIRS += appliance
+-endif
+ 
+ # Tests - order is important.
+ if ENABLE_APPLIANCE
+diff --git a/appliance/Makefile.am b/appliance/Makefile.am
+index 169ea15..8661bf4 100644
+--- a/appliance/Makefile.am
++++ b/appliance/Makefile.am
+@@ -35,12 +35,20 @@ superminfsdir = $(prefix)/lib/guestfs/supermin.d
+ 
+ fs_DATA =
+ superminfs_DATA = \
+-	supermin.d/base.img \
+-	supermin.d/daemon.img \
+ 	supermin.d/init.img \
+-	supermin.d/hostfiles \
+ 	supermin.d/udev-rules.img
+ 
++if ENABLE_DAEMON
++superminfs_DATA += \
++	supermin.d/daemon.img
++endif
++
++if ENABLE_APPLIANCE
++superminfs_DATA += \
++	supermin.d/base.img \
++	supermin.d/hostfiles
++endif
++
+ # This used to be a configure-generated file (as is update.sh still).
+ # However config.status always touches the destination file, which
+ # means the appliance got rebuilt too often.
diff --git a/debian/patches/0012-out-of-tree-build-Fix-link-creation.patch b/debian/patches/0012-out-of-tree-build-Fix-link-creation.patch
new file mode 100644
index 0000000..7d0d149
--- /dev/null
+++ b/debian/patches/0012-out-of-tree-build-Fix-link-creation.patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 7 Mar 2013 22:00:16 +0100
+Subject: out-of-tree build: Fix link creation
+
+---
+ appliance/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appliance/Makefile.am b/appliance/Makefile.am
+index 8661bf4..7a30b0e 100644
+--- a/appliance/Makefile.am
++++ b/appliance/Makefile.am
+@@ -108,7 +108,7 @@ supermin.d/udev-rules.img: 99-guestfs-serial.rules
+ 	rm -f $@ $@-t
+ 	rm -rf tmp-u
+ 	mkdir -p tmp-u/etc/udev/rules.d
+-	for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$f; done
++	for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done
+ 	( cd tmp-u && find | cpio --quiet -o -H newc ) > $@-t
+ 	rm -rf tmp-u
+ 	mv $@-t $@
diff --git a/debian/patches/series b/debian/patches/series
index 86b7c16..bd250b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,7 @@
 0006-erlang-Install-to-correct-directory.patch
 0007-out-of-tree-build-Fix-Ruby-bindings.patch
 0008-ruby-Don-t-compile-with-Werror.patch
-0009-ruby-Move-checks-for-symbols-from-configure.ac-to-ex.patch
+0009-Move-Ruby-related-checks-from-autoconf-to-extconf.rb.patch
 0010-out-of-tree-build-Fix-localized-manpages.patch
+0011-Change-conditional-build-disable-appliance-still-bui.patch
+0012-out-of-tree-build-Fix-link-creation.patch

-- 
Libguestfs Debian packaging

