diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/matchbox2/matchbox-panel-2_svn.bb | 3 | ||||
| -rw-r--r-- | packages/openmoko-base/openmoko-libs_svn.bb | 2 | ||||
| -rwxr-xr-x | packages/sysvinit/sysvinit/angstrom/rc | 54 | ||||
| -rw-r--r-- | packages/sysvinit/sysvinit_2.86.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch | 13 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 |
6 files changed, 43 insertions, 33 deletions
diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index 5022afa41a..d166e78a3a 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,11 +3,10 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" PV = "0.1+svn${SRCDATE}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index e7b711e627..b478ca2604 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications" SECTION = "openmoko/libs" LICENSE = "LGPL" -DEPENDS += "gtk+" +DEPENDS += "gtk+ eds-dbus" PV = "0.0.1+svn${SRCDATE}" PR = "r2" diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc index e43ddec14b..30b69ad516 100755 --- a/packages/sysvinit/sysvinit/angstrom/rc +++ b/packages/sysvinit/sysvinit/angstrom/rc @@ -1,5 +1,4 @@ #!/bin/sh - # # rc This file is responsible for starting/stopping # services when the runlevel changes. @@ -21,13 +20,12 @@ export VERBOSE startup_progress() { step=$(($step + $step_change)) - - if [ $(($num_steps + $first_step)) -lt 1 ]; then - num_steps="1" - first_step="0" + if [ "$num_steps" != "0" ]; then + progress=$((($step * $progress_size / $num_steps) + $first_step)) + else + progress=$progress_size fi - - progress=$(($step * $progress_size / $num_steps + $first_step)) + #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" if type psplash-write >/dev/null 2>&1; then TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true fi @@ -93,10 +91,10 @@ startup() { case "$runlevel" in 0|6) - # Count down from 0 to -100 and use the entire bar - first_step=0 + # Count down from -100 to 0 and use the entire bar + first_step=-100 progress_size=100 - step_change=-1 + step_change=1 ;; S) # Begin where the initramfs left off and use 2/3 @@ -113,6 +111,17 @@ startup() { ;; 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 @@ -126,18 +135,6 @@ startup() { done fi - 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 - # Now run the START scripts for this runlevel. for i in /etc/rc$runlevel.d/S* do @@ -170,9 +167,10 @@ startup() { done fi -if [ "x$runlevel" != "xS" ]; then - if type psplash-write >/dev/null 2>&1; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - umount /mnt/.psplash - fi -fi +#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch +#if [ "x$runlevel" != "xS" ]; then +# if type psplash-write >/dev/null 2>&1; then +# TMPDIR=/mnt/.psplash psplash-write "QUIT" || true +# umount /mnt/.psplash +# fi +#fi diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index a4c4ff8381..c8ce5ba191 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r33" +PR = "r34" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch index c82aa943d2..11931f83d6 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -36,3 +36,16 @@ Index: xorg-server-1.2.0/include/kdrive-config.h.in /* Verbose debugging output hilarity */ #undef DEBUG +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-30 12:47:25.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-30 12:39:01.000000000 +0200 +@@ -1540,7 +1540,7 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index b64bfe8ff9..e6cd3b2f30 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r3" +PR = "r4" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ |