summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/binutils/binutils-cross.inc2
-rw-r--r--packages/busybox/busybox-1.2.1/slugos/defconfig6
-rw-r--r--packages/busybox/busybox_1.2.1.bb2
-rw-r--r--packages/gcc/gcc-cross_4.1.2.bb2
-rw-r--r--packages/gcc/gcc_4.1.2.bb2
-rw-r--r--packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch8
-rw-r--r--packages/gpe-login/files/lock-on-supend.patch14
-rw-r--r--packages/gpe-login/gpe-login_0.90.bb4
-rw-r--r--packages/initrdscripts/files/30-bootmenu.sh8
-rw-r--r--packages/initrdscripts/initramfs-jffs2_0.1.bb3
-rw-r--r--packages/initrdscripts/initramfs-module-block_1.0.bb3
-rw-r--r--packages/initrdscripts/initramfs-module-bootmenu_1.0.bb5
-rw-r--r--packages/initrdscripts/initramfs-module-initfs_1.0.bb3
-rw-r--r--packages/initrdscripts/initramfs-module-loop_1.0.bb3
-rw-r--r--packages/initrdscripts/initramfs-module-nfs_1.0.bb3
-rw-r--r--packages/initrdscripts/initramfs-uniboot_1.0.bb5
-rw-r--r--packages/keylaunch/files/keylaunchrc8
-rw-r--r--packages/keylaunch/files/unbreak-keyevents.patch22
-rw-r--r--packages/keylaunch/keylaunch-conf/.mtn2git_empty (renamed from packages/keylaunch/files/akita/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/80chvt-SUID (renamed from packages/keylaunch/files/80chvt-SUID)0
-rw-r--r--packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty (renamed from packages/keylaunch/files/c7x0/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/akita/keylaunchrc (renamed from packages/keylaunch/files/akita/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty (renamed from packages/keylaunch/files/collie/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc (renamed from packages/keylaunch/files/c7x0/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty (renamed from packages/keylaunch/files/corgie/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/collie/keylaunchrc (renamed from packages/keylaunch/files/collie/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty (renamed from packages/keylaunch/files/husky/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/corgie/keylaunchrc (renamed from packages/keylaunch/files/corgie/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty (renamed from packages/keylaunch/files/shepherd/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/husky/keylaunchrc (renamed from packages/keylaunch/files/husky/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf/keylaunchrc31
-rw-r--r--packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty (renamed from packages/keylaunch/files/spitz/.mtn2git_empty)0
-rw-r--r--packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc (renamed from packages/keylaunch/files/shepherd/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty0
-rw-r--r--packages/keylaunch/keylaunch-conf/spitz/keylaunchrc (renamed from packages/keylaunch/files/spitz/keylaunchrc)0
-rw-r--r--packages/keylaunch/keylaunch-conf_2.0.10.bb27
-rw-r--r--packages/keylaunch/keylaunch_2.0.10.bb36
-rw-r--r--packages/klibc/files/fstype-sane-and-vfat.patch60
-rw-r--r--packages/klibc/klibc-utils-fstype_1.1.1.bb14
-rw-r--r--packages/klibc/klibc.inc1
-rw-r--r--packages/klibc/klibc_1.1.1.bb2
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.21/defconfig100
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.6.bb2
-rw-r--r--packages/linux/linux-hackndev-2.6_git.bb (renamed from packages/linux/linux-hackndev-2.6_svn.bb)7
-rw-r--r--packages/linux/linux-handhelds-2.6.inc10
-rw-r--r--packages/mpfr/mpfr-native_svn.bb3
-rw-r--r--packages/mpfr/mpfr_svn.bb (renamed from packages/mpfr/mpfr_cvs.bb)8
-rw-r--r--packages/webcam-server/webcam-server_0.50.bb4
-rw-r--r--packages/zaurusd/zaurusd_svn.bb6
49 files changed, 307 insertions, 107 deletions
diff --git a/packages/binutils/binutils-cross.inc b/packages/binutils/binutils-cross.inc
index fb966d3c7b..642d5318e7 100644
--- a/packages/binutils/binutils-cross.inc
+++ b/packages/binutils/binutils-cross.inc
@@ -6,7 +6,7 @@ PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
--program-prefix=${TARGET_PREFIX} \
--enable-install-libbfd \
- "
+ --disable-werror"
do_stage () {
oe_runmake install
diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig
index c76954e711..74ece9c3b6 100644
--- a/packages/busybox/busybox-1.2.1/slugos/defconfig
+++ b/packages/busybox/busybox-1.2.1/slugos/defconfig
@@ -171,7 +171,7 @@ CONFIG_MKNOD=y
CONFIG_MV=y
# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
CONFIG_OD=y
# CONFIG_PRINTENV is not set
CONFIG_PRINTF=y
@@ -595,8 +595,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 64a6000747..325111c22f 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 = "r14"
+PR = "r15"
SRC_URI += "file://wget-long-options.patch;patch=1 \
file://df_rootfs.patch;patch=1 \
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 337562b207..f7a00d8afc 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -5,7 +5,7 @@ inherit cross
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment this one too.
-PR = "r11"
+PR = "r12"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index a6c99140b5..92db116555 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
LICENSE = "GPL"
# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment the -cross .bb PR too.
-PR = "r8"
+PR = "r9"
inherit autotools gettext
diff --git a/packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch b/packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
new file mode 100644
index 0000000000..afad073acf
--- /dev/null
+++ b/packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
@@ -0,0 +1,8 @@
+diff -r 976c01632fea gpe-login.keylaunchrc
+--- a/gpe-login.keylaunchrc Sun Nov 25 22:39:23 2007 +0200
++++ b/gpe-login.keylaunchrc Mon Nov 26 01:12:14 2007 +0200
+@@ -1,3 +1,3 @@ key=????XF86AudioRecord:xcalibrate:/usr/
+-key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
++key=????XF86AudioRecord:xcalibrate:/usr/bin/xtscal
+ key=????XF86PowerDown:-:/usr/bin/apm --suspend
+ key=????Held XF86PowerDown:-:bl toggle
diff --git a/packages/gpe-login/files/lock-on-supend.patch b/packages/gpe-login/files/lock-on-supend.patch
new file mode 100644
index 0000000000..2aeb20f1ea
--- /dev/null
+++ b/packages/gpe-login/files/lock-on-supend.patch
@@ -0,0 +1,14 @@
+Lock screen when device goes to suspend, not after some time has passed
+since resume and they stole your data from the unprotected screen.
+
+--- gpe-login-0.90/Makefile.am.org 2007-04-02 15:46:52.000000000 +0300
++++ gpe-login-0.90/Makefile.am 2007-11-24 22:41:24.000000000 +0200
+@@ -17,7 +17,7 @@
+ x11_SCRIPTS = gpe-login.setup X11/gpe-login.pre-session
+ x11_DATA = gpe-login.keylaunchrc X11/gpe-login.gtkrc
+
+-apmdir = $(sysconfdir)/apm/resume.d
++apmdir = $(sysconfdir)/apm/suspend.d
+ apm_SCRIPTS = gpe-login.suspend
+
+ xsessiondir = $(sysconfdir)/X11/Xsession.d
diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb
index 08cfa2a0e0..c2a274ba8b 100644
--- a/packages/gpe-login/gpe-login_0.90.bb
+++ b/packages/gpe-login/gpe-login_0.90.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd gpe-theme-clearlooks"
RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r2"
+PR = "r4"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
@@ -16,6 +16,8 @@ inherit gpe autotools pkgconfig
SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://lock-on-supend.patch;patch=1 "
+SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index 5b3e7782f4..1bb53d20a3 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -1,3 +1,7 @@
+#
+# (c) 2007 Paul Sokolovsky
+#
+
# If root is explicitly specified, skip interactive selection
if [ -z "$ROOT_DEVICE" ]; then
##############################
@@ -52,7 +56,9 @@ get_menu_selection()
get_partition_type()
{
- fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC`
+# fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC`
+ fstype=`fstype </dev/$dev`
+ fstype=`expr "$fstype" : 'FSTYPE=\([A-Za-z0-9]*\).*'`
}
scan_for_loopimgs()
diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb
index 3e11465536..f938b9d3b1 100644
--- a/packages/initrdscripts/initramfs-jffs2_0.1.bb
+++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb
@@ -1,8 +1,9 @@
SRC_URI = "file://jffs2boot.sh"
-PR = "r1"
+PR = "r2"
do_install() {
install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /init "
diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb
index 73f7a709f1..72812a2490 100644
--- a/packages/initrdscripts/initramfs-module-block_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-block_1.0.bb
@@ -1,5 +1,5 @@
SRC_URI = "file://85-blockboot.sh"
-PR = "r0"
+PR = "r1"
RDEPENDS = "initramfs-uniboot"
DESCRIPTION = "An initramfs module for booting off normal block devices."
@@ -8,4 +8,5 @@ do_install() {
install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /initrd.d/* "
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 3fc8647f6c..002acff0a9 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,6 +1,6 @@
SRC_URI = "file://30-bootmenu.sh"
-PR = "r1"
-RDEPENDS = "util-linux-mount initramfs-uniboot initramfs-module-block initramfs-module-loop"
+PR = "r3"
+RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
do_install() {
@@ -8,4 +8,5 @@ do_install() {
install -m 0755 ${WORKDIR}/30-bootmenu.sh ${D}/initrd.d/
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /initrd.d/* "
diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
index 48ae6c2160..64bba4a304 100644
--- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
@@ -1,5 +1,5 @@
SRC_URI = "file://10-initfs.sh"
-PR = "r1"
+PR = "r2"
DESCRIPTION = "An initramfs module for initializing filesystems."
RDEPENDS = "initramfs-uniboot"
RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
@@ -9,4 +9,5 @@ do_install() {
install -m 0755 ${WORKDIR}/10-initfs.sh ${D}/initrd.d/
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /initrd.d/* "
diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb
index 5cc84bcaf8..1a2d0a9754 100644
--- a/packages/initrdscripts/initramfs-module-loop_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb
@@ -1,5 +1,5 @@
SRC_URI = "file://80-loopboot.sh"
-PR = "r1"
+PR = "r2"
DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
mounting it."
RDEPENDS = "initramfs-uniboot initramfs-module-initfs"
@@ -10,4 +10,5 @@ do_install() {
install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /initrd.d/* "
diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb
index 6555688fce..acf71adb92 100644
--- a/packages/initrdscripts/initramfs-module-nfs_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb
@@ -1,5 +1,5 @@
SRC_URI = "file://80-nfsboot.sh"
-PR = "r0"
+PR = "r1"
DESCRIPTION = "An initramfs module for booting via NFS."
RDEPENDS = "initramfs-uniboot"
RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
@@ -9,4 +9,5 @@ do_install() {
install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /initrd.d/nfs "
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index f8d9d76936..167ce71ffe 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,11 +1,10 @@
SRC_URI = "file://init.sh"
-PR = "r0"
+PR = "r2"
DESCRIPTON = "A modular initramfs init script system."
-RDEPENDS = "busybox-static"
-RRECOMMENDS = "kernel-module-uinput"
do_install() {
install -m 0755 ${WORKDIR}/init.sh ${D}/init
}
+PACKAGE_ARCH = "all"
FILES_${PN} += " /init "
diff --git a/packages/keylaunch/files/keylaunchrc b/packages/keylaunch/files/keylaunchrc
deleted file mode 100644
index 0296db9dad..0000000000
--- a/packages/keylaunch/files/keylaunchrc
+++ /dev/null
@@ -1,8 +0,0 @@
-key=????Pressed XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE
-key=????Pressed XF86Calendar:gpe-calendar
-key=????Pressed telephone:gpe-contacts
-key=????Pressed XF86Mail:gpe-taskmanager
-key=????Pressed XF86Start:~matchbox-remote -desktop
-key=????Pressed XF86PowerDown:~apm --suspend
-key=????Held XF86PowerDown:~bl toggle
-key=????Combine XF86Calendar XF86Start:gpe-keylock
diff --git a/packages/keylaunch/files/unbreak-keyevents.patch b/packages/keylaunch/files/unbreak-keyevents.patch
new file mode 100644
index 0000000000..0a2d58b16a
--- /dev/null
+++ b/packages/keylaunch/files/unbreak-keyevents.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>"
+# Date 1196027570 -7200
+# Node ID 282176e5c55dba673756b4707716f06a5c8b37e2
+# Parent 833c989472a7987681ea3b8cbd6f9eb77293177a
+We of course still want to receive key events even after subscribing to
+property events. This fixes when keylaunch doesn't receive forwarded
+power buttons events from gpe-login --autolock in its locked state.
+In plain words: now power button works with autolock screen.
+
+diff -r 833c989472a7 -r 282176e5c55d keylaunch.c
+--- a/keylaunch.c Sun Nov 25 22:04:29 2007 +0200
++++ b/keylaunch.c Sun Nov 25 23:52:50 2007 +0200
+@@ -682,7 +682,7 @@ main (int argc, char *argv[])
+ {
+ initialize (argc, argv);
+
+- XSelectInput (dpy, DefaultRootWindow (dpy), PropertyChangeMask);
++ XSelectInput (dpy, DefaultRootWindow (dpy), PropertyChangeMask | KeyPressMask | KeyReleaseMask);
+ gpe_launch_monitor_display (dpy);
+
+ signal (SIGCHLD, SIG_IGN);
diff --git a/packages/keylaunch/files/akita/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/akita/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/.mtn2git_empty
diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/keylaunch-conf/80chvt-SUID
index e3b4efef5d..e3b4efef5d 100644
--- a/packages/keylaunch/files/80chvt-SUID
+++ b/packages/keylaunch/keylaunch-conf/80chvt-SUID
diff --git a/packages/keylaunch/files/c7x0/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/c7x0/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/keylaunch-conf/akita/keylaunchrc
index 9bb64db066..9bb64db066 100644
--- a/packages/keylaunch/files/akita/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/akita/keylaunchrc
diff --git a/packages/keylaunch/files/collie/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/collie/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty
diff --git a/packages/keylaunch/files/c7x0/keylaunchrc b/packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc
index e0b729a508..e0b729a508 100644
--- a/packages/keylaunch/files/c7x0/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc
diff --git a/packages/keylaunch/files/corgie/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/corgie/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty
diff --git a/packages/keylaunch/files/collie/keylaunchrc b/packages/keylaunch/keylaunch-conf/collie/keylaunchrc
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/collie/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/collie/keylaunchrc
diff --git a/packages/keylaunch/files/husky/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/husky/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty
diff --git a/packages/keylaunch/files/corgie/keylaunchrc b/packages/keylaunch/keylaunch-conf/corgie/keylaunchrc
index e0b729a508..e0b729a508 100644
--- a/packages/keylaunch/files/corgie/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/corgie/keylaunchrc
diff --git a/packages/keylaunch/files/shepherd/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/shepherd/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty
diff --git a/packages/keylaunch/files/husky/keylaunchrc b/packages/keylaunch/keylaunch-conf/husky/keylaunchrc
index e0b729a508..e0b729a508 100644
--- a/packages/keylaunch/files/husky/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/husky/keylaunchrc
diff --git a/packages/keylaunch/keylaunch-conf/keylaunchrc b/packages/keylaunch/keylaunch-conf/keylaunchrc
new file mode 100644
index 0000000000..c84fa25137
--- /dev/null
+++ b/packages/keylaunch/keylaunch-conf/keylaunchrc
@@ -0,0 +1,31 @@
+# Format:
+# "key=" <ModState> [<Event>] <Keysym>+ ":" [ <Window> ":" ] <Command>
+# ModState:
+# "????" - any modifier (don't care)
+# "...." - no modifer
+# "*..." - Shift
+# ".*.." - Control
+# "..*." - Alt
+# "...*" - AltGr
+# Shift/Control/Alt/AltGr can be combined (e.g. ".**." == Control+Alt)
+# Event:
+# <empty> - Normal keytouch (short keypress followed by release)
+# Held - Long keytouch (pressed and held for some time)
+# Special Events (use with care):
+# Pressed - Key was just pressed (note: other events may match too, e.g.
+# normal/Held)
+# Released - Key was just released (note: other events may match too)
+# Combine - Several keys pressed together (note: other events may match too)
+# Keysym: One or more (for Combine only) X keysyms
+# Window: Ignored, do not use
+# Command: Command line to execute, if starts with ~, suppress X startup notification
+# (use for non-X apps).
+#
+key=????XF86AudioRecord:gpe-soundbite record --autogenerate-filename $HOME_VOLATILE
+key=????XF86Calendar:gpe-calendar
+key=????telephone:gpe-contacts
+key=????XF86Mail:gpe-taskmanager
+key=????XF86Start:~matchbox-remote -desktop
+key=????XF86PowerDown:~apm --suspend
+key=????Held XF86PowerDown:~bl toggle
+key=????Combine XF86Calendar XF86Start:gpe-keylock
diff --git a/packages/keylaunch/files/spitz/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/keylaunch/files/spitz/.mtn2git_empty
+++ b/packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty
diff --git a/packages/keylaunch/files/shepherd/keylaunchrc b/packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc
index e0b729a508..e0b729a508 100644
--- a/packages/keylaunch/files/shepherd/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc
diff --git a/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/keylaunch-conf/spitz/keylaunchrc
index 9bb64db066..9bb64db066 100644
--- a/packages/keylaunch/files/spitz/keylaunchrc
+++ b/packages/keylaunch/keylaunch-conf/spitz/keylaunchrc
diff --git a/packages/keylaunch/keylaunch-conf_2.0.10.bb b/packages/keylaunch/keylaunch-conf_2.0.10.bb
new file mode 100644
index 0000000000..aeb9c862ca
--- /dev/null
+++ b/packages/keylaunch/keylaunch-conf_2.0.10.bb
@@ -0,0 +1,27 @@
+RDEPENDS_append_spitz = " display-brightness"
+RDEPENDS_append_akita = " display-brightness"
+RDEPENDS_append_c7x0 = " display-brightness"
+
+SECTION = "gpe"
+LICENSE = "GPL"
+DESCRIPTION = "Device-specific keylaunch configuration"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PR = "r2"
+
+SRC_URI = " file://keylaunchrc"
+SRC_URI += " file://80chvt-SUID"
+
+do_install () {
+ install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/X11/Xinit.d
+ install -m 0644 ${WORKDIR}/keylaunchrc ${D}${sysconfdir}/keylaunchrc.matchbox
+ install ${WORKDIR}/80chvt-SUID ${D}${sysconfdir}/X11/Xinit.d
+}
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10
+}
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox
+}
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index f7d63968ac..2afba67f16 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -1,10 +1,7 @@
inherit gpe
-DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch display-brightness"
-
-RDEPENDS_append_spitz = " display-brightness"
-RDEPENDS_append_akita = " display-brightness"
-RDEPENDS_append_c7x0 = " display-brightness"
+DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch keylaunch-conf"
+RDEPENDS = "keylaunch-conf"
SECTION = "gpe"
LICENSE = "GPL"
@@ -14,31 +11,14 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
computers. You can connect each key to a program of your choice; if the\
program is already running, keylaunch can bring its window to the front\
rather than just running another copy."
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r12"
-
-SRC_URI += " file://keylaunchrc"
-SRC_URI += " file://makefile-fix.patch;patch=1"
-SRC_URI += " file://80chvt-SUID"