* [PATCH] v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script
@ 2017-04-27 21:49 Martin Jansa
2017-04-27 22:01 ` ✗ patchtest: failure for " Patchwork
2017-06-23 19:04 ` [PATCH] " Martin Jansa
0 siblings, 2 replies; 3+ messages in thread
From: Martin Jansa @ 2017-04-27 21:49 UTC (permalink / raw)
To: openembedded-core
* 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 <Martin.Jansa@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 06ac983d4d..18f755a5d0 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 kvm64"
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
}
--
2.12.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* ✗ patchtest: failure for v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script
2017-04-27 21:49 [PATCH] v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script Martin Jansa
@ 2017-04-27 22:01 ` Patchwork
2017-06-23 19:04 ` [PATCH] " Martin Jansa
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2017-04-27 22:01 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
== Series Details ==
Series: v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script
Revision: 1
URL : https://patchwork.openembedded.org/series/6549/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Patch v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script
Issue Commit shortlog is too long [test_shortlog_length]
Suggested fix Edit shortlog so that it is 90 characters or less (currently 117 characters)
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script
2017-04-27 21:49 [PATCH] v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script Martin Jansa
2017-04-27 22:01 ` ✗ patchtest: failure for " Patchwork
@ 2017-06-23 19:04 ` Martin Jansa
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2017-06-23 19:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer, Burton, Ross
[-- Attachment #1: Type: text/plain, Size: 5560 bytes --]
ping
On Thu, Apr 27, 2017 at 11:49 PM, Martin Jansa <martin.jansa@gmail.com>
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.
>
> Signed-off-by: Martin Jansa <Martin.Jansa@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 06ac983d4d..18f755a5d0 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 kvm64"
>
> 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] = "634964ae18ef68c8493add2ce150e3
> b4502badeb0d9194b4bd81241d25
> 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
> }
> --
> 2.12.2
>
>
[-- Attachment #2: Type: text/html, Size: 7389 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-23 19:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-27 21:49 [PATCH] v86d, qemuboot-x86.inc: use KERNEL_MODULE_AUTOLOAD+KERNEL_MODULE_PROBECONF for uvesafb instead of fbsetup init script Martin Jansa
2017-04-27 22:01 ` ✗ patchtest: failure for " Patchwork
2017-06-23 19:04 ` [PATCH] " Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox