org.openmoko.april-update: f820252e68a953805e70b4e79c44c6164a6c75a9

oe at monotone.openmoko.org oe at monotone.openmoko.org
Mon May 19 17:33:18 CEST 2008


revision:            f820252e68a953805e70b4e79c44c6164a6c75a9
date:                2008-05-19T12:27:48
author:              freyther at openembedded.org
branch:              org.openmoko.april-update
changelog:
merge of '083c85544a6e460740bde19d5712dec0f40da16d'
     and 'e8a92aff5d770501d008038611d763528352e3ca'

manifest:
format_version "1"

new_manifest [268a908f91d6ee048bab9bdeaedf660293107c52]

old_revision [083c85544a6e460740bde19d5712dec0f40da16d]

add_dir "packages/e17/exquisite"

add_dir "packages/e17/exquisite-theme-freerunner"

add_dir "packages/sysvinit/sysvinit/openmoko"

add_file "packages/e17/exquisite/exquisite-init"
 content [a2ca8543bd38292927282dfab4fab182e34b134b]

add_file "packages/e17/exquisite-theme-freerunner/freerunner.edj"
 content [96803d60ff6617d49ff7fb028a64b44d8602035a]

add_file "packages/e17/exquisite-theme-freerunner.bb"
 content [2b206c8d1079c5b95dab852b1293270cebda3bad]

add_file "packages/e17/exquisite_cvs.bb"
 content [79e961d9e34af08cf324d21c229e0c62a8b3d533]

add_file "packages/sysvinit/sysvinit/openmoko/rc"
 content [7f8096c89c25d7686a337e06cf8b4f0c63a49f86]

patch "packages/tasks/task-openmoko-linux.bb"
 from [843fd403bdc9926e1865f0303e6f5caa4b4452a8]
   to [fcae6e852e91591a4e09dbe7b45b94e4d9827cd3]

patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
 from [b6120434f910d084652aecf6c1d3d4c501be78cc]
   to [2dc6884e952dee7e109e25041adc60ac64e9235f]

patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
 from [e41ab9242ae6d5e9acea897aa94ca13e00b76f1b]
   to [b56910d44d0e1faf35df602150fde099c07c46e0]

  set "packages/e17/exquisite/exquisite-init"
 attr "mtn:execute"
value "true"

  set "packages/e17/exquisite-theme-freerunner/freerunner.edj"
 attr "mtn:manual_merge"
value "true"

old_revision [e8a92aff5d770501d008038611d763528352e3ca]

patch "conf/distro/include/sane-srcrevs.inc"
 from [89166126a8a5d503bb8c5e0e511be56b37659832]
   to [4fb30221d410d02cf18dc64f454f5708196060d6]

patch "packages/openmoko-projects/illume-theme_svn.bb"
 from [a5b248c743b547dd436dd3ee40850b98a7f125e6]
   to [a426add7f3c8b72e40e7865aa85755e8a677a2b7]
