summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-27 11:44:42 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-27 11:44:42 +0100
commit8f32595f6b8ed885a8291b1eb5cd671ece4b7d58 (patch)
tree118f54c8a15e29bb0026ba62d0dfc2e469162724 /meta
parent5c96414966b7b92bc1877b463c082bd13e8f6d57 (diff)
downloadopenembedded-core-8f32595f6b8ed885a8291b1eb5cd671ece4b7d58.tar.gz
openembedded-core-8f32595f6b8ed885a8291b1eb5cd671ece4b7d58.tar.bz2
openembedded-core-8f32595f6b8ed885a8291b1eb5cd671ece4b7d58.zip
x11-common: Remove unused Xinit file, remove hardcoded user assumptions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xinit16
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xserver6
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession6
-rw-r--r--meta/packages/x11-common/x11-common_0.1.bb2
4 files changed, 3 insertions, 27 deletions
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xinit b/meta/packages/x11-common/x11-common/etc/X11/Xinit
deleted file mode 100644
index f566ffe5be..0000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xinit
+++ /dev/null
@@ -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
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver
index 689d522d09..9a0986ad61 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xserver
@@ -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"
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession b/meta/packages/x11-common/x11-common/etc/X11/Xsession
index 8f3e5edd7d..6441596b04 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xsession
@@ -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`
diff --git a/meta/packages/x11-common/x11-common_0.1.bb b/meta/packages/x11-common/x11-common_0.1.bb
index 74e620bd16..75d9836198 100644
--- a/meta/packages/x11-common/x11-common_0.1.bb
+++ b/meta/packages/x11-common/x11-common_0.1.bb
@@ -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}