diff options
| -rw-r--r-- | conf/machine/include/qoriq.inc | 3 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch (renamed from recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch) | 0 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu-qoriq/run-ptest (renamed from recipes-devtools/qemu/qemu/run-ptest) | 0 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu-qoriq_git.bb (renamed from recipes-devtools/qemu/qemu_fslgit.bb) | 14 |
4 files changed, 13 insertions, 4 deletions
diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc index 70cd56b..a32f1bc 100644 --- a/conf/machine/include/qoriq.inc +++ b/conf/machine/include/qoriq.inc @@ -7,8 +7,7 @@ PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux" PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" PREFERRED_PROVIDER_openssl = "openssl-qoriq" - -PREFERRED_VERSION_qemu = "2.4.0+fsl" +PREFERRED_PROVIDER_qemu = "qemu-qoriq" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" diff --git a/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch index a99f720..a99f720 100644 --- a/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch +++ b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch diff --git a/recipes-devtools/qemu/qemu/run-ptest b/recipes-devtools/qemu/qemu-qoriq/run-ptest index f4b8e97..f4b8e97 100644 --- a/recipes-devtools/qemu/qemu/run-ptest +++ b/recipes-devtools/qemu/qemu-qoriq/run-ptest diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb index 08a31a9..c70ed14 100644 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ b/recipes-devtools/qemu/qemu-qoriq_git.bb @@ -5,8 +5,16 @@ require recipes-devtools/qemu/qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -# This means QEMU v2.4.0 with FSL specific patches applied -PV = "2.4.0+fsl" +PROVIDES = "qemu" + +python() { + pkgs = d.getVar('PACKAGES', True).split() + for p in pkgs: + if 'qemu-qoriq' in p: + d.appendVar("RPROVIDES_%s" % p, p.replace('qemu-qoriq', 'qemu')) + d.appendVar("RCONFLICTS_%s" % p, p.replace('qemu-qoriq', 'qemu')) + d.appendVar("RREPLACES_%s" % p, p.replace('qemu-qoriq', 'qemu')) +} # remove not supported PACKAGECONFIG by this recipe PACKAGECONFIG[gcrypt] = "" @@ -34,6 +42,8 @@ EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}" EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}" PACKAGECONFIG_append = " libusb" +DISABLE_STATIC = "" + do_configure_prepend() { export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config } |