summaryrefslogtreecommitdiff
path: root/meta/packages/x11-common
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/x11-common')
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xdefaults3
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xserver77
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession38
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh4
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh7
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh7
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/default.xmodmap260
-rw-r--r--meta/packages/x11-common/x11-common_0.1.bb17
-rw-r--r--meta/packages/x11-common/xserver-nodm-init.bb22
-rwxr-xr-xmeta/packages/x11-common/xserver-nodm-init/xserver-nodm58
10 files changed, 0 insertions, 493 deletions
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xdefaults b/meta/packages/x11-common/x11-common/etc/X11/Xdefaults
deleted file mode 100644
index f5b69dd51..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xdefaults
+++ /dev/null
@@ -1,3 +0,0 @@
-Rxvt*scrollBar_right: true
-Rxvt*font: xft:Mono:pixelsize=9
-
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver
deleted file mode 100644
index 3d4aa74b9..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xserver
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-
-# note xinit needs full server path
-XSERVER=/usr/bin/Xipaq
-if [ -f /usr/bin/Xfbdev ]; then
- XSERVER=/usr/bin/Xfbdev
-fi
-if [ -f /usr/bin/Xepson ]; then
- XSERVER=/usr/bin/Xepson
-fi
-if [ -f /usr/bin/Xorg ]; then
- XSERVER=/usr/bin/Xorg
-fi
-if [ -f /usr/bin/Xomap ]; then
- XSERVER=/usr/bin/Xomap
-fi
-
-. /etc/profile
-
-module_id() {
- ## used to read from assets, but sometimes assets is corrupted
- # grep "Module ID" /proc/hal/assets | sed "s/.*://"
- ## used to read from /proc/hal/model, but that is removed in 2.6
- # echo ' iPAQ' `cat /proc/hal/model`
- awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
-ARGS=" -br -pn"
-
-if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
-
- . /etc/formfactor/config
-
- ARGS="$ARGS -keybd keyboard"
-
- # use usb mouse if present
- if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
- ARGS="$ARGS -mouse /dev/input/mice"
- fi
-
- # kdrive 1.4 onwards needs -mouse args
- if [ -n "$TSLIB_TSDEVICE" ]; then
- ARGS="$ARGS -mouse tslib"
- fi
-
- # start off server in conventional location.
- case `module_id` in
- "Generic OMAP1510/1610/1710")
- ARGS="$ARGS -mouse /dev/input/event0" ;;
- "Compulab CM-x270")
- #modprobe mbxfb
- #ARGS="$ARGS -fb /dev/fb1"
- ;;
- "Nokia N800")
- ARGS="$ARGS -mouse tslib" ;;
- "Nokia 770")
- ARGS="$ARGS -mouse tslib" ;;
- *)
- ;;
- esac
-
- ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
-
- if [ ! -z "$DISPLAY_DPI" ]; then
- ARGS="$ARGS -dpi $DISPLAY_DPI"
- fi
-
- if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
- ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
- fi
-
-fi
-
-DISPLAY=':0'
-
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession b/meta/packages/x11-common/x11-common/etc/X11/Xsession
deleted file mode 100644
index a87447a87..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-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`
- echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
-fi
-
-. /etc/profile
-
-if [ -f $HOME/.profile ]; then
- . $HOME/.profile
-fi
-
-SYSSESSIONDIR=/etc/X11/Xsession.d
-
-export CLUTTER_DISABLE_MIPMAPPED_TEXT=1
-
-for SESSIONFILE in $SYSSESSIONDIR/*; do
- set +e
- case "$SESSIONFILE" in
- *.sh)
- . "$SESSIONFILE"
- ;;
- *.shbg)
- "$SESSIONFILE" &
- ;;
- *~)
- # Ignore backup files
- ;;
- *)
- "$SESSIONFILE"
- ;;
- esac
- set -e
-done
-
-exit 0
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
deleted file mode 100644
index a9d102c74..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# kdrive 1.4 does not have default keymap in server
-#xmodmap - </etc/X11/default.xmodmap
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
deleted file mode 100644
index db7aa229d..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-XDGAUTOSTART=/etc/xdg/autostart
-if [ -d $XDGAUTOSTART ]; then
- for SCRIPT in $XDGAUTOSTART/*; do
- CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2`
- $CMD &
- done
-fi \ No newline at end of file
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
deleted file mode 100644
index b936dedf3..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -x $HOME/.Xsession ]; then
- exec $HOME/.Xsession
-elif [ -x /usr/bin/x-session-manager ]; then
- exec /usr/bin/x-session-manager
-else
- exec /usr/bin/x-window-manager
-fi
diff --git a/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap b/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap
deleted file mode 100644
index 05a13fa3c..000000000
--- a/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap
+++ /dev/null
@@ -1,260 +0,0 @@
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = minus underscore backslash
-keycode 21 = equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q q
-keycode 25 = w W w
-keycode 26 = e E
-keycode 27 = r R r
-keycode 28 = t T t
-keycode 29 = y Y y
-keycode 30 = u U u
-keycode 31 = i I i
-keycode 32 = o O o
-keycode 33 = p P p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A
-keycode 39 = s S s
-keycode 40 = d D
-keycode 41 = f F
-keycode 42 = g G g
-keycode 43 = h H h
-keycode 44 = j J j
-keycode 45 = k K k
-keycode 46 = l L l
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z Z z
-keycode 53 = x X x
-keycode 54 = c C
-keycode 55 = v V v
-keycode 56 = b B
-keycode 57 = n N n
-keycode 58 = m M m
-keycode 59 = comma less
-keycode 60 = period greater
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 92 =
-keycode 93 =
-keycode 94 = less greater bar
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 =
-keycode 98 =
-keycode 99 =
-keycode 100 =
-keycode 101 =
-keycode 102 =
-keycode 103 =
-keycode 104 = KP_Enter
-keycode 105 = Control_R
-keycode 106 = KP_Divide
-keycode 107 =
-keycode 108 = Mode_switch
-keycode 109 = Break
-keycode 110 = Home
-keycode 111 = Up
-keycode 112 = Prior
-keycode 113 = Left
-keycode 114 = Right
-keycode 115 = End
-keycode 116 = Down
-keycode 117 = Next
-keycode 118 = Insert
-keycode 119 = Delete
-keycode 120 = Menu
-keycode 121 = F13
-keycode 122 = F14
-keycode 123 = Help
-keycode 124 = Execute
-keycode 125 = F17
-keycode 126 = KP_Subtract
-keycode 127 = Pause
-keycode 128 =
-keycode 129 =
-keycode 130 =
-keycode 131 =
-keycode 132 =
-keycode 133 =
-keycode 134 =
-keycode 135 =
-keycode 136 =
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 =
-keycode 232 =
-keycode 233 =
-keycode 234 =
-keycode 235 =
-keycode 236 =
-keycode 237 =
-keycode 238 =
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
-
-add shift = Shift_L
-add shift = Shift_R
-add shift = Menu
-add lock = Caps_Lock
-add control = Control_L
-add control = Control_R
-add mod1 = Alt_L
-add mod2 = Num_Lock
-!mod3
-add mod4 = Mode_switch
-!mod5
-
diff --git a/meta/packages/x11-common/x11-common_0.1.bb b/meta/packages/x11-common/x11-common_0.1.bb
deleted file mode 100644
index 6791f961a..000000000
--- a/meta/packages/x11-common/x11-common_0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Common X11 scripts"
-LICENSE = "GPLv2"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
-PR = "r38"
-
-SRC_URI = "file://etc"
-S = ${WORKDIR}
-
-PACKAGE_ARCH = "all"
-
-do_install() {
- cp -R ${S}/etc ${D}/etc
- chmod -R 755 ${D}/etc
- find ${D}/etc -type d -name .svn -prune -exec rm -rf {} \;
- find ${D}/etc -type f -name \*~ -exec rm -rf {} \;
-}
diff --git a/meta/packages/x11-common/xserver-nodm-init.bb b/meta/packages/x11-common/xserver-nodm-init.bb
deleted file mode 100644
index c77b2f0f8..000000000
--- a/meta/packages/x11-common/xserver-nodm-init.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Simple Xserver Init Script (no dm)"
-LICENSE = "GPL"
-SECTION = "x11"
-PRIORITY = "optional"
-PR = "r22"
-RDEPENDS_${PN} = "dbus-wait sudo"
-
-SRC_URI = "file://xserver-nodm"
-S = ${WORKDIR}
-
-PACKAGE_ARCH = "all"
-
-do_install() {
- install -d ${D}/etc
- install -d ${D}/etc/init.d
- install xserver-nodm ${D}/etc/init.d
-}
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
diff --git a/meta/packages/x11-common/xserver-nodm-init/xserver-nodm b/meta/packages/x11-common/xserver-nodm-init/xserver-nodm
deleted file mode 100755
index 69ea94972..000000000
--- a/meta/packages/x11-common/xserver-nodm-init/xserver-nodm
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: xserver
-# Required-Start: $local_fs $remote_fs dbus
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
-
-killproc() { # kill the named process(es)
- pid=`/bin/pidof $1`
- [ "$pid" != "" ] && kill $pid
-}
-
-read CMDLINE < /proc/cmdline
-for x in $CMDLINE; do
- case $x in
- x11=false)
- echo "X Server disabled"
- exit 0;
- ;;
- esac
-done
-
-case "$1" in
- start)
- . /etc/profile
- username=root
- echo "Starting Xserver"
- if [ -f /etc/X11/Xusername ]; then
- username=`cat /etc/X11/Xusername`
- fi
- # Using sudo -i here has the nice side effect of making sire
- # HOME, USER and other previously problematic variables
- # are set correctly
- sudo -b -i -u $username /etc/X11/Xserver
- # Wait for the desktop to say its finished loading
- dbus-wait org.matchbox_project.desktop Loaded
- ;;
-
- stop)
- echo "Stopping XServer"
- killproc xinit
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- *)
- echo "usage: $0 { start | stop | restart }"
- ;;
-esac
-
-exit 0