Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

64 files changed, 394 insertions, 269 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f4e443c32d..7bdeca6771 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -638,6 +638,10 @@ sha256=cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6
 md5=f7672bfd563787a76fb7e9a43c062f18
 sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
 
+[http://downloads.sourceforge.net/lightblue/lightblue-0.3.3.tar.gz]
+md5=fb3761c8fff39a792035db4767847169
+sha256=90b3271e5ce4de91d3651ba11b92e64fc7afb2a54ebe01826023e5bb2b53a3bc
+
 [http://www.stats.bris.ac.uk/R/src/base/R-2/R-2.0.0.tar.gz]
 md5=3900bca37cabb4b76b8d736d51cc9251
 sha256=a06c3546400503e6d4ca4505c3f838b9bbd03fab6a3cbab7993f6d9115b68b64
@@ -16994,6 +16998,10 @@ sha256=9877655ae7e4465d6c237f0896d359bd77021436abc7ed7c89ba76afe6ebe774
 md5=eb38d423b49255a7b9f5ba1f50844b53
 sha256=d8e41f48c86403cb7fc8d0880a207c53a9e4ba6b6eab2fe8870c346567fa3a03
 
+[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.14.tar.gz]
+md5=3d8de7b5a4a100bd7d17278ea5e1c51b
+sha256=8975ba1e6575c3e6ed069bc1ac68457b020a48ce34df7da66aa9cf7a64f31e87
+
 [http://org.csail.mit.edu/pybluez/release/pybluez-src-0.2.tar.gz]
 md5=f51efe7a299ce1ecbf1a017a4dda11c8
 sha256=c16ac8a27af4fae6ef3f07cbd4da70bcf5b1be11dc664312f5c1e4d69c587d0a
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 966f2e2f57..1272244f17 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,7 +15,7 @@ SRCREV_pn-accelges ?= "206"
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
 SRCREV_pn-app-restarter ?= "4552"
-SRCREV_pn-assassin ?= "265"
+SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-clutter-box2d ?= "3197"
@@ -107,7 +107,7 @@ SRCREV_pn-mickeydbus ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-mickeyterm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
-SRCREV_pn-mokoko ?= "119"
+SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "27659"
 SRCREV_pn-mplayer-maemo ?= "342"
@@ -120,8 +120,8 @@ SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-numptyphysics ?= "109"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
-SRCREV_pn-om-locations ?= "88ecdbab66d1586a8d12a6f83bb40e25336d3086"
-SRCREV_pn-om-settings ?= "72"
+SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec"
+SRCREV_pn-om-settings ?= "74"
 SRCREV_pn-ompower ?= "4727"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
@@ -166,7 +166,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-toolchain-scripts ?= "4430"
+SRCREV_pn-openmoko-toolchain-scripts ?= "4878"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
@@ -177,6 +177,8 @@ SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
 SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
+SRCREV_pn-paroli-dialer ?= "118"
+SRCREV_pn-paroli-gui ?= "118"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 8caa9ecb5f..7e7aa1d022 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -18,11 +18,17 @@ DISTRO = "openmoko"
 
 OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
+INHERIT += "packaged-staging"
+
 CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/"
 
 PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
-ANGSTROM_FEED_CONFIGS ?= "openmoko-feed-configs"
+DISTRO_FEED_PREFIX ?= "om-dev"
+DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
 
 # 2.18 seems to break badly on 64-bit systems
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
@@ -56,8 +62,7 @@ PACKAGE_ARCH_pn-neod_om-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}"
 
 # Select package versions we want to use.
-PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
-PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
+PREFERRED_PROVIDER_gtk+ = "gtk+"
 
 # for jalimo
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
@@ -81,7 +86,3 @@ ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};
 
 # opkg
 PREFERRED_PROVIDER_opkg = "opkg"
-
-# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
-DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index a45380f606..d503532bf0 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -1,12 +1,10 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: FIC GTA01 (Neo 1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
+#@NAME: OM GTA01 (Neo1973)
+#@DESCRIPTION: Machine configuration for the OM Neo1973 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-MACHINE_CLASS = "neo1973"
-PACKAGE_EXTRA_ARCHS = "fic-gta01 ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
@@ -26,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-snd-soc-neo1973-wm8753 \
-  kernel-module-snd-soc-smdk2440 \
+  kernel-module-g-ether \
 "
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 9876ebecbd..b3fe6b8dc8 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -5,8 +5,6 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-MACHINE_CLASS = "neo1973"
-PACKAGE_EXTRA_ARCHS = "fic-gta02 ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
@@ -21,12 +19,7 @@ XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
-  kernel-module-gta01-pm-bt  \
-  kernel-module-gta01-pm-gps \
-  kernel-module-gta01-pm-gsm \
-  kernel-module-gta01kbd \
-  kernel-module-s3cmci \
-  kernel-module-snd-soc-neo1973-gta02-wm8753 \
+  kernel-modules \
 "
 
 # no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
@@ -36,12 +29,16 @@ SERIAL_CONSOLE = "115200 ttySAC2"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES += "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \
   -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
+  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
index 399352f299..4cf393843b 100644
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "1"
+PR = "r1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index 09eddaeb6b..3956c4878b 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 4ef3cfeb66..346506c10d 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r17"
+PR = "r18"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 14379a5da6..250802116a 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 31a2f1abe7..4742c87d1a 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 53304df387..4d93394ff4 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index e5c0f2473c..3db360423b 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
diff --git a/packages/busybox/files/hwclock.sh b/packages/busybox/files/hwclock.sh
index 5acfb9fb24..aab5c054af 100644
--- a/packages/busybox/files/hwclock.sh
+++ b/packages/busybox/files/hwclock.sh
@@ -14,6 +14,8 @@
 
 . /etc/default/rcS
 
+[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime
+
 case "$1" in
         start)
                 if [ "$VERBOSE" != no ]
@@ -26,9 +28,9 @@ case "$1" in
 		then
 			if [ -z "$TZ" ]
 			then
-	                   hwclock --hctosys
+	                   hwclock --hctosys $UTC
 			else
-			   TZ="$TZ" hwclock --hctosys
+			   TZ="$TZ" hwclock --hctosys $UTC
 			fi
 		fi
 
@@ -51,7 +53,7 @@ case "$1" in
 		fi
 		if [ "$HWCLOCKACCESS" != no ]
 		then
-			hwclock --systohc
+			hwclock --systohc $UTC
 		fi
 		if [ "$VERBOSE" != no ]
 		then
@@ -62,7 +64,7 @@ case "$1" in
 	show)
 		if [ "$HWCLOCKACCESS" != no ]
 		then
-			hwclock --show
+			hwclock --show $UTC
 		fi
 		;;
         *)
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 8b995b3a70..64ef21cbd4 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -49,6 +49,7 @@ RDEPENDS_${PN}-x11 = "${PN}"
 RRECOMMENDS_${PN}-lib = "${PN}"
 RCONFLICTS_${PN} = "dbus-1"
 RREPLACES_${PN} = "dbus-1"