-------------- next part --------------
#
#
# add_dir "packages/e17/exquisite"
# 
# add_dir "packages/e17/exquisite-theme-freerunner"
# 
# add_dir "packages/sysvinit/sysvinit/openmoko"
# 
# add_file "packages/e17/exquisite/exquisite-init"
#  content [a2ca8543bd38292927282dfab4fab182e34b134b]
# 
# add_file "packages/e17/exquisite-theme-freerunner/freerunner.edj"
#  content [96803d60ff6617d49ff7fb028a64b44d8602035a]
# 
# add_file "packages/e17/exquisite-theme-freerunner.bb"
#  content [2b206c8d1079c5b95dab852b1293270cebda3bad]
# 
# add_file "packages/e17/exquisite_cvs.bb"
#  content [79e961d9e34af08cf324d21c229e0c62a8b3d533]
# 
# add_file "packages/sysvinit/sysvinit/openmoko/rc"
#  content [7f8096c89c25d7686a337e06cf8b4f0c63a49f86]
# 
# patch "packages/tasks/task-openmoko-linux.bb"
#  from [843fd403bdc9926e1865f0303e6f5caa4b4452a8]
#    to [fcae6e852e91591a4e09dbe7b45b94e4d9827cd3]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [b6120434f910d084652aecf6c1d3d4c501be78cc]
#    to [2dc6884e952dee7e109e25041adc60ac64e9235f]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [e41ab9242ae6d5e9acea897aa94ca13e00b76f1b]
#    to [b56910d44d0e1faf35df602150fde099c07c46e0]
# 
#   set "packages/e17/exquisite/exquisite-init"
#  attr "mtn:execute"
# value "true"
# 
#   set "packages/e17/exquisite-theme-freerunner/freerunner.edj"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/e17/exquisite/exquisite-init	a2ca8543bd38292927282dfab4fab182e34b134b
+++ packages/e17/exquisite/exquisite-init	a2ca8543bd38292927282dfab4fab182e34b134b
@@ -0,0 +1,40 @@
+#!/bin/sh 
+
+for x in $(cat /proc/cmdline); do
+  case $x in
+    splash=false)
+      echo "Splash Disabled" 
+      exit 0;
+      ;;
+  esac
+done
+
+. /etc/init.d/functions
+
+### Default config here - gets overriden later
+THEME="-t default"
+FPS="-fps 30"
+### Override config - if there is a config file - load it.
+if test -f /etc/exquisite/config; then
+  . /etc/exquisite/config
+fi
+
+args=''
+case `machine_id` in
+  "hp_ipaq_h3100"|"hp_ipaq_h3800") 
+     args='-rot 90' ;;
+  "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi)
+     args='-rot 270' ;;
+esac
+args=$args" $FPS $THEME"
+
+export EXDIR=/mnt/.exquisite
+export EXQUISITE_IPC=$EXDIR/exquisite
+mount tmpfs -t tmpfs $EXDIR -o,size=40k
+exquisite -fb -fs $args &
+
+exquisite-write -wait 20
+exquisite-write "PULSATE"
+
+# kill off exquisite in 180 seconds if its not gone yet
+(sleep 180; exquisite-write "QUIT")&
============================================================
# packages/e17/exquisite-theme-freerunner/freerunner.edj is binary
============================================================
--- packages/e17/exquisite-theme-freerunner.bb	2b206c8d1079c5b95dab852b1293270cebda3bad
+++ packages/e17/exquisite-theme-freerunner.bb	2b206c8d1079c5b95dab852b1293270cebda3bad
@@ -0,0 +1,33 @@
+DDESCRIPTION = "A theme for exquisite"
+HOMEPAGE = "http://www.openmoko.org"
+LICENSE = "MIT/BSD"
+PACKAGE_ARCH="all"
+PV = "1.0"
+PR = "r1"
+
+#SRCNAME = "exquisite-theme-freerunner"
+S = "${WORKDIR}"
+
+inherit e
+
+SRC_URI = "file://freerunner.edj"
+
+
+CONFFILES_${PN} = "${sysconfdir}/exquisite/config-freerunner"
+FILES_${PN} = "${sysconfdir}/exquisite ${datadir}/exquisite/data/themes"
+
+do_install() {
+    install -d ${D}${sysconfdir}/exquisite
+    install -d ${D}${datadir}/exquisite/data/themes
+
+    install -m 0644 ${S}/freerunner.edj ${D}${datadir}/exquisite/data/themes/
+    
+    echo 'THEME="-t freerunner"' > ${D}${sysconfdir}/exquisite/config-freerunner
+}
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "exquisite-config"
+ALTERNATIVE_LINK = "${sysconfdir}/exquisite/config"
+ALTERNATIVE_PATH = "${sysconfdir}/exquisite/config-freerunner"
+ALTERNATIVE_PRIORITY = "10"
============================================================
--- packages/e17/exquisite_cvs.bb	79e961d9e34af08cf324d21c229e0c62a8b3d533
+++ packages/e17/exquisite_cvs.bb	79e961d9e34af08cf324d21c229e0c62a8b3d533
@@ -0,0 +1,28 @@
+DESCRIPTION = "A psplash replacement for display"
+LICENSE = "MIT BSD"
+DEPENDS = "eet evas ecore embryo edje"
+PV = "0.0.1+cvs${SRCDATE}"
+PR = "r0.01"
+RDEPENDS = "initscripts"
+RRECOMMENDS_${PN} = "exquisite-themes"
+
+SRCNAME = "exquisite"
+
+inherit e
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+SRC_URI += "file://exquisite-init"
+
+inherit update-rc.d
+
+do_install_prepend() {
+  install -d ${D}/mnt/.exquisite/
+  install -d ${D}${sysconfdir}/init.d/
+  install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite
+}
+
+INITSCRIPT_NAME = "exquisite"
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
+
+FILES_${PN} += "/mnt/.exquisite/"
============================================================
--- packages/sysvinit/sysvinit/openmoko/rc	7f8096c89c25d7686a337e06cf8b4f0c63a49f86
+++ packages/sysvinit/sysvinit/openmoko/rc	7f8096c89c25d7686a337e06cf8b4f0c63a49f86
@@ -0,0 +1,181 @@
+#!/bin/sh
+#
+# rc		This file is responsible for starting/stopping
+#		services when the runlevel changes.
+#
+#		Optimization feature:
+#		A startup script is _not_ run when the service was
+#		running in the previous runlevel and it wasn't stopped
+#		in the runlevel transition (most Debian services don't
+#		have K?? links in rc{1,2,3,4,5} )
+#
+# Author:	Miquel van Smoorenburg <miquels at cistron.nl>
+#		Bruce Perens <Bruce at Pixar.com>
+#
+# Version:	@(#)rc  2.78  07-Nov-1999  miquels at cistron.nl
+#
+
+. /etc/default/rcS
+export VERBOSE
+
+startup_progress() {
+    step=$(($step + $step_change))
+    if [ "$num_steps" != "0" ]; then
+        progress=$((($step * $progress_size / $num_steps) + $first_step))
+    else
+        progress=$progress_size
+    fi
+    #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
+# FIXME: this should be virtualised and come from a generic boot splash script
+# provided by some generic splash handler - be it psplash, exquisite or
+# whatever else soa  simple install of one splash instead of another works
+    if type exquisite-write >/dev/null 2>&1; then
+         EXQUISITE_IPC=/mnt/.exquisite/exquisite exquisite-write "PROGRESS $progress" || true
+    fi
+}
+
+
+#
+# Start script or program.
+#
+startup() {
+  # Handle verbosity
+  [ "$VERBOSE" = very ] && echo "INIT: Running $@..."
+
+  case "$1" in
+	*.sh)
+		# Source shell script for speed.
+		(
+			trap - INT QUIT TSTP
+			scriptname=$1
+			shift
+			. $scriptname
+		)
+		;;
+	*)
+		"$@"
+		;;
+  esac
+  startup_progress
+}
+
+  # Ignore CTRL-C only in this shell, so we can interrupt subprocesses.
+  trap ":" INT QUIT TSTP
+
+  # Set onlcr to avoid staircase effect.
+  stty onlcr 0>&1
+
+  # Now find out what the current and what the previous runlevel are.
+
+  runlevel=$RUNLEVEL
+  # Get first argument. Set new runlevel to this argument.
+  [ "$1" != "" ] && runlevel=$1
+  if [ "$runlevel" = "" ]
+  then
+	echo "Usage: $0 <runlevel>" >&2
+	exit 1
+  fi
+  previous=$PREVLEVEL
+  [ "$previous" = "" ] && previous=N
+
+  export runlevel previous
+
+  # Is there an rc directory for this new runlevel?
+  if [ -d /etc/rc$runlevel.d ]
+  then
+	# Find out where in the progress bar the initramfs got to.
+	PROGRESS_STATE=0
+	#if [ -f /dev/.initramfs/progress_state ]; then
+	#    . /dev/.initramfs/progress_state
+	#fi
+
+	# Split the remaining portion of the progress bar into thirds
+	progress_size=$(((100 - $PROGRESS_STATE) / 3))
+
+	case "$runlevel" in
+		0|6)
+			# Count down from -100 to 0 and use the entire bar
+			first_step=-100
+			progress_size=100
+			step_change=1
+			;;
+	        S)
+			# Begin where the initramfs left off and use 2/3
+			# of the remaining space
+			first_step=$PROGRESS_STATE
+			progress_size=$(($progress_size * 2))
+			step_change=1
+			;;
+		*)
+			# Begin where rcS left off and use the final 1/3 of
+			# the space (by leaving progress_size unchanged)
+			first_step=$(($progress_size * 2 + $PROGRESS_STATE))
+			step_change=1
+			;;
+	esac
+
+	num_steps=0
+	for s in /etc/rc$runlevel.d/[SK]*; do
+            case "${s##/etc/rc$runlevel.d/S??}" in
+                gdm|xdm|kdm|reboot|halt)
+                    break
+                    ;;
+            esac
+            num_steps=$(($num_steps + 1))
+        done
+        step=0
+
+	# First, run the KILL scripts.
+	if [ $previous != N ]
+	then
+		for i in /etc/rc$runlevel.d/K[0-9][0-9]*
+		do
+			# Check if the script is there.
+			[ ! -f $i ] && continue
+
+			# Stop the service.
+			startup $i stop
+		done
+	fi
+
+	# Now run the START scripts for this runlevel.
+	for i in /etc/rc$runlevel.d/S*
+	do
+		[ ! -f $i ] && continue
+
+		if [ $previous != N ] && [ $previous != S ]
+		then
+			#
+			# Find start script in previous runlevel and
+			# stop script in this runlevel.
+			#
+			suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]}
+			stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix
+			previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix
+			#
+			# If there is a start script in the previous level
+			# and _no_ stop script in this level, we don't
+			# have to re-start the service.
+			#
+			[ -f $previous_start ] && [ ! -f $stop ] && continue
+		fi
+		case "$runlevel" in
+			0|6)
+				startup $i stop
+				;;
+			*)
+				startup $i start
+				;;
+		esac
+	done
+  fi
+
+# FIXME: this should be virtualised and come from a generic boot splash script
+# provided by some generic splash handler - be it psplash, exquisite or
+# whatever else soa  simple install of one splash instead of another works
+if [ "x$runlevel" != "xS" ]; then
+    if type exquisite-write >/dev/null 2>&1; then
+        EXQUISITE_IPC=/mnt/.exquisite/exquisite exquisite-write "QUIT" || true
+    	umount /mnt/.exquisite
+    fi
+fi
============================================================
--- packages/tasks/task-openmoko-linux.bb	843fd403bdc9926e1865f0303e6f5caa4b4452a8
+++ packages/tasks/task-openmoko-linux.bb	fcae6e852e91591a4e09dbe7b45b94e4d9827cd3
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -17,8 +17,9 @@ RDEPENDS_task-openmoko-linux = "\
   module-init-tools-depmod \
   rsync \
   screen \
-  psplash \
   fbset \
   fbset-modes \
-#  update-alternatives \
+  exquisite \
+  exquisite-themes \
+  exquisite-theme-freerunner \
 "
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	b6120434f910d084652aecf6c1d3d4c501be78cc
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	2dc6884e952dee7e109e25041adc60ac64e9235f
@@ -95,7 +95,7 @@ case `module_id` in
                 modprobe mbxfb
                 ARGS="$ARGS -br -fb /dev/fb1" ;;
         "GTA01" | "GTA02")
