rjones pushed to libguestfs (f21). "Remove patch which is now upstream (RHBZ#1199733)."

[notifications at fedoraproject.org]

>From 0659da2c4e42c6303e69fc12db95e281d85252cc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sun, 29 Mar 2015 21:41:45 +0100
Subject: Remove patch which is now upstream (RHBZ#1199733).


diff --git a/0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch b/0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch
deleted file mode 100644
index 8e2210d..0000000
--- a/0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From af762e43424382d895d3a10aa6632adc601fdbad Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Thu, 5 Mar 2015 10:25:46 +0000
-Subject: [PATCH] arm: Use -M virt on 32 bit ARM, don't pass -dtb parameter.
-
-Note this means all the dtb code in libguestfs & supermin is
-obsolete/unused, and may be deleted at some point in future.
----
- src/guestfs-internal.h | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 64bad70..43cdd4d 100644
---- a/src/guestfs-internal.h
-+++ b/src/guestfs-internal.h
-@@ -151,12 +151,7 @@
- 
- /* Machine types.  XXX Make these configurable. */
- #ifdef __arm__
--/* In future, we can use mach-virt and drop the device tree completely
-- * (because the plan is for qemu to entirely generate the device tree
-- * internally when using mach-virt).
-- */
--#define MACHINE_TYPE "vexpress-a15"
--#define DTB_WILDCARD "vexpress*a15-tc1.dtb"
-+#define MACHINE_TYPE "virt"
- #endif
- #ifdef __aarch64__
- #define MACHINE_TYPE "virt"
--- 
-2.3.1
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 659e219..569845a 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -32,9 +32,6 @@ License:       LGPLv2+
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.28-stable/%{name}-%{version}.tar.gz
 
-# Upstream patch to use -M virt on 32 bit ARM (RHBZ#1199733).
-Patch1:        0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch
-
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -731,8 +728,6 @@ for %{name}.
 %prep
 %setup -q
 
-%patch1 -p1
-
 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     # For sVirt to work, the local temporary directory we use in the
     # tests must be labelled the same way as /tmp.
@@ -1232,6 +1227,7 @@ popd
 %changelog
 * Sun Mar 29 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.28.7-1
 - New upstream version 1.28.7.
+- Remove patch which is now upstream (RHBZ#1199733).
 
 * Mon Mar  9 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.28.6-2
 - Upstream patch to use -M virt on 32 bit ARM (RHBZ#1199733).
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libguestfs.git/commit/?h=f21&id=0659da2c4e42c6303e69fc12db95e281d85252cc