* [PATCH 1/3] Revert "matchbox-keyboard: export GTK_IM_MODULE_FILE location" @ 2016-02-02 11:04 Maxin B. John 2016-02-02 11:04 ` [PATCH 2/3] gtk-immodules-cache.bbclass: fix immodules-cache path Maxin B. John 2016-02-02 11:04 ` [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone Maxin B. John 0 siblings, 2 replies; 6+ messages in thread From: Maxin B. John @ 2016-02-02 11:04 UTC (permalink / raw) To: openembedded-core This reverts commit a8c25af91e56f20b9cfd4fa298b5002efc7af809. Signed-off-by: Maxin B. John <maxin.john@intel.com> --- meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh index 63d9b8d..6cf188b 100644 --- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh +++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh @@ -1,7 +1,6 @@ #!/bin/sh . /etc/formfactor/config -export GTK_IM_MODULE_FILE="/etc/gtk-2.0/gtk.immodules" CMD="" -- 2.4.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] gtk-immodules-cache.bbclass: fix immodules-cache path 2016-02-02 11:04 [PATCH 1/3] Revert "matchbox-keyboard: export GTK_IM_MODULE_FILE location" Maxin B. John @ 2016-02-02 11:04 ` Maxin B. John 2016-02-02 11:04 ` [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone Maxin B. John 1 sibling, 0 replies; 6+ messages in thread From: Maxin B. John @ 2016-02-02 11:04 UTC (permalink / raw) To: openembedded-core This commit in gtk+ moved the cache files below <libdir> " commit c8849046860a9b17fa943247d85ddadb29262b48 Author: Matthias Clasen <mclasen@redhat.com> Date: Thu Jul 4 09:27:17 2013 -0400 Move the module cache files below libdir These files contain architecture-dependent paths, and thus placing them into sysconfdir causes unnecessary hassle. Now the immodule cache file is looked for in libdir/gtk-2.0/2.10.0/immodules.cache. Belated backport of a change that was done in the run-up to 3.0.". Update gtk-immodules-cache.bbclass to use that path. The environment variable "GTK_IM_MODULE_FILE" can also be set to point GTK+ at the file to fix this problem. However, it causes problems for gtk3 apps. [YOCTO #6774] [YOCTO #8957] Signed-off-by: Maxin B. John <maxin.john@intel.com> --- meta/classes/gtk-immodules-cache.bbclass | 48 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass index 0a6316d..c099cd3 100644 --- a/meta/classes/gtk-immodules-cache.bbclass +++ b/meta/classes/gtk-immodules-cache.bbclass @@ -10,47 +10,51 @@ GTKIMMODULES_PACKAGES ?= "${PN}" gtk_immodule_cache_postinst() { if [ "x$D" != "x" ]; then - for maj_ver in 2 3; do - if [ -x $D${bindir}/gtk-query-immodules-$maj_ver.0 ]; then - IMFILES=$(ls $D${libdir}/gtk-$maj_ver.0/*/immodules/*.so) - ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \ - $IMFILES > $D/etc/gtk-$maj_ver.0/gtk.immodules 2>/dev/null && - sed -i -e "s:$D::" $D/etc/gtk-$maj_ver.0/gtk.immodules - - [ $? -ne 0 ] && exit 1 + if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then + IMFILES=$(ls $D${libdir}/gtk-2.0/*/immodules/*.so) + ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \ + $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null && + sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache + elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then + IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so) + ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \ + $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null && + sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache fi - done + [ $? -ne 0 ] && exit 1 exit 0 fi if [ ! -z `which gtk-query-immodules-2.0` ]; then - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + gtk-query-immodules-2.0 > ${libdir}/gtk-2.0/2.10.0/immodules.cache fi if [ ! -z `which gtk-query-immodules-3.0` ]; then - gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules + gtk-query-immodules-3.0 > ${libdir}/gtk-3.0/3.0.0/immodules.cache fi } gtk_immodule_cache_postrm() { if [ "x$D" != "x" ]; then - for maj_ver in 2 3; do - if [ -x $D${bindir}/gtk-query-immodules-$maj_ver.0 ]; then - IMFILES=$(ls $D${libdir}/gtk-$maj_ver.0/*/immodules/*.so) - ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \ - $IMFILES > $D/etc/gtk-$maj_ver.0/gtk.immodules 2>/dev/null && - sed -i -e "s:$D::" $D/etc/gtk-$maj_ver.0/gtk.immodules - - [ $? -ne 0 ] && exit 1 + if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then + IMFILES=$(ls $D${libdir}/gtk-2.0/*/immodules/*.so) + ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \ + $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null && + sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache + elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then + IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so) + ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \ + $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null && + sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache fi - done + [ $? -ne 0 ] && exit 1 exit 0 fi if [ ! -z `which gtk-query-immodules-2.0` ]; then - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + gtk-query-immodules-2.0 > ${libdir}/gtk-2.0/2.10.0/immodules.cache fi if [ ! -z `which gtk-query-immodules-3.0` ]; then - gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules + gtk-query-immodules-3.0 > ${libdir}/gtk-3.0/3.0.0/immodules.cache fi } -- 2.4.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone 2016-02-02 11:04 [PATCH 1/3] Revert "matchbox-keyboard: export GTK_IM_MODULE_FILE location" Maxin B. John 2016-02-02 11:04 ` [PATCH 2/3] gtk-immodules-cache.bbclass: fix immodules-cache path Maxin B. John @ 2016-02-02 11:04 ` Maxin B. John 2016-02-02 11:59 ` Martin Jansa 1 sibling, 1 reply; 6+ messages in thread From: Maxin B. John @ 2016-02-02 11:04 UTC (permalink / raw) To: openembedded-core We need machconfig file to automatically choose between physical and virtual keyboards. [YOCTO #9027] Signed-off-by: Maxin B. John <maxin.john@intel.com> --- meta/recipes-bsp/formfactor/files/beaglebone/machconfig | 10 ++++++++++ meta/recipes-bsp/formfactor/files/qemumips64/machconfig | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100755 meta/recipes-bsp/formfactor/files/beaglebone/machconfig create mode 100755 meta/recipes-bsp/formfactor/files/qemumips64/machconfig diff --git a/meta/recipes-bsp/formfactor/files/beaglebone/machconfig b/meta/recipes-bsp/formfactor/files/beaglebone/machconfig new file mode 100755 index 0000000..56a2ae2 --- /dev/null +++ b/meta/recipes-bsp/formfactor/files/beaglebone/machconfig @@ -0,0 +1,10 @@ +HAVE_TOUCHSCREEN=1 +HAVE_KEYBOARD=1 + +DISPLAY_CAN_ROTATE=0 +DISPLAY_ORIENTATION=0 +#DISPLAY_WIDTH_PIXELS=640 +#DISPLAY_HEIGHT_PIXELS=480 +#DISPLAY_BPP=16 +DISPLAY_DPI=150 +DISPLAY_SUBPIXEL_ORDER=vrgb diff --git a/meta/recipes-bsp/formfactor/files/qemumips64/machconfig b/meta/recipes-bsp/formfactor/files/qemumips64/machconfig new file mode 100755 index 0000000..56777b6 --- /dev/null +++ b/meta/recipes-bsp/formfactor/files/qemumips64/machconfig @@ -0,0 +1,10 @@ +HAVE_TOUCHSCREEN=1 +HAVE_KEYBOARD=1 + +DISPLAY_CAN_ROTATE=0 +DISPLAY_ORIENTATION=0 +DISPLAY_WIDTH_PIXELS=640 +DISPLAY_HEIGHT_PIXELS=480 +DISPLAY_BPP=16 +DISPLAY_DPI=150 +#DISPLAY_SUBPIXEL_ORDER=vrgb -- 2.4.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone 2016-02-02 11:04 ` [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone Maxin B. John @ 2016-02-02 11:59 ` Martin Jansa 2016-02-02 12:07 ` Burton, Ross 0 siblings, 1 reply; 6+ messages in thread From: Martin Jansa @ 2016-02-02 11:59 UTC (permalink / raw) To: Maxin B. John; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 1986 bytes --] On Tue, Feb 02, 2016 at 01:04:11PM +0200, Maxin B. John wrote: > We need machconfig file to automatically choose between physical and virtual > keyboards. beaglebone has its own BSP layer, why it should be added in oe-core? > > [YOCTO #9027] > > Signed-off-by: Maxin B. John <maxin.john@intel.com> > --- > meta/recipes-bsp/formfactor/files/beaglebone/machconfig | 10 ++++++++++ > meta/recipes-bsp/formfactor/files/qemumips64/machconfig | 10 ++++++++++ > 2 files changed, 20 insertions(+) > create mode 100755 meta/recipes-bsp/formfactor/files/beaglebone/machconfig > create mode 100755 meta/recipes-bsp/formfactor/files/qemumips64/machconfig > > diff --git a/meta/recipes-bsp/formfactor/files/beaglebone/machconfig b/meta/recipes-bsp/formfactor/files/beaglebone/machconfig > new file mode 100755 > index 0000000..56a2ae2 > --- /dev/null > +++ b/meta/recipes-bsp/formfactor/files/beaglebone/machconfig > @@ -0,0 +1,10 @@ > +HAVE_TOUCHSCREEN=1 > +HAVE_KEYBOARD=1 > + > +DISPLAY_CAN_ROTATE=0 > +DISPLAY_ORIENTATION=0 > +#DISPLAY_WIDTH_PIXELS=640 > +#DISPLAY_HEIGHT_PIXELS=480 > +#DISPLAY_BPP=16 > +DISPLAY_DPI=150 > +DISPLAY_SUBPIXEL_ORDER=vrgb > diff --git a/meta/recipes-bsp/formfactor/files/qemumips64/machconfig b/meta/recipes-bsp/formfactor/files/qemumips64/machconfig > new file mode 100755 > index 0000000..56777b6 > --- /dev/null > +++ b/meta/recipes-bsp/formfactor/files/qemumips64/machconfig > @@ -0,0 +1,10 @@ > +HAVE_TOUCHSCREEN=1 > +HAVE_KEYBOARD=1 > + > +DISPLAY_CAN_ROTATE=0 > +DISPLAY_ORIENTATION=0 > +DISPLAY_WIDTH_PIXELS=640 > +DISPLAY_HEIGHT_PIXELS=480 > +DISPLAY_BPP=16 > +DISPLAY_DPI=150 > +#DISPLAY_SUBPIXEL_ORDER=vrgb > -- > 2.4.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone 2016-02-02 11:59 ` Martin Jansa @ 2016-02-02 12:07 ` Burton, Ross 2016-02-03 10:25 ` Maxin B. John 0 siblings, 1 reply; 6+ messages in thread From: Burton, Ross @ 2016-02-02 12:07 UTC (permalink / raw) To: Martin Jansa; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 587 bytes --] On 2 February 2016 at 11:59, Martin Jansa <martin.jansa@gmail.com> wrote: > On Tue, Feb 02, 2016 at 01:04:11PM +0200, Maxin B. John wrote: > > We need machconfig file to automatically choose between physical and > virtual > > keyboards. > > beaglebone has its own BSP layer, why it should be added in oe-core? > This would be for the purely open beaglebone BSP in meta-yocto-bsp. We've always had some sort of real ARM BSP in meta-yocto-bsp for QA purposes. I'm not sure whether we want to say the beaglebone has a keyboard and mouse by default or not though. Ross [-- Attachment #2: Type: text/html, Size: 1070 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone 2016-02-02 12:07 ` Burton, Ross @ 2016-02-03 10:25 ` Maxin B. John 0 siblings, 0 replies; 6+ messages in thread From: Maxin B. John @ 2016-02-03 10:25 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core Hi Ross, >On Tue, Feb 02, 2016 at 12:07:06PM +0000, Burton, Ross wrote: >>On 2 February 2016 at 11:59, Martin Jansa <martin.jansa@gmail.com> wrote: On Tue, Feb 02, 2016 at 01:04:11PM +0200, Maxin B. John wrote: >>> We need machconfig file to automatically choose between physical and virtual >>> keyboards. > >> beaglebone has its own BSP layer, why it should be added in oe-core? > > This would be for the purely open beaglebone BSP in meta-yocto-bsp. > We've always had some sort of real ARM BSP in meta-yocto-bsp for QA purposes. > I'm not sure whether we want to say the beaglebone has a keyboard and mouse by default or not though. > After discussing about this, it is "safe" to assume that generally we attach a USB keyboard and mouse to the beaglebone board. Also it is not ok to set the resolution related values for Beaglebone. I will send a v2. >Ross Best Regards, Maxin ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-03 10:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-02 11:04 [PATCH 1/3] Revert "matchbox-keyboard: export GTK_IM_MODULE_FILE location" Maxin B. John 2016-02-02 11:04 ` [PATCH 2/3] gtk-immodules-cache.bbclass: fix immodules-cache path Maxin B. John 2016-02-02 11:04 ` [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone Maxin B. John 2016-02-02 11:59 ` Martin Jansa 2016-02-02 12:07 ` Burton, Ross 2016-02-03 10:25 ` Maxin B. John
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox