diff options
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-native.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_6.2.0.bb | 4 | ||||
-rwxr-xr-x | scripts/runqemu | 1 |
4 files changed, 1 insertions, 19 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc index 5d3ba3486c..d9acc613f9 100644 --- a/meta/recipes-devtools/qemu/qemu-native.inc +++ b/meta/recipes-devtools/qemu/qemu-native.inc | |||
@@ -5,7 +5,3 @@ inherit native | |||
5 | EXTRA_OEMAKE:append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" | 5 | EXTRA_OEMAKE:append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" |
6 | 6 | ||
7 | LDFLAGS:append = " -fuse-ld=bfd" | 7 | LDFLAGS:append = " -fuse-ld=bfd" |
8 | |||
9 | do_install:append() { | ||
10 | ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} | ||
11 | } | ||
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 843de3337a..325118cfb3 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -138,17 +138,6 @@ do_install:append() { | |||
138 | } | 138 | } |
139 | # END of qemu-mips workaround | 139 | # END of qemu-mips workaround |
140 | 140 | ||
141 | make_qemu_wrapper() { | ||
142 | gdk_pixbuf_module_file=`pkg-config --variable=gdk_pixbuf_cache_file gdk-pixbuf-2.0` | ||
143 | |||
144 | for tool in `ls ${D}${bindir}/qemu-system-*`; do | ||
145 | create_wrapper $tool \ | ||
146 | GDK_PIXBUF_MODULE_FILE=$gdk_pixbuf_module_file \ | ||
147 | FONTCONFIG_PATH=/etc/fonts \ | ||
148 | GTK_THEME=Adwaita | ||
149 | done | ||
150 | } | ||
151 | |||
152 | # Disable kvm/virgl/mesa on targets that do not support it | 141 | # Disable kvm/virgl/mesa on targets that do not support it |
153 | PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" | 142 | PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" |
154 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" | 143 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" |
diff --git a/meta/recipes-devtools/qemu/qemu_6.2.0.bb b/meta/recipes-devtools/qemu/qemu_6.2.0.bb index c9a53e3b05..062ed32b01 100644 --- a/meta/recipes-devtools/qemu/qemu_6.2.0.bb +++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb | |||
@@ -12,10 +12,6 @@ EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" | |||
12 | EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" | 12 | EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" |
13 | EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" | 13 | EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" |
14 | 14 | ||
15 | do_install:append:class-nativesdk() { | ||
16 | ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} | ||
17 | } | ||
18 | |||
19 | PACKAGECONFIG ??= " \ | 15 | PACKAGECONFIG ??= " \ |
20 | fdt sdl kvm pie \ | 16 | fdt sdl kvm pie \ |
21 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ | 17 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ |
diff --git a/scripts/runqemu b/scripts/runqemu index 4e05c1bb15..07429372ea 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -1369,6 +1369,7 @@ class BaseConfig(object): | |||
1369 | if self.sdl == True: | 1369 | if self.sdl == True: |
1370 | self.qemu_opt += 'sdl,' | 1370 | self.qemu_opt += 'sdl,' |
1371 | elif self.gtk == True: | 1371 | elif self.gtk == True: |
1372 | os.environ['FONTCONFIG_PATH'] = '/etc/fonts' | ||
1372 | self.qemu_opt += 'gtk,' | 1373 | self.qemu_opt += 'gtk,' |
1373 | 1374 | ||
1374 | if self.gl == True: | 1375 | if self.gl == True: |