diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 02:40:27 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 02:40:27 +0000 |
| commit | f73e6c2a07c62ffb16775680d8631f2d1dec19c5 (patch) | |
| tree | cb21f3c77fd701ed6b6e85e1f5ed4b45225a8836 /packages/gpe-login | |
| parent | a702a4829935cbe81edef1de716bc81664f94e0a (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/24 02:33:48+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded
2005/02/24 02:33:16+00:00 (none)!cwiiis
Update user-own-collie-devs patch for gpe-login.
2005/02/24 02:21:03+00:00 (none)!cwiiis
Use user-own-collie-devs patch in gpe-login again.
2005/02/23 19:50:06-06:00 ti.com!kergoth
Add OpenOMAP, a simple OE built distribution for TI OMAP development platforms.
2005/02/23 19:46:00-06:00 ti.com!kergoth
Set MODUTILS = '26' in the omap1610h2.conf, since the only omap kernel we've got is 2.6 anyway.
2005/02/24 01:40:43+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded
2005/02/23 19:40:28-06:00 ti.com!kergoth
gnupg2: kill the unnecessary do_install docdir rearranging, add /usr/share/gnupg to FILES_PN.
2005/02/24 01:39:57+00:00 (none)!cwiiis
Make keylaunch use custom keylaunchrc (empty for collie, otherwise default).
2005/02/24 01:17:28+00:00 (none)!cwiiis
Use update-alternatives and custom kbdconfig in matchbox svn as well.
2005/02/23 16:21:10+00:00 (none)!cwiiis
Make gpe-appmgr only install on the gpe-image of bigscreen devices.
2005/02/23 16:14:27+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded
2005/02/23 13:38:49+00:00 (none)!cwiiis
Merge
2005/02/23 12:41:55+00:00 (none)!cwiiis
Move loading of libgtkstylus to Xsession.d from profile.d.
2005/02/23 12:34:56+00:00 (none)!cwiiis
Remove apm_bios patch and make Xsession more debian-like (source all scripts) in gpe-dm.
2005/02/23 12:33:12+00:00 (none)!cwiiis
Add keysym for power button on collie for X
2005/02/22 10:44:46+00:00 (none)!cwiiis
Merge matchbox-wm changes, and make use update-alternatives class.
2005/02/22 02:52:05+00:00 (none)!cwiiis
Use custom kbdconfig with matchbox-wm (for simpad and collie)
2005/02/18 22:36:53+00:00 (none)!cwiiis
Add --with-env-editor switch to configure of sudo
2005/02/18 22:35:54+00:00 (none)!cwiiis
Really get rid of the apm_bios removal patch for collie...
2005/02/18 22:33:47+00:00 (none)!cwiiis
-Update gpe-login patch to set ownership of devices
-Remove patch that deletes /dev/apm_bios for collie - no longer necessary
BKrev: 421d3e9bcU67BQXgiWhQfs1uU1AqSg
Diffstat (limited to 'packages/gpe-login')
| -rw-r--r-- | packages/gpe-login/files/user-own-collie-devs.patch | 42 | ||||
| -rw-r--r-- | packages/gpe-login/gpe-login_0.75.bb | 5 |
2 files changed, 20 insertions, 27 deletions
diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch index c45fa06369..ea2afd8583 100644 --- a/packages/gpe-login/files/user-own-collie-devs.patch +++ b/packages/gpe-login/files/user-own-collie-devs.patch @@ -1,33 +1,25 @@ -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 +--- ../gpe-login-0.75-r3/gpe-login-0.75/X11/gpe-login.pre-session 2005-02-24 02:24:33 +00:00 ++++ gpe-login-0.75/X11/gpe-login.pre-session 2005-02-24 02:28:14 +00:00 +@@ -30,13 +30,19 @@ + chown $USER /dev/touchscreen/0 fi -+if [ -e /dev/dsp ]; then -+chown $USER /dev/dsp +-if [ -e /dev/collie-fl ]; then ++if [ -e /dev/misc/buzzer ]; then ++chown $USER /dev/misc/buzzer +fi + - if [ -e /dev/sound/mixer ]; then - chown $USER /dev/sound/mixer ++# The following added for collie ++if [ -e /dev/sharp_fl ]; then + chown $USER /dev/sharp_fl 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 +-if [ -e /dev/misc/buzzer ]; then +-chown $USER /dev/misc/buzzer ++if [ -e /dev/fb0 ]; then ++chown $USER /dev/fb0 fi ++# collie bits finished -+if [ -e /dev/collie-fl ]; then -+chown $USER /dev/sharp_fl -+fi -+ - if [ -e /dev/misc/buzzer ]; then - chown $USER /dev/misc/buzzer - fi + # check for ramdisk location + if [ -d /mnt/ramfs ]; then diff --git a/packages/gpe-login/gpe-login_0.75.bb b/packages/gpe-login/gpe-login_0.75.bb index 6de07d8e6a..ac432e5edf 100644 --- a/packages/gpe-login/gpe-login_0.75.bb +++ b/packages/gpe-login/gpe-login_0.75.bb @@ -8,6 +8,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r2" +PR = "r3" -SRC_URI += "file://pre-session.patch;patch=1" +SRC_URI += "file://pre-session.patch;patch=1 \ + file://user-own-collie-devs.patch;patch=1" |