[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH x 3] Three small fixes for Debian



These small fixes are required to fix the build and tests on Debian
(using the debootstrap/debirf appliance).

There is currently another bug in the Debian tests which I'm looking
into.  hexdump always fails as follows:

libguestfs: error: hexdump: hexdump: /test123: hexdump: /sysroot/test123: Bad file descriptor

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
>From 3e4bd83ce0d3f9c7af52adb1dbdf5a5718e81454 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones debian5x64 home annexia org>
Date: Wed, 4 Nov 2009 14:30:13 +0000
Subject: [PATCH 1/3] debian: Ignore some generated debirf files.

---
 .gitignore |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbe7998..c365865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,11 @@
 *.a
 ABOUT-NLS
 aclocal.m4
+appliance/debian/.bootstrap.log
+appliance/debian/.fakeroot-state.debirf-libguestfs
+appliance/debian/debirf-libguestfs*.cgz
+appliance/debian/root/
+appliance/debian/vmlinuz-*
 appliance/debian/debirf.conf
 appliance/initramfs.*.img
 appliance/initramfs.*.supermin.hostfiles
-- 
1.6.5.2

>From 644fccb4aeed3e39978d340b18821aa704adf1bd Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones debian5x64 home annexia org>
Date: Wed, 4 Nov 2009 14:30:41 +0000
Subject: [PATCH 2/3] Debian: Ignore Debian appliance root when looking for translatable files.

---
 Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a4f4b0b..87efb2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,6 +194,7 @@ all-local:
 	grep -v '^perl/examples/' | \
 	grep -v '/guestfs_protocol.c' | \
 	grep -v '/rc_protocol.c' | \
+	grep -v 'appliance/debian/root' | \
 	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in
 
-- 
1.6.5.2

>From a3be3a3b877277c1e4b130e1676b9ad307cafa10 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones debian5x64 home annexia org>
Date: Wed, 4 Nov 2009 14:31:06 +0000
Subject: [PATCH 3/3] Debian: Include ISOFS driver in the kernel.

---
 appliance/kmod.whitelist.in |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in
index 533bda8..9a93413 100644
--- a/appliance/kmod.whitelist.in
+++ b/appliance/kmod.whitelist.in
@@ -43,6 +43,9 @@ nls_utf8.ko
 nls_cp437.ko
 nls_base.ko
 
+isofs.ko
+zlib_inflate.ko
+
 dm-*.ko
 
 cramfs.ko
-- 
1.6.5.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]