Add a PACKAGECONFIG option to allow the user to disable the mouse
cursor/pointer in the X server. This might be useful where a
touchscreen is used.
(From OE-Core rev: 680940250c9a1c7b43229c5e4f4fed5cc3e31033)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move the (non-factual) x utils dependencies from x11-common to
x11 packagegroup.
Remove some obsolete configuration from x11-common:
* Xsession.d/12keymap.sh: commented out xmodmap call for kdrive
* default.xmodmap: xmodmap file used by 12keymap.sh
* Xdefaults: rxvt configuration
At this point x11-common is just /etc/X11/Xsession and three
non-intrusive Xsession scripts: make these explicitly part of
xserver-nodm-init. RCONFLICT with the versions of xserver-common
that also provide these files.
VIRTUAL-RUNTIME_xserver_common is no longer a real abstraction but
preserve the setting for backwards compatibility (if the variable
is set to "xserver-common", the right thing still happens).
(From OE-Core rev: ee153327b046fe8474e498f39ecc87e573bc8604)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta-oe provides a 2.0 version of this recipe, but this one now
does everything the meta-oe version does.
There's one exception though: xserver-common is not a runtime
dependency. This needs to be added elsewhere for the platforms that
require it.
(From OE-Core rev: bf6fd144b6f3539009089df5f188d09c7c899140)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
X startup is now handled in xserver-nodm-init.
(From OE-Core rev: 877851cf0f76a5052900954670fb64aed27a7a1f)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit should provide the same functionality as before, but
should make meta-oe xserver-nodm-init-2.0 obsolete as well as
keep systemd and sysvinit startup better in sync.
/etc/X11/Xserver is not called anymore: it is provided by both
x11-common and xserver-common with no useful differences (but some
annoying ones). Instead xserver-nodm-init provides
/etc/xserver-nodm/Xserver as the startup script and
/etc/default/xserver-nodm as the default settings file. These are
used by both init systems.
The Xserver script could be completely removed (with sysv and
systemd calling xinit directly), but to keep compatibility with
meta-oes xserver-nodm-init-2.0 the Xserver script sources
/etc/X11/xserver-common if one exists -- and systemd EnvironmentFile
cannot do that.
x11-common used to have a packageconfig to easily control screen
blanking. Move this to xserver-nodm-init.
(From OE-Core rev: e8ce3d2626e505924a75de96650abca166fd230a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Replace xtscal with xinput-calibrator as part of removing xtscal.
[YOCTO #9365]
(From OE-Core rev: 85afb3445da5c3526f6046eb98262f9af7b78cba)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the if-statement that had misspelled XDG_RUNTIME_DIR.
Also fix whitespace.
(From OE-Core rev: 8db2be8b246362aff9931a31882fa3bab0043419)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
when "blank" is not in PACKAGECONFIG, explicitly set dpms and
screensaver off. The intention here is to make it easier to
create builds that should not blank the screen (just remove
"blank" from x11-common PACKAGECONFIG).
Also remove a unneeded "find -exec rm" from do_install.
Partly fixes [YOCTO #7278].
(From OE-Core rev: 32ac0bfb0167cb350be5d4b8faca490956dd7d93)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If reboot was called from inside the Xserver there could happen a race
condition where chvt would never end, and therefore the whole system was
stalled.
The user could not recover the system by ssh the machine or using the
keyboard.
Running chvt in background fixes the issue.
Also move sleep 1s inside stop to give time for killproc xinit for
fix issue when chvt 1 don't work because X server is still running.
(From OE-Core rev: 19eaf4a59f4545e049f525d0b0446a9c08d18f0f)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When X is stopped it remains in the same vt that was launched,
change to vt1 instead to avoid manual vt switch.
[YOCTO #5336]
(From OE-Core rev: 6cf330bfbbb8ab7f9506bbed59ce6c2d90a0c1a2)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it's not complete, but recipes depending on virtual/libx11 are easiest
to spot, I've long list of PNBLACKLIST for all recipes which cannot
be built in distro without x11 in DISTRO_FEATURES
(From OE-Core rev: 78d269fa9a586e24ef058ba5315c696f15935f56)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Runlevel 3 is often multi-user without X, so don't start the X
server in runlevel 3. This allows one to start up a machine without
X running from the bootloader.
(From OE-Core rev: 116b8a48f0d701d8f0b7807144ffdb708aad215e)
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a '\n' to the last line of the file to fix:
No newline at end of file
(From OE-Core rev: b3090263ba31702631270643c7a7d7af8f4d9234)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.
(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
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>
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>
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>
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>
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>
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>
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>
* 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>
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>
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>
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>
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>
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>
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>
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>
/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>
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>
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>
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>
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>
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>
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>
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>
Trevor Woerner
Jussi Kukkonen
Maxin B. John
Tom Hochstein
Ricardo Ribalda Delgado
Aníbal Limón
Martin Jansa
Dan McGregor
Robert Yang
Otavio Salvador
Paul Eggleton
Laurentiu Palcu
Richard Purdie
Darren Hart
Ross Burton
Javier Martinez Canillas
Andrea Adami
Zhai Edwin
Saul Wold
Koen Kooi
Yu Ke
Dongxiao Xu
Mark Hatle
Wolfgang Denk
Richard Griffiths
Richard Purdie