pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

haxm: Cleanup



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Feb 13 03:39:43 2019 +0100
Changeset:	88de8eff95704a444cca2048b987d78a175b9943

Modified Files:
	haxm/Makefile
	haxm/distinfo
	haxm/patches/patch-core_ia32.c
	haxm/patches/patch-core_ia32__ops.asm
	haxm/patches/patch-core_include_ia32.h
	haxm/patches/patch-core_include_vcpu.h
	haxm/patches/patch-core_vcpu.c

Log Message:
haxm: Cleanup

- document patches
- enable OSABI

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=88de8eff95704a444cca2048b987d78a175b9943

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 haxm/Makefile                          |  2 +-
 haxm/distinfo                          | 10 +++++-----
 haxm/patches/patch-core_ia32.c         |  4 ++++
 haxm/patches/patch-core_ia32__ops.asm  |  4 ++++
 haxm/patches/patch-core_include_ia32.h |  4 ++++
 haxm/patches/patch-core_include_vcpu.h |  4 ++++
 haxm/patches/patch-core_vcpu.c         |  4 ++++
 7 files changed, 26 insertions(+), 6 deletions(-)

diffs:
diff --git a/haxm/Makefile b/haxm/Makefile
index d70e5ff76d..eb0cc551f5 100644
--- a/haxm/Makefile
+++ b/haxm/Makefile
@@ -13,6 +13,6 @@ LICENSE=	modified-bsd
 
 WRKSRC=		${WRKDIR}/haxm-${GITHUB_TAG}
 
-#OSVERSION_SPECIFIC=	YES
+OSVERSION_SPECIFIC=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/haxm/distinfo b/haxm/distinfo
index 263e210753..ebb87921d0 100644
--- a/haxm/distinfo
+++ b/haxm/distinfo
@@ -4,8 +4,8 @@ SHA1 (haxm-0.c072ad9b68e1d558a9fb791511468d10a1a9b319-c072ad9b68e1d558a9fb791511
 RMD160 (haxm-0.c072ad9b68e1d558a9fb791511468d10a1a9b319-c072ad9b68e1d558a9fb791511468d10a1a9b319.tar.gz) = 6c1248be0b9ee775c9879627bf60d20eb3a94368
 SHA512 (haxm-0.c072ad9b68e1d558a9fb791511468d10a1a9b319-c072ad9b68e1d558a9fb791511468d10a1a9b319.tar.gz) = df8e8b634fea18faa05ae57648dee6500a5b0d93fa081172835e1991ab3ae2b6ad0ad1a99d91d695f0a6656e79744445ff6f6f42947b311bb8245640dd8cff23
 Size (haxm-0.c072ad9b68e1d558a9fb791511468d10a1a9b319-c072ad9b68e1d558a9fb791511468d10a1a9b319.tar.gz) = 233043 bytes
-SHA1 (patch-core_ia32.c) = 8a3bcd53a42ca6a67e3d146186305e81fb8eb751
-SHA1 (patch-core_ia32__ops.asm) = 1881d60a63967c3e1858ee223a1b421993a50fb8
-SHA1 (patch-core_include_ia32.h) = f2da278f209af765c68270cf6e51b8959f7a5ec0
-SHA1 (patch-core_include_vcpu.h) = 5740d39138cbab414450aa540d80cf8a30574f11
-SHA1 (patch-core_vcpu.c) = d1b8e7f72f1e3db1853e8b4563ab506cbd3ac29f
+SHA1 (patch-core_ia32.c) = 6252b1b49d5198a9c16aa206cbfc1981c43c9b70
+SHA1 (patch-core_ia32__ops.asm) = ca208e579a39a15f5c62322dcad595b4b0ac4a34
+SHA1 (patch-core_include_ia32.h) = 3195558c44d1d196a7ac89aaa9b1931790395acc
+SHA1 (patch-core_include_vcpu.h) = 9b9e020d4e15f9e310ef5d22fa41b2289813394f
+SHA1 (patch-core_vcpu.c) = 068a20bf96c797cfd5f4629ce0e5cbb0104995a8
diff --git a/haxm/patches/patch-core_ia32.c b/haxm/patches/patch-core_ia32.c
index c2888a3e7a..b7a414a350 100644
--- a/haxm/patches/patch-core_ia32.c
+++ b/haxm/patches/patch-core_ia32.c
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Cherry-pick from upstream review:
+ - Fix FPU DNA exception on NetBSD
+   https://github.com/intel/haxm/pull/168
+
 --- core/ia32.c.orig	2019-02-12 09:24:47.000000000 +0000
 +++ core/ia32.c
 @@ -81,6 +81,11 @@ uint64_t ia32_rdtsc(void)
diff --git a/haxm/patches/patch-core_ia32__ops.asm b/haxm/patches/patch-core_ia32__ops.asm
index 9d49de6979..89e4a05dbd 100644
--- a/haxm/patches/patch-core_ia32__ops.asm
+++ b/haxm/patches/patch-core_ia32__ops.asm
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Cherry-pick from upstream review:
+ - Fix FPU DNA exception on NetBSD
+   https://github.com/intel/haxm/pull/168
+
 --- core/ia32_ops.asm.orig	2019-02-12 09:24:47.000000000 +0000
 +++ core/ia32_ops.asm
 @@ -213,6 +213,10 @@ function asm_enable_irq, 0
diff --git a/haxm/patches/patch-core_include_ia32.h b/haxm/patches/patch-core_include_ia32.h
index 8414f093d7..e6c61f4bde 100644
--- a/haxm/patches/patch-core_include_ia32.h
+++ b/haxm/patches/patch-core_include_ia32.h
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Cherry-pick from upstream review:
+ - Fix FPU DNA exception on NetBSD
+   https://github.com/intel/haxm/pull/168
+
 --- core/include/ia32.h.orig	2019-02-12 09:24:47.000000000 +0000
 +++ core/include/ia32.h
 @@ -72,6 +72,7 @@ void ASMCALL set_kernel_fs(uint16_t val)
diff --git a/haxm/patches/patch-core_include_vcpu.h b/haxm/patches/patch-core_include_vcpu.h
index fdef2d342c..bb1f5b8945 100644
--- a/haxm/patches/patch-core_include_vcpu.h
+++ b/haxm/patches/patch-core_include_vcpu.h
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Cherry-pick from upstream review:
+ - Fix FPU DNA exception on NetBSD
+   https://github.com/intel/haxm/pull/168
+
 --- core/include/vcpu.h.orig	2019-02-12 09:24:47.000000000 +0000
 +++ core/include/vcpu.h
 @@ -238,6 +238,7 @@ struct vcpu_t {
diff --git a/haxm/patches/patch-core_vcpu.c b/haxm/patches/patch-core_vcpu.c
index 570b78daea..30f200f6bb 100644
--- a/haxm/patches/patch-core_vcpu.c
+++ b/haxm/patches/patch-core_vcpu.c
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Cherry-pick from upstream review:
+ - Fix FPU DNA exception on NetBSD
+   https://github.com/intel/haxm/pull/168
+
 --- core/vcpu.c.orig	2019-02-12 09:24:47.000000000 +0000
 +++ core/vcpu.c
 @@ -2041,6 +2041,10 @@ static void vcpu_enter_fpu_state(struct 


Home | Main Index | Thread Index | Old Index