[Pkg-libvirt-commits] [libguestfs] 26/34: Updated patch queue
Hilko Bengen
bengen at moszumanska.debian.org
Fri Mar 7 10:39:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch experimental
in repository libguestfs.
commit 23352e870348369b4b8c71819de4d9a66540933b
Author: Hilko Bengen <bengen at debian.org>
Date: Tue Mar 4 21:36:02 2014 +0100
Updated patch queue
---
...0001-Fix-for-systemd-based-Debian-systems.patch | 20 ---
...0001-Fix-guestfs-supermin-appliance-path.patch} | 4 +-
...failed-attempt-at-building-out-of-tree-s.patch} | 0
... => 0003-Disable-gnulib-tests-by-default.patch} | 6 +-
.../0003-remove-last-trace-of-ntfsprogs.patch | 20 ---
...> 0004-golang-Fix-for-out-of-tree-builds.patch} | 4 +-
...emd-libraries-for-guestfsd-to-packagelist.patch | 21 +++
...for-situations-where-ocamlopt-is-not-avai.patch | 88 ++++++++++++
...p-Lintian-overrides-initramfs-related-stu.patch | 22 ---
.../0007-Fix-out-of-tree-appliance-build.patch | 21 +++
...s-for-various-tests-in-out-of-tree-builds.patch | 140 +++++++++++++++++++
...tree-build-Do-not-accidentally-build-mlli.patch | 64 +++++++++
...e-file-that-is-autogenerated-by-configure.patch | 150 +++++++++++++++++++++
debian/patches/series | 17 ++-
14 files changed, 501 insertions(+), 76 deletions(-)
diff --git a/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
deleted file mode 100644
index 423f14a..0000000
--- a/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 11 Aug 2011 00:24:11 +0200
-Subject: Fix for systemd-based Debian systems
-
----
- appliance/make.sh.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/appliance/make.sh.in b/appliance/make.sh.in
-index 7fa494e..5907b01 100755
---- a/appliance/make.sh.in
-+++ b/appliance/make.sh.in
-@@ -58,4 +58,7 @@ if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
- echo "/usr/share/augeas/lenses/*.aug" >> supermin.d/hostfiles-t
- fi
-
-+# Make sure that /init can be run on systemd-enabled Debian systems
-+echo '/lib/lsb/*' >> supermin.d/hostfiles-t
-+
- mv supermin.d/hostfiles-t supermin.d/hostfiles
diff --git a/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0001-Fix-guestfs-supermin-appliance-path.patch
similarity index 94%
rename from debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
rename to debian/patches/0001-Fix-guestfs-supermin-appliance-path.patch
index 7ef7be1..6dd64dc 100644
--- a/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0001-Fix-guestfs-supermin-appliance-path.patch
@@ -9,10 +9,10 @@ The supermin appliance files are not installed to the multiarch lib directory.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index a9cc9fe..85f3b91 100644
+index 7077d37..ef8af5e 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
-@@ -27,8 +27,8 @@ EXTRA_DIST = \
+@@ -28,8 +28,8 @@ EXTRA_DIST = \
make.sh.in \
packagelist.in
diff --git a/debian/patches/0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch b/debian/patches/0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
similarity index 100%
rename from debian/patches/0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
rename to debian/patches/0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
diff --git a/debian/patches/0005-Disable-gnulib-tests-by-default.patch b/debian/patches/0003-Disable-gnulib-tests-by-default.patch
similarity index 92%
rename from debian/patches/0005-Disable-gnulib-tests-by-default.patch
rename to debian/patches/0003-Disable-gnulib-tests-by-default.patch
index 6874ab7..0df25c0 100644
--- a/debian/patches/0005-Disable-gnulib-tests-by-default.patch
+++ b/debian/patches/0003-Disable-gnulib-tests-by-default.patch
@@ -8,7 +8,7 @@ Subject: Disable gnulib tests by default
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index e34e10c..f76e1e2 100644
+index b47a572..020628e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@ include $(top_srcdir)/common-rules.mk
@@ -24,10 +24,10 @@ index e34e10c..f76e1e2 100644
# Basic source for the library.
SUBDIRS += tests/data generator src examples po
diff --git a/configure.ac b/configure.ac
-index 96ae786..88dbbb9 100644
+index c50f0d2..49a40d7 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1578,6 +1578,15 @@ dnl For search paths.
+@@ -1553,6 +1553,15 @@ dnl For search paths.
AC_DEFINE_UNQUOTED([PATH_SEPARATOR],["$PATH_SEPARATOR"],
[Character that separates path elements in search paths])
diff --git a/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch b/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
deleted file mode 100644
index cb1efc5..0000000
--- a/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
-Date: Fri, 17 May 2013 10:11:37 +0200
-Subject: remove last trace of ntfsprogs
-
----
- appliance/packagelist.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 2963033..19dd291 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -78,7 +78,6 @@
- mtools
- nilfs-tools
- ntfs-3g
-- ntfsprogs
- openssh-client
- reiserfsprogs
- sysvinit /* for /sbin/reboot */
diff --git a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0004-golang-Fix-for-out-of-tree-builds.patch
similarity index 92%
rename from debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
rename to debian/patches/0004-golang-Fix-for-out-of-tree-builds.patch
index 3bd7c5a..5e12e50 100644
--- a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0004-golang-Fix-for-out-of-tree-builds.patch
@@ -8,10 +8,10 @@ Subject: golang: Fix for out-of-tree builds
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 88dbbb9..95d8513 100644
+index 49a40d7..6c5c29b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1470,7 +1470,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
+@@ -1445,7 +1445,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
AC_CHECK_PROG([GOLANG],[go],[go],[no])
AS_IF([test "x$GOLANG" != "xno"],[
AC_MSG_CHECKING([if $GOLANG is usable])
diff --git a/debian/patches/0005-Add-systemd-libraries-for-guestfsd-to-packagelist.patch b/debian/patches/0005-Add-systemd-libraries-for-guestfsd-to-packagelist.patch
new file mode 100644
index 0000000..c1dbfae
--- /dev/null
+++ b/debian/patches/0005-Add-systemd-libraries-for-guestfsd-to-packagelist.patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 1 Mar 2014 17:41:08 +0100
+Subject: Add systemd libraries (for guestfsd) to packagelist
+
+---
+ appliance/packagelist.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/appliance/packagelist.in b/appliance/packagelist.in
+index b93cd09..5e2a1aa 100644
+--- a/appliance/packagelist.in
++++ b/appliance/packagelist.in
+@@ -69,6 +69,8 @@ ifelse(DEBIAN,1,
+ libcap2
+ libhivex0
+ libpcre3
++ libsystemd-id128-0
++ libsystemd-journal0
+ libyajl2
+ linux-image
+ dnl syslinux 'suggests' mtools, but in reality it's a hard dependency:
diff --git a/debian/patches/0006-More-fixes-for-situations-where-ocamlopt-is-not-avai.patch b/debian/patches/0006-More-fixes-for-situations-where-ocamlopt-is-not-avai.patch
new file mode 100644
index 0000000..4cd0057
--- /dev/null
+++ b/debian/patches/0006-More-fixes-for-situations-where-ocamlopt-is-not-avai.patch
@@ -0,0 +1,88 @@
+From: Hilko Bengen <bengen at hilluzination.de>
+Date: Fri, 28 Feb 2014 19:58:04 +0100
+Subject: More fixes for situations where ocamlopt is not available
+
+- run bindtests.opt only if available
+- use ocamlc -custom
+- Don't try to install native code if it hasn't been built (Thanks to Olaf Hering)
+---
+ mllib/Makefile.am | 2 +-
+ ocaml/Makefile.am | 7 ++++++-
+ ocaml/examples/Makefile.am | 11 ++++-------
+ ocaml/run-bindtests | 2 ++
+ 4 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/mllib/Makefile.am b/mllib/Makefile.am
+index 2e35d1e..0e317b2 100644
+--- a/mllib/Makefile.am
++++ b/mllib/Makefile.am
+@@ -176,7 +176,7 @@ common_utils_tests: common_gettext.cmx common_utils.cmx common_utils_tests.cmx
+ else
+ common_utils_tests: common_gettext.cmo common_utils.cmo common_utils_tests.cmo
+ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
+- mlguestfs.cma -linkpkg $^ -cclib -lncurses -o $@
++ mlguestfs.cma -linkpkg $^ -cclib -lncurses -custom -o $@
+ endif
+
+ TESTS_ENVIRONMENT = $(top_builddir)/run --test
+diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
+index 708b2e7..7c8e515 100644
+--- a/ocaml/Makefile.am
++++ b/ocaml/Makefile.am
+@@ -171,13 +171,18 @@ depend: .depend
+ SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
+
+ # Do the installation by hand, because we want to run ocamlfind.
++data_hook_files = META *.so *.a *.cma *.cmi $(srcdir)/*.mli
++if HAVE_OCAMLOPT
++data_hook_files += *.cmx *.cmxa
++endif
++
+ install-data-hook:
+ mkdir -p $(DESTDIR)$(OCAMLLIB)
+ mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
+ $(OCAMLFIND) install \
+ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
+ guestfs \
+- META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli
++ $(data_hook_files)
+ rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.*
+ rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a
+
+diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
+index 472e180..de647fc 100644
+--- a/ocaml/examples/Makefile.am
++++ b/ocaml/examples/Makefile.am
+@@ -58,16 +58,13 @@ inspect_vm: inspect_vm.ml
+ $(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) -package unix -linkpkg \
+ -warn-error A -I .. mlguestfs.cmxa $< -o $@
+ else
+-
+-# This avoids:
+-# Error: Error on dynamically loaded library: ../dllmlguestfs.so: libguestfs.so.0: cannot open shared object file: No such file or directory
+ create_disk: create_disk.ml
+- $(top_builddir)/run $(OCAMLFIND) ocamlc $(OCAMLFINDFLAGS) -package unix -linkpkg \
+- -warn-error A -I .. mlguestfs.cma $< -o $@
++ $(OCAMLFIND) ocamlc $(OCAMLFINDFLAGS) -package unix -linkpkg \
++ -warn-error A -I .. mlguestfs.cma -custom $< -o $@
+
+ inspect_vm: inspect_vm.ml
+- $(top_builddir)/run $(OCAMLFIND) ocamlc $(OCAMLFINDFLAGS) -package unix -linkpkg \
+- -warn-error A -I .. mlguestfs.cma $< -o $@
++ $(OCAMLFIND) ocamlc $(OCAMLFINDFLAGS) -package unix -linkpkg \
++ -warn-error A -I .. mlguestfs.cma -custom $< -o $@
+ endif
+
+ endif
+diff --git a/ocaml/run-bindtests b/ocaml/run-bindtests
+index 3b73e8d..1fa54ec 100755
+--- a/ocaml/run-bindtests
++++ b/ocaml/run-bindtests
+@@ -21,5 +21,7 @@ set -e
+ ./bindtests.bc > bindtests.tmp
+ diff -u $srcdir/../bindtests bindtests.tmp
+
++test -x ./bindtests.opt || exit 0
++
+ ./bindtests.opt > bindtests.tmp
+ diff -u $srcdir/../bindtests bindtests.tmp
diff --git a/debian/patches/0007-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch b/debian/patches/0007-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch
deleted file mode 100644
index 3357deb..0000000
--- a/debian/patches/0007-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 22 Feb 2014 12:26:40 +0100
-Subject: Debian: Strip Lintian overrides,
- initramfs-related stuff from appliance
-
----
- appliance/make.sh.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/appliance/make.sh.in b/appliance/make.sh.in
-index 5907b01..abfef14 100755
---- a/appliance/make.sh.in
-+++ b/appliance/make.sh.in
-@@ -51,6 +51,8 @@ grep -v '^/usr/share/doc/' |
- grep -v '^/usr/share/info/' |
- grep -v '^/usr/share/gnome/help/' |
- grep -v '^/usr/share/cracklib/' |
-+grep -v '^/usr/share/lintian/' |
-+grep -v '^/\(usr/share\|etc\)/initramfs-tools/' |
- grep -v '^/usr/share/i18n/' > supermin.d/hostfiles-t
-
- # Include any Augeas lenses from the host.
diff --git a/debian/patches/0007-Fix-out-of-tree-appliance-build.patch b/debian/patches/0007-Fix-out-of-tree-appliance-build.patch
new file mode 100644
index 0000000..35cb705
--- /dev/null
+++ b/debian/patches/0007-Fix-out-of-tree-appliance-build.patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen at hilluzination.de>
+Date: Sun, 2 Mar 2014 19:18:18 +0100
+Subject: Fix out-of-tree appliance build
+
+---
+ appliance/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appliance/Makefile.am b/appliance/Makefile.am
+index ef8af5e..e38c534 100644
+--- a/appliance/Makefile.am
++++ b/appliance/Makefile.am
+@@ -106,7 +106,7 @@ daemon.tar.gz: ../daemon/guestfsd guestfsd.suppressions
+
+ init.tar.gz: init
+ rm -f $@ $@-t
+- tar zcf $@-t init
++ ( cd $(srcdir) && tar zcf - init ) > $@-t
+ mv $@-t $@
+
+ # We should put this file in /lib/udev/rules.d, but put it in /etc so
diff --git a/debian/patches/0008-Fixes-for-various-tests-in-out-of-tree-builds.patch b/debian/patches/0008-Fixes-for-various-tests-in-out-of-tree-builds.patch
new file mode 100644
index 0000000..e5f3808
--- /dev/null
+++ b/debian/patches/0008-Fixes-for-various-tests-in-out-of-tree-builds.patch
@@ -0,0 +1,140 @@
+From: Hilko Bengen <bengen at hilluzination.de>
+Date: Mon, 3 Mar 2014 23:58:57 +0100
+Subject: Fixes for various tests in out-of-tree builds
+
+---
+ builder/test-config/virt-builder/repos.d/test-index.conf.in | 2 +-
+ tests/9p/Makefile.am | 3 ++-
+ tests/9p/test-9p.sh | 2 +-
+ tests/disks/Makefile.am | 1 +
+ tests/disks/test-qemu-drive-libvirt.sh | 11 ++++++++---
+ tests/disks/test-qemu-drive.sh | 4 ++--
+ tests/guests/guest-aux/make-fedora-img.pl | 6 +++---
+ tests/guests/guest-aux/make-windows-img.sh | 4 ++--
+ 8 files changed, 20 insertions(+), 13 deletions(-)
+
+diff --git a/builder/test-config/virt-builder/repos.d/test-index.conf.in b/builder/test-config/virt-builder/repos.d/test-index.conf.in
+index 3755e75..22e03c4 100644
+--- a/builder/test-config/virt-builder/repos.d/test-index.conf.in
++++ b/builder/test-config/virt-builder/repos.d/test-index.conf.in
+@@ -1,2 +1,2 @@
+ [test-index]
+-uri=file://@abs_top_srcdir@/builder/test-index
++uri=file://@abs_top_builddir@/builder/test-index
+diff --git a/tests/9p/Makefile.am b/tests/9p/Makefile.am
+index 949e6d5..9b3c880 100644
+--- a/tests/9p/Makefile.am
++++ b/tests/9p/Makefile.am
+@@ -21,4 +21,5 @@ EXTRA_DIST = $(TESTS)
+
+ TESTS = test-9p.sh
+
+-TESTS_ENVIRONMENT = $(top_builddir)/run --test
++TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) \
++ $(top_builddir)/run --test
+diff --git a/tests/9p/test-9p.sh b/tests/9p/test-9p.sh
+index 16e9e4c..6733fd9 100755
+--- a/tests/9p/test-9p.sh
++++ b/tests/9p/test-9p.sh
+@@ -50,7 +50,7 @@ rm -f test-9p.img test-9p.out
+ sparse test-9p.img 1M
+
+ config -device '$virtio_9p,fsdev=test9p,mount_tag=test9p'
+-config -fsdev 'local,id=test9p,path=$(pwd),security_model=passthrough'
++config -fsdev 'local,id=test9p,path=${abs_srcdir},security_model=passthrough'
+
+ run
+
+diff --git a/tests/disks/Makefile.am b/tests/disks/Makefile.am
+index 1315e71..2a94279 100644
+--- a/tests/disks/Makefile.am
++++ b/tests/disks/Makefile.am
+@@ -24,6 +24,7 @@ TESTS = \
+
+ TESTS_ENVIRONMENT = \
+ abs_srcdir=$(abs_srcdir) \
++ abs_builddir=$(abs_builddir) \
+ $(top_builddir)/run --test
+
+ EXTRA_DIST = \
+diff --git a/tests/disks/test-qemu-drive-libvirt.sh b/tests/disks/test-qemu-drive-libvirt.sh
+index 8467fe4..1ba014b 100755
+--- a/tests/disks/test-qemu-drive-libvirt.sh
++++ b/tests/disks/test-qemu-drive-libvirt.sh
+@@ -26,6 +26,11 @@ if [ -z "$abs_srcdir" ]; then
+ exit 1
+ fi
+
++if [ -z "$abs_builddir" ]; then
++ echo "$0: abs_builddir environment variable must be set"
++ exit 1
++fi
++
+ if [ ! -x ../../src/libvirt-is-version ]; then
+ echo "$0: test skipped because libvirt-is-version is not built yet"
+ exit 77
+@@ -37,11 +42,11 @@ if ! ../../src/libvirt-is-version 1 1 3; then
+ fi
+
+ guestfish="\
+- ../../fish/guestfish -c test://$abs_srcdir/test-qemu-drive-libvirt.xml"
++ ../../fish/guestfish -c test://$abs_builddir/test-qemu-drive-libvirt.xml"
+
+ export LIBGUESTFS_BACKEND=direct
+-export LIBGUESTFS_HV="$(pwd)/debug-qemu.sh"
+-export DEBUG_QEMU_FILE="$(pwd)/test-qemu-drive-libvirt.out"
++export LIBGUESTFS_HV="${abs_srcdir}/debug-qemu.sh"
++export DEBUG_QEMU_FILE="${abs_builddir}/test-qemu-drive-libvirt.out"
+
+ function check_output ()
+ {
+diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh
+index 4f10cdb..91677bd 100755
+--- a/tests/disks/test-qemu-drive.sh
++++ b/tests/disks/test-qemu-drive.sh
+@@ -24,8 +24,8 @@ set -e
+ guestfish=../../fish/guestfish
+
+ export LIBGUESTFS_BACKEND=direct
+-export LIBGUESTFS_HV="$(pwd)/debug-qemu.sh"
+-export DEBUG_QEMU_FILE="$(pwd)/test-qemu-drive.out"
++export LIBGUESTFS_HV="${abs_srcdir}/debug-qemu.sh"
++export DEBUG_QEMU_FILE="${abs_builddir}/test-qemu-drive.out"
+
+ function check_output ()
+ {
+diff --git a/tests/guests/guest-aux/make-fedora-img.pl b/tests/guests/guest-aux/make-fedora-img.pl
+index 4eb08b5..1c23b6d 100755
+--- a/tests/guests/guest-aux/make-fedora-img.pl
++++ b/tests/guests/guest-aux/make-fedora-img.pl
+@@ -217,12 +217,12 @@ if (-f "mdadm.tmp.$$") {
+ unlink ("mdadm.tmp.$$") or die;
+ }
+
+-$g->upload ('guest-aux/fedora-name.db', '/var/lib/rpm/Name');
+-$g->upload ('guest-aux/fedora-packages.db', '/var/lib/rpm/Packages');
++$g->upload ($ENV{SRCDIR}.'/guest-aux/fedora-name.db', '/var/lib/rpm/Name');
++$g->upload ($ENV{SRCDIR}.'/guest-aux/fedora-packages.db', '/var/lib/rpm/Packages');
+
+ $g->upload ($ENV{SRCDIR}.'/../data/bin-x86_64-dynamic', '/bin/ls');
+
+-$g->txz_in ('guest-aux/fedora-journal.tar.xz', '/var/log/journal');
++$g->txz_in ($ENV{SRCDIR}.'/guest-aux/fedora-journal.tar.xz', '/var/log/journal');
+
+ $g->mkdir ('/boot/grub');
+ $g->touch ('/boot/grub/grub.conf');
+diff --git a/tests/guests/guest-aux/make-windows-img.sh b/tests/guests/guest-aux/make-windows-img.sh
+index 41b1d48..860ec06 100755
+--- a/tests/guests/guest-aux/make-windows-img.sh
++++ b/tests/guests/guest-aux/make-windows-img.sh
+@@ -58,8 +58,8 @@ mkfs ntfs /dev/sda2
+ mount /dev/sda2 /
+ mkdir-p /Windows/System32/Config
+
+-upload guest-aux/windows-software /Windows/System32/Config/SOFTWARE
+-upload guest-aux/windows-system /Windows/System32/Config/SYSTEM
++upload $SRCDIR/guest-aux/windows-software /Windows/System32/Config/SOFTWARE
++upload $SRCDIR/guest-aux/windows-system /Windows/System32/Config/SYSTEM
+
+ upload $SRCDIR/../data/bin-win32.exe /Windows/System32/cmd.exe
+
diff --git a/debian/patches/0009-Fix-out-of-tree-build-Do-not-accidentally-build-mlli.patch b/debian/patches/0009-Fix-out-of-tree-build-Do-not-accidentally-build-mlli.patch
new file mode 100644
index 0000000..dab8146
--- /dev/null
+++ b/debian/patches/0009-Fix-out-of-tree-build-Do-not-accidentally-build-mlli.patch
@@ -0,0 +1,64 @@
+From: Hilko Bengen <bengen at hilluzination.de>
+Date: Tue, 4 Mar 2014 00:00:02 +0100
+Subject: Fix out-of-tree build: Do not accidentally build mllib components in
+ srcdir
+
+---
+ builder/Makefile.am | 2 +-
+ resize/Makefile.am | 2 +-
+ sparsify/Makefile.am | 2 +-
+ sysprep/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/builder/Makefile.am b/builder/Makefile.am
+index b3de967..387913c 100644
+--- a/builder/Makefile.am
++++ b/builder/Makefile.am
+@@ -226,7 +226,7 @@ depend: .depend
+
+ .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
+ rm -f $@ $@-t
+- $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
++ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
+ $(SED) 's/ *$$//' | \
+ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
+ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
+diff --git a/resize/Makefile.am b/resize/Makefile.am
+index ef35bf9..67cb8c9 100644
+--- a/resize/Makefile.am
++++ b/resize/Makefile.am
+@@ -147,7 +147,7 @@ depend: .depend
+
+ .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
+ rm -f $@ $@-t
+- $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
++ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
+ $(SED) 's/ *$$//' | \
+ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
+ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
+diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
+index bf6caf0..516069a 100644
+--- a/sparsify/Makefile.am
++++ b/sparsify/Makefile.am
+@@ -138,7 +138,7 @@ depend: .depend
+
+ .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
+ rm -f $@ $@-t
+- $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
++ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
+ $(SED) 's/ *$$//' | \
+ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
+ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
+diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
+index 22da6fd..d20ad08 100644
+--- a/sysprep/Makefile.am
++++ b/sysprep/Makefile.am
+@@ -225,7 +225,7 @@ depend: .depend
+
+ .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
+ rm -f $@ $@-t
+- $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
++ $(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
+ $(SED) 's/ *$$//' | \
+ $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
+ $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
diff --git a/debian/patches/0010-Remove-file-that-is-autogenerated-by-configure.patch b/debian/patches/0010-Remove-file-that-is-autogenerated-by-configure.patch
new file mode 100644
index 0000000..db13e74
--- /dev/null
+++ b/debian/patches/0010-Remove-file-that-is-autogenerated-by-configure.patch
@@ -0,0 +1,150 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 1 Mar 2014 17:41:24 +0100
+Subject: Remove file that is autogenerated by configure
+
+---
+ tests/disks/test-qemu-drive-libvirt.xml | 135 --------------------------------
+ 1 file changed, 135 deletions(-)
+ delete mode 100644 tests/disks/test-qemu-drive-libvirt.xml
+
+diff --git a/tests/disks/test-qemu-drive-libvirt.xml b/tests/disks/test-qemu-drive-libvirt.xml
+deleted file mode 100644
+index 4407d0c..0000000
+--- a/tests/disks/test-qemu-drive-libvirt.xml
++++ /dev/null
+@@ -1,135 +0,0 @@
+-<!--
+- tests/disks/test-qemu-drive-libvirt.xml. Generated from test-qemu-drive-libvirt.xml.in by configure.
+- Copyright (C) 2013-2014 Red Hat Inc.
+-
+- This program is free software; you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation; either version 2 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
+-
+- You should have received a copy of the GNU General Public License
+- along with this program; if not, write to the Free Software
+- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-
+- Test XML for test-qemu-drive-libvirt.sh
+--->
+-<node>
+-
+- <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
+- <test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
+- <name>ceph1</name>
+- <memory>1048576</memory>
+- <os>
+- <type>hvm</type>
+- <boot dev='hd'/>
+- </os>
+- <devices>
+- <disk type='network' device='disk'>
+- <driver name='qemu'/>
+- <source protocol='rbd' name='abc-def/ghi-jkl'>
+- <host name='1.2.3.4' port='1234'/>
+- <host name='1.2.3.5' port='1235'/>
+- <host name='1.2.3.6' port='1236'/>
+- </source>
+- <target dev='vda' bus='virtio'/>
+- </disk>
+- </devices>
+- </domain>
+-
+- <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
+- <test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
+- <name>ceph2</name>
+- <memory>1048576</memory>
+- <os>
+- <type>hvm</type>
+- <boot dev='hd'/>
+- </os>
+- <devices>
+- <disk type='network' device='disk'>
+- <driver name='qemu'/>
+- <source protocol='rbd' name='abc-def/ghi-jkl'/>
+- <target dev='vda' bus='virtio'/>
+- </disk>
+- </devices>
+- </domain>
+-
+- <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
+- <test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
+- <name>gluster</name>
+- <memory>1048576</memory>
+- <os>
+- <type>hvm</type>
+- <boot dev='hd'/>
+- </os>
+- <devices>
+- <disk type='network' device='disk'>
+- <driver name='qemu'/>
+- <source protocol='gluster' name='volname/image'>
+- <host name='1.2.3.4' port='1234'/>
+- </source>
+- <target dev='vda' bus='virtio'/>
+- </disk>
+- </devices>
+- </domain>
+-
+- <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
+- <test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
+- <name>iscsi</name>
+- <memory>1048576</memory>
+- <os>
+- <type>hvm</type>
+- <boot dev='hd'/>
+- </os>
+- <devices>
+- <disk type='network' device='disk'>
+- <driver name='qemu'/>
+- <source protocol='iscsi' name='iqn.2003-01.org.linux-iscsi.fedora'>
+- <host name='1.2.3.4' port='1234'/>
+- </source>
+- <target dev='vda' bus='virtio'/>
+- </disk>
+- </devices>
+- </domain>
+-
+- <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
+- <test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
+- <name>nbd</name>
+- <memory>1048576</memory>
+- <os>
+- <type>hvm</type>
+- <boot dev='hd'/>
+- </os>
+- <devices>
+- <disk type='network' device='disk'>
+- <driver name='qemu'/>
+- <source protocol='nbd'>
+- <host name='1.2.3.4' port='1234'/>
+- </source>
+- <target dev='vda' bus='virtio'/>
+- </disk>
+- </devices>
+- </domain>
+-
+- <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
+- <test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
+- <name>sheepdog</name>
+- <memory>1048576</memory>
+- <os>
+- <type>hvm</type>
+- <boot dev='hd'/>
+- </os>
+- <devices>
+- <disk type='network' device='disk'>
+- <driver name='qemu'/>
+- <source protocol='sheepdog' name='volume'/>
+- <target dev='vda' bus='virtio'/>
+- </disk>
+- </devices>
+- </domain>
+-
+-</node>
diff --git a/debian/patches/series b/debian/patches/series
index 20acac0..8c55567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,10 @@
-0001-Fix-for-systemd-based-Debian-systems.patch
-0002-Fix-guestfs-supermin-appliance-path.patch
-0003-remove-last-trace-of-ntfsprogs.patch
-0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
-0005-Disable-gnulib-tests-by-default.patch
-0006-golang-Fix-for-out-of-tree-builds.patch
-0007-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch
+0001-Fix-guestfs-supermin-appliance-path.patch
+0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
+0003-Disable-gnulib-tests-by-default.patch
+0004-golang-Fix-for-out-of-tree-builds.patch
+0005-Add-systemd-libraries-for-guestfsd-to-packagelist.patch
+0006-More-fixes-for-situations-where-ocamlopt-is-not-avai.patch
+0007-Fix-out-of-tree-appliance-build.patch
+0008-Fixes-for-various-tests-in-out-of-tree-builds.patch
+0009-Fix-out-of-tree-build-Do-not-accidentally-build-mlli.patch
+0010-Remove-file-that-is-autogenerated-by-configure.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list