[OE-core] [PATCH][pyro 1/4] v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script

[akuster808]

On 08/11/2017 05:34 PM, Martin Jansa wrote:
> * also add UVESA_MODE variable for easier change of resolution and respect it in QB_KERNEL_CMDLINE_APPEND
>    as well
> * don't use init script just to call modprobe
> * I wasn't able to test this all the way with runqemu, because runqemu
>    doesn't work on my system, but I've verified that the right params
>    appear there and that I can easily change UVESA_MODE from
>    conf/local.conf, the modules.d and modprobe.d files look OK:
>    OE qemux86@ ~/build/oe-core/tmp-glibc/deploy/images/qemux86/core-image-sato-qemux86-20170427212613.rootfs
>    $ cat etc/modules-load.d/uvesafb.conf
>    uvesafb
>
>    OE qemux86@ ~/build/oe-core/tmp-glibc/deploy/images/qemux86/core-image-sato-qemux86-20170427212613.rootfs
>    $ cat etc/modprobe.d/uvesafb.conf
>    options uvesafb mode_option=1600x1200-32
>
>    so I'll be able to drop this KERNEL_MODULE_AUTOLOAD +
>    KERNEL_MODULE_PROBECONF from my DISTRO conf.

All 4 merged to stagging.

thanks,
Armin
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>   meta/conf/machine/include/qemuboot-x86.inc |  7 +++++-
>   meta/recipes-bsp/v86d/v86d/fbsetup         |  3 ---
>   meta/recipes-bsp/v86d/v86d/uvesafb.conf    |  2 --
>   meta/recipes-bsp/v86d/v86d_0.1.10.bb       | 36 ------------------------------
>   4 files changed, 6 insertions(+), 42 deletions(-)
>   delete mode 100755 meta/recipes-bsp/v86d/v86d/fbsetup
>   delete mode 100644 meta/recipes-bsp/v86d/v86d/uvesafb.conf
>
> diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
> index acd03a1ce8..acf9d55c40 100644
> --- a/meta/conf/machine/include/qemuboot-x86.inc
> +++ b/meta/conf/machine/include/qemuboot-x86.inc
> @@ -10,6 +10,11 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo"
>   
>   QB_AUDIO_DRV = "alsa"
>   QB_AUDIO_OPT = "-soundhw ac97,es1370"
> -QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
> +QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
>   # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
>   QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
> +
> +KERNEL_MODULE_AUTOLOAD += "uvesafb"
> +KERNEL_MODULE_PROBECONF += "uvesafb"
> +UVESA_MODE ?= "640x480-32"
> +module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
> diff --git a/meta/recipes-bsp/v86d/v86d/fbsetup b/meta/recipes-bsp/v86d/v86d/fbsetup
> deleted file mode 100755
> index 2a409cc529..0000000000
> --- a/meta/recipes-bsp/v86d/v86d/fbsetup
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -#!/bin/sh
> -
> -/sbin/modprobe uvesafb
> diff --git a/meta/recipes-bsp/v86d/v86d/uvesafb.conf b/meta/recipes-bsp/v86d/v86d/uvesafb.conf
> deleted file mode 100644
> index 43789755d3..0000000000
> --- a/meta/recipes-bsp/v86d/v86d/uvesafb.conf
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -# Load uvesafb.ko at boot
> -uvesafb
> diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
> index eab466d30d..579a0a27eb 100644
> --- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb
> +++ b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
> @@ -11,8 +11,6 @@ PR = "r2"
>   
>   SRC_URI = "http://distfiles.gentoo.org/distfiles/${BP}.tar.bz2 \
>              file://Update-x86emu-from-X.org.patch \
> -           file://fbsetup \
> -           file://uvesafb.conf \
>              file://ar-from-env.patch \
>              file://aarch64-host.patch \
>   "
> @@ -23,9 +21,6 @@ SRC_URI[sha256sum] = "634964ae18ef68c8493add2ce150e3b4502badeb0d9194b4bd81241d25
>   PACKAGE_ARCH = "${MACHINE_ARCH}"
>   COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
>   
> -INITSCRIPT_NAME = "fbsetup"
> -INITSCRIPT_PARAMS = "start 0 S ."
> -
>   do_configure () {
>   	./configure --with-x86emu
>   }
> @@ -37,35 +32,4 @@ do_compile () {
>   do_install () {
>   	install -d ${D}${base_sbindir}
>   	install v86d ${D}${base_sbindir}/
> -
> -        # Only install fbsetup script if 'sysvinit' is in DISTRO_FEATURES
> -        if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
> -            install -d ${D}${sysconfdir}/init.d/
> -            install -m 0755 ${WORKDIR}/fbsetup ${D}${sysconfdir}/init.d/fbsetup
> -        fi
> -
> -        # Install systemd related configuration file
> -        if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> -            install -d ${D}${sysconfdir}/modules-load.d
> -            install -m 0644 ${WORKDIR}/uvesafb.conf ${D}${sysconfdir}/modules-load.d
> -        fi
> -}
> -
> -# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
> -# manually to avoid unnecessary postinst/preinst generated.
> -python __anonymous() {
> -    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
> -        d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
> -}
> -
> -inherit update-rc.d
> -
> -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
> -pkg_postinst_${PN} () {
> -	if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
> -		if [ -n "$D" ]; then
> -			OPTS="--root=$D"
> -		fi
> -		systemctl $OPTS mask fbsetup.service
> -	fi
>   }