Commit Graph

32 Commits

Author SHA1 Message Date
Paul Eggleton f541b7388c xserver-nodm-init: improvements from meta-oe
Bring in some changes from the meta-oe version of this script in order
to bring them closer together. (Unfortunately it does not completely
supersede the recipes in meta-oe - there is still some unification to be
done between x11-common and xserver-common.)

* Add systemd support (with extensions for ROOTLESS_X)
* Remove sudo from RDEPENDS_${PN} since this hasn't been used by this
  for a long time
* Rearrange recipe slightly to make the order logical

A couple of additional improvements at the same time:
* Use ROOT_HOME for root's home directory
* Set short description in SUMMARY instead of DESCRIPTION

(From OE-Core rev: d4f82500fb30e9e25b517e65c2bd72b3c2bad070)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-26 11:29:45 +01:00
Laurentiu Palcu ca48b14f08 xserver-nodm-init: remove xuser creation, RDEPEND on xuser-account
[YOCTO #4345]

(From OE-Core rev: 8536c410c54956027807e80f37586fb1f4d29af9)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-10 09:41:55 +01:00
Richard Purdie 0d9f7900de allarch: Drop various problematic allarch usages
In each of these cases allarch is used where the package in question has a
dependency on things which are not allach and change when MACHINE is changed.

This leads to a rebuild of the package each time MACHINE is switched and
the sstate checksum changes. The dependencies in question are not suited
be being marked as ABISAFE.

(From OE-Core rev: 087a680429efa713a98fbb89f927b046fe07f87c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-15 15:57:30 +01:00
Darren Hart 12c9f9a835 xserver-nodm-init: Add xuser to input group
Fixes [YOCTO 4164](3/3)

Input devices come and go, so a single chmod in this init script is not
adequate to ensure rootless X servers can use input devices.

The o+rw method also introduces a security hole.

The newly added input group and input udev rule address this in a secure
way. Ensure the xuser is added to the input group.

(From OE-Core rev: 150b7ac8e1c0f029b90f63424867ee5347821cf7)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Saul Wold <sgw@linux.intel.com>
Cc: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-04 14:04:42 +01:00
Richard Purdie 9d77233df2 xserver-nodm: Correct initscript header
The init script header is incorrect, we only start this at runlevels 2 and 5.

(From OE-Core rev: c1181d376d20dc203ef036d5659d1c2bf2308975)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-27 11:56:31 +00:00
Ross Burton 1e1db8439b x11-common: set XDG_RUNTIME_DIR if it isn't already set
Wayland needs this set for the communication pipes, so set a fallback in case it
hasn't already been set.

(From OE-Core rev: 263508220674321473a746a137bb5d4b21c55119)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-18 13:28:03 +00:00
Ross Burton 02127c4fa6 x11-common: don't prune .svn directories on install, we're in git now
(From OE-Core rev: 719200638923c374fd7481fdd19dca259c1dd6ed)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-02 05:52:09 -07:00
Ross Burton aa212d2b25 x11-common: just support Xorg now that kdrive has been removed
This script was also handling Xomap, Xipaq and Xepson...

(From OE-Core rev: d81aaad65fa805d105cf4f261fd618cb6f2a5e79)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-02 05:52:08 -07:00
Javier Martinez Canillas 8353aa1ad9 xserver-nodm-init: use ${sysconfdir} instead of /etc for packaging
It is considered good practice to use the build system provided
variables instead of directly specify hardcoded paths.

(From OE-Core rev: aada9260af9dcac42c21e189fdf6698e509c26a4)

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:49 +01:00
Javier Martinez Canillas 7d17a8ebf1 x11-common: use ${sysconfdir} instead of /etc for packaging
It is considered good practice to use the build system provided
variables instead of directly specify hardcoded paths.

(From OE-Core rev: 5082056a4671570ca4578da2f622b3cc6f9f2dda)

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:49 +01:00
Laurentiu Palcu 7f017cab0b connman: bump PR and add some comments
The comments are for informing anyone who wants to change USERADD_PARAMs
to make sure it's in sync with the one in xserver-nodm-init, in order
for rootless X to work.

(From OE-Core rev: c4d0b1c5438039dab07103c151c0c5a76a4c9499)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-13 13:11:23 +01:00
Martin Jansa 3349b88a76 More 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.

(From OE-Core rev: 960ee8076e860353a05eb2eb7f825a455c54698d)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-26 22:51:58 +00:00
Andrea Adami 72fc52b61d x11-common: remove extraneous BSP customizations
(From OE-Core rev: caf0bdaa8f137ac7a775aff3d41ec1bfb2907afa)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-06 12:11:35 +00:00
Zhai Edwin ccc84d94b8 xserver-nodm-init: Fix xuser creation
Rootless X start fail as xuser has no home and shell. This patch fix it.

(From OE-Core rev: 012b6054cd5757edd6b1eb31789718bb97c26193)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-16 16:05:37 +00:00
Saul Wold e8e37cff2a xserver-nodm-init: Use useradd to add the xuser for rootless X
This also address an issue with dbus and connman, since connmand
needs to start as the xuser in the rootless X situation.

Fixes: [YOCTO #1699]

(From OE-Core rev: 6823a32035de5d0bcd82a3b41a6ad536aaddbc58)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-02 08:58:01 +00:00
Zhai Edwin 44fd68da7c xserver-nodm-init: Change hidraw mode to allow normal user access
USB HID like touch screen could be presented as hidraw* device, this change
make user under rootless X can access them.

(From OE-Core rev: ddb54d4a467b51f5f8f305f532bd5ea64df92876)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-07 22:54:14 +01:00
Richard Purdie 8294f427d0 xserver-nodm: Disable dbus-wait as it causes users too much confusion
In the event the xserver fails to start the dbus-wait has to time out and
this causes many users a lot of confusion. If we wish to reinstate this,
we need to find a safer mechanism to do it where X failing to start cancels
the timeout (sends a dbus event at that point?) The comments are left in the
file as an example in case some user does wish to enable is.

(From OE-Core rev: 0471b17b061e57231387ef90c95fc0c34fc0e66b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-31 19:38:31 +01:00
Zhai Edwin cb3de7d9ca xserver-nodm-init: Fix X start failure on some platform
sudo is used to run rootless X in xserver-nodm, and start to fail with
"xf86OpenConsole: Cannot open /dev/tty0" error after upgrade to 1.8.1. sudo
seems wait for some resource that is unavailable in early phase of booting.
This patch swith to "su" for rootless X starting as a fix.

[YOCTO #1211] got fixed

(From OE-Core rev: cb935833a128d67e6c1fbe745cf68a58df6470d1)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-04 15:04:34 +01:00
Richard Purdie 8511d1ec1b 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 referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Richard Purdie 52295fa3de Improve handling of 'all' architecture recipes and their interaction with sstate
The existing PACKAGE_ARCH = "all" mechanism of sharing packages is problematic
with sstate since there are a variety of variables which have target specific
values and the sstate package therefore correctly changes signature depending
on the MACHINE setting.

This patch creates a new "allarch" class which sets:

PACKAGE_ARCH = "all"

(as per the existing convention)

INHIBIT_DEFAULT_DEPS = "1"

(since its not target specific and therefore can't depend on the cross
compiler or target libc)

TARGET_ARCH = "all"
TARGET_OS = "linux"
TARGET_CC_ARCH = "none"

(since these variables shouldn't change between the different packages and
target compiler flags shouldn't be getting used)

PACKAGE_EXTRA_ARCHS = ""

(since we shouldn't be depending on any architecture specific package architectures)

Not all PACKAGE_ARCH = "all" recipes can use this class since some run configure
checks on the compiler. This means they have target specific components and therefore
the "all" classification is incorrect.

(From OE-Core rev: 26e5e5feb695864b11e47e24017e254c28f14494)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-31 13:07:00 +01:00
Koen Kooi bd97aa3a54 x11-common: fix dbus-launch RDEPENDS
/usr/bin/dbus-launch is in the dbus-x11 packages, the dbus-launch package doesn't exist

(From OE-Core rev: 69763109038fc4a29720d9ff692f2001722862ce)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 00:27:25 +01:00
Koen Kooi da1a404540 x11-common 0.1: add runtime dep on dbus-x11
dbus-launch moved into the dbus-x11 packages, so we need to drag it in.

Also reorder fields to better fit with the styleguide

(From OE-Core rev: 5457a4ddefac2262067172d0db5c7d646aacb5c0)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-26 16:52:00 +01:00
Yu Ke 6a7b1fe1bb recipes: Add Upstream-Status for multiple recipes
iputils: update patch Upstream-Status
mktemp: update patch Upstream-Status
xinetd: update Upstream-Status
libdrm: update patch Upstream-Status
qemugl: update patch Upstream-Status
x11-common: update patch Upstream-Status
xorg-app: update patch Upstream-Status
xorg-driver: update patch Upstream-Status

(From OE-Core rev: 6c49b8e881bc811386c5f1ebac95829d44ad9bb3)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:28:59 +01:00
Richard Purdie aeaa356a5e xserver-nodm-init: Mark as machine specific after recent rootless X changes
Fix summplied by ke.yu@intel.com

[YOCTO #906]

(From OE-Core rev: f0afe5827570eff5442d2f9a9846b4098e5c3333)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-19 01:31:22 +00:00
Dongxiao Xu 6b16a5fd42 xserver-nodm-init: add xuser to group audio
add rootless X user to group audio to access /dev/snd/*

Fixes [YOCTO #799]

CC: Ke Yu <ke.yu@intel.com>
(From OE-Core rev: 4df75586c0f5447670fe945285c7ad01c5e1f37f)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-15 17:49:17 +00:00
Yu Ke e98c515b2b xserver-nodm-init: add rootless-x support
most rootless X work are already done in the kernel, xserver and
graphics driver, this patches add the the remaining userspace setting:

- create /etc/X11/Xusername to set rootless X user
- add rootless X user to group video, tty to access /dev/tty[0-4]
  and /dev/dri/card0
- grant rootless X user access right to /dev/input/*, /var/log

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-02-23 10:55:10 -08:00
Mark Hatle 9ee3c77f4e recipes-graphics: Add more detailed SUMMARY and DESCRIPTIONS
Add more detailed SUMMARY and DESCRIPTIONS to various graphics and
graphics related components.  I've recently gotten question from users
what something is, or why it was needed.. this should go a long way toward
answering those questions.

Many of the descriptions were taken directly from the upstream location,
where one was not available the Debian packages were consulted for
information.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-03 08:49:22 -08:00
Wolfgang Denk 97d80dd990 x11-common: Fix unusable serial console
The serial console port is basicly unusable in images containing X.
Login works fine, but at the shell prompt only one out of N input
characters (N usually between 2 and 10) gets through to the shell.

dbus-launch (running as "dbus-launch --sh-syntax --exit-with-session")
is also reading from /dev/console and "eating" the missing characters.

As soon as I stop the Xserver ("sh /etc/init.d/xserver-nodm stop")
the serial console starts wroking fine (because dbus-launch is not
running any more).

This patch addresses the problem.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-28 17:28:24 +00:00
Yu Ke a1d635bc1c xserver-nodm-init: add license checksum
Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-12-09 12:37:11 +00:00
Yu Ke c344349a98 x11-common: add license checksum
it is local file recipe and no GPLv2 license file, so
add a patch to add GPLv2 license file

Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-12-09 12:37:10 +00:00
Richard Griffiths 546ffc5fa5 x11-common: correct the syntax for the -mouse arg to Xfbdev
Fixes [BUGID #99]

The mouse option as passed to Xfbdev was correct for most
targets, except mips (and a PS/2 mouse). Modifying the
syntax of the option fixes the mips case, and has no impact
on other users.

Signed-off-by: Richard Griffiths <rgriffit@windriver.com>
2010-10-04 09:40:58 +01:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00