merge of a615f71806dc9ceee0102ed403b1e7fe4f948b5d

     and aac02cf2eb8931c6f1e4df467cc5ff36a36a2051

13 files changed, 77 insertions, 21 deletions

diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass
new file mode 100644
index 0000000000..2248f326cc
--- /dev/null
+++ b/classes/multimachine.bbclass
@@ -0,0 +1,22 @@
+STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${HOST_OS}/${PF}"
+WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${HOST_OS}/${PF}"
+STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${HOST_OS}/kernel"
+
+# Find any machine specific sub packages and if present, mark the 
+# whole package as machine specific for multimachine purposes.
+python __anonymous () {
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	macharch = bb.data.getVar('MACHINE_ARCH', d, 1)
+	multiarch  = bb.data.getVar('PACKAGE_ARCH', d, 1)
+
+	for pkg in packages:
+		pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1)
+
+		# We could look for != PACKAGE_ARCH here but how to choose 
+		# if multiple differences are present?
+		# Look through IPKG_ARCHS for the priority order?
+		if pkgarch and pkgarch == macharch:
+			multiarch = macharch
+
+	bb.data.setVar('MULTIMACH_ARCH', multiarch, d)
+}
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 403b13934f..100017410d 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -12,10 +12,8 @@ ANGSTROM_URI = "http://www.angstrom-distribution.org/"
 MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
 
 #use ipkg package format with debian style naming
-INHERIT += "package_ipk debian"
-
 #use multimachine buildrules 
-include conf/distro/include/multimachine.conf
+INHERIT += "package_ipk debian multimachine"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index da5caa7998..2646fe78a6 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -4,7 +4,7 @@
 
 MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
 
-INHERIT += "package_ipk debian"
+INHERIT += "package_ipk debian multimachine"
 TARGET_OS = "linux"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
@@ -15,5 +15,3 @@ PARALLEL_INSTALL_MODULES = "1"
 UDEV_DEVFS_RULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
-
-include conf/distro/include/multimachine.conf
diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/conf/distro/include/.mtn2git_empty
+++ /dev/null
diff --git a/conf/distro/include/multimachine.conf b/conf/distro/include/multimachine.conf
deleted file mode 100644
index 1f73ffd30f..0000000000
--- a/conf/distro/include/multimachine.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}"
-WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}"
-STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 01c90a5b26..dfdbe19e46 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -53,7 +53,11 @@ PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
 #<>
 #<>Other Specific stuff.
 #<>
-INHERIT += "package_tar package_ipk"
+#<>
+#<>We want to be able to build this for all jornadas so
+#<>to not mess up the folders we need to make them dynamic.
+#<>It will use different folders depending on Arch (set in local.conf)
+INHERIT += "package_tar package_ipk multimachine"
 BBINCLUDELOGS = "yes"
 IMAGE_FSTYPES = "tar.bz2"
 TARGET_OS = "linux"
@@ -76,12 +80,6 @@ include conf/distro/preferred-opie-versions.inc
 PCMCIA_MANAGER = "pcmciautils"
 
 #<>
-#<>We want to be able to build this for all jornadas so
-#<>to not mess up the folders we need to make them dynamic.
-#<>It will use different folders depending on Arch (set in local.conf)
-include conf/distro/include/multimachine.conf
-
-#<>
 #<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2
 #<>
 FULL_OPTIMIZATION = "-O2"
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index edcbacc80e..b7f456320f 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -5,7 +5,7 @@
 DISTRO = "openzaurus"
 DISTRO_NAME = "OpenZaurus"
 
-INHERIT += " package_ipk debian"
+INHERIT += " package_ipk debian multimachine"
 # For some reason, this doesn't work
 # TARGET_OS ?= "linux"
 TARGET_OS = "linux"
@@ -16,5 +16,3 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
 PARALLEL_INSTALL_MODULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
-
-include conf/distro/include/multimachine.conf
diff --git a/packages/gpe-login/files/chvt-keylaunch.patch b/packages/gpe-login/files/chvt-keylaunch.patch
new file mode 100644
index 0000000000..5e62a1107e
--- /dev/null
+++ b/packages/gpe-login/files/chvt-keylaunch.patch
@@ -0,0 +1,11 @@
+--- gpe-login-0.86/gpe-login.keylaunchrc.orig	2006-05-28 20:38:39.846547024 +0200
++++ gpe-login-0.86/gpe-login.keylaunchrc	2006-05-28 20:38:56.800969560 +0200
+@@ -1,3 +1,8 @@
+ key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
+ key=???XF86PowerDown:-:/usr/bin/apm --suspend
+ key=???Held XF86PowerDown:-:bl toggle
++
++# VT changing
++key=...*Left:-:~chvt 1
++key=...*Right:-:~chvt 3
++key=...*Escape:-:~/etc/init.d/gpe-dm stop
diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb
index f6eb0c921a..1dd6818903 100644
--- a/packages/gpe-login/gpe-login_0.86.bb
+++ b/packages/gpe-login/gpe-login_0.86.bb
@@ -7,7 +7,7 @@ PRIORITY    = "optional"
 DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS    = "xkbd"
 RPROVIDES   = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
@@ -16,3 +16,4 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
 SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
 
+SRC_URI_append += " file://chvt-keylaunch.patch;patch=1 "
diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/files/80chvt-SUID
new file mode 100644
index 0000000000..e3b4efef5d
--- /dev/null
+++ b/packages/keylaunch/files/80chvt-SUID
@@ -0,0 +1,25 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: chvt-SUID.sh
+# Date: 28-May-06
+
+
+#
+# Sets the SUID bit on chvt to allow changing to the VT from inside X by
+# any user. Since a SUID binary still is a security risk, we chmod only
+# when keylaunch is used and not by default.
+#
+
+for target in /usr/bin/chvt.console-tools
+do
+	if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws" 
+	then
+		echo "Making [$target] SUID root..."
+		chmod u+s "$target"
+	else
+		echo "Ignoring [$target]"
+	fi
+done
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc
index 0379c719c4..27cce24e93 100644
--- a/packages/keylaunch/files/akita/keylaunchrc
+++ b/packages/keylaunch/files/akita/keylaunchrc
@@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar
 #key=....F19:-:                                                                 
 #key=....F19:-:                                                                 
 #key=....F10:-:                                                                 
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc
index f5e1fd70be..433221a586 100644
--- a/packages/keylaunch/files/spitz/keylaunchrc
+++ b/packages/keylaunch/files/spitz/keylaunchrc
@@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar
 #key=....F19:-:                                                                 
 #key=....F19:-:                                                                 
 #key=....F10:-:                                                                 
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index c06c9c4587..67ed0923f2 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
  program is already running, keylaunch can bring its window to the front\
  rather than just running another copy."
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI += " file://keylaunchrc"