x11-common: Remove unused Xinit file, remove hardcoded user assumptions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-05-27 11:44:42 +01:00
parent 5c96414966
commit 8f32595f6b
4 changed files with 3 additions and 27 deletions

View File

@ -1,16 +0,0 @@
#!/bin/sh
#
export USER=root
export HOME=/home/root
if [ ! -d $HOME ] && [ -d /root ]; then
HOME=/root
fi
export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
export PATH=$PATH:/usr/X11R6/bin
SYSSESSIONDIR=/etc/X11/Xinit.d
exec run-parts $SYSSESSIONDIR

View File

@ -1,8 +1,6 @@
#!/bin/sh
#
. /etc/formfactor/config
# note xinit needs full server path
XSERVER=/usr/bin/Xipaq
if [ -f /usr/bin/Xfbdev ]; then
@ -28,12 +26,12 @@ module_id() {
awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
}
export USER=root
ARGS=" -br -pn"
if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
. /etc/formfactor/config
# use ucb 1x00 touchscreen if present
if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"

View File

@ -1,11 +1,5 @@
#!/bin/sh
HOME_VOLATILE=/home/$USER/ramdisk
export HOME_VOLATILE
HOME=/home/$USER
export HOME
if [ -x /usr/bin/dbus-launch ]; then
# As this is the X session script, always start a new DBus session.
eval `dbus-launch --sh-syntax --exit-with-session`

View File

@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
PR = "r36"
PR = "r37"
SRC_URI = "file://etc"
S = ${WORKDIR}