[Pkg-libvirt-commits] [libguestfs] 336/384: Rebased patch queue

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 6aaab3486c5f5068cdf6fb0642b6b533344b88c2
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Mar 7 20:41:33 2015 +0100

    Rebased patch queue
---
 debian/patches/0003-Do-not-use-DTB-for-armel.patch | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0003-Do-not-use-DTB-for-armel.patch b/debian/patches/0003-Do-not-use-DTB-for-armel.patch
index 01c5064..cb863ef 100644
--- a/debian/patches/0003-Do-not-use-DTB-for-armel.patch
+++ b/debian/patches/0003-Do-not-use-DTB-for-armel.patch
@@ -3,21 +3,20 @@ Date: Sun, 6 Jul 2014 21:34:47 +0200
 Subject: Do not use DTB for armel
 
 ---
- src/guestfs-internal.h | 2 ++
- 1 file changed, 2 insertions(+)
+ src/guestfs-internal.h | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index fd0c4a1..e2d19c6 100644
+index 43cdd4d..fe69f00 100644
 --- a/src/guestfs-internal.h
 +++ b/src/guestfs-internal.h
-@@ -145,8 +145,10 @@
-  * internally when using mach-virt).
-  */
- #define MACHINE_TYPE "vexpress-a15"
+@@ -152,6 +152,9 @@
+ /* Machine types.  XXX Make these configurable. */
+ #ifdef __arm__
+ #define MACHINE_TYPE "virt"
 +#ifdef __ARM_PCS_VFP /* do not use DTB for armel */
- #define DTB_WILDCARD "vexpress*a15-tc1.dtb"
- #endif
++#define DTB_WILDCARD "vexpress*a15-tc1.dtb"
 +#endif
+ #endif
  #ifdef __aarch64__
  #define MACHINE_TYPE "virt"
- #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git