Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 00:29:40+00:00 nexus.co.uk!pb
remove gweled from gpe-games one more time

2005/01/02 00:27:53+00:00 nexus.co.uk!pb
add gpe-soundbite to task-gpe-apps.  remove useless miniclipboard.

2005/01/02 00:26:33+00:00 nexus.co.uk!pb
patch libsvg to use expat rather than libxml2


2005/01/02 00:22:09+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/01/02 00:21:52+00:00 (none)!cwiiis
Bump PR on gpe-session-scripts (and a mvdir back and forth, sorry)

2005/01/02 00:18:53+00:00 (none)!cwiiis
Merge

2005/01/02 00:08:17+00:00 (none)!cwiiis
Add collie key-mappings.

2005/01/02 00:03:14+00:00 (none)!cwiiis
Complete move of gpe-task-games to meta-gpe.

2005/01/02 00:50:26+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/02 00:50:13+01:00 uni-frankfurt.de!mickeyl
upgrade wlan-ng to 0.2.1pre23 and reset PACKAGE_ARCH for the utils packages. this .bb looks pretty suboptimal, splitting it up into a modules and a utils .bb would be useful

2005/01/01 19:23:45+01:00 uni-frankfurt.de!mickeyl
s/collie-fl/sharp_fl/ in devices initscript

BKrev: 41d742e6y8_hdUO3hSBlG_tQVPYNiw

20 files changed, 800 insertions, 10 deletions

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1pre22.bb b/packages/cairo/libsvg/expat.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1pre22.bb
+++ b/packages/cairo/libsvg/expat.patch
diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index e69de29bb2..b2aa43ebfd 100644
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -0,0 +1,19 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "expat jpeg zlib libpng"
+DESCRIPTION = "SVG parser library"
+LICENSE = "LGPL"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg \
+	file://expat.patch;patch=1;pnum=0"
+S = "${WORKDIR}/libsvg"
+PR = "r1"
+
+EXTRA_OECONF = "--with-expat"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/gpe-session-scripts/files/collie.xmodmap
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-session-scripts/files/collie.xmodmap
diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh
index e69de29bb2..3f2910b439 100644
--- a/packages/gpe-session-scripts/files/keymap.sh
+++ b/packages/gpe-session-scripts/files/keymap.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+
+case $MACHINE in
+	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+		xmodmap - < /etc/X11/shepherd.xmodmap
+		;;
+        "Sharp-Collie"
+                xmodmap - < /etc/X11/collie.xmodmap
+                ;;
+	"Simpad")
+		xmodmap - < /etc/X11/simpad.xmodmap
+		;;
+esac
+
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index 4420012098..9996e57f28 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 inherit gpe
 
