Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at Mon Jan 17 19:39:02 CET 2011. -------- --- kvm/kvm.changes 2011-01-14 12:06:43.000000000 +0100 +++ kvm/kvm.changes 2011-01-15 01:03:43.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 14 23:53:09 UTC 2011 - brogers@novell.com + +- update gpxe roms to version 1.0.1 +- tweak braille support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gpxe-0.9.9.tar.bz2 gpxe-code-cleanups.patch gpxe_avoid_spaces_in_build_rule.patch New: ---- gpxe-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.lzkXuP/_old 2011-01-17 19:38:36.000000000 +0100 +++ /var/tmp/diff_new_pack.lzkXuP/_new 2011-01-17 19:38:36.000000000 +0100 @@ -21,7 +21,7 @@ %bcond_with vde %define bios_id seabios-0.6.1 -%define pxe_rom_id gpxe-0.9.9 +%define pxe_rom_id gpxe-1.0.1 #%define vgabios_id vgabios-0.6c # note that this list doesn't include the gpxe roms since they get handled @@ -47,7 +47,9 @@ Name: kvm BuildRequires: SDL-devel alsa alsa-devel gnutls-devel libaio-devel libcurl-devel libpulse-devel ncurses-devel pciutils-devel perl python texinfo +%if 0%{?suse_version} >= 1140 BuildRequires: brlapi-devel +%endif %ifarch %ix86 x86_64 ia64 %if %{build_fw_from_source} # needed for building vgabios: @@ -71,12 +73,15 @@ %if %suse_version < 1110 Requires: kvm-kmp %endif +%if 0%{?suse_version} >= 1140 +Requires: libbrlapi0_5 +%endif License: BSD3c ; GPLv2 ; GPLv2+ ; LGPLv2.1+ ; MIT Group: System/Kernel Summary: Kernel-based Virtual Machine Url: http://kvm.qumranet.com/ Version: 0.13.0 -Release: 4 +Release: 5 Source0: qemu-%{name}-%{version}.tar.bz2 Source1: 60-kvm.rules Source2: qemu-ifup @@ -90,15 +95,13 @@ Source11: s390-zipl.rom # common and X86 patches Patch01: gpxe-rom-settings.patch -Patch02: gpxe-code-cleanups.patch -Patch03: gpxe_avoid_spaces_in_build_rule.patch -Patch04: seabios-sanitize-version.patch -Patch05: vgabios-bcc-paths.patch -Patch06: fix-virtio-blk-failure-after-reboot.patch -Patch07: qemu-datadir.diff -Patch08: kvm-qemu-default-memsize.patch -Patch09: kvm-qemu-no-fallback-if-open-kvm-fails.patch -Patch10: kvm-qemu-user-space-tool-name.patch +Patch02: seabios-sanitize-version.patch +Patch03: vgabios-bcc-paths.patch +Patch04: fix-virtio-blk-failure-after-reboot.patch +Patch05: qemu-datadir.diff +Patch06: kvm-qemu-default-memsize.patch +Patch07: kvm-qemu-no-fallback-if-open-kvm-fails.patch +Patch08: kvm-qemu-user-space-tool-name.patch # Mac OS X patches Patch20: kvm-qemu-lpc.patch @@ -169,8 +172,6 @@ rpm2cpio %{SOURCE8} | cpio -id ./usr/bin/bcc ./usr/lib/bcc/bcc-cc1 %setup -q -T -D -n %{pxe_rom_id} -b 7 %patch01 -p1 -%patch02 -p1 -%patch03 -p1 %endif %setup -q -n qemu-%{name}-%{version} -a 6 #%setup -q -n qemu-%{name}-%{version} -a 6 -a 9 @@ -180,15 +181,15 @@ do rm -f pc-bios/$i done +%patch02 -p1 +%patch03 -p1 %patch04 -p1 -%patch05 -p1 -%patch06 -p1 %endif cp %{SOURCE10} . +%patch05 -p1 +%patch06 -p1 %patch07 -p1 %patch08 -p1 -%patch09 -p1 -%patch10 -p1 # Mac OS X guest %if %{mac_bios} %if %{mac_patches_ported} ++++++ gpxe-0.9.9.tar.bz2 -> gpxe-1.0.1.tar.bz2 ++++++ ++++ 135869 lines of diff (skipped) ++++++ gpxe-rom-settings.patch ++++++ --- /var/tmp/diff_new_pack.lzkXuP/_old 2011-01-17 19:38:37.000000000 +0100 +++ /var/tmp/diff_new_pack.lzkXuP/_new 2011-01-17 19:38:37.000000000 +0100 @@ -1,20 +1,7 @@ -diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile -index 8f6c97e..c5c8dbc 100644 ---- a/src/arch/i386/Makefile -+++ b/src/arch/i386/Makefile -@@ -69,7 +69,7 @@ CFLAGS += -Ui386 - - # Locations of utilities - # --ISOLINUX_BIN = /usr/lib/syslinux/isolinux.bin -+ISOLINUX_BIN = /usr/share/syslinux/isolinux.bin - - # i386-specific directories containing source files - # -diff --git a/src/config/general.h b/src/config/general.h -index ee07dfc..fa97198 100644 ---- a/src/config/general.h -+++ b/src/config/general.h +Index: gpxe-1.0.1/src/config/general.h +=================================================================== +--- gpxe-1.0.1.orig/src/config/general.h ++++ gpxe-1.0.1/src/config/general.h @@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * Timer configuration * @@ -24,7 +11,7 @@ banner should appear */ /* -@@ -79,7 +79,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); +@@ -91,7 +91,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * you want to use. * */ ++++++ kvm-studio-vnc.patch ++++++ --- /var/tmp/diff_new_pack.lzkXuP/_old 2011-01-17 19:38:37.000000000 +0100 +++ /var/tmp/diff_new_pack.lzkXuP/_new 2011-01-17 19:38:37.000000000 +0100 @@ -18,7 +18,7 @@ vnc_jobs_join(vs); /* Wait encoding jobs */ vnc_lock_output(vs); -@@ -1045,10 +1047,19 @@ static void vnc_disconnect_finish(VncSta +@@ -1045,6 +1047,13 @@ static void vnc_disconnect_finish(VncSta qemu_mutex_destroy(&vs->output_mutex); #endif qemu_free(vs); @@ -32,13 +32,7 @@ } int vnc_client_io_error(VncState *vs, int ret, int last_errno) - { -+ static int num_disconnects = 0; -+ - if (ret == 0 || ret == -1) { - if (ret == -1) { - switch (last_errno) { -@@ -2510,6 +2521,39 @@ char *vnc_display_local_addr(DisplayStat +@@ -2510,6 +2519,39 @@ char *vnc_display_local_addr(DisplayStat return vnc_socket_local_addr("%s:%s", vs->lsock); } @@ -78,7 +72,7 @@ int vnc_display_open(DisplayState *ds, const char *display) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; -@@ -2539,7 +2583,36 @@ int vnc_display_open(DisplayState *ds, c +@@ -2539,7 +2581,36 @@ int vnc_display_open(DisplayState *ds, c while ((options = strchr(options, ','))) { options++; if (strncmp(options, "password", 8) == 0) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org