remove obsolete patches

libguestfs-1.13.14-disable-erlang.patch
 libguestfs-1.13.14-no-machine.patch
 libguestfs-1.13.14-provided-appliance.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=20
This commit is contained in:
Olaf Hering 2012-08-29 13:31:00 +00:00 committed by Git OBS Bridge
parent f3151abec5
commit aea87fef39
4 changed files with 0 additions and 80 deletions

View File

@ -1,28 +0,0 @@
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -886,22 +886,7 @@ AS_IF([test "x$enable_php" != "xno"],
])
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
-dnl Erlang
-AC_ARG_ENABLE([erlang],
- AS_HELP_STRING([--disable-erlang], [Disable Erlang language bindings]),
- [],
- [enable_erlang=yes])
-AS_IF([test "x$enable_erlang" != "xno"],
- [
- AC_ERLANG_PATH_ERLC([no])
-
- if test "x$ERLC" != "xno"; then
- AC_ERLANG_CHECK_LIB([erl_interface], [],
- [AC_MSG_FAILURE([Erlang erl_interface library not installed. Use --disable-erlang to disable.])])
- AC_ERLANG_SUBST_LIB_DIR
- fi
- ])
-AM_CONDITIONAL([HAVE_ERLANG], [test "x$ERLC" != "xno"])
+AM_CONDITIONAL([HAVE_ERLANG], [test "xno" != "xno"])
dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
AS_IF([test "x$PERL" != "xno"],

View File

@ -1,16 +0,0 @@
Index: src/launch.c
===================================================================
--- src/launch.c.orig
+++ src/launch.c
@@ -521,10 +521,7 @@ launch_appliance (guestfs_h *g)
* since it falls back through various different acceleration
* modes, so try that first (thanks Markus Armbruster).
*/
- if (qemu_supports (g, "-machine")) {
- add_cmdline (g, "-machine");
- add_cmdline (g, "accel=kvm:tcg");
- } else {
+ if (1) {
/* qemu sometimes needs this option to enable hardware
* virtualization, but some versions of 'qemu-kvm' will use KVM
* regardless (even where this option appears in the help text).

View File

@ -1,33 +0,0 @@
Index: src/appliance.c
===================================================================
--- src/appliance.c.orig
+++ src/appliance.c
@@ -44,6 +44,7 @@
/* Old-style appliance is going to be obsoleted. */
static const char *kernel_name = "vmlinuz." host_cpu;
static const char *initrd_name = "initramfs." host_cpu ".img";
+static const char *appliance_name = "rootfs." host_cpu ".img";
static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem, void *data), void *data, char **pelem);
static int dir_contains_file (const char *dir, const char *file);
@@ -171,9 +172,10 @@ guestfs___build_appliance (guestfs_h *g,
size_t len = strlen (path);
*kernel = safe_malloc (g, len + strlen (kernel_name) + 2);
*initrd = safe_malloc (g, len + strlen (initrd_name) + 2);
+ *appliance = safe_malloc (g, len + strlen (appliance_name) + 2);
sprintf (*kernel, "%s/%s", path, kernel_name);
sprintf (*initrd, "%s/%s", path, initrd_name);
- *appliance = NULL;
+ sprintf (*appliance, "%s/%s", path, appliance_name);
free (path);
return 0;
@@ -187,7 +189,7 @@ guestfs___build_appliance (guestfs_h *g,
static int
contains_ordinary_appliance (guestfs_h *g, const char *path, void *data)
{
- return dir_contains_files (path, kernel_name, initrd_name, NULL);
+ return dir_contains_files (path, kernel_name, initrd_name, appliance_name, NULL);
}
static int

View File

@ -120,9 +120,6 @@ Version: 1.19.34
Release: 0
Patch: libguestfs-1.19.30.patch
Patch34: libguestfs-1.19.34.patch
Patch1: libguestfs-1.13.14-disable-erlang.patch
Patch2: libguestfs-1.13.14-provided-appliance.patch
Patch3: libguestfs-1.13.14-no-machine.patch
Patch5: libguestfs-1.13.14-ruby.patch
Source0: %{name}-%{version}.tar.gz
Source1: guestfs.tar.xz