diff options
24 files changed, 402 insertions, 132 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 0c7fe5be49..22a2c98a16 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -218,7 +218,7 @@ DISTRO_EXTRA_DEPENDS += " \ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ angstrom-version \ opkg opkg-collateral distro-feed-configs \ util-linux-mount util-linux-umount \ diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 5cf079de84..7a7c29f121 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1713,7 +1713,7 @@ PREFERRED_VERSION_setserial ?= "2.17" PREFERRED_VERSION_setxkbmap ?= "1.0.4" PREFERRED_VERSION_sgml-common ?= "0.6.3" PREFERRED_VERSION_sgml-common-native ?= "0.6.3" -PREFERRED_VERSION_shared-mime-info ?= "0.22" +PREFERRED_VERSION_shared-mime-info ?= "0.51" PREFERRED_VERSION_sharp-compat-libs ?= "0.5" PREFERRED_VERSION_sharprom-toolchain-native ?= "1.0" PREFERRED_VERSION_shasum-native ?= "1.0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e8c88626cc..6b1d5d8fe6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -212,9 +212,11 @@ SRCREV_pn-zhone ?= "929c78f2e83faef526064231c17958eaef72eba3" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "36540" +EFL_SRCREV ?= "37324" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" +SRCREV_pn-eina-native ?= "${EFL_SRCREV}" +SRCREV_pn-eina ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" SRCREV_pn-eet ?= "${EFL_SRCREV}" SRCREV_pn-evas-native ?= "${EFL_SRCREV}" diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc index 22c6ad4233..5394855523 100644 --- a/conf/machine/include/palm.inc +++ b/conf/machine/include/palm.inc @@ -3,7 +3,6 @@ # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/packages/e17/e-wm/enlightenment_start.oe b/packages/e17/e-wm/enlightenment_start.oe index 7d472fa76f..e5a65025cb 100644 --- a/packages/e17/e-wm/enlightenment_start.oe +++ b/packages/e17/e-wm/enlightenment_start.oe @@ -5,4 +5,5 @@ if [ -r /etc/enlightenment/default_profile ]; then . /etc/enlightenment/default_profile fi +renice -10 -p $$ exec enlightenment_start $E_PROFILE diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index acbee85a70..a2fabc7840 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -2,11 +2,51 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -PR = "r15" +PR = "r17" inherit e update-alternatives -RDEPENDS += "shared-mime-info mime-support" +RDEPENDS += "shared-mime-info mime-support edje-utils glibc-utils" + +PACKAGES =+ "\ + ${PN}-config-default \ + ${PN}-config-illume \ + ${PN}-config-minimalist \ + ${PN}-config-netbook \ + ${PN}-config-scaleable \ + ${PN}-config-standard \ + ${PN}-theme-default \ + ${PN}-theme-illume \ + ${PN}-background-dark-gradient \ + ${PN}-background-light-gradient \ + ${PN}-images \ + ${PN}-icons \ + ${PN}-other \ + ${PN}-input-methods \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-config-default \ + ${PN}-images \ + ${PN}-icons \ + ${PN}-other \ + ${PN}-input-methods \ +" + +PACKAGE_ARCH_${PN}-config-default = "all" +PACKAGE_ARCH_${PN}-config-illume = "all" +PACKAGE_ARCH_${PN}-config-minimalist = "all" +PACKAGE_ARCH_${PN}-config-netbook = "all" +PACKAGE_ARCH_${PN}-config-scaleable = "all" +PACKAGE_ARCH_${PN}-config-standard = "all" +PACKAGE_ARCH_${PN}-theme-default = "all" +PACKAGE_ARCH_${PN}-theme-illume = "all" +PACKAGE_ARCH_${PN}-background-dark-gradient = "all" +PACKAGE_ARCH_${PN}-background-light-gradient = "all" +PACKAGE_ARCH_${PN}-images = "all" +PACKAGE_ARCH_${PN}-icons = "all" +PACKAGE_ARCH_${PN}-other = "all" +PACKAGE_ARCH_${PN}-input-methods = "all" SRC_URI = "\ svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \ @@ -37,30 +77,53 @@ do_stage() { do_install_append() { # customising - should rather make this simple upstream - rm -rf ${D}${datadir}/enlightenment/data/backgrounds/* - rm -rf ${D}${datadir}/enlightenment/data/fonts/* - rm -rf ${D}${datadir}/enlightenment/data/other/* install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir} install -d ${D}/${sysconfdir}/xdg/menus install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ + for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done + for I in `find ${D}/${libdir}/enlightenment -name "*.la" -print`; do rm -f $I; done } FILES_${PN} = "\ ${bindir}/* \ ${libdir}/enlightenment/modules/*/*.* \ ${libdir}/enlightenment/modules/*/*/* \ - ${libdir}/enlightenment/preload/*.so \ - ${datadir} \ + ${datadir}/locale \ + ${datadir}/enlightenment/data/icons \ + ${datadir}/enlightenment/data/input_methods \ + ${datadir}/enlightenment/data/config/profile.cfg \ ${sysconfdir} \ " +FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" +FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume" +FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist" +FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook" +FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable" +FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard" +FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" +FILES_${PN}-theme-illume = "${datadir}/enlightenment/data/themes/illume.edj" +FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj" +FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj" +FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj" +FILES_${PN}-images = "${datadir}/enlightenment/data/images" +FILES_${PN}-icons = "${datadir}/enlightenment/data/icons" +FILES_${PN}-other = "${datadir}/enlightenment/data/other" +FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods" + +RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" +RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume" +RRECOMMENDS_${PN}-config-minimalist = "${PN}-background-light-gradient \ +${PN}-theme-default" +RRECOMMENDS_${PN}-config-netbook = "${PN}-background-dark-gradient \ +${PN}-theme-default" +RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default" +RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default" + FILES_${PN}-dbg += "\ ${libdir}/enlightenment/modules/*/*/.debug/ \ ${libdir}/enlightenment/preload/.debug/ \ " - -FILES_${PN}-dev += "\ - ${libdir}/enlightenment/preload/*.?a \ -" +FILES_${PN}-dev += "${libdir}/enlightenment/preload/*.?a" CONFFILES_${PN} = "/etc/xdg/menus/applications.menu" diff --git a/packages/e17/exquisite/exquisite-init b/packages/e17/exquisite/exquisite-init new file mode 100644 index 0000000000..1750184842 --- /dev/null +++ b/packages/e17/exquisite/exquisite-init @@ -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 40 +exquisite-write "PULSATE" + +# kill off exquisite in 300 seconds if its not gone yet +(sleep 300; exquisite-write "QUIT")& diff --git a/packages/e17/exquisite_svn.bb b/packages/e17/exquisite_svn.bb index 4777226df5..e303600d58 100644 --- a/packages/e17/exquisite_svn.bb +++ b/packages/e17/exquisite_svn.bb @@ -2,8 +2,32 @@ DESCRIPTION = "A psplash replacement for display" LICENSE = "MIT BSD" DEPENDS = "eet evas ecore embryo edje" PV = "0.0.1+svnr${SRCREV}" -PR = "r1" +PR = "r3" +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 +} + + +do_install_append() { + rm -rf ${D}${datadir}/exquisite/data/fonts/* +} + +INITSCRIPT_NAME = "exquisite" +INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ." + +FILES_${PN} += "/mnt/.exquisite/" diff --git a/packages/e17/illume-theme-illume_svn.bb b/packages/e17/illume-theme-illume_svn.bb deleted file mode 100644 index eb313e074c..0000000000 --- a/packages/e17/illume-theme-illume_svn.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Illume theme for Illume E module" -HOMEPAGE = "http://www.enlightenment.org/" -LICENSE = "MIT/BSD" -DEPENDS = "edje-native eet-native" -PV = "0.0+${PR}-svnr${SRCREV}" -PR = "r1" - -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=THEMES/b_and_w;proto=http" -S = "${WORKDIR}/THEMES/b_and_w" - -do_compile() { - edje_cc illume.edc - edje_cc illume_init.edc -} - -do_install() { - install -d ${D}${sysconfdir}/enlightenment - install -d ${D}${datadir}/enlightenment/data/themes/ - install -d ${D}${datadir}/enlightenment/data/init/ - - # FIXME: hack. should modify profile.cfg and nto use enlightenment_start.oe - echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile - - install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/ - install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/ -} - -RPROVIDES_${PN} = "illume-theme" -CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile" -FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment" - -PACKAGE_ARCH_${PN} = "all" - diff --git a/packages/e17/illume_svn.bb b/packages/e17/illume_svn.bb deleted file mode 100644 index de738211f7..0000000000 --- a/packages/e17/illume_svn.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager" -HOMEPAGE = "http://illume.projects.openmoko.org" -AUTHOR = "Carsten 'Rasterman' Haitzler" -LICENSE = "MIT/BSD" -DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native" -PV = "0.0+svnr${SRCREV}" -PR = "r14" - -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=illume;proto=http \ - file://gsm-segfault.patch;patch=1;pnum=1" -S = "${WORKDIR}/${PN}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ -" - -RRECOMMENDS_${PN} = "\ - ${PN}-config-illume \ - ${PN}-theme \ - ${PN}-dicts-english-us \ - ${PN}-keyboards-default \ - ${PN}-keyboards-numbers \ - ${PN}-keyboards-terminal \ -" - -PACKAGES =+ "\ - ${PN}-config-illume \ - ${PN}-config-asu \ - ${PN}-dicts-english-us \ - ${PN}-keyboards-default \ - ${PN}-keyboards-numbers \ - ${PN}-keyboards-terminal \ -" -PACKAGE_ARCH_${PN}-config-illume = "all" -PACKAGE_ARCH_${PN}-config-asu = "all" -PACKAGE_ARCH_${PN}-dicts-english-us = "all" -PACKAGE_ARCH_${PN}-keyboards-default = "all" -PACKAGE_ARCH_${PN}-keyboards-numbers = "all" -PACKAGE_ARCH_${PN}-keyboards-terminal = "all" - -FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume/*" -FILES_${PN}-config-asu = "${datadir}/enlightenment/data/config/asu/*" -FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic" -FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd" -FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd" -FILES_${PN}-keyboards-terminal = "${libdir}/enlightenment/modules/illume/keyboards/Terminal.kbd" - -FILES_${PN} = "\ - ${libdir}/enlightenment/modules/*/*.edj \ - ${libdir}/enlightenment/modules/*/*.desktop \ - ${libdir}/enlightenment/modules/*/*/* \ -" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" diff --git a/packages/efl1/edje_svn.bb b/packages/efl1/edje_svn.bb index 17c8f91024..5e767ac580 100644 --- a/packages/efl1/edje_svn.bb +++ b/packages/efl1/edje_svn.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.5.0.043+svnr${SRCREV}" -PR = "r5" +PR = "r6" inherit efl -# gain some extra performance at the expense of RAM -EXTRA_OECONF = "--enable-edje-program-cache" +# gain some extra performance at the expense of RAM - generally i'd say bad +# and a possible source of bugs +#EXTRA_OECONF = "--enable-edje-program-cache" PACKAGES =+ "${PN}-utils" RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests" diff --git a/packages/efl1/eet-native_svn.bb b/packages/efl1/eet-native_svn.bb index 0b0b5a4862..454bc53a7b 100644 --- a/packages/efl1/eet-native_svn.bb +++ b/packages/efl1/eet-native_svn.bb @@ -1,6 +1,6 @@ require eet_svn.bb inherit native -DEPENDS = "zlib-native jpeg-native" +DEPENDS = "zlib-native jpeg-native eina-native" # we no longer inherit pkgconfig, so we need to state this explicitly # (see explanation in efl.bbclass and autotools.bbclass) DEPENDS += "pkgconfig-native" diff --git a/packages/efl1/eet_svn.bb b/packages/efl1/eet_svn.bb index e801a543e7..6f7a615fad 100644 --- a/packages/efl1/eet_svn.bb +++ b/packages/efl1/eet_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "EET is the Enlightenment data storage library" -DEPENDS = "zlib jpeg openssl" +DEPENDS = "zlib jpeg openssl eina" LICENSE = "MIT BSD" PV = "1.0.1+svnr${SRCREV}" PR = "r3" diff --git a/packages/efl1/eina-native_svn.bb b/packages/efl1/eina-native_svn.bb new file mode 100644 index 0000000000..8cc34bb178 --- /dev/null +++ b/packages/efl1/eina-native_svn.bb @@ -0,0 +1,6 @@ +require eina_svn.bb +inherit native +DEPENDS = "" +# we no longer inherit pkgconfig, so we need to state this explicitly +# (see explanation in efl.bbclass and autotools.bbclass) +DEPENDS += "pkgconfig-native" diff --git a/packages/efl1/eina_svn.bb b/packages/efl1/eina_svn.bb new file mode 100644 index 0000000000..f38c4c5b36 --- /dev/null +++ b/packages/efl1/eina_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Eina is the Enlightenment data library" +LICENSE = "LGPL" +PV = "0.0.1+svnr${SRCREV}" +PR = "r0" + +inherit efl + +FILES_${PN} += "${libdir}/eina" diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb index 387a1da89c..71e1235b46 100644 --- a/packages/linux/linux-hackndev-2.6_git.bb +++ b/packages/linux/linux-hackndev-2.6_git.bb @@ -6,15 +6,10 @@ PR = "r14" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" -SRC_URI = "git://git.hackndev.com/linux-hnd;protocol=git \ +SRC_URI = "git://git.hackndev.com/linux-hnd;protocol=git;tag=master \ file://defconfig" -SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ - file://init \ - file://initramfs_list \ - file://busybox-config" - -S = "${WORKDIR}/trunk" +S = "${WORKDIR}/git" K_MAJOR = "2" K_MINOR = "6" diff --git a/packages/netbase/netbase/palmt650/interfaces b/packages/netbase/netbase/palmt650/interfaces new file mode 100644 index 0000000000..db4c4ca21f --- /dev/null +++ b/packages/netbase/netbase/palmt650/interfaces @@ -0,0 +1,22 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Wireless interfaces + +# Wired or wireless interfaces + +# Ethernet/RNDIS gadget (g_ether) +# ... or on host side, usbnet and random hwaddr +auto usb0 +iface usb0 inet static + address 192.168.0.202 + netmask 255.255.255.0 + network 192.168.0.0 + gateway 192.168.0.200 + +# Bluetooth networking +iface bnep0 inet dhcp + diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb index 1b02bf77df..78aebc62fc 100644 --- a/packages/python/python-ecore_svn.bb +++ b/packages/python/python-ecore_svn.bb @@ -1,5 +1,5 @@ require python-efl.inc -DEPENDS += "python-evas ecore" +DEPENDS += "python-evas ecore eina" RDEPENDS += "python-evas" PV = "0.3.0+svnr${SRCREV}" PR = "r0" diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb index 4e33847dae..532db0875f 100644 --- a/packages/python/python-edje_svn.bb +++ b/packages/python/python-edje_svn.bb @@ -1,5 +1,5 @@ require python-efl.inc -DEPENDS += "edje python-evas" +DEPENDS += "edje python-evas eina" RDEPENDS += "python-evas" PV = "0.3.0+svnr${SRCREV}" PR = "r0" diff --git a/packages/python/python-evas_svn.bb b/packages/python/python-evas_svn.bb index 6f53bf7e8d..2deb020b70 100644 --- a/packages/python/python-evas_svn.bb +++ b/packages/python/python-evas_svn.bb @@ -1,5 +1,5 @@ require python-efl.inc -DEPENDS += "evas" +DEPENDS += "evas eina" PV = "0.3.0+svnr${SRCREV}" PR = "r0" diff --git a/packages/sysvinit/sysvinit/openmoko/rc b/packages/sysvinit/sysvinit/openmoko/rc new file mode 100644 index 0000000000..9d28a6890b --- /dev/null +++ b/packages/sysvinit/sysvinit/openmoko/rc @@ -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@cistron.nl> +# Bruce Perens <Bruce@Pixar.com> +# +# Version: @(#)rc 2.78 07-Nov-1999 miquels@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 diff --git a/packages/sysvinit/sysvinit/openmoko/rcS-default b/packages/sysvinit/sysvinit/openmoko/rcS-default new file mode 100644 index 0000000000..5bb57ef74f --- /dev/null +++ b/packages/sysvinit/sysvinit/openmoko/rcS-default @@ -0,0 +1,25 @@ +# +# Defaults for the boot scripts in /etc/rcS.d +# + +# Time files in /tmp are kept in days. +TMPTIME=0 +# Set to yes if you want sulogin to be spawned on bootup +SULOGIN=no +# Set to no if you want to be able to login over telnet/rlogin +# before system startup is complete (as soon as inetd is started) +DELAYLOGIN=no +# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not. +UTC=yes +# Set VERBOSE to "no" if you would like a more quiet bootup. +VERBOSE=no +# Set EDITMOTD to "no" if you don't want /etc/motd to be editted automatically +EDITMOTD=no +# Whether to fsck root on boot +ENABLE_ROOTFS_FSCK=no +# Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup. +FSCKFIX=yes +# Set TICKADJ to the correct tick value for this specific machine +#TICKADJ=10000 +# Enable caching in populate-volatile.sh +VOLATILE_ENABLE_CACHE=yes diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 0922199c6f..c399874b8d 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 = "r43" +PR = "r44" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb index a477c6e8c5..a285762c9c 100644 --- a/packages/tasks/task-x11-illume.bb +++ b/packages/tasks/task-x11-illume.bb @@ -9,7 +9,7 @@ PR = "r0" inherit task # Default illume theme -ILLUME_THEME ?= "illume-theme-illume" +# ILLUME_THEME ?= "illume-theme-illume" RDEPENDS_${PN} = "\ task-x11-server \ @@ -17,11 +17,6 @@ RDEPENDS_${PN} = "\ # xserver-kdrive-splash-illume \ \ e-wm \ - illume \ - illume-config-illume \ - illume-dicts-english-us \ - illume-keyboards-default \ - illume-keyboards-numbers \ - illume-keyboards-terminal \ - ${ILLUME_THEME} \ + e-wm-config-illume \ +# ${ILLUME_THEME} \ " |