diff options
-rw-r--r-- | packages/gpe-dm/gpe-dm_0.44.bb | 4 | ||||
-rw-r--r-- | packages/meta/opie-image.bb | 2 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar.inc | 98 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar_1.2.0.bb | 2 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 2 | ||||
-rw-r--r-- | packages/sysvinit/sysvinit/inittab | 30 | ||||
-rw-r--r-- | packages/sysvinit/sysvinit_2.86.bb | 2 |
7 files changed, 134 insertions, 6 deletions
diff --git a/packages/gpe-dm/gpe-dm_0.44.bb b/packages/gpe-dm/gpe-dm_0.44.bb index 08ac75586f..1aed569fec 100644 --- a/packages/gpe-dm/gpe-dm_0.44.bb +++ b/packages/gpe-dm/gpe-dm_0.44.bb @@ -6,10 +6,10 @@ SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEPENDS = "glib-2.0" -PR = "r2" +PR = "r3" INITSCRIPT_NAME = "gpe-dm" -INITSCRIPT_PARAMS = "defaults 99" +INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." SRC_URI += " file://source-xsession-scripts.patch;patch=1 \ file://collie-suspend-hack.patch;patch=1" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index 19e2aa19dc..f717c870b6 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -1,7 +1,7 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" -FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" +FEED_URIS_append_openzaurus = " opie##http://oz.hentges.net/snapshots/3.5.3-2/collie/feed" FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index e69de29bb2..a873b0251b 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -0,0 +1,98 @@ +DESCRIPTION = "Opie Launcher and Taskbar" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Team Opie <opie@handhelds.org>" +DEPENDS = "opie-libqrsync opie-qss" +APPNAME = "qpe" + +S = "${WORKDIR}/launcher" + +# Caps/Numlock icons for devices with keyboard +EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" + +# Wallpaper and welcome splash +PIXMAP_SIZE = "" +PIXMAP_SIZE_c7x0 = "-640x480" +# PIXMAP_SIZE_tosa = "-640x480" +PIXMAP_SIZE_simpad = "-800x600" + +inherit opie update-rc.d + +INITSCRIPT_NAME = "opie" +INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." + +do_configure_prepend() { + ln -s ${WORKDIR}/calibrate ${S}/calibrate + ln -s ${WORKDIR}/mediummount ${S}/mediummount + install -m 0644 ${WORKDIR}/server.pro ${S}/server.pro +} + +do_stage() { + install obexinterface.h ${STAGING_INCDIR}/ + +} + +SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings" +PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png" + +do_install() { + install -d ${D}${palmtopdir}/bin + for i in ${SECTIONS} + do + install -d ${D}${palmtopdir}/apps/$i/ + install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/ + done + install -d ${D}${palmtopdir}/pics/launcher + install -d ${D}${palmtopdir}/pics/logo + install -d ${D}${palmtopdir}/pics/RoH/star/ + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/profile.d + install -d ${D}${palmtopdir}/etc/colors + install -d ${D}${palmtopdir}/etc/skel + + install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe + install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/ + install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/ + install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ + + for p in ${PICS} + do + install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p + done + install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg + + install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/ + install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/ + + install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/ + install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/ + + install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie + install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ + + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ + fi + + install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/ +} + +updatercd_postinst_ramses() { +if test "x$D" != "x"; then + D="-r $D" +else + D="" # do not autostart at installation time +fi +update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +} + +FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.0.bb b/packages/opie-taskbar/opie-taskbar_1.2.0.bb index f27d7fcef6..50a7fe7f0c 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.0.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.0.bb @@ -1,7 +1,7 @@ include ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index fe68d2a13c..b2dad6d2c1 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/sysvinit/sysvinit/inittab b/packages/sysvinit/sysvinit/inittab index e69de29bb2..79e3086901 100644 --- a/packages/sysvinit/sysvinit/inittab +++ b/packages/sysvinit/sysvinit/inittab @@ -0,0 +1,30 @@ +# /etc/inittab: init(8) configuration. +# $Id$ + +# The default runlevel. +id:5:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 96b6c1a68f..d68460b12d 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r12" +PR = "r13" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. |