sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add D_NEEDMINOR as now required on -current for drivers that use the

Browse source 
cloner library:
	http://svn.freebsd.org/viewvc/base?view=revision&revision=179726
- Add CONFLICTS and change COMMENT in preparation for kqemu-kmod-devel commit
- Bump PORTREVISION
This commit is contained in:
Juergen Lock 2008-06-22 21:42:36 +00:00
parent 6a8a5fcf47
commit a9b5f0b433
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=215558
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
emulators/kqemu-kmod/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= kqemu PORTNAME= kqemu
PORTVERSION= 1.3.0.p11 PORTVERSION= 1.3.0.p11
PORTREVISION= 8 PORTREVISION= 9
CATEGORIES= emulators kld CATEGORIES= emulators kld
MASTER_SITES= http://bellard.org/qemu/ \ MASTER_SITES= http://bellard.org/qemu/ \
http://qemu.org/ \ http://qemu.org/ \
@ -18,12 +18,13 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/.p/pre/}
DIST_SUBDIR= kqemu DIST_SUBDIR= kqemu
MAINTAINER= nox@FreeBSD.org MAINTAINER= nox@FreeBSD.org
COMMENT= Kernel Accelerator for QEMU CPU Emulator (development version) COMMENT= Kernel Accelerator for QEMU CPU Emulator
ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS= i386 amd64
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
USE_GMAKE= yes USE_GMAKE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC}
CONFLICTS= kqemu-kmod-devel-[0-9]*
USE_RC_SUBR= kqemu USE_RC_SUBR= kqemu

26
emulators/kqemu-kmod/files/patch-kqemu-freebsd.c
View file

@ -1,5 +1,5 @@
Index: kqemu-freebsd.c Index: kqemu-freebsd.c
@@ -208,9 +208,17 @@ @@ -222,9 +222,17 @@
int CDECL kqemu_schedule(void) int CDECL kqemu_schedule(void)
{ {
/* kqemu_log("kqemu_schedule\n"); */ /* kqemu_log("kqemu_schedule\n"); */
@ -17,7 +17,27 @@ Index: kqemu-freebsd.c
return SIGPENDING(curthread); return SIGPENDING(curthread);
} }
#endif #endif
@@ -320,8 +328,15 @@ @@ -258,6 +266,10 @@
static struct clonedevs *kqemuclones;
static TAILQ_HEAD(,kqemu_instance) kqemuhead = TAILQ_HEAD_INITIALIZER(kqemuhead);
static eventhandler_tag clonetag;
+#ifndef D_NEEDMINOR
+/* see http://svn.freebsd.org/viewvc/base?view=revision&revision=179726 */
+#define D_NEEDMINOR 0
+#endif
#endif
static d_close_t kqemu_close;
@@ -282,7 +294,7 @@
/* bmaj */ -1
#else
.d_version = D_VERSION,
- .d_flags = D_NEEDGIANT,
+ .d_flags = D_NEEDGIANT | D_NEEDMINOR,
.d_open = kqemu_open,
.d_ioctl = kqemu_ioctl,
.d_close = kqemu_close,
@@ -334,8 +346,15 @@
#if __FreeBSD_version >= 500000 #if __FreeBSD_version >= 500000
dev->si_drv1 = NULL; dev->si_drv1 = NULL;
TAILQ_REMOVE(&kqemuhead, ks, kqemu_ent); TAILQ_REMOVE(&kqemuhead, ks, kqemu_ent);
@ -33,7 +53,7 @@ Index: kqemu-freebsd.c
free(ks, M_KQEMU); free(ks, M_KQEMU);
--kqemu_ref_count; --kqemu_ref_count;
} }
@@ -500,7 +515,13 @@ @@ -514,7 +533,13 @@
while ((ks = TAILQ_FIRST(&kqemuhead)) != NULL) { while ((ks = TAILQ_FIRST(&kqemuhead)) != NULL) {
kqemu_destroy(ks); kqemu_destroy(ks);
} }