diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/bluez/bluez-gnome_0.14.bb | 14 | ||||
-rw-r--r-- | packages/bluez/bluez-libs_3.16.bb | 1 | ||||
-rw-r--r-- | packages/bluez/bluez-utils_3.16.bb | 116 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/gumstix-connex/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh | 6 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/gumstix-verdex/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh | 6 | ||||
-rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 | ||||
-rw-r--r-- | packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch | 91 | ||||
-rw-r--r-- | packages/linux/linux-gta01_2.6.22.5.bb | 4 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2/openmoko-terminal.png | bin | 11078 -> 11860 bytes | |||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2_1.0.0.bb | 3 | ||||
-rw-r--r-- | packages/python/python-openmoko_0.1.bb | 2 | ||||
-rw-r--r-- | packages/update-modules/update-modules_1.0.bb | 12 |
14 files changed, 250 insertions, 7 deletions
diff --git a/packages/bluez/bluez-gnome_0.14.bb b/packages/bluez/bluez-gnome_0.14.bb new file mode 100644 index 0000000000..0fb8a7980f --- /dev/null +++ b/packages/bluez/bluez-gnome_0.14.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "BLuetooth configuration applet" +LICENSE = "GPL+LGPL" + +PR = "r1" + +DEPENDS = "dbus-glib gconf libnotify gtk+" +RRECOMMENDS = "gnome-icon-theme" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-libs_3.16.bb b/packages/bluez/bluez-libs_3.16.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.16.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils_3.16.bb b/packages/bluez/bluez-utils_3.16.bb new file mode 100644 index 0000000000..b8dbfbca7c --- /dev/null +++ b/packages/bluez/bluez-utils_3.16.bb @@ -0,0 +1,116 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +# ti patch doesn't apply, people using it should rediff it and send it upstream +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ +# file://hciattach-ti-bts.patch;patch=1 \ + " +PR = "r0" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat ${PN}-alsa" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + ${libdir}/cups/backend/.debug \ + ${libdir}/alsa-lib/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_sbindir}/hid2hci \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/initscripts/initscripts-1.0/gumstix-connex/.mtn2git_empty b/packages/initscripts/initscripts-1.0/gumstix-connex/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/gumstix-connex/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh b/packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh new file mode 100644 index 0000000000..3826457609 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -e /proc/cpu/alignment ]; then + echo "2" > /proc/cpu/alignment +fi + diff --git a/packages/initscripts/initscripts-1.0/gumstix-verdex/.mtn2git_empty b/packages/initscripts/initscripts-1.0/gumstix-verdex/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/gumstix-verdex/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh b/packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh new file mode 100644 index 0000000000..3826457609 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -e /proc/cpu/alignment ]; then + echo "2" > /proc/cpu/alignment +fi + diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index ebddf17b61..3d2f0f50b4 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r98" +PR = "r99" SRC_URI = "file://functions \ file://halt \ diff --git a/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch b/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch new file mode 100644 index 0000000000..cc74c0e289 --- /dev/null +++ b/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch @@ -0,0 +1,91 @@ +Index: linux-2.6.22.5/drivers/input/evdev.c +=================================================================== +--- linux-2.6.22.5.orig/drivers/input/evdev.c ++++ linux-2.6.22.5/drivers/input/evdev.c +@@ -28,7 +28,7 @@ struct evdev { + char name[16]; + struct input_handle handle; + wait_queue_head_t wait; +- struct evdev_client *grab; ++ int grab; + struct list_head client_list; + }; + +@@ -36,6 +36,7 @@ struct evdev_client { + struct input_event buffer[EVDEV_BUFFER_SIZE]; + int head; + int tail; ++ int grab; + struct fasync_struct *fasync; + struct evdev *evdev; + struct list_head node; +@@ -48,8 +49,7 @@ static void evdev_event(struct input_han + struct evdev *evdev = handle->private; + struct evdev_client *client; + +- if (evdev->grab) { +- client = evdev->grab; ++ list_for_each_entry(client, &evdev->client_list, node) { + + do_gettimeofday(&client->buffer[client->head].time); + client->buffer[client->head].type = type; +@@ -58,17 +58,7 @@ static void evdev_event(struct input_han + client->head = (client->head + 1) & (EVDEV_BUFFER_SIZE - 1); + + kill_fasync(&client->fasync, SIGIO, POLL_IN); +- } else +- list_for_each_entry(client, &evdev->client_list, node) { +- +- do_gettimeofday(&client->buffer[client->head].time); +- client->buffer[client->head].type = type; +- client->buffer[client->head].code = code; +- client->buffer[client->head].value = value; +- client->head = (client->head + 1) & (EVDEV_BUFFER_SIZE - 1); +- +- kill_fasync(&client->fasync, SIGIO, POLL_IN); +- } ++ } + + wake_up_interruptible(&evdev->wait); + } +@@ -105,9 +95,10 @@ static int evdev_release(struct inode *i + struct evdev_client *client = file->private_data; + struct evdev *evdev = client->evdev; + +- if (evdev->grab == client) { +- input_release_device(&evdev->handle); +- evdev->grab = NULL; ++ if (client->grab) { ++ if(!--evdev->grab && evdev->exist) ++ input_release_device(&evdev->handle); ++ client->grab = 0; + } + + evdev_fasync(-1, file, 0); +@@ -488,17 +479,19 @@ static long evdev_ioctl_handler(struct f + + case EVIOCGRAB: + if (p) { +- if (evdev->grab) +- return -EBUSY; +- if (input_grab_device(&evdev->handle)) ++ if (client->grab) + return -EBUSY; +- evdev->grab = client; ++ if (!evdev->grab++) ++ if (input_grab_device(&evdev->handle)) ++ return -EBUSY; ++ client->grab = 0; + return 0; + } else { +- if (evdev->grab != client) ++ if (!client->grab) + return -EINVAL; +- input_release_device(&evdev->handle); +- evdev->grab = NULL; ++ if (!--evdev->grab) ++ input_release_device(&evdev->handle); ++ client->grab = 0; + return 0; + } + diff --git a/packages/linux/linux-gta01_2.6.22.5.bb b/packages/linux/linux-gta01_2.6.22.5.bb index 4b970f9811..1f06c49764 100644 --- a/packages/linux/linux-gta01_2.6.22.5.bb +++ b/packages/linux/linux-gta01_2.6.22.5.bb @@ -1,10 +1,10 @@ require linux-gta01.inc SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http" -#SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1" +SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1" MOKOR = "moko11" -PR = "${MOKOR}-r1" +PR = "${MOKOR}-r2" VANILLA_VERSION = "2.6.22.5" diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png Binary files differindex 56e8e59628..3b383c10e6 100644 --- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png +++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index cff759edd6..afb0592050 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,10 +1,9 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r4" - RCONFLICTS = "openmoko-terminal" RREPLACES = "openmoko-terminal" +PR = "r5" inherit openmoko2 diff --git a/packages/python/python-openmoko_0.1.bb b/packages/python/python-openmoko_0.1.bb index e193f0f2de..6755d4dca8 100644 --- a/packages/python/python-openmoko_0.1.bb +++ b/packages/python/python-openmoko_0.1.bb @@ -6,7 +6,7 @@ SECTION = "devel/python" PR = "r1" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/bindings;module=python;proto=http \ - file://python-path.patch;patch=1" + file://python-path.patch;patch=1;maxdate=20070829" S = "${WORKDIR}/python" diff --git a/packages/update-modules/update-modules_1.0.bb b/packages/update-modules/update-modules_1.0.bb index dadcddb8c3..cc7a585207 100644 --- a/packages/update-modules/update-modules_1.0.bb +++ b/packages/update-modules/update-modules_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Script to manage module configuration files" LICENSE = "GPLv2" PACKAGE_ARCH = "all" RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r5" +PR = "r6" SRC_URI = "file://update-modules" @@ -18,3 +18,13 @@ do_install() { install -d ${D}${sbindir} install ${WORKDIR}/update-modules ${D}${sbindir} } + +# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which +# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have +# to deal with that unique legacy corner case, we just nullify the +# RDEPENDS here and handle it in the Unslung image recipe. I know this +# is ugly. Please don't remove it unless you first make the RDEPENDS +# line at the top of this file understand that a machine can be used +# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's +# not worth the effort to do that, so just overlook the next line. +RDEPENDS_unslung = "" |