mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

recipes: adapt to qemu.bbclass refactoring

Browse Source 
Avoid inheriting qemu.bbclass and use oe.qemu.xxx instead.

Also, the 'qemu-native' dep is replaced by 'qemuwrapper-cross' for
PACKAGE_WRITE_DEPS. qemuwrapper-cross is the one that is actually
used by postints and it has 'qemu-native' in DEPENDS.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Chen Qi
2025-04-10 06:41:44 -07:00
committed by Khem Raj
parent 46866b0022
commit 24ff52ba3b
9 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/espeak/espeak_1.48.04.bb
+2 -2
View File
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b20
S = "${WORKDIR}/espeak-${PV}-source"
DEPENDS = "portaudio-v19 qemu-helper-native"
inherit siteinfo qemu
inherit siteinfo
CXXFLAGS += "-DUSE_PORTAUDIO"
@@ -31,7 +31,7 @@ do_compile() {
oe_runmake
cd "${S}/platforms/big_endian"
qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${S}/platforms/big_endian', '${STAGING_DIR_TARGET}${base_libdir}'])}"
qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${S}/platforms/big_endian', '${STAGING_DIR_TARGET}${base_libdir}'])}"
cat >qemuwrapper <<EOF
#!/bin/sh
$qemu_binary "\$@"
meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb
+2 -2
View File
@@ -7,7 +7,7 @@ SECTION = "libs"
LICENSE = "HDF5"
LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e"
inherit cmake siteinfo qemu multilib_header multilib_script
inherit cmake siteinfo multilib_header multilib_script
DEPENDS += "qemu-native zlib"
@@ -30,7 +30,7 @@ EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}
gen_emu() {
# Write out a qemu wrapper that will be used by cmake
# so that it can run target helper binaries through that.
qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
cat > ${WORKDIR}/qemuwrapper << EOF
#!/bin/sh
$qemu_binary "\$@"
meta-oe/recipes-support/uim/uim_1.9.0.bb
+6 -6
View File
@@ -25,7 +25,7 @@ LEAD_SONAME = "libuim.so.1"
COMPATIBLE_HOST:riscv64 = "null"
COMPATIBLE_HOST:riscv32 = "null"
inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache
inherit features_check autotools pkgconfig gettext gtk-immodules-cache
REQUIRED_DISTRO_FEATURES = "x11"
@@ -118,10 +118,10 @@ FILES:uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
${datadir}/uim/skk*.scm \
"
PACKAGE_WRITE_DEPS += "qemu-native"
PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
pkg_postinst:uim-anthy() {
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim
${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim
else
uim-module-manager --register anthy --path ${datadir}/uim
fi
@@ -129,7 +129,7 @@ pkg_postinst:uim-anthy() {
pkg_prerm:uim-anthy() {
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy
${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy
else
uim-module-manager --path ${datadir}/uim --unregister anthy
fi
@@ -137,7 +137,7 @@ pkg_prerm:uim-anthy() {
pkg_postinst:uim-skk() {
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim
${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim
else
uim-module-manager --register skk --path ${datadir}/uim
fi
@@ -145,7 +145,7 @@ pkg_postinst:uim-skk() {
pkg_postrm:uim-skk() {
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk
${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk
else
uim-module-manager --path ${datadir}/uim --unregister skk
fi
meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
+2 -2
View File
@@ -18,14 +18,14 @@ SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f0
UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html"
UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar"
inherit autotools-brokensep multilib_header qemu
inherit autotools-brokensep multilib_header
S = "${WORKDIR}/unixODBC-${PV}"
EXTRA_OEMAKE += "LIBS=-lltdl"
EXTRA_OECONF += "--enable-utf8ini"
DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}"
QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}"
QEMU_WRAPPER = "${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}"
do_configure:prepend() {
# old m4 files will cause libtool version don't match