From 7622c4f6c050f26f252066a0fcaacdbf340dcefa 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) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold --- .../qemu/qemu-git/remove-hardcoded-libexec.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch (limited to 'meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch') diff --git a/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch b/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch deleted file mode 100644 index 83f5463aad..0000000000 --- a/meta/recipes-devtools/qemu/qemu-git/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