+RPROVIDES_${PN} = "dbus-1"
 
 PACKAGES =+ "${PN}-lib ${PN}-x11"
 
diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb
index b3768ceb1e..6f71d062ce 100644
--- a/packages/dbus/dbus_1.0.3.bb
+++ b/packages/dbus/dbus_1.0.3.bb
@@ -1,4 +1,4 @@
 require dbus.inc
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index f5c07e3a91..e14523daaf 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r8"
+PR = "r9"
diff --git a/packages/directfb/lite_0.9.26+cvs20070207.bb b/packages/directfb/lite_0.9.26+cvs20070207.bb
index 2f43627829..32f97bf962 100644
--- a/packages/directfb/lite_0.9.26+cvs20070207.bb
+++ b/packages/directfb/lite_0.9.26+cvs20070207.bb
@@ -9,7 +9,7 @@ LICENSE = "LGPL"
 
 # this is a CVS only release
 
-SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[9:]}"
+SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[10:]}"
 
 S = "${WORKDIR}/lite"
 
diff --git a/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf b/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf
new file mode 100644
index 0000000000..3581064245
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf
@@ -0,0 +1,38 @@
+[frameworkd]
+version = 1
+log_level = DEBUG
+log_to = syslog
+
+[odeviced.kernel26]
+# set 1 to disable the module
+disable = 0
+
+[odeviced.idlenotifier]
+# set 1 to disable the module
+disable = 1
+# add input nodes to ignore for idle activity
+ignoreinput = 2,3,4
+
+[odeviced.powercontrol-neo]
+disable = 1
+
+[ogsmd]
+disable = 1
+# specify your modemtype here
+
+[ogpsd]
+device = EtenDevice
+channel = SerialChannel
+path = /dev/ttySAC2
+
+[ogpsd.serialchannel]
+baudrate = 57600
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
+[opimd]
+disable = 1
diff --git a/packages/glibc/glibc-2.3.6/etc/ld.so.conf b/packages/glibc/glibc-2.3.6/etc/ld.so.conf
new file mode 100644
index 0000000000..46e06d3f0a
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/usr/local/lib
+
diff --git a/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch b/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch
new file mode 100644
index 0000000000..f05c04cb45
--- /dev/null
+++ b/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch
@@ -0,0 +1,166 @@
+---
+ ChangeLog         |    4 ++++
+ modules/cfgfile.c |   49 +++++++++++++++++++++++++++++--------------------
+ 2 files changed, 33 insertions(+), 20 deletions(-)
+
+--- ChangeLog.orig
++++ ChangeLog
+@@ -1,5 +1,9 @@
++2008-12-18  Florian Boor <florian@kernelconcepts.de>
++
++	* cfgfile.c: Some fixes to wifi key string generation.
++
+ 2008-05-23      Florian Boor <florian.boor@kernelconcepts.de>
+ 
+ 	* Relase version 0.2.7
+ 	* Update translations
+ 
+--- modules/cfgfile.c.orig
++++ modules/cfgfile.c
+@@ -1,8 +1,8 @@
+ /*
+  *
+- * Copyright (C) 2002, 2003  Florian Boor <florian.boor@kernelconcepts.de>
++ * Copyright (C) 2002, 2003, 2008  Florian Boor <florian.boor@kernelconcepts.de>
+  *               2004  Ole Reinhardt <ole.reinhardt@kernelconcepts.de>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version
+@@ -128,12 +128,10 @@ gint get_param_val(gchar* line, gchar* p
+ 	for (b=a+1;b<strlen(line);b++)
+ 		if ((line[b]=='\n') || (line[b]=='\0')) break;
+ 	param=strncpy(param,&line[st],sep-st);
+ 	param[sep-st]='\0';
+ 	
+-//KC-OR: changed because singe character values not recognized correctly
+-//		if ((b-a) > 0) value=strncpy(value,&line[a],b-a);	
+ 	if ((b-a) > 0) value=strncpy(value,&line[a],b-a);	
+ 	value[b-a]='\0';
+ 	return 0;
+ }
+ 
+@@ -562,15 +560,17 @@ gchar *get_iflist()
+ 		strncat(result," ",255);
+ 	}
+ 	return result;
+ }
+ 
+-void get_wifikey_string(NWInterface_t iface, char* key)
++void get_wifikey_string(NWInterface_t iface, gchar** key)
+ {
+ 	gint nokeys = FALSE;
+ 	gint count;
+ 	gchar temp[42];
++	gchar *lkey = g_strdup(""), *t;
++
+ 	
+ 	if ((strlen(iface.key[0]) == 0) && 
+ 	    (strlen(iface.key[1]) == 0) && 
+ 	    (strlen(iface.key[2]) == 0) && 
+ 	    (strlen(iface.key[3]) == 0)) 
+@@ -581,29 +581,36 @@ void get_wifikey_string(NWInterface_t if
+ 	
+ 	if (strlen(iface.key[iface.keynr-1]) == 0)
+ 		for (iface.keynr = 1; ifa