20 Commits

Author SHA1 Message Date
Ross Burton cf1819332d meta-oe: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2016-05-02 14:03:03 -07:00
Martin Jansa 9a381e8c4d xserver-common, xserver-nodm-init: drop allarch, depends on couple TUNE_PKGARCH recipes
* xmodmap xrandr xdpyinfo fbset xinput-calibrator xinit
* see:
  http://lists.openembedded.org/pipermail/openembedded-devel/2015-September/103271.html
* fixes:
ERROR: xserver-common different signature for task do_package_write_ipk.sigdata between qemux86copy and qemuarm
runtaskdeps changed from ['fbsetfbset_2.1.bb.do_packagedata', 'opkg-utilsopkg-utils_git.bb.do_populate_sysroot:virtual:native', 'pseudopseudo_1.7.4.bb.do_populate_sysroot:virtual:native', 'xinput-calibratorxinput-calibrator_git.bb.do_packagedata', 'xorg-appxdpyinfo_1.3.2.bb.do_packagedata', 'xorg-appxmodmap_1.0.9.bb.do_packagedata', 'xorg-appxrandr_1.4.3.bb.do_packagedata', 'xserver-commonxserver-common_1.34.bb.do_package', 'xserver-commonxserver-common_1.34.bb.do_packagedata'] to ['fbsetfbset_2.1.bb.do_packagedata', 'opkg-utilsopkg-utils_git.bb.do_populate_sysroot:virtual:native', 'pseudopseudo_1.7.4.bb.do_populate_sysroot:virtual:native', 'xinput-calibratorxinput-calibrator_git.bb.do_packagedata', 'xorg-appxdpyinfo_1.3.2.bb.do_packagedata', 'xorg-appxmodmap_1.0.9.bb.do_packagedata', 'xorg-appxrandr_1.4.3.bb.do_packagedata', 'xserver-commonxserver-common_1.34.bb.do_package', 'xserver-commonxserver-common_1.34.bb.do_packagedata']
meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb.do_packagedata with hash ce7c4dca0cda8d720fd74d2bd1d66fbb
 changed to
meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb.do_packagedata with hash a232e1b9ce0275f2a989d74cc7053a84
openembedded-core/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb.do_packagedata with hash d688277915e6c9d7e41a00d941dfc590
 changed to
openembedded-core/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb.do_packagedata with hash 9d440e251880adaaa743aecabc86ae36
openembedded-core/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb.do_packagedata with hash 8122f0ff1b1e47cca2ddb162075e7f44
 changed to
openembedded-core/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb.do_packagedata with hash 4d9acf7ce5cfa462d66b04b2bf14b851
openembedded-core/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb.do_packagedata with hash 9d3e895ec99bf9e9204aa619238e4cc8
 changed to
openembedded-core/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb.do_packagedata with hash f4a63b5a780ad1eee027ec5c41d1698b
openembedded-core/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb.do_packagedata with hash ee29483d3bbb3d83e14898c2316c81ab
 changed to
openembedded-core/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb.do_packagedata with hash 0c39e999928942dfd8a7f4b8e67446d7
meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb.do_package with hash 1657fdd755ae7b98394b34c5e29e0f6c
 changed to
meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb.do_package with hash df6f3388166d833898c5f24024d71703
meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb.do_packagedata with hash 2794fb1e9e3f8dd7ce2437d5396f6d49
 changed to
meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb.do_packagedata with hash 007535177f70ddf4efae8d117226490e
Hash for dependent task xorg-appxrandr_1.4.3.bb.do_packagedata changed from ee29483d3bbb3d83e14898c2316c81ab to 0c39e999928942dfd8a7f4b8e67446d7
Hash for dependent task xinput-calibratorxinput-calibrator_git.bb.do_packagedata changed from d688277915e6c9d7e41a00d941dfc590 to 9d440e251880adaaa743aecabc86ae36
Hash for dependent task fbsetfbset_2.1.bb.do_packagedata changed from ce7c4dca0cda8d720fd74d2bd1d66fbb to a232e1b9ce0275f2a989d74cc7053a84
Hash for dependent task xserver-commonxserver-common_1.34.bb.do_package changed from 1657fdd755ae7b98394b34c5e29e0f6c to df6f3388166d833898c5f24024d71703
Hash for dependent task xorg-appxmodmap_1.0.9.bb.do_packagedata changed from 9d3e895ec99bf9e9204aa619238e4cc8 to f4a63b5a780ad1eee027ec5c41d1698b
Hash for dependent task xserver-commonxserver-common_1.34.bb.do_packagedata changed from 2794fb1e9e3f8dd7ce2437d5396f6d49 to 007535177f70ddf4efae8d117226490e
Hash for dependent task xorg-appxdpyinfo_1.3.2.bb.do_packagedata changed from 8122f0ff1b1e47cca2ddb162075e7f44 to 4d9acf7ce5cfa462d66b04b2bf14b851

