Update the append to work with the improved qemu.inc. Enable gcrypt PACKAGECONFIG options.
In order to enable libgcrypt the QEMU configure must be patched to handle pkg-config support for libgcrypt. This is because upstream libgcrypt does not provide pkg-config support but OE does. The solution used works around the need to patch QEMU, by implementing the patch as a sed replace so that a patch does not need to be used and maintained across versions. Signed-off-by: Nathan Rossi <[email protected]> --- recipes-devtools/qemu/qemu-xilinx_2017.1.bb | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb b/recipes-devtools/qemu/qemu-xilinx_2017.1.bb index f291ebb42f..8fba4d1fe6 100644 --- a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb +++ b/recipes-devtools/qemu/qemu-xilinx_2017.1.bb @@ -11,20 +11,17 @@ LIC_FILES_CHKSUM = " \ " SRCREV = "a83265d7403ee49c9a911c920961ef29deac96eb" -SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1 \ - " +SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1" S = "${WORKDIR}/git" # Disable KVM completely -KVMENABLE = "--disable-kvm" +PACKAGECONFIG_remove = "kvm" -# Strip all appends (needed because qemu.inc adds patches using overrides) -SRC_URI[_append] = "" +# Enable libgcrypt +PACKAGECONFIG_append = " gcrypt" -DISABLE_STATIC_pn-qemu-xilinx = "" -DISABLE_STATIC_pn-qemu-xilinx-native = "" -DISABLE_STATIC_pn-nativesdk-qemu-xilinx = "" +DISABLE_STATIC_pn-${PN} = "" PTEST_ENABLED = "" @@ -32,13 +29,15 @@ PTEST_ENABLED = "" EXTRA_OECONF_append = " \ --bindir=${bindir}/qemu-xilinx \ --libexecdir=${libexecdir}/qemu-xilinx \ - --datadir=${datadir}/qemu-xilinx \ " -do_install() { - export STRIP="true" - autotools_do_install +do_configure_prepend() { + # rewrite usage of 'libgcrypt-config' with 'pkg-config libgcrypt' + sed -r -i 's/libgcrypt-config(\s*--)/pkg-config libgcrypt\1/g' ${S}/configure +} +do_install_append() { # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi } + -- 2.11.0 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
