<div dir="ltr">ping</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 27, 2017 at 11:49 PM, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">* also add UVESA_MODE variable for easier change of resolution and respect it in QB_KERNEL_CMDLINE_APPEND<br>
as well<br>
* don't use init script just to call modprobe<br>
* I wasn't able to test this all the way with runqemu, because runqemu<br>
doesn't work on my system, but I've verified that the right params<br>
appear there and that I can easily change UVESA_MODE from<br>
conf/local.conf, the modules.d and modprobe.d files look OK:<br>
OE qemux86@ ~/build/oe-core/tmp-glibc/<wbr>deploy/images/qemux86/core-<wbr>image-sato-qemux86-<wbr>20170427212613.rootfs<br>
$ cat etc/modules-load.d/uvesafb.<wbr>conf<br>
uvesafb<br>
<br>
OE qemux86@ ~/build/oe-core/tmp-glibc/<wbr>deploy/images/qemux86/core-<wbr>image-sato-qemux86-<wbr>20170427212613.rootfs<br>
$ cat etc/modprobe.d/uvesafb.conf<br>
options uvesafb mode_option=1600x1200-32<br>
<br>
so I'll be able to drop this KERNEL_MODULE_AUTOLOAD +<br>
KERNEL_MODULE_PROBECONF from my DISTRO conf.<br>
<br>
Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
---<br>
meta/conf/machine/include/<wbr>qemuboot-x86.inc | 7 +++++-<br>
meta/recipes-bsp/v86d/v86d/<wbr>fbsetup | 3 ---<br>
meta/recipes-bsp/v86d/v86d/<wbr>uvesafb.conf | 2 --<br>
meta/recipes-bsp/v86d/<a href="http://v86d_0.1.10.bb" rel="noreferrer" target="_blank">v86d_0.<wbr>1.10.bb</a> | 36 ------------------------------<br>
4 files changed, 6 insertions(+), 42 deletions(-)<br>
delete mode 100755 meta/recipes-bsp/v86d/v86d/<wbr>fbsetup<br>
delete mode 100644 meta/recipes-bsp/v86d/v86d/<wbr>uvesafb.conf<br>
<br>
diff --git a/meta/conf/machine/include/<wbr>qemuboot-x86.inc b/meta/conf/machine/include/<wbr>qemuboot-x86.inc<br>
index 06ac983d4d..18f755a5d0 100644<br>
--- a/meta/conf/machine/include/<wbr>qemuboot-x86.inc<br>
+++ b/meta/conf/machine/include/<wbr>qemuboot-x86.inc<br>
@@ -10,6 +10,11 @@ QB_CPU_KVM_x86-64 = "-cpu kvm64"<br>
<br>
QB_AUDIO_DRV = "alsa"<br>
QB_AUDIO_OPT = "-soundhw ac97,es1370"<br>
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"<br>
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_<wbr>MODE} oprofile.timer=1 uvesafb.task_timeout=-1"<br>
# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy<br>
QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"<br>
+<br>
+KERNEL_MODULE_AUTOLOAD += "uvesafb"<br>
+KERNEL_MODULE_PROBECONF += "uvesafb"<br>
+UVESA_MODE ?= "640x480-32"<br>
+module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"<br>
diff --git a/meta/recipes-bsp/v86d/v86d/<wbr>fbsetup b/meta/recipes-bsp/v86d/v86d/<wbr>fbsetup<br>
deleted file mode 100755<br>
index 2a409cc529..0000000000<br>
--- a/meta/recipes-bsp/v86d/v86d/<wbr>fbsetup<br>
+++ /dev/null<br>
@@ -1,3 +0,0 @@<br>
-#!/bin/sh<br>
-<br>
-/sbin/modprobe uvesafb<br>
diff --git a/meta/recipes-bsp/v86d/v86d/<wbr>uvesafb.conf b/meta/recipes-bsp/v86d/v86d/<wbr>uvesafb.conf<br>
deleted file mode 100644<br>
index 43789755d3..0000000000<br>
--- a/meta/recipes-bsp/v86d/v86d/<wbr>uvesafb.conf<br>
+++ /dev/null<br>
@@ -1,2 +0,0 @@<br>
-# Load uvesafb.ko at boot<br>
-uvesafb<br>
diff --git a/meta/recipes-bsp/v86d/<a href="http://v86d_0.1.10.bb" rel="noreferrer" target="_blank">v86d_<wbr>0.1.10.bb</a> b/meta/recipes-bsp/v86d/<a href="http://v86d_0.1.10.bb" rel="noreferrer" target="_blank">v86d_<wbr>0.1.10.bb</a><br>
index eab466d30d..579a0a27eb 100644<br>
--- a/meta/recipes-bsp/v86d/<a href="http://v86d_0.1.10.bb" rel="noreferrer" target="_blank">v86d_<wbr>0.1.10.bb</a><br>
+++ b/meta/recipes-bsp/v86d/<a href="http://v86d_0.1.10.bb" rel="noreferrer" target="_blank">v86d_<wbr>0.1.10.bb</a><br>
@@ -11,8 +11,6 @@ PR = "r2"<br>
<br>
SRC_URI = "<a href="http://distfiles.gentoo.org/distfiles/${BP}.tar.bz2" rel="noreferrer" target="_blank">http://distfiles.gentoo.org/<wbr>distfiles/${BP}.tar.bz2</a> \<br>
file://Update-x86emu-from-X.<wbr>org.patch \<br>
- file://fbsetup \<br>
- file://uvesafb.conf \<br>
file://ar-from-env.patch \<br>
file://aarch64-host.patch \<br>
"<br>
@@ -23,9 +21,6 @@ SRC_URI[sha256sum] = "<wbr>634964ae18ef68c8493add2ce150e3<wbr>b4502badeb0d9194b4bd81241d25<br>
PACKAGE_ARCH = "${MACHINE_ARCH}"<br>
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'<br>
<br>
-INITSCRIPT_NAME = "fbsetup"<br>
-INITSCRIPT_PARAMS = "start 0 S ."<br>
-<br>
do_configure () {<br>
./configure --with-x86emu<br>
}<br>
@@ -37,35 +32,4 @@ do_compile () {<br>
do_install () {<br>
install -d ${D}${base_sbindir}<br>
install v86d ${D}${base_sbindir}/<br>
-<br>
- # Only install fbsetup script if 'sysvinit' is in DISTRO_FEATURES<br>
- if ${@bb.utils.contains('DISTRO_<wbr>FEATURES','sysvinit','true','<wbr>false',d)}; then<br>
- install -d ${D}${sysconfdir}/init.d/<br>
- install -m 0755 ${WORKDIR}/fbsetup ${D}${sysconfdir}/init.d/<wbr>fbsetup<br>
- fi<br>
-<br>
- # Install systemd related configuration file<br>
- if ${@bb.utils.contains('DISTRO_<wbr>FEATURES','systemd','true','<wbr>false',d)}; then<br>
- install -d ${D}${sysconfdir}/modules-<wbr>load.d<br>
- install -m 0644 ${WORKDIR}/uvesafb.conf ${D}${sysconfdir}/modules-<wbr>load.d<br>
- fi<br>
-}<br>
-<br>
-# As the recipe doesn't inherit systemd.bbclass, we need to set this variable<br>
-# manually to avoid unnecessary postinst/preinst generated.<br>
-python __anonymous() {<br>
- if not bb.utils.contains('DISTRO_<wbr>FEATURES', 'sysvinit', True, False, d):<br>
- d.setVar("INHIBIT_UPDATERCD_<wbr>BBCLASS", "1")<br>
-}<br>
-<br>
-inherit update-rc.d<br>
-<br>
-PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_<wbr>FEATURES','systemd','systemd-<wbr>systemctl-native','',d)}"<br>
-pkg_postinst_${PN} () {<br>
- if ${@bb.utils.contains('DISTRO_<wbr>FEATURES','systemd sysvinit','true','false',d)}; then<br>
- if [ -n "$D" ]; then<br>
- OPTS="--root=$D"<br>
- fi<br>
- systemctl $OPTS mask fbsetup.service<br>
- fi<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.12.2<br>
<br>
</font></span></blockquote></div><br></div>