r2264 - in trunk/oe/packages: . tasks x11-c-locale x11-c-locale/files x11-c-locale/files/locale x11-c-locale/files/locale/C xserver-kdrive-common xserver-kdrive-common/xserver-kdrive-common xserver-kdrive-common/xserver-kdrive-common/etc xserver-kdrive-common/xserver-kdrive-common/etc/X11 xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d xserver-kdrive-common/xserver-nodm-init

mickey at sita.openmoko.org mickey at sita.openmoko.org
Fri Jun 15 09:39:32 CEST 2007


Author: mickey
Date: 2007-06-15 09:39:19 +0200 (Fri, 15 Jun 2007)
New Revision: 2264

Added:
   trunk/oe/packages/x11-c-locale/
   trunk/oe/packages/x11-c-locale/files/
   trunk/oe/packages/x11-c-locale/files/locale/
   trunk/oe/packages/x11-c-locale/files/locale/C/
   trunk/oe/packages/x11-c-locale/files/locale/C/XLC_LOCALE
   trunk/oe/packages/x11-c-locale/files/locale/locale.dir
   trunk/oe/packages/x11-c-locale/x11-c-locale_0.0.bb
   trunk/oe/packages/xserver-kdrive-common/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
   trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb
   trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/
   trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
Modified:
   trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe: add infrastructure tweaking to make core fonts display w/ kdrive


Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/tasks/task-openmoko.bb	2007-06-15 07:39:19 UTC (rev 2264)
@@ -4,7 +4,7 @@
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r43"
+PR = "r44"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -69,6 +69,7 @@
   xserver-kdrive-fbdev \
   xserver-kdrive-common \
   xserver-nodm-init \
+  x11-c-locale \
   ttf-bitstream-vera \
   xauth \
   xhost \

Added: trunk/oe/packages/x11-c-locale/files/locale/C/XLC_LOCALE
===================================================================
--- trunk/oe/packages/x11-c-locale/files/locale/C/XLC_LOCALE	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/x11-c-locale/files/locale/C/XLC_LOCALE	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,63 @@
+#  $Xorg: C,v 1.3 2000/08/17 19:46:59 cpqbld Exp $
+#  XLocale Database Sample for C.
+#  $XFree86: xc/nls/XLC_LOCALE/C,v 1.3 2000/02/25 21:02:32 dawes Exp $
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		STRING
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL
+}
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-1:GR
+}
+
+END XLC_XLOCALE

Added: trunk/oe/packages/x11-c-locale/files/locale/locale.dir
===================================================================
--- trunk/oe/packages/x11-c-locale/files/locale/locale.dir	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/x11-c-locale/files/locale/locale.dir	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,12 @@
+#	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.10 2005-09-30 07:52:46 daniels Exp $
+#	$Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
+#
+#	This file contains locale database file names
+#	The first word is the locale database file name and
+#	the second word is the full locale name.
+#
+#	$XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $
+#
+
+C/XLC_LOCALE				C
+C/XLC_LOCALE:				C

