recipes: adapt to qemu.bbclass refactoring
PATCH 1/2 recipes: adapt to qemu.bbclass refactoring
From: Chen Qi <[email protected]>
Avoid inheriting qemu.bbclass and use oe.qemu.xxx instead.
Also, the unneeded 'qemu-native' dep is removed from PACKAGE_WRITE_DEPS. The package creating process does not need qemu-native.
Signed-off-by Chen Qi <[email protected]>
--- meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb | 4 ++-- meta-oe/recipes-devtools/nodejs/nodejs_22.14.0.bb | 6 +++--- meta-oe/recipes-extended/icewm/icewm_3.7.3.bb | 4 ++-- meta-oe/recipes-graphics/graphviz/graphviz_12.2.1.bb | 6 ++---- meta-oe/recipes-support/espeak/espeak_1.48.04.bb | 4 ++-- meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb | 4 ++-- meta-oe/recipes-support/uim/uim_1.9.0.bb | 11 +++++------ meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb | 4 ++-- 8 files changed, 20 insertions(+), 23 deletions(-)
meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb +2 -2
@@ -28,13 +28,13 @@ PACKAGECONFIG[fortran] = "--with-cross=${WORKDIR}/cross_values.txt --enable-fort LDFLAGS:append:x86-64 = " -lgcc" LDFLAGS:append:x86 = " -lgcc" -inherit autotools gettext pkgconfig qemu +inherit autotools gettext pkgconfig DEPENDS += "qemu-native" do_configure() { if [ "${@bb.utils.contains('PACKAGECONFIG', 'fortran', '1', '', d)}" = "1" ]; then - 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-devtools/nodejs/nodejs_22.14.0.bb +3 -3
@@ -9,7 +9,7 @@ DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-nati DEPENDS:append:class-target = " qemu-native" DEPENDS:append:class-native = " c-ares-native" -inherit pkgconfig python3native qemu ptest siteinfo +inherit pkgconfig python3native ptest siteinfo COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*"
@@ -107,8 +107,8 @@ python do_create_v8_qemu_wrapper () { on the host.""" qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), d.expand('${STAGING_DIR_HOST}${base_libdir}')] - qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), - qemu_libdirs) + qemu_cmd = oe.qemu.qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), + qemu_libdirs) if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": qemu_cmd = ""
meta-oe/recipes-extended/icewm/icewm_3.7.3.bb +2 -2
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "4d845d8af6194fa25b36524467ae9fdcca2faed5c4046515e3bc633ff1 UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" -inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives +inherit autotools pkgconfig gettext perlnative features_check update-alternatives REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--with-libdir=${datadir}/icewm \
@@ -31,7 +31,7 @@ do_compile:prepend:class-target() { cd ${B} oe_runmake -C src genpref - qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" cat >qemuwrapper <<EOF #!/bin/sh ${qemu_binary} src/genpref "\$@"
meta-oe/recipes-graphics/graphviz/graphviz_12.2.1.bb +2 -4
@@ -16,7 +16,7 @@ DEPENDS = " \ DEPENDS:append:class-target = " ${BPN}-native" DEPENDS:append:class-nativesdk = " ${BPN}-native" -inherit autotools-brokensep pkgconfig gettext qemu +inherit autotools-brokensep pkgconfig gettext SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \ "
@@ -84,7 +84,7 @@ SYSROOT_PREPROCESS_FUNCS:append:class-native = " graphviz_sstate_postinst" pkg_postinst:${PN} () { if [ -n "$D" ]; then if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then - ${@qemu_run_binary(d, '$D', '${bindir}/dot')} -c + ${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/dot')} -c fi else dot -c
@@ -96,8 +96,6 @@ pkg_postrm:${PN} () { rmdir --ignore-fail-on-non-empty $D${libdir}/graphviz } -PACKAGE_WRITE_DEPS += "qemu-native" - PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" FILES:${PN}-python += "${PYTHON_SITEPACKAGES_DIR}/ ${libdir}/graphviz/python/"
meta-oe/recipes-support/espeak/espeak_1.48.04.bb +2 -2
@@ -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
@@ -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 +5 -6
@@ -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,9 @@ FILES:uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ ${datadir}/uim/skk*.scm \ " -PACKAGE_WRITE_DEPS += "qemu-native" 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 +128,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 +136,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 +144,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
@@ -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
Signature · 1 line
2.49.0
PATCH 2/2 waf-samba.bbclass: adapt to qemu.bbclass refactoring
From: Chen Qi <[email protected]>
Avoid inheriting qemu.bbclass and use oe.qemu.xxx instead.
Signed-off-by Chen Qi <[email protected]>
--- meta-networking/classes/waf-samba.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-networking/classes/waf-samba.bbclass +2 -2
@@ -1,7 +1,7 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf # -inherit qemu python3native +inherit python3native DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python3"
@@ -77,7 +77,7 @@ do_configure() { echo 'Checking uname release type: "${OLDEST_KERNEL}"' >> ${CROSS_ANSWERS} cat ${WAF_CROSS_ANSWERS_PATH}/cross-answers-${TARGET_ARCH}.txt >> ${CROSS_ANSWERS} - qemu_binary="${@qemu_target_binary(d)}" + qemu_binary="${@oe.qemu.qemu_target_binary(d)}" if [ "${qemu_binary}" = "qemu-allarch" ]; then qemu_binary="qemuwrapper" fi
Signature · 1 line
2.49.0