ERROR: xserver-nodm-init different signature for task do_package_write_ipk.sigdata between qemux86copy and qemuarm
runtaskdeps changed from ['opkg-utilsopkg-utils_git.bb.do_populate_sysroot:virtual:native', 'pseudopseudo_1.7.4.bb.do_populate_sysroot:virtual:native', 'xorg-appxinit_1.3.4.bb.do_packagedata', 'xserver-commonxserver-common_1.34.bb.do_packagedata', 'xserver-nodm-initxserver-nodm-init_2.0.bb.do_package', 'xserver-nodm-initxserver-nodm-init_2.0.bb.do_packagedata'] to ['opkg-utilsopkg-utils_git.bb.do_populate_sysroot:virtual:native', 'pseudopseudo_1.7.4.bb.do_populate_sysroot:virtual:native', 'xorg-appxinit_1.3.4.bb.do_packagedata', 'xserver-commonxserver-common_1.34.bb.do_packagedata', 'xserver-nodm-initxserver-nodm-init_2.0.bb.do_package', 'xserver-nodm-initxserver-nodm-init_2.0.bb.do_packagedata']
openembedded-core/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb.do_packagedata with hash 6963e42ac1053b62ce4a6570a74e27bf
 changed to
openembedded-core/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb.do_packagedata with hash eb81dc4aa06e4a2f1fb3e76bac3d4d88
meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb.do_packagedata with hash 2794fb1e9e3f8dd7ce2437d5396f6d49
 changed to
meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb.do_packagedata with hash 007535177f70ddf4efae8d117226490e
Hash for dependent task xorg-appxinit_1.3.4.bb.do_packagedata changed from 6963e42ac1053b62ce4a6570a74e27bf to eb81dc4aa06e4a2f1fb3e76bac3d4d88
Hash for dependent task xserver-commonxserver-common_1.34.bb.do_packagedata changed from 2794fb1e9e3f8dd7ce2437d5396f6d49 to 007535177f70ddf4efae8d117226490e

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-11-16 21:50:08 +01:00
Dan McGregor b6fcccb70a xserver-nodm-init: only enable for runlevel 5
Runlevel 5 is traditionally graphical. If it starts in runlevel 2
or 3 systemd gets confused and adds it as a dependency of the
multi-user target, not just the graphical target.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-12 19:35:39 +01:00
Matthieu CRAPET c95e155780 recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues
Changes:
- rename SUMMARY with length > 80 to DESCRIPTION
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line

Note: don't bump PR

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-23 23:20:02 +01:00
Jonathan Liu 305038f932 xserver-nodm-init: do not execute Xsession twice
The /etc/X11/Xserver script runs xinit /etc/X11/Xsession already so
there is no need to do /usr/bin/xinit /etc/X11/Xsession --
/etc/X11/Xserver. Having xinit nested will result in Xsession being
executed twice. To resolve this, just execute /etc/X11/Xserver directly
instead of going through xinit.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-20 12:29:55 +02:00
Martin Jansa 823d41b46a xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES
* Otavio reported unpackaged files without systemd enabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-19 02:45:28 +02:00
Martin Jansa a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Martin Jansa 05c8eb4393 xserver-nodm-init: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:04 +02:00
Andreas Müller 42e00e8ffd xserver-nodm-init: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-07-16 09:39:07 +02:00
Martin Jansa 2cb1ae5c17 xserver-nodm-init: add EnvironmentFile
* used to set HOME variable before /etc/X11/Xsession is started
* e.g. enlightenment is creating ${HOME}/.e and without this it ends in
  /tmp/.e and during startup HOME gets defined and switched to
  /home/root/.e

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-04-10 08:55:00 +02:00
Denis 'GNUtoo' Carikli 8f6027c1bd xserver-nodm-init: use /etc/X11/Xserver from service file instead of Xorg directly
* /etc/X11/Xserver is provided by xserver-common and sets correct DPI
  before starting Xorg (or other xserver)

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-04-10 08:55:00 +02:00
Martin Jansa 8cd93743d7 Quoting fixes
* We have various variables which are either not quoted at all or are
* half quoted. This patch fixes the bad exmaples so everything is consistent.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-26 23:57:23 +01:00
Andreas Müller e521e25a0a xserver-nodm-init: remove unneeded systemd code
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-23 16:46:31 +01:00
Otavio Salvador 0265a98f71 xserver-nodm-init: move systemd service to xserver-nodm-init-systemd
Move systemd service to xserver-nodm-init-systemd to be consistent
with other packages.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-01-09 10:31:00 +01:00
Martin Jansa 7206edddeb xserver-nodm-init: set USER and HOME
* when it's executed from init then HOME is set to '/'
* shadow/agetty set HOME fine and Xinit is doing the same, but for xinit Xsession it didn't work

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-11-01 08:55:04 +01:00
Otavio Salvador d07327e658 xserver-nodm-init: exit 1 only if systemd is installed and use ${base_bindir}
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-10-11 22:43:18 +02:00
Koen Kooi 4ad7ec4356 xserver-nodm-init: add optional systemd support
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-07-26 13:53:32 +02:00
Paul Eggleton 040f75eca2 Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the references. Thanks to Phil Blundell for
the command.

(Prompted by oe-core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-07-14 16:49:27 +01:00
Martin Jansa ea8d7d2d14 recipes: use allarch.bbclass instead just PACKAGE_ARCH = all
* otherwise such recipes are rebuilt or reused from sstate after every
  MACHINE change, because of different checksums see [YOCTO #1075]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2011-06-02 10:04:54 +02:00
Martin Jansa 89500c583e recipes,classes: import a lot of recipes from meta-shr
* tested on shr-lite-image for om-gta02 and nokia900 (with meta-shr layer)
2011-04-10 14:43:41 +02:00