summaryrefslogtreecommitdiff
path: root/sysutils/xentools41
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xentools41')
-rw-r--r--sysutils/xentools41/Makefile4
-rw-r--r--sysutils/xentools41/distinfo4
-rw-r--r--sysutils/xentools41/patches/patch-df22
3 files changed, 20 insertions, 10 deletions
diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile
index 0a8e141a49e..e2143dbc7c9 100644
--- a/sysutils/xentools41/Makefile
+++ b/sysutils/xentools41/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2015/04/19 13:13:21 spz Exp $
+# $NetBSD: Makefile,v 1.51 2015/06/11 17:42:43 bouyer Exp $
#
# VERSION is set in version.mk as it is shared with other packages
.include "version.mk"
DISTNAME= xen-${VERSION}
PKGNAME= xentools41-${VERSION}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index 65da55b1c44..359ec2b5804 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2015/04/19 13:13:21 spz Exp $
+$NetBSD: distinfo,v 1.39 2015/06/11 17:42:43 bouyer Exp $
SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -43,7 +43,7 @@ SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d
SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3
SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d
-SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c
+SHA1 (patch-df) = e7b41242fcb4a0d4fb9e22376af6a50d1081f96c
SHA1 (patch-firmware_hvmloader_Makefile) = b2914e4988ba004d45403d67f1580b1f9725d006
SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989
SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886
diff --git a/sysutils/xentools41/patches/patch-df b/sysutils/xentools41/patches/patch-df
index 9b0c50cb764..7d117eeb23f 100644
--- a/sysutils/xentools41/patches/patch-df
+++ b/sysutils/xentools41/patches/patch-df
@@ -1,16 +1,26 @@
-$NetBSD: patch-df,v 1.1 2012/01/26 11:19:23 cegger Exp $
+$NetBSD: patch-df,v 1.2 2015/06/11 17:42:43 bouyer Exp $
---- ioemu-qemu-xen/hw/ide.c.orig 2011-02-11 17:54:51.000000000 +0000
-+++ ioemu-qemu-xen/hw/ide.c
-@@ -761,6 +761,7 @@ static void ide_identify(IDEState *s)
- put_le16(p + 61, s->nb_sectors >> 16);
+--- ioemu-qemu-xen/hw/ide.c.orig 2014-01-09 13:44:42.000000000 +0100
++++ ioemu-qemu-xen/hw/ide.c 2015-06-11 16:15:49.000000000 +0200
+@@ -757,10 +757,15 @@
+ put_le16(p + 58, oldsize >> 16);
+ if (s->mult_sectors)
+ put_le16(p + 59, 0x100 | s->mult_sectors);
+- put_le16(p + 60, s->nb_sectors);
+- put_le16(p + 61, s->nb_sectors >> 16);
++ if (s->nb_sectors > 0x10000000)
++ oldsize = 0x10000000; /* report only 128GB */
++ else
++ oldsize = s->nb_sectors;
++ put_le16(p + 60, oldsize);
++ put_le16(p + 61, oldsize >> 16);
put_le16(p + 62, 0x07); /* single word dma0-2 supported */
put_le16(p + 63, 0x07); /* mdma0-2 supported */
+ put_le16(p + 64, 0x03); /* pio3-4 supported */
put_le16(p + 65, 120);
put_le16(p + 66, 120);
put_le16(p + 67, 120);
-@@ -812,13 +813,12 @@ static void ide_atapi_identify(IDEState
+@@ -812,13 +817,12 @@
put_le16(p + 53, 7); /* words 64-70, 54-58, 88 valid */
put_le16(p + 62, 7); /* single word dma0-2 supported */
put_le16(p + 63, 7); /* mdma0-2 supported */