Added: trunk/oe/packages/x11-c-locale/x11-c-locale_0.0.bb
===================================================================
--- trunk/oe/packages/x11-c-locale/x11-c-locale_0.0.bb	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/x11-c-locale/x11-c-locale_0.0.bb	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,19 @@
+SRC_URI = "file://locale"
+
+do_install() {
+	install -d ${D}${libdir}/X11
+	cp -a ${WORKDIR}/locale ${D}${libdir}/X11/
+}
+
+FILES_${PN} = "${libdir}"
+
+pkg_postinst_${PN}() {
+#!/bin/sh
+
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+fc-cache -r
+}
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,3 @@
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,16 @@
+#!/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

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,108 @@
+#!/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
+if [ -f /usr/bin/Xw100 ]; then                                                                                                                                              
+  XSERVER=Xw100                                                                                                                                                             
+fi                                                                                                                                                                          
+if [ -f /usr/bin/Ximageon ]; then                                                                                                                                           
+   XSERVER=Ximageon                                                                                                                                                          
+fi   
+
+. /etc/profile
+
+
+
+fallback_screen_arg() {
+    geom=`fbset | grep geometry`
+    w=`echo $geom | awk '{ print $2 }'`
+    h=`echo $geom | awk '{ print $3 }'`
+    b=`echo $geom | awk '{ print $6 }'`
+    echo -n "${w}x${h}x${b}"
+} 
+
+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
+}
+
+export USER=root
+
+ARGS=" -br -pn -pf built-ins,/usr/share/fonts/ttf,/usr/share/fonts/truetype"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+  ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+  ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+        "HP iPAQ H3100" | "HP iPAQ H3800")                                                                                                                                   
+                ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;                                                                                                       
+        "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")                                                                                                                 
+                ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;                                                                                                      
+        "HP iPAQ H5400" | "HP iPAQ H2200")                                                                                                                                   
+                ARGS="$ARGS -dpi 100 -rgba rgb" ;;                                                                                                                           
+        "HP iPAQ HX4700")                                                                                                                                                    
+                ARGS="$ARGS -dpi 200" ;;                                                                                                                                     
+        "Ramses")                                                                                                                                                            
+                # What is this "vt2" in aid of?                                                                                                                              
+                ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;                                                                                                   
+        # both 'Sharp-Collie' and just 'Collie' have been reported                                                                                                           
+        *Poodle)                                                                                                                                                             
+                ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;                                                                                                      
+        *Collie)                                                                                                                                                             
+                ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270"                                                                                                         
+                ;;                                                                                                                                                           
+        "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")                                                                                                                    
+                ARGS="$ARGS -dpi 200 -rgba rgb" ;;                                                                                                                           
+        "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")                                                                                                                      
+                ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;                                                                                                       
+        "Simpad")                                                                                                                                                            
+                ARGS="$ARGS -dpi 100 -rgba rgb" ;;                                                                                                                           
+        "Generic OMAP1510/1610/1710")                                                                                                                                        
+                ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;                                                                                                            
+        "Cellon C8000 Board")                                                                                                                                                
+                ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;                                                                                                                
+        "HTC Universal")                                                                                                                                                     
+                ARGS="$ARGS -dpi 100 -screen 480x640 at 270" ;;                                                                                
+	"ARM-IntegratorCP" | "ARM-Versatile PB")
+		ARGS="$ARGS -rgba vrgb" ;;
+	"Compulab CM-x270")
+                modprobe mbxfb
+	        ARGS="$ARGS -fb /dev/fb1"
+                ;;
+        *)
+		# Its a device we dont know about - in which case force
+                # kdrive to use the current framebuffer geometry otherwise
+		# it will defualt to trying to achieve 1024x768 
+		S=`fallback_screen_arg`
+		ARGS="$ARGS -screen $S"
+		;;
+esac
+
+DISPLAY=':0'
+
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+HOME_VOLATILE=/home/$USER/ramdisk
+export HOME_VOLATILE
+
+if [ -f /usr/bin/dbus-launch ]; then
+  ## test for an existing bus daemon, just to be safe
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     ## if not found, launch a new one
+     eval `dbus-launch --auto-syntax --exit-with-session`
+     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+  fi
+fi
+
+. /etc/profile
+
+if [ -f $HOME/.profile ]; then
+ . $HOME/.profile
+fi
+
+SYSSESSIONDIR=/etc/X11/Xsession.d
+
+run-parts $SYSSESSIONDIR
+
+exit 0
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
+do
+   /usr/bin/xtscal
+done

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -x $HOME/.Xsession ]; then
+    exec $HOME/.Xsession
+else
+    exec /usr/bin/x-window-manager
+fi
+
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
+PR = "r10"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+PACKAGE_ARCH = "all"
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	rm -fR ${D}/etc/.svn
+	rm -fR ${D}/etc/*/.svn
+	rm -fR ${D}/etc/*/*/.svn
+	chmod -R 755 ${D}/etc
+}

Added: trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+killproc() {            # kill the named process(es)
+        pid=`/bin/ps -e x |
+             /bin/grep $1 |
+             /bin/grep -v grep |
+             /bin/sed -e 's/^  *//' -e 's/ .*//'`
+        [ "$pid" != "" ] && kill $pid
+}
+
+for x in $(cat /proc/cmdline); do
+        case $x in
+        x11=false)
+		echo "X Server disabled" 
+		exit 0;
+                ;;
+        esac
+done
+
+case "$1" in
+  start)
+    # We don't want this script to block the rest of the boot process
+    if [ "$2" != "background" ]; then
+      $0 $1 background &
+    else
+       . /etc/profile
+
+       echo "Starting Xserver"
+       /etc/X11/Xserver &
+    fi 
+  ;;
+
+  stop)
+        echo "Stopping XServer"
+        killproc xinit
+  ;;
+
+  restart)
+	$0 stop
+        sleep 1
+        $0 start
+  ;;
+
+  *)
+        echo "usage: $0 { start | stop | restart }"
+  ;;
+esac
+
+exit 0


Property changes on: trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb	2007-06-15 02:43:27 UTC (rev 2263)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb	2007-06-15 07:39:19 UTC (rev 2264)
@@ -0,0 +1,21 @@
+DESCRIPTION = "Simple Xserver Init Script (no dm)"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+PR = "r8"
+
+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 99 5 2 . stop 20 0 1 6 ."





More information about the commitlog mailing list