-                ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm" ;;
+                ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -br" ;;
         "Motorola Ezx Platform")
                 ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" ;;
         "Nokia N800")
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	e41ab9242ae6d5e9acea897aa94ca13e00b76f1b
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	b56910d44d0e1faf35df602150fde099c07c46e0
@@ -2,7 +2,7 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r27.01"
+PR = "r28"
 
 SRC_URI = "\
   file://Xdefaults \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080519/edaee83f/attachment.htm 
-------------- next part --------------
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [89166126a8a5d503bb8c5e0e511be56b37659832]
#    to [4fb30221d410d02cf18dc64f454f5708196060d6]
# 
# patch "packages/openmoko-projects/illume-theme_svn.bb"
#  from [a5b248c743b547dd436dd3ee40850b98a7f125e6]
#    to [a426add7f3c8b72e40e7865aa85755e8a677a2b7]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	89166126a8a5d503bb8c5e0e511be56b37659832
+++ conf/distro/include/sane-srcrevs.inc	4fb30221d410d02cf18dc64f454f5708196060d6
@@ -42,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "79"
-SRCREV_pn-illume-theme ?= "79"
+SRCREV_pn-illume ?= "86"
+SRCREV_pn-illume-theme ?= "86"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb	a5b248c743b547dd436dd3ee40850b98a7f125e6
+++ packages/openmoko-projects/illume-theme_svn.bb	a426add7f3c8b72e40e7865aa85755e8a677a2b7
@@ -4,7 +4,7 @@ PV = "0.0+svnr${SRCPV}"
 
 PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCPV}"
-PR = "r5"
+PR = "r5.02"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
 S = "${WORKDIR}/illume"
@@ -15,9 +15,11 @@ do_install() {
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
+    install -d ${D}${datadir}/enlightenment/data/init/
 
     # Make illume the default profile
     echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
 
     install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080519/edaee83f/attachment-0001.htm 


More information about the commitlog mailing list