pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
haxm: qemu-haxm: Drop
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Feb 13 15:59:12 2019 +0100
Changeset: a86ce0be9ed07896a83f46f948f7433ab1b6b040
Removed Files:
haxm/DESCR
haxm/Makefile
haxm/PLIST
haxm/distinfo
haxm/files/haxm-mknod
haxm/files/haxm-modload.in
haxm/files/haxm-modunload
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
qemu-haxm/DESCR
qemu-haxm/Makefile
qemu-haxm/PLIST
qemu-haxm/PLIST.Linux
qemu-haxm/distinfo
qemu-haxm/files/Makefile.multinode-NetBSD
qemu-haxm/options.mk
qemu-haxm/patches/patch-configure
qemu-haxm/patches/patch-include_sysemu_kvm.h
qemu-haxm/patches/patch-target_i386_kvm-stub.c
Log Message:
haxm: qemu-haxm: Drop
Imported into pkgsrc.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a86ce0be9ed07896a83f46f948f7433ab1b6b040
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
haxm/DESCR | 9 --
haxm/Makefile | 58 --------
haxm/PLIST | 5 -
haxm/distinfo | 11 --
haxm/files/haxm-mknod | 25 ----
haxm/files/haxm-modload.in | 3 -
haxm/files/haxm-modunload | 3 -
haxm/patches/patch-core_ia32.c | 20 ---
haxm/patches/patch-core_ia32__ops.asm | 19 ---
haxm/patches/patch-core_include_ia32.h | 25 ----
haxm/patches/patch-core_include_vcpu.h | 16 ---
haxm/patches/patch-core_vcpu.c | 34 -----
qemu-haxm/DESCR | 11 --
qemu-haxm/Makefile | 140 -------------------
qemu-haxm/PLIST | 180 -------------------------
qemu-haxm/PLIST.Linux | 8 --
qemu-haxm/distinfo | 9 --
qemu-haxm/files/Makefile.multinode-NetBSD | 59 --------
qemu-haxm/options.mk | 29 ----
qemu-haxm/patches/patch-configure | 12 --
qemu-haxm/patches/patch-include_sysemu_kvm.h | 21 ---
qemu-haxm/patches/patch-target_i386_kvm-stub.c | 21 ---
22 files changed, 718 deletions(-)
diffs:
diff --git a/haxm/DESCR b/haxm/DESCR
deleted file mode 100644
index adbfbcd88e..0000000000
--- a/haxm/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-HAXM is a cross-platform hardware-assisted virtualization engine (hypervisor),
-widely used as an accelerator for Android Emulator and QEMU. It has always
-supported running on Windows and macOS, and has been ported to other host
-operating systems as well, such as Linux and NetBSD.
-
-HAXM runs as a kernel-mode driver on the host operating system, and provides a
-KVM-like interface to user space, thereby enabling applications like QEMU to
-utilize the hardware virtualization capabilities built into modern Intel CPUs,
-namely Intel Virtualization Technology.
diff --git a/haxm/Makefile b/haxm/Makefile
deleted file mode 100644
index 353cb74eff..0000000000
--- a/haxm/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD$
-
-GITHUB_PROJECT= haxm
-GITHUB_TAG= c072ad9b68e1d558a9fb791511468d10a1a9b319
-DISTNAME= haxm-0.${GITHUB_TAG}
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GITHUB:=intel/}
-
-MAINTAINER= kamil%NetBSD.org@localhost
-HOMEPAGE= https://github.com/intel/haxm/
-COMMENT= Intel Hardware Accelerated Execution Manager
-LICENSE= modified-bsd
-
-WRKSRC= ${WRKDIR}/haxm-${GITHUB_TAG}
-
-ONLY_FOR_PLATFORM= NetBSD-*-x86_64
-OSVERSION_SPECIFIC= YES
-
-BUILD_DIRS= platforms/netbsd
-
-BUILDLINK_PASSTHRU_DIRS+= ${BSDSRCDIR}/sys
-
-BUILD_DEFS+= BSDSRCDIR
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+= -Wno-error=address-of-packed-member
-.endif
-
-KMOD= haxm.kmod
-KMODULEDIR= stand/${MACHINE}/${OS_VERSION}/modules
-
-INSTALLATION_DIRS+= sbin # auxiliary scripts
-INSTALLATION_DIRS+= ${KMODULEDIR}
-
-PLIST_SUBST+= MACHINE=${MACHINE}
-
-pre-configure:
-.for file in haxm-mknod haxm-modunload
- ${CP} ${FILESDIR}/${file} ${WRKSRC}
-.endfor
- ${SED} \
- -e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@MACHINE@|${MACHINE}|g' \
- -e 's|@OS_VERSION@|${OS_VERSION}|g' \
- ${FILESDIR}/haxm-modload.in > ${WRKSRC}/haxm-modload
-
-do-install:
- ${RUN} cd ${WRKSRC}/platforms/netbsd && \
- ${INSTALL_PROGRAM} ${KMOD} ${DESTDIR}${PREFIX}/${KMODULEDIR}
-.for file in haxm-modload haxm-modunload haxm-mknod
- ${RUN} cd ${WRKSRC} && \
- ${INSTALL_SCRIPT} ${file} ${DESTDIR}${PREFIX}/sbin
-.endfor
-
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/haxm/PLIST b/haxm/PLIST
deleted file mode 100644
index 7104bee5e6..0000000000
--- a/haxm/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD$
-sbin/haxm-mknod
-sbin/haxm-modload
-sbin/haxm-modunload
-stand/${MACHINE}/${OS_VERSION}/modules/haxm.kmod
diff --git a/haxm/distinfo b/haxm/distinfo
deleted file mode 100644
index ebb87921d0..0000000000
--- a/haxm/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-SHA1 (haxm-0.c072ad9b68e1d558a9fb791511468d10a1a9b319-c072ad9b68e1d558a9fb791511468d10a1a9b319.tar.gz) = da6fe9b8c98292e8c4ca5f62ad6aa9a4a65c6bb1
-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) = 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/files/haxm-mknod b/haxm/files/haxm-mknod
deleted file mode 100644
index 1a92fb9067..0000000000
--- a/haxm/files/haxm-mknod
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-if [ -e /dev/HAX ]; then
- echo "ERR: HAXM devices have been already created"
- exit 1
-fi
-
-echo "*** Creating HAX devices ***"
-mknod /dev/HAX c 220 0
-mkdir /dev/hax_vm
-for i in `seq 0 7`; do mkdir /dev/hax_vm0$i; done
-for i in `seq 0 7`; do mknod /dev/hax_vm/vm0$i c 222 $i; done
-
-echo "*** Creating VCPU Nodes ***"
-i=0
-while [ $i -lt 128 ]; do
- vm=$(echo "$i/16"|bc)
- vcpu=$(echo "$i%16"|bc)
- echo "i=$i vm=$vm vcpu=$vcpu"
- cmd=$(printf "mknod /dev/hax_vm%02d/vcpu%02d c 221 %d" $vm $vcpu $i)
- $cmd
- let "i+=1"
-done
-
-echo "*** Done ****"
diff --git a/haxm/files/haxm-modload.in b/haxm/files/haxm-modload.in
deleted file mode 100644
index 617c9ded99..0000000000
--- a/haxm/files/haxm-modload.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-modload @PREFIX@/stand/@MACHINE@/@OS_VERSION@/modules/haxm.kmod
diff --git a/haxm/files/haxm-modunload b/haxm/files/haxm-modunload
deleted file mode 100644
index 9e2e279e33..0000000000
--- a/haxm/files/haxm-modunload
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-modunload haxm
diff --git a/haxm/patches/patch-core_ia32.c b/haxm/patches/patch-core_ia32.c
deleted file mode 100644
index b7a414a350..0000000000
--- a/haxm/patches/patch-core_ia32.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$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)
- #endif
- }
-
-+void hax_clts(void)
-+{
-+ asm_clts();
-+}
-+
- void hax_fxinit(void)
- {
- asm_fxinit();
diff --git a/haxm/patches/patch-core_ia32__ops.asm b/haxm/patches/patch-core_ia32__ops.asm
deleted file mode 100644
index 89e4a05dbd..0000000000
--- a/haxm/patches/patch-core_ia32__ops.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
- sti
- ret
-
-+function asm_clts, 0
-+ clts
-+ ret
-+
- function asm_fxinit, 0
- finit
- ret
diff --git a/haxm/patches/patch-core_include_ia32.h b/haxm/patches/patch-core_include_ia32.h
deleted file mode 100644
index e6c61f4bde..0000000000
--- a/haxm/patches/patch-core_include_ia32.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$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)
-
- void ASMCALL asm_btr(uint8_t *addr, uint bit);
- void ASMCALL asm_bts(uint8_t *addr, uint bit);
-+void ASMCALL asm_clts(void);
- void ASMCALL asm_fxinit(void);
- void ASMCALL asm_fxsave(mword *addr);
- void ASMCALL asm_fxrstor(mword *addr);
-@@ -85,6 +86,8 @@ void ia32_wrmsr(uint32_t reg, uint64_t v
-
- uint64_t ia32_rdtsc(void);
-
-+void hax_clts(void);
-+
- void hax_fxinit(void);
- void hax_fxsave(mword *addr);
- void hax_fxrstor(mword *addr);
diff --git a/haxm/patches/patch-core_include_vcpu.h b/haxm/patches/patch-core_include_vcpu.h
deleted file mode 100644
index bb1f5b8945..0000000000
--- a/haxm/patches/patch-core_include_vcpu.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$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 {
- #ifdef CONFIG_HAX_EPT2
- struct mmio_fetch_cache mmio_fetch;
- #endif // CONFIG_HAX_EPT2
-+ int cr0_ts;
- };
-
- #define vmx(v, field) v->vmx.field
diff --git a/haxm/patches/patch-core_vcpu.c b/haxm/patches/patch-core_vcpu.c
deleted file mode 100644
index 30f200f6bb..0000000000
--- a/haxm/patches/patch-core_vcpu.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$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
- struct fx_layout *hfx = (struct fx_layout *)hax_page_va(hstate->hfxpage);
- struct fx_layout *gfx = (struct fx_layout *)hax_page_va(gstate->gfxpage);
-
-+ vcpu->cr0_ts = !!(get_cr0() & CR0_TS);
-+
-+ hax_clts();
-+
- hax_fxsave((mword *)hfx);
- hax_fxrstor((mword *)gfx);
- }
-@@ -2052,8 +2056,14 @@ static void vcpu_exit_fpu_state(struct v
- struct fx_layout *hfx = (struct fx_layout *)hax_page_va(hstate->hfxpage);
- struct fx_layout *gfx = (struct fx_layout *)hax_page_va(gstate->gfxpage);
-
-+ hax_clts();
-+
- hax_fxsave((mword *)gfx);
- hax_fxrstor((mword *)hfx);
-+
-+ if (vcpu->cr0_ts) {
-+ set_cr0(get_cr0() | CR0_TS);
-+ }
- }
-
- // Instructions are never longer than 15 bytes:
diff --git a/qemu-haxm/DESCR b/qemu-haxm/DESCR
deleted file mode 100644
index d939711a26..0000000000
--- a/qemu-haxm/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-QEMU is a FAST! processor emulator using dynamic translation to achieve
-good emulation speed, QEMU has two operating modes:
-
- * Full system emulation. In this mode, QEMU emulates a full system
- (for example a PC), including a processor and various peripherals.
- It can be used to launch different Operating Systems without rebooting
- the PC or to debug system code.
- * User mode emulation (Linux host only). In this mode, QEMU can launch
- Linux processes compiled for one CPU on another CPU. It can be used
- to launch the Wine Windows API emulator or to ease cross-compilation
- and cross-debugging.
diff --git a/qemu-haxm/Makefile b/qemu-haxm/Makefile
deleted file mode 100644
index fcbb07a3d8..0000000000
--- a/qemu-haxm/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-# $NetBSD: Makefile,v 1.172 2017/08/30 21:00:46 kamil Exp $
-
-DISTNAME= qemu-3.0
-CATEGORIES= emulators
-
-GIT_REPOSITORIES= qemu
-GIT_REPO.qemu= https://github.com/qemu/qemu.git
-
-WRKSRC= ${WRKDIR}/qemu
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.qemu-project.org/
-COMMENT= CPU emulator using dynamic translation
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
-
-USE_CURSES= resize_term wide
-USE_LANGUAGES+= c c++
-USE_TOOLS+= bison flex gmake makeinfo perl:build pkg-config
-FAKE_NCURSES= yes
-UNLIMIT_RESOURCES= datasize
-HAS_CONFIGURE= yes
-
-BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
-
-SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= pre-configure
-SUBST_MESSAGE.prefix= Setting PREFIX
-SUBST_FILES.prefix+= configure
-SUBST_VARS.prefix+= PREFIX
-
-.include "options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --python=${PYTHONBIN}
-CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+= --enable-curses
-CONFIGURE_ARGS+= --enable-jemalloc
-CONFIGURE_ARGS+= --disable-opengl
-CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
-
-.if defined(PKGSRC_USE_SSP)
-# do not add flags to everything
-PKGSRC_USE_SSP= no
-CONFIGURE_ARGS+= --enable-stack-protector
-.endif
-
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-lm32
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-m68k
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblaze
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblazeel
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64el
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mipsel
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-moxie
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-or1k
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-s390x
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4eb
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-tricore
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-unicore32
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensa
-NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb
-
-PKG_SYSCONFSUBDIR= qemu
-
-REPLACE_PERL+= scripts/texi2pod.pl
-
-INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
-
-UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel
-UE_ARCHS+= or1k ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
-UE_ARCHS+= sparc64 x86_64 microblazeel s390x unicore32
-
-.if ${OPSYS} == "NetBSD"
-USER_EMUL= i386 x86_64 sparc sparc64
-PLIST.nbd= YES
-.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
-USER_EMUL= i386 x86_64 sparc sparc64
-PLIST.nbd= YES
-.elif ${OPSYS} == "Darwin"
-USER_EMUL=
-CONFIGURE_ARGS+= --disable-bsd-user
-PLIST.nbd= YES
-.elif ${OPSYS} == "Linux"
-USER_EMUL= ${UE_ARCHS}
-PLIST.nbd= YES
-PLIST.ivshmem= YES
-.elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
-PLIST.nbd= YES
-CONFIGURE_ARGS+= --disable-coroutine-pool
-.endif
-
-PLIST_VARS+= ${UE_ARCHS} nbd ivshmem
-.for var in ${USER_EMUL}
-PLIST.${var}= YES
-.endfor
-
-TEST_TARGET= check
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
- ${DESTDIR}${PREFIX}/share/doc/qemu/
-
-.include "../../wip/mk/git-package.mk"
-
-# On Darwin, qemu uses Cocoa and CoreAudio
-.if ${OPSYS} == "Darwin"
-.include "../../mk/oss.buildlink3.mk"
-.endif
-.include "../../archivers/lzo/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/jemalloc/buildlink3.mk"
-.include "../../devel/snappy/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/qemu-haxm/PLIST b/qemu-haxm/PLIST
deleted file mode 100644
index ffeb123e94..0000000000
--- a/qemu-haxm/PLIST
+++ /dev/null
@@ -1,180 +0,0 @@
-@comment $NetBSD: PLIST,v 1.51 2017/08/30 21:00:46 kamil Exp $
-bin/elf2dmp
-${PLIST.ivshmem}bin/ivshmem-client
-${PLIST.ivshmem}bin/ivshmem-server
-${PLIST.alpha}bin/qemu-alpha
-${PLIST.arm}bin/qemu-arm
-${PLIST.armeb}bin/qemu-armeb
-${PLIST.cris}bin/qemu-cris
-bin/qemu-edid
-bin/qemu-ga
-${PLIST.i386}bin/qemu-i386
-bin/qemu-img
-bin/qemu-io
-${PLIST.m68k}bin/qemu-m68k
-${PLIST.microblaze}bin/qemu-microblaze
-${PLIST.microblazeel}bin/qemu-microblazeel
-${PLIST.mips}bin/qemu-mips
-${PLIST.mipsel}bin/qemu-mipsel
-${PLIST.nbd}bin/qemu-nbd
-${PLIST.or1k}bin/qemu-or1k
-${PLIST.ppc}bin/qemu-ppc
-${PLIST.ppc64}bin/qemu-ppc64
-${PLIST.ppc64abi32}bin/qemu-ppc64abi32
-${PLIST.s390x}bin/qemu-s390x
-${PLIST.sh4}bin/qemu-sh4
-${PLIST.sh4eb}bin/qemu-sh4eb
-${PLIST.sparc}bin/qemu-sparc
-${PLIST.sparc32plus}bin/qemu-sparc32plus
-${PLIST.sparc64}bin/qemu-sparc64
-bin/qemu-system-aarch64
-bin/qemu-system-alpha
-bin/qemu-system-arm
-bin/qemu-system-cris
-bin/qemu-system-hppa
-bin/qemu-system-i386
-bin/qemu-system-lm32
-bin/qemu-system-m68k
-bin/qemu-system-microblaze
-bin/qemu-system-microblazeel
-bin/qemu-system-mips
-bin/qemu-system-mips64
-bin/qemu-system-mips64el
-bin/qemu-system-mipsel
-bin/qemu-system-moxie
-bin/qemu-system-nios2
-bin/qemu-system-or1k
-bin/qemu-system-ppc
-bin/qemu-system-ppc64
-bin/qemu-system-riscv32
-bin/qemu-system-riscv64
-bin/qemu-system-s390x
-bin/qemu-system-sh4
-bin/qemu-system-sh4eb
-bin/qemu-system-sparc
-bin/qemu-system-sparc64
-bin/qemu-system-tricore
-bin/qemu-system-unicore32
-bin/qemu-system-x86_64
-bin/qemu-system-xtensa
-bin/qemu-system-xtensaeb
-${PLIST.unicore32}bin/qemu-unicore32
-${PLIST.x86_64}bin/qemu-x86_64
-man/man1/qemu-img.1
-man/man1/qemu.1
-man/man7/qemu-block-drivers.7
-man/man7/qemu-cpu-models.7
-man/man7/qemu-ga-ref.7
-man/man7/qemu-qmp-ref.7
-man/man8/qemu-ga.8
-man/man8/qemu-nbd.8
-share/applications/qemu.desktop
-share/doc/qemu/Makefile.multinode-NetBSD
-share/doc/qemu/qemu-doc.html
-share/doc/qemu/qemu-doc.txt
-share/doc/qemu/qemu-ga-ref.html
-share/doc/qemu/qemu-ga-ref.txt
-share/doc/qemu/qemu-qmp-ref.html
-share/doc/qemu/qemu-qmp-ref.txt
-share/icons/hicolor/128x128/apps/qemu.png
-share/icons/hicolor/16x16/apps/qemu.png
-share/icons/hicolor/24x24/apps/qemu.png
-share/icons/hicolor/256x256/apps/qemu.png
-share/icons/hicolor/32x32/apps/qemu.bmp
-share/icons/hicolor/32x32/apps/qemu.png
-share/icons/hicolor/48x48/apps/qemu.png
-share/icons/hicolor/512x512/apps/qemu.png
-share/icons/hicolor/64x64/apps/qemu.png
-share/icons/hicolor/scalable/apps/qemu.svg
-${PLIST.gtk}share/locale/bg/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/de_DE/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/fr_FR/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/hu/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo
-share/qemu/QEMU,cgthree.bin
-share/qemu/QEMU,tcx.bin
-share/qemu/bamboo.dtb
-share/qemu/bios-256k.bin
-share/qemu/bios.bin
-share/qemu/canyonlands.dtb
-share/qemu/efi-e1000.rom
-share/qemu/efi-e1000e.rom
-share/qemu/efi-eepro100.rom
-share/qemu/efi-ne2k_pci.rom
-share/qemu/efi-pcnet.rom
-share/qemu/efi-rtl8139.rom
-share/qemu/efi-virtio.rom
-share/qemu/efi-vmxnet3.rom
-share/qemu/hppa-firmware.img
-share/qemu/keymaps/ar
-share/qemu/keymaps/bepo
-share/qemu/keymaps/cz
-share/qemu/keymaps/da
-share/qemu/keymaps/de
-share/qemu/keymaps/de-ch
-share/qemu/keymaps/en-gb
-share/qemu/keymaps/en-us
-share/qemu/keymaps/es
-share/qemu/keymaps/et
-share/qemu/keymaps/fi
-share/qemu/keymaps/fo
-share/qemu/keymaps/fr
-share/qemu/keymaps/fr-be
-share/qemu/keymaps/fr-ca
-share/qemu/keymaps/fr-ch
-share/qemu/keymaps/hr
-share/qemu/keymaps/hu
-share/qemu/keymaps/is
-share/qemu/keymaps/it
-share/qemu/keymaps/ja
-share/qemu/keymaps/lt
-share/qemu/keymaps/lv
-share/qemu/keymaps/mk
-share/qemu/keymaps/nl
-share/qemu/keymaps/no
-share/qemu/keymaps/pl
-share/qemu/keymaps/pt
-share/qemu/keymaps/pt-br
-share/qemu/keymaps/ru
-share/qemu/keymaps/sl
-share/qemu/keymaps/sv
-share/qemu/keymaps/th
-share/qemu/keymaps/tr
-share/qemu/kvmvapic.bin
-share/qemu/linuxboot.bin
-share/qemu/linuxboot_dma.bin
-share/qemu/multiboot.bin
-share/qemu/openbios-ppc
-share/qemu/openbios-sparc32
-share/qemu/openbios-sparc64
-share/qemu/palcode-clipper
-share/qemu/petalogix-ml605.dtb
-share/qemu/petalogix-s3adsp1800.dtb
-share/qemu/ppc_rom.bin
-share/qemu/pvh.bin
-share/qemu/pxe-e1000.rom
-share/qemu/pxe-eepro100.rom
-share/qemu/pxe-ne2k_pci.rom
-share/qemu/pxe-pcnet.rom
-share/qemu/pxe-rtl8139.rom
-share/qemu/pxe-virtio.rom
-share/qemu/qemu_vga.ndrv
-share/qemu/s390-ccw.img
-share/qemu/s390-netboot.img
-share/qemu/sgabios.bin
-share/qemu/skiboot.lid
-share/qemu/slof.bin
-share/qemu/spapr-rtas.bin
-share/qemu/trace-events-all
-share/qemu/u-boot-sam460-20100605.bin
-share/qemu/u-boot.e500
-share/qemu/vgabios-bochs-display.bin
-share/qemu/vgabios-cirrus.bin
-share/qemu/vgabios-qxl.bin
-share/qemu/vgabios-ramfb.bin
-share/qemu/vgabios-stdvga.bin
-share/qemu/vgabios-virtio.bin
-share/qemu/vgabios-vmware.bin
-share/qemu/vgabios.bin
diff --git a/qemu-haxm/PLIST.Linux b/qemu-haxm/PLIST.Linux
deleted file mode 100644
index ca5a923bb0..0000000000
--- a/qemu-haxm/PLIST.Linux
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.4 2015/12/10 02:51:05 joerg Exp $
-bin/qemu-aarch64
-bin/qemu-mips64
-bin/qemu-mips64el
-bin/qemu-mipsn32
-bin/qemu-mipsn32el
-bin/qemu-ppc64le
-libexec/qemu-bridge-helper
diff --git a/qemu-haxm/distinfo b/qemu-haxm/distinfo
deleted file mode 100644
index f3e6b5330d..0000000000
--- a/qemu-haxm/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.124 2017/04/15 17:38:48 riastradh Exp $
-
-SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
-RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
-SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
-Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
-SHA1 (patch-configure) = 3dff8457b48cdf60abc5b3208fc6522cb8962907
-SHA1 (patch-include_sysemu_kvm.h) = e3cd7c41d8c1cc25a7ea290c7c97474bae7938a8
-SHA1 (patch-target_i386_kvm-stub.c) = 54864ca8a0292f35e4f7d8bb94e98160652a16b5
diff --git a/qemu-haxm/files/Makefile.multinode-NetBSD b/qemu-haxm/files/Makefile.multinode-NetBSD
deleted file mode 100644
index f4313832eb..0000000000
--- a/qemu-haxm/files/Makefile.multinode-NetBSD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: Makefile.multinode-NetBSD,v 1.4 2012/06/07 21:23:46 ryoon Exp $
-# Source: http://mail-index.NetBSD.org/netbsd-help/2005/03/25/0005.html
-#
-# Starts up two qemu instances and networks bridges them to the local
-# ethernet (ETHER_IF}. Works best with NetBSD configured to use serial
-# consoles in DISK[12]
-#
-# Usage:
-# sudo make netbsd1
-# sudo make netbsd2
-#
-# - Hubert Feyrer <hubert%feyrer.de@localhost>
-#
-
-#NETBSD_NOGFX=
-NETBSD_NOGFX= -nographic
-
-ETHER_IF= tlp0
-QEMU_RAM= 20
-DISK1= harddisk.netbsd1
-DISK2= harddisk.netbsd2
-
-
-all: netbsd1 netbsd2
-
-netbsd1: bridge
- ifconfig tap1 create up || echo tap1: already there
- brconfig bridge0 add tap1 up || echo tap1: already on bridge0
- brconfig bridge0 -learn tap1 # real hub mode, step 1b
- brconfig bridge0 flush # real hub more, step 2
- qemu \
- -m ${QEMU_RAM} \
- ${NETBSD_NOGFX} \
- -boot c \
- -net tap,fd=3,ifname=tap1 3<>/dev/tap1 \
- -net nic,macaddr=de:ad:be:ef:00:01 \
- ${DISK1}
- brconfig bridge0 delete tap1
- ifconfig tap1 destroy
-
-netbsd2: bridge
- ifconfig tap2 create up || echo tap2: already there
- brconfig bridge0 add tap2 up || echo tap2: already on bridge0
- brconfig bridge0 -learn tap2 # real hub mode, step 1c
- brconfig bridge0 flush # real hub mode, step 2
- qemu \
- -m ${QEMU_RAM} \
- ${NETBSD_NOGFX} \
- -boot c \
- -net tap,fd=3,ifname=tap2 3<>/dev/tap2 \
- -net nic,macaddr=de:ad:be:ef:00:02 \
- ${DISK2}
- brconfig bridge0 delete tap2
- ifconfig tap2 destroy
-
-bridge:
- ifconfig bridge0 create || echo bridge0: already there
- brconfig bridge0 add ${ETHER_IF} || echo bridge0: ${ETHER_IF} already there
- brconfig bridge0 -learn ${ETHER_IF} # real hub mode, step 1a
diff --git a/qemu-haxm/options.mk b/qemu-haxm/options.mk
deleted file mode 100644
index bfb0ee84b9..0000000000
--- a/qemu-haxm/options.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2017/08/30 21:00:46 kamil Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
-PKG_SUPPORTED_OPTIONS= gtk3 sdl
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS+= sdl
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= gtk
-
-.if !empty(PKG_OPTIONS:Mgtk3)
-PLIST.gtk= yes
-CONFIGURE_ARGS+= --enable-gtk
-.include "../../x11/gtk3/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gtk
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+= --enable-sdl
-.include "../../devel/SDL2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-sdl
-.endif
diff --git a/qemu-haxm/patches/patch-configure b/qemu-haxm/patches/patch-configure
deleted file mode 100644
index c558668111..0000000000
--- a/qemu-haxm/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- configure.orig 2019-01-28 11:56:13.642973851 +0000
-+++ configure
-@@ -819,6 +819,7 @@ DragonFly)
- ;;
- NetBSD)
- bsd="yes"
-+ hax="yes"
- make="${MAKE-gmake}"
- audio_drv_list="oss try-sdl"
- audio_possible_drivers="oss sdl"
diff --git a/qemu-haxm/patches/patch-include_sysemu_kvm.h b/qemu-haxm/patches/patch-include_sysemu_kvm.h
deleted file mode 100644
index 3e412068ca..0000000000
--- a/qemu-haxm/patches/patch-include_sysemu_kvm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- include/sysemu/kvm.h.orig 2019-02-02 13:14:03.877852089 +0000
-+++ include/sysemu/kvm.h
-@@ -459,8 +459,16 @@ int kvm_vm_check_extension(KVMState *s,
- kvm_vcpu_ioctl(cpu, KVM_ENABLE_CAP, &cap); \
- })
-
-+#ifdef CONFIG_KVM
- uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
- uint32_t index, int reg);
-+#else
-+#define kvm_arch_get_supported_cpuid(a,b,c,d) \
-+ ({ \
-+ abort(); \
-+ 0; \
-+ })
-+#endif
- uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index);
-
-
diff --git a/qemu-haxm/patches/patch-target_i386_kvm-stub.c b/qemu-haxm/patches/patch-target_i386_kvm-stub.c
deleted file mode 100644
index 123f308a39..0000000000
--- a/qemu-haxm/patches/patch-target_i386_kvm-stub.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- target/i386/kvm-stub.c.orig 2019-02-02 13:12:09.564671574 +0000
-+++ target/i386/kvm-stub.c
-@@ -29,16 +29,6 @@ bool kvm_enable_x2apic(void)
- {
- return false;
- }
--
--/* This function is only called inside conditionals which we
-- * rely on the compiler to optimize out when CONFIG_KVM is not
-- * defined.
-- */
--uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
-- uint32_t index, int reg)
--{
-- abort();
--}
- #endif
-
- bool kvm_hv_vpindex_settable(void)
Home |
Main Index |
Thread Index |
Old Index