From ad4c18503374b2c0fe7767ebaf726cdf599d5476 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 4 Jan 2005 18:40:11 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/04 18:19:08+00:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded 2005/01/04 18:18:43+00:00 (none)!cwiiis Update matchbox packages to latest versions. 2005/01/04 18:17:57+00:00 (none)!cwiiis Update patch in gpe-login to reflect device name changes. 2005/01/04 18:54:22+01:00 (none)!br1 nylon-scripts update 2005/01/04 18:53:56+01:00 (none)!br1 busybox: use syslog.conf file for configuring syslog 2005/01/04 18:53:02+01:00 (none)!br1 ntpdate (nylon): run ntpdate per cron job 2005/01/04 18:51:02+01:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/closed/build/unstable/openembedded 2005/01/03 19:22:49+01:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/closed/build/unstable/openembedded 2005/01/03 19:22:15+01:00 (none)!br1 libcgicc: add do_stage BKrev: 41dae30bdaCaSnKAzfQ6vY7Ve8o7fw --- .../gpe-login/files/user-own-collie-devs.patch | 33 ++++++++++++++++++++++ packages/gpe-login/gpe-login_0.74.bb | 16 +++++++++++ packages/gpe-login/gpe-login_0.75.bb | 14 +++++++++ 3 files changed, 63 insertions(+) (limited to 'packages/gpe-login') diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch index e69de29bb2..c45fa06369 100644 --- a/packages/gpe-login/files/user-own-collie-devs.patch +++ b/packages/gpe-login/files/user-own-collie-devs.patch @@ -0,0 +1,33 @@ +diff -urNd ../gpe-login-0.73-r1/gpe-login-0.73/X11/gpe-login.pre-session gpe-login-0.73/X11/gpe-login.pre-session +--- ../gpe-login-0.73-r1/gpe-login-0.73/X11/gpe-login.pre-session 2004-01-17 11:24:23.000000000 +0000 ++++ gpe-login-0.73/X11/gpe-login.pre-session 2004-09-17 13:07:56.000000000 +0100 +@@ -6,10 +6,18 @@ + chown $USER /dev/sound/dsp + fi + ++if [ -e /dev/dsp ]; then ++chown $USER /dev/dsp ++fi ++ + if [ -e /dev/sound/mixer ]; then + chown $USER /dev/sound/mixer + fi + ++if [ -e /dev/mixer ]; then ++chown $USER /dev/mixer ++fi ++ + if [ -e /dev/touchscreen/0raw ]; then + chown $USER /dev/touchscreen/0raw + fi +@@ -18,6 +26,10 @@ + chown $USER /dev/touchscreen/0 + fi + ++if [ -e /dev/collie-fl ]; then ++chown $USER /dev/sharp_fl ++fi ++ + if [ -e /dev/misc/buzzer ]; then + chown $USER /dev/misc/buzzer + fi diff --git a/packages/gpe-login/gpe-login_0.74.bb b/packages/gpe-login/gpe-login_0.74.bb index e69de29bb2..5a399aaf6b 100644 --- a/packages/gpe-login/gpe-login_0.74.bb +++ b/packages/gpe-login/gpe-login_0.74.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL" +inherit gpe + +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r3" + +SRC_URI += "file://user-own-collie-devs.patch;patch=1 \ + file://pre-session-ramdisk.patch;patch=1" diff --git a/packages/gpe-login/gpe-login_0.75.bb b/packages/gpe-login/gpe-login_0.75.bb index e69de29bb2..5abc838e1b 100644 --- a/packages/gpe-login/gpe-login_0.75.bb +++ b/packages/gpe-login/gpe-login_0.75.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r1" + +SRC_URI += "file://user-own-collie-devs.patch;patch=1 \ + file://pre-session-ramdisk.patch;patch=1" -- cgit 1.2.3-korg