From 505f88fd3e169b3481c2bb2afbef535db00d095f Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 10 Dec 2012 10:08:13 +0200 Subject: qemu: upgrade to 1.3.0 remove-hardcoded-libexec.patch: removed - included in the new version qemu-vmware-vga-depth.patch: removed - doesn't apply anymore - the problem addressed by the patch is fixed by reverting commit 1f202568e0553b416483e5993f1bde219c22cf72 Revert-vmware_vga-Add-back-some-info-in-local-state-.patch: - VMware VGA requires that the depth presented to the guest to be the same as the Display Surface depth in order to do not corrupt the display - do not cache the DS depth (the depth might change) - revert commit 1f202568 - QEMU now uses pixman (DEPENDS += "pixman") - rearrange the recipe in order to mimic the bitbake flow - update both variants (.tar.bz2, git) (From OE-Core rev: 7622c4f6c050f26f252066a0fcaacdbf340dcefa) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch | 30 ------ .../qemu/qemu-1.2.0/enable-i386-linux-user.patch | 55 ----------- .../fallback-to-safe-mmap_min_addr.patch | 39 -------- .../qemu/qemu-1.2.0/fix-configure-checks.patch | 22 ----- .../qemu/qemu-1.2.0/init-info.patch | 18 ---- .../qemu/qemu-1.2.0/larger_default_ram_size.patch | 22 ----- .../qemu/qemu-1.2.0/linker-flags.patch | 25 ----- .../qemu/qemu-1.2.0/no-strip.patch | 15 --- .../qemu/qemu-1.2.0/powerpc_rom.bin | Bin 4096 -> 0 bytes .../qemu/qemu-1.2.0/qemu-vmware-vga-depth.patch | 106 --------------------- .../qemu/qemu-1.2.0/relocatable_sdk.patch | 34 ------- .../qemu/qemu-1.2.0/remove-hardcoded-libexec.patch | 41 -------- 12 files changed, 407 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/enable-i386-linux-user.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/fallback-to-safe-mmap_min_addr.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/init-info.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/larger_default_ram_size.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/no-strip.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/powerpc_rom.bin delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/qemu-vmware-vga-depth.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch (limited to 'meta/recipes-devtools/qemu/qemu-1.2.0') diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch deleted file mode 100644 index f3ebde6364..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch +++ /dev/null @@ -1,30 +0,0 @@ -After kernel commit: - -http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08 - -It appears that the emulated colours in qemu are incorrect and that -the red and blue channels are reversed. This patch reverses that logic -so the colours are correctly displayed on the versatile platform which -doesn't support the BGR bit. - -RP 16/9/2011 - -Upstream-Status: Pending - -Index: qemu-1.2.0/hw/pl110.c -=================================================================== ---- qemu-1.2.0.orig/hw/pl110.c 2012-09-06 14:07:27.619821133 -0700 -+++ qemu-1.2.0/hw/pl110.c 2012-09-06 14:12:07.699829648 -0700 -@@ -168,7 +168,11 @@ - fprintf(stderr, "pl110: Bad color depth\n"); - exit(1); - } -- if (s->cr & PL110_CR_BGR) -+ -+ if (s->version && s->bpp == BPP_16) -+ /* Code assumes BPP_16 == 565 and BGR is never set on the versatile in 565 mode */ -+ bpp_offset = 0; -+ else if (s->cr & PL110_CR_BGR) - bpp_offset = 0; - else - bpp_offset = 24; diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/enable-i386-linux-user.patch deleted file mode 100644 index bb0d6a3848..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/enable-i386-linux-user.patch +++ /dev/null @@ -1,55 +0,0 @@ -Enable i386-linux-user - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [configuration] - -Index: qemu-0.14.0/Makefile.target -=================================================================== ---- qemu-0.14.0.orig/Makefile.target -+++ qemu-0.14.0/Makefile.target -@@ -78,8 +78,13 @@ ifeq ($(TARGET_BASE_ARCH), i386) - libobj-y += cpuid.o - endif - libobj-$(CONFIG_NEED_MMU) += mmu.o -+ifndef CONFIG_LINUX_USER - libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o - libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o -+else -+libobj-$(TARGET_I386) += dummygl.o -+libobj-$(TARGET_X86_64) += dummygl.o -+endif #CONFIG_LINUX_USER - libobj-$(TARGET_ARM) += dummygl.o - libobj-$(TARGET_MIPS) += dummygl.o - libobj-$(TARGET_PPC) += dummygl.o -Index: qemu-0.14.0/target-i386/dummygl.c -=================================================================== ---- /dev/null -+++ qemu-0.14.0/target-i386/dummygl.c -@@ -0,0 +1,26 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window) -+{ -+ -+} -+ -+void opengl_process_enable(void) -+{ -+ -+} -+ -+ -+void mem_opengl(uint64_t ptr) -+{ -+ -+} -+ -+void helper_opengl(void) -+{ -+} diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/fallback-to-safe-mmap_min_addr.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/fallback-to-safe-mmap_min_addr.patch deleted file mode 100644 index 2075386b9f..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/fallback-to-safe-mmap_min_addr.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 13 May 2010 12:23:40 +0200 -Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read - -* 65536 is default at least for ubuntu and fedora. ---- - linux-user/main.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -Upstream-Status: Pending - -Index: qemu-0.14.0/linux-user/main.c -=================================================================== ---- qemu-0.14.0.orig/linux-user/main.c -+++ qemu-0.14.0/linux-user/main.c -@@ -36,6 +36,7 @@ - #include "envlist.h" - - #define DEBUG_LOGFILE "/tmp/qemu.log" -+#define MMAP_MIN_ADDR_DEFAULT 65536 - - char *exec_path; - -@@ -3010,8 +3011,14 @@ int main(int argc, char **argv, char **e - if (fscanf(fp, "%lu", &tmp) == 1) { - mmap_min_addr = tmp; - qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr); -+ } else { -+ qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT); -+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT; - } - fclose(fp); -+ } else { -+ qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT); -+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT; - } - } - diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch deleted file mode 100644 index ef77c92842..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch +++ /dev/null @@ -1,22 +0,0 @@ -In native builds, qemu can fail to find zlib development files in the native -sysroot and the build machine might not have zlib-dev packages installed. - -Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are -added and files in the sysroot can be found. - -Patch from Paul Eggleton, Comments by RP 28/11/10 - -Upstream-Status: Inappropriate [embedded specific] - -Index: qemu-1.2.0/configure -=================================================================== ---- qemu-1.2.0.orig/configure 2012-09-05 07:03:06.000000000 -0700 -+++ qemu-1.2.0/configure 2012-09-06 13:55:07.007793823 -0700 -@@ -281,6 +281,7 @@ - QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" - QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" - QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" -+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" - if test "$debug_info" = "yes"; then - CFLAGS="-g $CFLAGS" - LDFLAGS="-g $LDFLAGS" diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/init-info.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/init-info.patch deleted file mode 100644 index 2250444a2b..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/init-info.patch +++ /dev/null @@ -1,18 +0,0 @@ -# This is a workaround to the crashes seen on Ubuntu. Setting info to zero -# makes info.info.x11.display zero and avoids the calls to -# opengl_exec_set_parent_window, one of which is crashing. - -Upstream-Status: Pending - -Index: qemu-0.14.0/ui/sdl.c -=================================================================== ---- qemu-0.14.0.orig/ui/sdl.c -+++ qemu-0.14.0/ui/sdl.c -@@ -863,6 +863,7 @@ void sdl_display_init(DisplayState *ds, - vi = SDL_GetVideoInfo(); - host_format = *(vi->vfmt); - -+ bzero(&info, sizeof(info)); - SDL_GetWMInfo(&info); - if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display) - opengl_exec_set_parent_window(info.info.x11.display, diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/larger_default_ram_size.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/larger_default_ram_size.patch deleted file mode 100644 index 711c36071d..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/larger_default_ram_size.patch +++ /dev/null @@ -1,22 +0,0 @@ -This patch is taken from debian. 128M is too less sometimes if distro -with lot of packages is booted so this patch raises the default to 384M - -It has not been applied to upstream qemu - -Khem Raj - -Upstream-Status: Pending - -Index: qemu-0.14.0/vl.c -=================================================================== ---- qemu-0.14.0.orig/vl.c -+++ qemu-0.14.0/vl.c -@@ -168,7 +168,7 @@ int main(int argc, char **argv) - //#define DEBUG_NET - //#define DEBUG_SLIRP - --#define DEFAULT_RAM_SIZE 128 -+#define DEFAULT_RAM_SIZE 384 - - #define MAX_VIRTIO_CONSOLES 1 - diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch deleted file mode 100644 index 0106ae2420..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fedora 13 switched the default behaviour of the linker to no longer -indirectly link to required libraries (i.e. dependencies of a library -already linked to). Therefore we need to explicitly pass the depended on -libraries into the linker for building to work on Fedora 13. - -More information is available on the Fedora Wiki: -https://fedoraproject.org/wiki/UnderstandingDSOLinkChange - -JL - 15/06/10 - -Upstream-Status: Inappropriate [configuration] - -Index: qemu-1.2.0/Makefile.target -=================================================================== ---- qemu-1.2.0.orig/Makefile.target 2012-09-05 07:03:06.000000000 -0700 -+++ qemu-1.2.0/Makefile.target 2012-09-06 13:42:24.819764288 -0700 -@@ -130,7 +130,7 @@ - obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o - obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o - obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o --LIBS+=-lz -+LIBS+=-lz -lX11 -ldl - - QEMU_CFLAGS += $(VNC_TLS_CFLAGS) - QEMU_CFLAGS += $(VNC_SASL_CFLAGS) diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/no-strip.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/no-strip.patch deleted file mode 100644 index d6a4377cd0..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/no-strip.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: qemu-0.14.0/Makefile -=================================================================== ---- qemu-0.14.0.orig/Makefile -+++ qemu-0.14.0/Makefile -@@ -235,7 +235,7 @@ install-sysconfig: - install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" - ifneq ($(TOOLS),) -- $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" -+ $(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)" - endif - ifneq ($(BLOBS),) - $(INSTALL_DIR) "$(DESTDIR)$(datadir)" diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/powerpc_rom.bin b/meta/recipes-devtools/qemu/qemu-1.2.0/powerpc_rom.bin deleted file mode 100644 index c4044296c5..0000000000 Binary files a/meta/recipes-devtools/qemu/qemu-1.2.0/powerpc_rom.bin and /dev/null differ diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/qemu-vmware-vga-depth.patch deleted file mode 100644 index a1b8035b70..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/qemu-vmware-vga-depth.patch +++ /dev/null @@ -1,106 +0,0 @@ -# fix VMware VGA driver depth calculation error, which may cause segmentation fault -# -# ktian1, 06/29/2010 - -Upstream-Status: Pending - -Index: qemu-1.2.0/console.h -=================================================================== ---- qemu-1.2.0.orig/console.h 2012-09-06 14:12:23.371832381 -0700 -+++ qemu-1.2.0/console.h 2012-09-06 14:12:23.627832390 -0700 -@@ -171,6 +171,12 @@ - void (*free_displaysurface)(DisplaySurface *surface); - }; - -+struct DisplayPostCallback { -+ void (*postcall) (void *); -+ void *parm; -+ struct DisplayPostCallback *next; -+}; -+ - struct DisplayState { - struct DisplaySurface *surface; - void *opaque; -@@ -178,6 +184,7 @@ - - struct DisplayAllocator* allocator; - struct DisplayChangeListener* listeners; -+ struct DisplayPostCallback* postcalls; - - void (*mouse_set)(int x, int y, int on); - void (*cursor_define)(QEMUCursor *cursor); -@@ -233,6 +240,12 @@ - ds->listeners = dcl; - } - -+static inline void register_displaypostcallback(DisplayState *ds, DisplayPostCallback *dpc) -+{ -+ dpc->next = ds->postcalls; -+ ds->postcalls = dpc; -+} -+ - static inline void dpy_update(DisplayState *s, int x, int y, int w, int h) - { - struct DisplayChangeListener *dcl = s->listeners; -Index: qemu-1.2.0/hw/vmware_vga.c -=================================================================== ---- qemu-1.2.0.orig/hw/vmware_vga.c 2012-09-06 14:12:23.371832381 -0700 -+++ qemu-1.2.0/hw/vmware_vga.c 2012-09-06 14:18:05.595845288 -0700 -@@ -1081,6 +1081,8 @@ - static void vmsvga_init(struct vmsvga_state_s *s, - MemoryRegion *address_space, MemoryRegion *io) - { -+ DisplayPostCallback *dpc; -+ - s->scratch_size = SVGA_SCRATCH_SIZE; - s->scratch = g_malloc(s->scratch_size * 4); - -@@ -1098,6 +1100,10 @@ - vga_common_init(&s->vga); - vga_init(&s->vga, address_space, io, true); - vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); -+ dpc = g_malloc0(sizeof(DisplayPostCallback)); -+ dpc->postcall = vmsvga_reset; -+ dpc->parm = s; -+ register_displaypostcallback(s->vga.ds, dpc); - - s->depth = ds_get_bits_per_pixel(s->vga.ds); - s->bypp = ds_get_bytes_per_pixel(s->vga.ds); -Index: qemu-1.2.0/qemu-common.h -=================================================================== ---- qemu-1.2.0.orig/qemu-common.h 2012-09-06 14:12:23.371832381 -0700 -+++ qemu-1.2.0/qemu-common.h 2012-09-06 14:12:23.643832391 -0700 -@@ -250,6 +250,7 @@ - typedef struct DisplayChangeListener DisplayChangeListener; - typedef struct DisplaySurface DisplaySurface; - typedef struct DisplayAllocator DisplayAllocator; -+typedef struct DisplayPostCallback DisplayPostCallback; - typedef struct PixelFormat PixelFormat; - typedef struct TextConsole TextConsole; - typedef TextConsole QEMUConsole; -Index: qemu-1.2.0/vl.c -=================================================================== ---- qemu-1.2.0.orig/vl.c 2012-09-06 14:12:23.371832381 -0700 -+++ qemu-1.2.0/vl.c 2012-09-06 14:17:32.635844142 -0700 -@@ -2352,6 +2352,7 @@ - char boot_devices[33] = "cad"; /* default to HD->floppy->CD-ROM */ - DisplayState *ds; - DisplayChangeListener *dcl; -+ DisplayPostCallback *dpc; - int cyls, heads, secs, translation; - QemuOpts *hda_opts = NULL, *opts, *machine_opts; - QemuOptsList *olist; -@@ -3699,6 +3700,13 @@ - - /* display setup */ - dpy_resize(ds); -+ dpc = ds->postcalls; -+ while (dpc != NULL) { -+ if (dpc->postcall != NULL) -+ dpc->postcall(dpc->parm); -+ dpc = dpc->next; -+ } -+ - dcl = ds->listeners; - while (dcl != NULL) { - if (dcl->dpy_refresh != NULL) { diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch deleted file mode 100644 index 0a01a8a048..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Inappropriate [SDK specific] - -In order to be able to change the dynamic loader path when relocating -binaries, the interp section has to be made big enough to accomodate -the new path (4096 is the maximum path length in Linux). - -Signed-off-by: Laurentiu Palcu - -Index: qemu-1.2.0/i386.ld -=================================================================== ---- qemu-1.2.0.orig/i386.ld -+++ qemu-1.2.0/i386.ld -@@ -8,7 +8,7 @@ SECTIONS - { - /* Read-only sections, merged into text segment: */ - . = 0x60000000 + SIZEOF_HEADERS; -- .interp : { *(.interp) } -+ .interp : { *(.interp); . = 0x1000; } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } -Index: qemu-1.2.0/x86_64.ld -=================================================================== ---- qemu-1.2.0.orig/x86_64.ld -+++ qemu-1.2.0/x86_64.ld -@@ -6,7 +6,7 @@ SECTIONS - { - /* Read-only sections, merged into text segment: */ - . = 0x60000000 + SIZEOF_HEADERS; -- .interp : { *(.interp) } -+ .interp : { *(.interp); . = 0x1000; } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch deleted file mode 100644 index 8db460a5f6..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch +++ /dev/null @@ -1,41 +0,0 @@ -This will allow the libexecdir to be set on the command line -and have the files installed and used from the correct location - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Saul Wold - -Index: qemu-1.2.0/configure -=================================================================== ---- qemu-1.2.0.orig/configure -+++ qemu-1.2.0/configure -@@ -183,6 +183,7 @@ datadir="\${prefix}/share" - qemu_docdir="\${prefix}/share/doc/qemu" - bindir="\${prefix}/bin" - libdir="\${prefix}/lib" -+libexecdir="\${prefix}/libexec" - includedir="\${prefix}/include" - sysconfdir="\${prefix}/etc" - confsuffix="/qemu" -@@ -644,7 +645,9 @@ for opt do - ;; - --sysconfdir=*) sysconfdir="$optarg" - ;; -- --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\ -+ --libexecdir=*) libexecdir="$optarg" -+ ;; -+ --sbindir=*|--sharedstatedir=*|--localstatedir=*|\ - --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\ - --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*) - # These switches are silently ignored, for compatibility with -@@ -3190,8 +3193,8 @@ echo "sysconfdir=$sysconfdir" >> $config - echo "qemu_confdir=$qemu_confdir" >> $config_host_mak - echo "qemu_datadir=$qemu_datadir" >> $config_host_mak - echo "qemu_docdir=$qemu_docdir" >> $config_host_mak --echo "libexecdir=\${prefix}/libexec" >> $config_host_mak --echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak -+echo "libexecdir=$libexecdir" >> $config_host_mak -+echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak - - echo "ARCH=$ARCH" >> $config_host_mak - if test "$debug_tcg" = "yes" ; then -- cgit v1.2.3-54-g00ecf