diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2010-01-17 16:20:56 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2010-01-17 16:20:56 +0000 |
| commit | d4e517700042730d5420402bec25ccfa88fed6c8 (patch) | |
| tree | fa8e73dd336e8f03ab2c5b0677215cf74cc8885a /emulators/qemu-devel/files/patch-bg | |
| parent | Add cl-trivial-features, which ensures consistent *FEATURES* across multiple (diff) | |
Finally bring qemu 0.12.1 into ports as the new emulators/qemu-devel,
release announcement is here:
http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg02151.html
Quoting from pkg-message:
- kqemu is no longer supported in qemu upstream after the 0.11 branch
was created, which means also not in this version. (Linux has moved
on to kvm now for qemu(-like) virtualization needs, so if you want qemu
to go faster and don't want to switch to virtualbox or stick to the older
emulators/qemu port which is at 0.11.1 atm and as such still supports
kqemu you should help getting the FreeBSD kvm port updated and
completed:
http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD
)
Notes
Notes:
svn path=/head/; revision=248018
Diffstat (limited to 'emulators/qemu-devel/files/patch-bg')
| -rw-r--r-- | emulators/qemu-devel/files/patch-bg | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/emulators/qemu-devel/files/patch-bg b/emulators/qemu-devel/files/patch-bg index 7e645929d40e..b1a37f58345f 100644 --- a/emulators/qemu-devel/files/patch-bg +++ b/emulators/qemu-devel/files/patch-bg @@ -1,15 +1,26 @@ -Index: qemu/Makefile.target -@@ -179,7 +179,7 @@ +Index: qemu/Makefile +@@ -16,6 +16,8 @@ + + VPATH=$(SRC_PATH):$(SRC_PATH)/hw + ++QEMU_CFLAGS+= -DSMBD_COMMAND=\"${LOCALBASE}/sbin/smbd\" -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\" ++ + LIBS+=-lz $(LIBS_TOOLS) - ######################################################### + ifdef BUILD_DOCS +Index: qemu/Makefile.target +@@ -6,6 +6,7 @@ + TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) + VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw + QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H ++QEMU_CFLAGS+= -DSMBD_COMMAND=\"${LOCALBASE}/sbin/smbd\" -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\" --CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -+CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DSMBD_COMMAND=\"${LOCALBASE}/sbin/smbd\" -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\" - LIBS+=-lm - ifndef CONFIG_USER_ONLY - LIBS+=-lz -Index: qemu/vl.c -@@ -133,10 +133,12 @@ + ifdef CONFIG_USER_ONLY + # user emulator name +Index: qemu/net.h +@@ -99,12 +99,14 @@ + int slirp_is_inited(void); + void net_client_check(void); -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" @@ -20,7 +31,19 @@ Index: qemu/vl.c #define SMBD_COMMAND "/usr/sfw/sbin/smbd" #else #define SMBD_COMMAND "/usr/sbin/smbd" + #endif +#endif + #endif +Index: qemu/net/tap.h +@@ -29,8 +29,8 @@ + #include "qemu-common.h" + #include "qemu-option.h" + +-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" +-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" ++#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" ++#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" + + int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan); - //#define DEBUG_UNUSED_IOPORT |