diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2025-05-30 12:42:23 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-05-29 22:28:02 -0700 |
| commit | acacb59a48ba2b854074ac2a604bdd72dc443266 (patch) | |
| tree | 9fe22a7db9eddf0b5c55ce05b064a735e5f80161 /meta-oe/recipes-extended | |
| parent | c21040ea2d463f791bcd4b79e605831504decefa (diff) | |
| download | meta-openembedded-acacb59a48ba2b854074ac2a604bdd72dc443266.tar.gz | |
Revert "recipes: adapt to qemu.bbclass refactoring"
This reverts commit 24ff52ba3b73757cc0255a5b19822e2e4d3d4e0a.
The original patch was my bad. The patches for oe-core were re-worked,
but I forgot the recall this patch.
In fact, inheriting qemu is needed because it sets a clear barriar
for people to use qemu user mode. And the QEMU_OPTIONS settings
are also in qemu.bbclass.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/icewm/icewm_3.7.4.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/icewm/icewm_3.7.4.bb b/meta-oe/recipes-extended/icewm/icewm_3.7.4.bb index 77160b5b51..fa76f2e34e 100644 --- a/meta-oe/recipes-extended/icewm/icewm_3.7.4.bb +++ b/meta-oe/recipes-extended/icewm/icewm_3.7.4.bb | |||
| @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "e248e299616f417f5051423ea65a15668b71c1fdc9b5e477b47b1e80db | |||
| 10 | UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" | 10 | UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" |
| 11 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 11 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
| 12 | 12 | ||
| 13 | inherit autotools pkgconfig gettext perlnative features_check update-alternatives | 13 | inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives |
| 14 | REQUIRED_DISTRO_FEATURES = "x11" | 14 | REQUIRED_DISTRO_FEATURES = "x11" |
| 15 | 15 | ||
| 16 | EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ | 16 | EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ |
| @@ -31,7 +31,7 @@ do_compile:prepend:class-target() { | |||
| 31 | cd ${B} | 31 | cd ${B} |
| 32 | oe_runmake -C src genpref | 32 | oe_runmake -C src genpref |
| 33 | 33 | ||
| 34 | qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" | 34 | qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" |
| 35 | cat >qemuwrapper <<EOF | 35 | cat >qemuwrapper <<EOF |
| 36 | #!/bin/sh | 36 | #!/bin/sh |
| 37 | ${qemu_binary} src/genpref "\$@" | 37 | ${qemu_binary} src/genpref "\$@" |
