v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script

From: Gan Yau Wai <[email protected]>

The package_qa_check_rdepends() in insane.bbclass has incorrectly replace its localdata OVERRIDES value with the package name. Fixing it by appending the package name to the existing OVERRIDES value. This resolves RDEPENDS QA error when setting PACKAGECONFIG using a pn- override at local.conf.

Cherry picked from master 60d28dd72daee235150ab6605cbf953f1ea691df

[YOCTO #11374]

Signed-off-by Gan Yau Wai <[email protected]>

Signed-off-by Ross Burton <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta/classes/insane.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/classes/insane.bbclass +0 -0

index dc1c2f8d41..5a3d017004 100644
@@ -867,7 +867,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip,

taskdeps, packages, d):

if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image"
in pkg:
localdata = bb.data.createCopy(d)

meta/classes/insane.bbclass +2 -1

-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES') + ':'
+ pkg)
 
         # Now check the RDEPENDS
         rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS') or

"")
--
2.14.0

* 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.

Signed-off-by Martin Jansa <[email protected]>

---
  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

meta/conf/machine/include/qemuboot-x86.inc +6 -1

index acd03a1ce8..acf9d55c40 100644
@@ -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}"

meta/recipes-bsp/v86d/v86d/fbsetup deleted +0 -3

deleted file mode 100755
index 2a409cc529..0000000000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/sbin/modprobe uvesafb

meta/recipes-bsp/v86d/v86d/uvesafb.conf deleted +0 -2

deleted file mode 100644
index 43789755d3..0000000000
@@ -1,2 +0,0 @@
-# Load uvesafb.ko at boot
-uvesafb

meta/recipes-bsp/v86d/v86d_0.1.10.bb +0 -36

index eab466d30d..579a0a27eb 100644
@@ -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
  }