@@ -16,12 +16,13 @@ SRC_URI += "file://zaurus.sh \
 	file://change-default-applets.patch;patch=1 \
 	file://xdefaults.patch;patch=1 \
 	file://matchbox-session \
-	file://shepherd.xmodmap file://simpad.xmodmap"
+	file://shepherd.xmodmap file://simpad.xmodmap \
+	file://collie.xmodmap"
 
 do_install_append() {
 	install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus
 	install ${WORKDIR}/keymap.sh ${D}/etc/X11/Xinit.d/12keymap
-	for m in simpad shepherd; do
+	for m in simpad shepherd collie; do
 		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/etc/X11/
 	done
 	install -d ${D}/etc/gpe/xsettings-default.d
diff --git a/packages/initscripts/initscripts-1.0/collie/devices b/packages/initscripts/initscripts-1.0/collie/devices
index e69de29bb2..7413e455b0 100644
--- a/packages/initscripts/initscripts-1.0/collie/devices
+++ b/packages/initscripts/initscripts-1.0/collie/devices
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
+	ln -sf /dev/sharp_ts /dev/ts
+	ln -sf /dev/sharp_fl /dev/fl
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+exit 0
diff --git a/packages/initscripts/initscripts-1.0/corgi/devices b/packages/initscripts/initscripts-1.0/corgi/devices
index e69de29bb2..fd34d84bc9 100644
--- a/packages/initscripts/initscripts-1.0/corgi/devices
+++ b/packages/initscripts/initscripts-1.0/corgi/devices
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	ln -sf /dev/sharp_ts /dev/ts
+        ln -sf /dev/sharp_fl /dev/fl
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+## enable (working) suspend/resume via power button on c7x0
+echo 1 >/proc/power_key_off
+
+exit 0
diff --git a/packages/initscripts/initscripts-1.0/device_table.txt b/packages/initscripts/initscripts-1.0/device_table.txt
index e69de29bb2..662cca7e2e 100644
--- a/packages/initscripts/initscripts-1.0/device_table.txt
+++ b/packages/initscripts/initscripts-1.0/device_table.txt
@@ -0,0 +1,162 @@
+#/dev/		d	775	0	0	-	-	-	-	-
+#/dev/msys	d	775	0	0	-	-	-	-	-
+#/dev/pts	d	775	0	0	-	-	-	-	-
+#/var		d	775	0	0	-	-	-	-	-
+/boot/var/empty	d	755	0	3	-	-	-	-
+/dev/apm_bios	c	660	0	46	10	134	-	-	-
+/dev/audio	c	660	0	29	14	4	-	-	-
+/dev/audio1	c	660	0	29	14	20	-	-	-
+/dev/audio2	c	660	0	29	14	36	-	-	-
+/dev/audio3	c	660	0	29	14	52	-	-	-
+/dev/bty	c	644	0	0	60	0	0	1	5
+/dev/sharp_fl	c	640	0	44	254	0	-	-	-
+/dev/console	c	662	0	5	5	1	-	-
+/dev/cusa0	c	640	0	0	205	5	-	-	-
+/dev/cusa1	c	640	0	0	205	6	-	-	-
+/dev/cusa2	c	640	0	0	205	7	-	-	-
+/dev/dsp	c	660	0	29	14	3	-	-	-
+/dev/dsp1	c	660	0	29	14	19	-	-	-
+/dev/dsp2	c	660	0	29	14	35	-	-	-
+/dev/dsp3	c	660	0	29	14	51	-	-	-
+/dev/fb		c	660	0	44	29	0	0	32	2
+/dev/fb0autodetect	c	660	0	44	29	1	-	-	-
+/dev/fb0current	c	660	0	44	29	0	-	-	-
+#/dev/fb1	c	660	0	44	29	32	-	-	-
+/dev/fb1autodetect	c	660	0	44	29	33	-	-	-
+/dev/fb1current	c	660	0	44	29	32	-	-	-
+/dev/full	c	666	0	7	-	-	-
+/dev/hda	b	660	0	6	3	0	-	-	-
+/dev/hda	b	660	0	6	3	1	1	1	20
+/dev/hdb	b	660	0	6	3	64	-	-	-
+/dev/hdb	b	660	0	6	3	65	1	1	20
+/dev/hdc	b	660	0	6	22	0	-	-	-
+/dev/hdc	b	660	0	6	22	1	1	1	20
+/dev/initctl	p	600	0	0	-	-	-	-
+/dev/i2c0	c	660	0	0	89	0	-	-	-
+/dev/inportbm	c	660	0	0	10	2	-	-	-
+/dev/input/event c	660	0	0	13	64	0	1       20
+/dev/ircomm0	c	640	0	0	161	0	-	-	-
+/dev/jbm	c	660	0	0	10	4	-	-	-
+/dev/kmem	c	640	0	15	1	2	-	-	-
+/dev/lirc	c	660	0	5	61	0	-	-	-
+/dev/logibm	c	660	0	0	10	0	-	-	-
+/dev/loop0	b	660	0	11	7	0	-	-	-
+/dev/loop1	b	660	0	11	7	1	-	-	-
+/dev/mem	c	640	0	15	1	1	-	-	-
+/dev/mixer	c	666	0	0	14	0	-	-	-
+/dev/mixer1	c	666	0	0	14	16	-	-	-
+/dev/mixer2	c	666	0	0	14	32	-	-	-
+/dev/mixer3	c	666	0	0	14	48	-	-	-
+/dev/mmcda	b	640	0	0	60	0	-	-	-
+/dev/mmcda1	b	640	0	0	60	1	-	-	-
+/dev/mmcda2	b	640	0	0	60	2	-	-	-
+/dev/msys/fla	b	660	0	11	100	0	-	-	-
+/dev/msys/fla1	b	660	0	11	100	1	-	-	-
+/dev/msys/fla2	b	660	0	11	100	2	-	-	-
+/dev/msys/fla3	b	660	0	11	100	3	-	-	-
+/dev/msys/fla4	b	660	0	11	100	4	-	-	-
+/dev/msys/flb	b	660	0	11	100	64	-	-	-
+/dev/msys/flb1	b	660	0	11	100	65	-	-	-
+/dev/msys/flb2	b	660	0	11	100	66	-	-	-
+/dev/msys/flb3	b	660	0	11	100	67	-	-	-
+/dev/msys/flb4	b	660	0	11	100	68	-	-	-
+/dev/mtd	c	660	0	6	90	0	0	2	8
+/dev/mtdblock	b	640	0	0	31	0	0	1	8
+/dev/nst0	c	664	0	11	9	128	-	-	-
+/dev/nst0a	c	664	0	11	9	224	-	-	-
+/dev/nst0l	c	664	0	11	9	160	-	-	-
+/dev/nst0m	c	664	0	11	9	192	-	-	-
+/dev/nst1	c	664	0	11	9	129	-	-	-
+/dev/nst1a	c	664	0	11	9	225	-	-	-
+/dev/nst1l	c	664	0	11	9	161	-	-	-
+/dev/nst1m	c	664	0	11	9	193	-	-	-
+/dev/null	c	666	0	0	1	3	-	-	-
+/dev/par0	c	660	0	7	6	0	-	-	-
+/dev/par1	c	660	0	7	6	1	-	-	-
+/dev/par2	c	660	0	7	6	2	-	-	-
+/dev/port	c	640	0	15	1	4	-	-	-
+/dev/ppp	c	640	0	0	108	0	-	-	-
+/dev/psaux	c	660	0	0	10	1	-	-	-
+/dev/ptmx	c	666	0	5	5	2	-	-	-
+/dev/ptya0	c	660	0	5	2	176	-	-	-
+/dev/ptya1	c	660	0	5	2	177	-	-	-
+/dev/ptya2	c	660	0	5	2	178	-	-	-
+/dev/ptya3	c	660	0	5	2	179	-	-	-
+/dev/ptya4	c	660	0	5	2	180	-	-	-
+/dev/ptya5	c	660	0	5	2	181	-	-	-
+/dev/ptya6	c	660	0	5	2	182	-	-	-
+/dev/ptya7	c	660	0	5	2	183	-	-	-
+/dev/ptya8	c	660	0	5	2	184	-	-	-
+/dev/ptya9	c	660	0	5	2	185	-	-	-
+/dev/ptyaa	c	660	0	5	2	186	-	-	-
+/dev/ptyab	c	660	0	5	2	187	-	-	-
+/dev/ptyac	c	660	0	5	2	188	-	-	-
+/dev/ptyad	c	660	0	5	2	189	-	-	-
+/dev/ptyae	c	660	0	5	2	190	-	-	-
+/dev/ptyaf	c	660	0	5	2	191	-	-	-
+/dev/ram	b	640	0	0	1	0	0	1	4
+/dev/random	c	444	0	0	1	8	-	-	-
+/dev/rmidi0	c	660	0	0	35	64	-	-	-
+/dev/rmidi1	c	660	0	0	35	65	-	-	-
+/dev/rmidi2	c	660	0	0	35	66	-	-	-
+/dev/rmidi3	c	660	0	0	35	67	-	-	-
+/dev/rtc	c	660	0	47	10	135	-	-	-
+/dev/scd0	b	660	0	6	11	0	-	-	-
+/dev/scd1	b	660	0	6	11	1	-	-	-
+/dev/sda	b	660	0	6	8	0	-	-	-
+/dev/sda1	b	660	0	6	8	1	-	-	-
+/dev/sda2	b	660	0	6	8	2	-	-	-
+/dev/sda3	b	660	0	6	8	3	-	-	-
+/dev/sda4	b	660	0	6	8	4	-	-	-
+/dev/sda5	b	660	0	6	8	5	-	-	-
+/dev/sda6	b	660	0	6	8	6	-	-	-
+/dev/sda7	b	660	0	6	8	7	-	-	-
+/dev/sda8	b	660	0	6	8	8	-	-	-
+/dev/sda9	b	660	0	6	8	9	-	-	-
+/dev/sdb	b	660	0	6	8	16	-	-	-
+/dev/sdb1	b	660	0	6	8	17	-	-	-
+/dev/sdb2	b	660	0	6	8	18	-	-	-
+/dev/sdb3	b	660	0	6	8	19	-	-	-
+/dev/sdb4	b	660	0	6	8	20	-	-	-
+/dev/sdb5	b	660	0	6	8	21	-	-	-
+/dev/sdb6	b	660	0	6	8	22	-	-	-
+/dev/sdb7	b	660	0	6	8	23	-	-	-
+/dev/sdb8	b	660	0	6	8	24	-	-	-
+/dev/sdb9	b	660	0	6	8	25	-	-	-
+/dev/sdc	b	660	0	6	8	32	-	-	-
+/dev/sdc1	b	660	0	6	8	33	-	-	-
+/dev/sdc2	b	660	0	6	8	34	-	-	-
+/dev/sdc3	b	660	0	6	8	35	-	-	-
+/dev/sdc4	b	660	0	6	8	36	-	-	-
+/dev/sdc5	b	660	0	6	8	37	-	-	-
+/dev/sdc6	b	660	0	6	8	38	-	-	-
+/dev/sdc7	b	660	0	6	8	39	-	-	-
+/dev/sdc8	b	660	0	6	8	40	-	-	-
+/dev/sdc9	b	660	0	6	8	41	-	-	-
+/dev/sd_slotstat	c	660	0	6	10	240	-	-	-
+/dev/sharp_audioctl	c	660	0	29	10	213	-	-	-
+/dev/sharp_buz	c	660	0	29	10	211	-	-	-
+/dev/sharp_kbdctl	c	660	0	45	10	214	-	-	-
+/dev/sharp_led	c	660	0	48	10	210	-	-	-
+/dev/sharp_ts	c	640	0	45	11	0	-	-	-
+/dev/smtpe0	c	640	0	0	35	128	-	-	-
+/dev/smtpe1	c	640	0	0	35	129	-	-	-
+/dev/smtpe2	c	640	0	0	35	130	-	-	-
+/dev/smtpe3	c	640	0	0	35	131	-	-	-
+/dev/sndstat	c	660	0	29	14	6	-	-	-
+/dev/st0	c	660	0	11	9	0	-	-	-
+/dev/st0a	c	660	0	11	9	96	-	-	-
+/dev/st0l	c	660	0	11	9	32	-	-	-
+/dev/st0m	c	660	0	11	9	64	-	-	-
+/dev/st1	c	660	0	11	9	1	-	-	-
+/dev/st1a	c	660	0	11	9	97	-	-	-
+/dev/st1l	c	660	0	11	9	33	-	-	-
+/dev/st1m	c	660	0	11	9	65	-	-	-
+/dev/tty	c	662	0	5	5	0	-	-	-
+/dev/tty	c	666	0	5	4	0	0	1	9
+/dev/ttyS	c	640	0	5	4	64	0	1	4
+/dev/ttySA	c	640	0	5	204	5	0	1	4
+/dev/ttyUSB	c	660	0	5	188	0	0	1	2
+/dev/urandom	c	644	0	0	1	9	-	-	-
+/dev/usbmouse	c	640	0	45	10	32	-	-	-
+/dev/zero	c	644	0	0	1	5	-	-
diff --git a/packages/initscripts/initscripts-1.0/husky/devices b/packages/initscripts/initscripts-1.0/husky/devices
index e69de29bb2..fd34d84bc9 100644
--- a/packages/initscripts/initscripts-1.0/husky/devices
+++ b/packages/initscripts/initscripts-1.0/husky/devices
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	ln -sf /dev/sharp_ts /dev/ts
+        ln -sf /dev/sharp_fl /dev/fl
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+## enable (working) suspend/resume via power button on c7x0
+echo 1 >/proc/power_key_off
+
+exit 0
diff --git a/packages/initscripts/initscripts-1.0/poodle/devices b/packages/initscripts/initscripts-1.0/poodle/devices
index e69de29bb2..7413e455b0 100644
--- a/packages/initscripts/initscripts-1.0/poodle/devices
+++ b/packages/initscripts/initscripts-1.0/poodle/devices
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
+	ln -sf /dev/sharp_ts /dev/ts
+	ln -sf /dev/sharp_fl /dev/fl
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+exit 0
diff --git a/packages/initscripts/initscripts-1.0/shepherd/devices b/packages/initscripts/initscripts-1.0/shepherd/devices
index e69de29bb2..a892e9fec3 100644
--- a/packages/initscripts/initscripts-1.0/shepherd/devices
+++ b/packages/initscripts/initscripts-1.0/shepherd/devices
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
+	ln -sf /dev/sharp_ts /dev/ts
+        ln -sf /dev/sharp_fl /dev/fl
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+## enable (working) suspend/resume via power button on c7x0
+echo 1 >/proc/power_key_off
+
+exit 0
diff --git a/packages/initscripts/initscripts-1.0/tosa/devices b/packages/initscripts/initscripts-1.0/tosa/devices
index e69de29bb2..2d0d15d54f 100644
--- a/packages/initscripts/initscripts-1.0/tosa/devices
+++ b/packages/initscripts/initscripts-1.0/tosa/devices
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	ln -sf /dev/sharp_ts /dev/ts
+        ln -sf /dev/sharp_fl /dev/fl
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+#Always turn on usb
+if [ ! -d /dev/usb ]; then mkdir /dev/usb; fi
+mknod /dev/usb/host_ohci c 10 222
+
+exit 0
diff --git a/packages/initscripts/initscripts-1.0/uml/devices b/packages/initscripts/initscripts-1.0/uml/devices
index e69de29bb2..fc1d96788b 100644
--- a/packages/initscripts/initscripts-1.0/uml/devices
+++ b/packages/initscripts/initscripts-1.0/uml/devices
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# Devfs handling script.  Since we arent running devfsd due to various reasons
+# which I will not lay out here, we need to create some links for compatibility.
+
+. /etc/default/rcS
+
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
+
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
+
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
+
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
+
+exit 0
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 617e84a8b3..95ad790b70 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r25"
+PR = "r26"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index e69de29bb2..94b73d3edc 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -0,0 +1,34 @@
+PACKAGES = gpe-task-apps-extra gpe-task-games gpe-task-web gpe-task-desktopapps
+DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+PR="r1"
+
+ALLOW_EMPTY = 1
+
+gpe-task-apps-extra = "\
+    gpe-filemanager \
+    gpe-nmf \
+    gpe-soundbite \
+    mbmerlin"
+
+RDEPENDS_gpe-task-apps-extra := "${gpe-task-apps-extra}"
+DEPENDS += " ${gpe-task-apps-extra}"
+
+gpe-task-web = "\
+    gpe-irc \
+    minimo \
+    gaim"
+
+RDEPENDS_gpe-task-web := "${gpe-task-web}"
+DEPENDS += " ${gpe-task-web}"
+
+gpe-task-desktopapps = "\
+    firefox \
+    thunderbird \
+    galculator \
+    gnumeric \
+    gpdf \
+    totem"
+
+RDEPENDS_gpe-task-desktopapps := "${gpe-task-desktopapps}"
+DEPENDS += " ${gpe-task-desktopapps}"
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 506d8a0adc..bfc7e043bc 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
 PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r30"
+PR = "r33"
 
 ALLOW_EMPTY = 1
 
@@ -84,22 +84,22 @@ gpe-task-apps = "\
     gpe-what \
     matchbox-panel-hacks \
     gpe-aerial \
-    mbmerlin \
-    miniclipboard \
+    gpe-soundbite \
     rosetta"
 
 RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
 DEPENDS += " ${gpe-task-apps}"
 
 gpe-task-games = "\
-    gpe-tetris \
-    gpe-othello \
+    gpe-go \
     gpe-lights \
+    gpe-othello \
+    gpe-tetris \
     gsoko \
     xdemineur"
 
 RDEPENDS_gpe-task-games := "${gpe-task-games}"
-DEPENDS += "${gpe-task-games}"
+DEPENDS += " ${gpe-task-games}"
 
 DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
 
diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
index e69de29bb2..da21b48e72 100644
--- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
+++ b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
@@ -0,0 +1,102 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
++++ mtd/util/mkfs.jffs2.c
+@@ -92,7 +92,12 @@
+ 	struct filesystem_entry *files;	/* Only relevant to directories */
+ };
+ 
++struct ignorepath_entry {
++    struct ignorepath_entry* next;  /* Points to the next ignorepath element */
++    char name[PATH_MAX];             /* Name of the entry */
++};
+ 
++static struct ignorepath_entry* ignorepath = 0;
+ static int out_fd = -1;
+ static int in_fd = -1;
+ static char default_rootdir[] = ".";
+@@ -367,6 +372,7 @@
+ 	char *hpath, *tpath;
+ 	struct dirent *dp, **namelist;
+ 	struct filesystem_entry *entry;
++    struct ignorepath_entry* element = ignorepath;
+ 
+ 
+ 	if (lstat(hostpath, &sb)) {
+@@ -376,6 +382,15 @@
+ 	entry = add_host_filesystem_entry(targetpath, hostpath, 
+ 			sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
+ 
++	while ( element ) {
++		if ( strcmp( element->name, hostpath ) == 0 ) {
++			printf( "Note: ignoring directories below '%s'\n", hostpath );
++			return entry;
++			break;
++		}
++		element = element->next;
++	}
++
+ 	n = scandir(hostpath, &namelist, 0, alphasort);
+ 	if (n < 0) {
+ 		perror_msg_and_die("opening directory %s", hostpath);
+@@ -1147,6 +1162,7 @@
+ 	{"root", 1, NULL, 'r'},
+ 	{"pagesize", 1, NULL, 's'},
+ 	{"eraseblock", 1, NULL, 'e'},
++	{"ignore", 1, NULL, 'I'},
+ 	{"output", 1, NULL, 'o'},
+ 	{"help", 0, NULL, 'h'},
+ 	{"verbose", 0, NULL, 'v'},
+@@ -1189,6 +1205,7 @@
+         "  -L, --list-compressors  Show the list of the avaiable compressors\n"
+         "  -t, --test-compression  Call decompress and compare with the original (for test)\n"
+ 	"  -n, --no-cleanmarkers   Don't add a cleanmarker to every eraseblock\n"
++	"  -I, --ignore=PATH       Ignore sub directory and file tree below PATH when recursing over the file system\n"
+ 	"  -o, --output=FILE       Output to FILE (default: stdout)\n"
+ 	"  -l, --little-endian     Create a little-endian filesystem\n"
+ 	"  -b, --big-endian        Create a big-endian filesystem\n"
+@@ -1349,11 +1366,12 @@
+ 	struct filesystem_entry *root;
+         char *compr_name = NULL;
+         int compr_prior  = -1;
++	struct ignorepath_entry* element = ignorepath;
+ 
+         jffs2_compressors_init();
+ 
+ 	while ((opt = getopt_long(argc, argv, 
+-					"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0) 
++					"D:d:r:s:i:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0) 
+ 	{
+ 		switch (opt) {
+ 			case 'D':
+@@ -1376,6 +1394,27 @@
+ 				page_size = strtol(optarg, NULL, 0);
+ 				break;
+ 
++			case 'I':
++				printf( "Note: Adding '%s' to ignore Path\n", optarg );
++				if ( !ignorepath ) {
++					ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
++					ignorepath->next = 0;
++					strcpy( &ignorepath->name[0], optarg );
++				} else {
++					while ( element->next ) element = element->next;
++					element->next = xmalloc( sizeof( struct ignorepath_entry ) );
++ 					element->next->next = 0;
++					strcpy( &element->next->name[0], optarg );
++				}
++				printf( "--------- Dumping ignore path list ----------------\n" );
++				element=ignorepath;
++				while ( element ) {
++					printf( "  * '%s'\n", &element->name[0] );
++					element = element->next;
++				}
++				printf( "---------------------------------------------------\n" );
++				break;
++
+ 			case 'o':
+ 				if (out_fd != -1) {
+ 					error_msg_and_die("output filename specified more than once");
diff --git a/packages/mtd/mtd-utils/removelinuxinc.patch b/packages/mtd/mtd-utils/removelinuxinc.patch
index e69de29bb2..984d1af514 100644
--- a/packages/mtd/mtd-utils/removelinuxinc.patch
+++ b/packages/mtd/mtd-utils/removelinuxinc.patch
@@ -0,0 +1,16 @@
+diff -urN mtd.orig/fs/jffs2/compr_rtime.c mtd/fs/jffs2/compr_rtime.c
+--- mtd.orig/fs/jffs2/compr_rtime.c	2004-04-02 20:36:01.000000000 -0500
++++ mtd/fs/jffs2/compr_rtime.c	2004-04-02 20:35:37.000000000 -0500
+@@ -21,11 +21,7 @@
+  *
+  */
+ 
+-#include <linux/kernel.h>
+-#include <linux/types.h>
+-#include <linux/errno.h>
+-#include <linux/string.h> 
+-
++#include <string.h> 
+ #include <stdint.h>
+ 
+ /* _compress returns the compressed size, -1 if bigger */
diff --git a/packages/mtd/mtd-utils/stdint.patch b/packages/mtd/mtd-utils/stdint.patch
index e69de29bb2..ba171fcfde 100644
--- a/packages/mtd/mtd-utils/stdint.patch
+++ b/packages/mtd/mtd-utils/stdint.patch
@@ -0,0 +1,11 @@
+--- fs/jffs2/compr_rtime.c	2004-04-01 00:07:53.000000000 +0100
++++ fs/jffs2/compr_rtime.c	2004-04-01 00:07:53.000000000 +0100
+@@ -26,6 +26,8 @@
+ #include <linux/errno.h>
+ #include <linux/string.h> 
+ 
++#include <stdint.h>
++
+ /* _compress returns the compressed size, -1 if bigger */
+ int jffs2_rtime_compress(unsigned char *data_in, unsigned char *cpage_out, 
+ 		   uint32_t *sourcelen, uint32_t *dstlen)
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb