diff options
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 f566ffe5b..000000000 --- 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 689d522d0..9a0986ad6 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 8f3e5edd7..6441596b0 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 74e620bd1..75d983619 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} |