From 805ada20ea4fcbfd4a58605e62693ff81fc41b56 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 Mar 2009 06:28:46 +0100 Subject: [PATCH] add WindowManager and xinit --- .../python/multimedia/elisa/init.d/71_elisa | 18 --------------- packages/virtual/Xorg/build | 1 + packages/virtual/Xorg/init.d/65_xorg | 13 +++++------ packages/virtual/Xorg/install | 5 ++--- packages/virtual/image/config/etc/conf.d/core | 22 ++++++++++++++----- packages/virtual/image/config/etc/sysconfig | 1 - packages/virtual/image/install | 3 --- packages/x11/other/mrxvt/init.d/70_mrxvt | 12 ---------- 8 files changed, 25 insertions(+), 50 deletions(-) delete mode 100755 packages/python/multimedia/elisa/init.d/71_elisa delete mode 100755 packages/x11/other/mrxvt/init.d/70_mrxvt diff --git a/packages/python/multimedia/elisa/init.d/71_elisa b/packages/python/multimedia/elisa/init.d/71_elisa deleted file mode 100755 index 48f48faa1b..0000000000 --- a/packages/python/multimedia/elisa/init.d/71_elisa +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# start elisa -# -# runlevels: openelec - -. /etc/sysconfig - -if test -f /usr/bin/elisa; then - - echo "### Starting Elisa ###" - -# elisa -l -n & #> /dev/null 2>&1 & - /usr/bin/elisa -l -f 2> $HOME/elisa.log - -fi - -exit 0 diff --git a/packages/virtual/Xorg/build b/packages/virtual/Xorg/build index 2b0e8613b4..c00d01b740 100755 --- a/packages/virtual/Xorg/build +++ b/packages/virtual/Xorg/build @@ -14,6 +14,7 @@ $SCRIPTS/build xkeyboard-config #Tools + #$SCRIPTS/build xrandr #$SCRIPTS/build xresprobe #$SCRIPTS/build read-edid diff --git a/packages/virtual/Xorg/init.d/65_xorg b/packages/virtual/Xorg/init.d/65_xorg index 1cbc86a9d3..f32d0a87f9 100755 --- a/packages/virtual/Xorg/init.d/65_xorg +++ b/packages/virtual/Xorg/init.d/65_xorg @@ -9,12 +9,11 @@ echo "### starting Xorg ###" # modprobe drm - mkdir -p /var/lib/xkb/ +mkdir -p /var/lib/xkb/ - # use Screen0 if present to workaround a bug with some graphic drivers - # that report 2 screens and prevent Xorg from loading correctly - SCREEN= - [ -f /etc/X11/xorg.conf ] && grep -q Screen0 /etc/X11/xorg.conf && SCREEN="-screen Screen0" +if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then + mount -o bind /storage /var/log + mount -o bind /storage /var/tmp +fi - # starts X.org - Xorg vt$TTY $SCREEN > /dev/null 2>&1 & +xinit $XINITRC -- $XSERVERRC \ No newline at end of file diff --git a/packages/virtual/Xorg/install b/packages/virtual/Xorg/install index f48fb27698..f02f4a0653 100755 --- a/packages/virtual/Xorg/install +++ b/packages/virtual/Xorg/install @@ -31,10 +31,9 @@ $SCRIPTS/install xf86-video-nv #$SCRIPTS/install xrandr #$SCRIPTS/install xresprobe #$SCRIPTS/install read-edid -#$SCRIPTS/install xinit -#$SCRIPTS/install ratpoison +$SCRIPTS/install xinit #+$SCRIPTS/install pciutils - +$SCRIPTS/install evilwm #mkdir -p $INSTALL/usr/bin #cp $PKG_DIR/scripts/oe_wrapper $INSTALL/usr/bin #cp $PKG_DIR/scripts/startx $INSTALL/usr/bin diff --git a/packages/virtual/image/config/etc/conf.d/core b/packages/virtual/image/config/etc/conf.d/core index b3b7d1252b..a6285d9bce 100644 --- a/packages/virtual/image/config/etc/conf.d/core +++ b/packages/virtual/image/config/etc/conf.d/core @@ -34,19 +34,29 @@ export LANG #------------------------------------------------------------------------------- DISPLAY=':0.0' TTY=1 -XINITRC='/etc/X11/xinit/xinitrc' -XSERVERRC='/etc/X11/xinit/xserverrc' +XINITRC='/usr/lib/X11/xinit/xinitrc' +XSERVERRC='/usr/lib/X11/xinit/xserverrc' export DISPLAY export XINITRC export XSERVERRC export TTY +#------------------------------------------------------------------------------- +# Turn on/off WindowManager +#------------------------------------------------------------------------------- +OE_X_WM_ENABLED=yes + +#------------------------------------------------------------------------------- +# Default Font for WindowManager +#------------------------------------------------------------------------------- +WM_FONT='-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1' + #------------------------------------------------------------------------------- # Elisas environment variables. #------------------------------------------------------------------------------- -ELISA_DEBUG=*:5 -export ELISA_DEBUG +ELISA_DEBUG=yes +ELISA_FULLSCREEN=yes +ELISA_TMPLOG=yes -GST_DEBUG=GST_ELEMENT_FACTORY:3 -export GST_DEBUG \ No newline at end of file +ELISA_LOGFILE='/var/log/elisa.log' diff --git a/packages/virtual/image/config/etc/sysconfig b/packages/virtual/image/config/etc/sysconfig index ae1d73f8b5..abfc2e763b 100644 --- a/packages/virtual/image/config/etc/sysconfig +++ b/packages/virtual/image/config/etc/sysconfig @@ -3,4 +3,3 @@ /usr/bin/test -r /etc/conf.d/dhcp.override && . /etc/conf.d/dhcp.override /usr/bin/test -r /etc/conf.d/dhcp && . /etc/conf.d/dhcp /usr/bin/test -r /etc/conf.d/elisa && . /etc/conf.d/elisa -/usr/bin/test -r /etc/conf.d/minimyth && . /etc/conf.d/minimyth diff --git a/packages/virtual/image/install b/packages/virtual/image/install index 1ad92f1520..2bb995cd64 100755 --- a/packages/virtual/image/install +++ b/packages/virtual/image/install @@ -33,9 +33,7 @@ case "$2" in $SCRIPTS/install gcc-final $SCRIPTS/install linux $2 $SCRIPTS/install busybox $2 -# $SCRIPTS/install exquisite $SCRIPTS/install automountd -# $SCRIPTS/install ntfs-3g echo $TARGET_ARCH > $INSTALL/etc/arch echo "$GEEXBOX_VERSION" > $INSTALL/etc/version @@ -51,7 +49,6 @@ case "$2" in $SCRIPTS/install network # Elisa... -# $SCRIPTS/install Python $SCRIPTS/install elisa $SCRIPTS/install elisa-plugins-good $SCRIPTS/install elisa-plugins-bad diff --git a/packages/x11/other/mrxvt/init.d/70_mrxvt b/packages/x11/other/mrxvt/init.d/70_mrxvt deleted file mode 100755 index a69651f473..0000000000 --- a/packages/x11/other/mrxvt/init.d/70_mrxvt +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# start HAL daemon -# -# runlevels: openelec, debug, configure - -. /etc/sysconfig - -echo "### Starting MRXVT ###" - - /usr/bin/mrxvt > /dev/null 2>&1 & -