[oe-commits] org.oe.dev merge of '376819ac84d75f0ce8ec06340963023a9c9942a4'
openmoko commit
openembedded-commits at lists.openembedded.org
Thu Aug 30 07:00:59 UTC 2007
merge of '376819ac84d75f0ce8ec06340963023a9c9942a4'
and '60fb33a02ef3883ba5e899817c59b6eb330776e0'
Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: 8c413d0ea6a794422850c0f057cc2e801fe9923e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8c413d0ea6a794422850c0f057cc2e801fe9923e
Files:
1
packages/gsm/files/gsmd
packages/gsm/libgsmd_svn.bb
packages/initscripts/initscripts-1.0/gumstix-connex
packages/initscripts/initscripts-1.0/gumstix-verdex
packages/bluez/bluez-gnome_0.14.bb
packages/bluez/bluez-libs_3.16.bb
packages/bluez/bluez-utils_3.16.bb
packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh
packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh
packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch
classes/efl_base.bbclass
classes/kernel.bbclass
conf/machine/include/zaurus-2.6.inc
packages/initscripts/initscripts_1.0.bb
packages/linux/linux-gta01_2.6.22.5.bb
packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
packages/openmoko2/openmoko-terminal2_1.0.0.bb
packages/python/python-openmoko_0.1.bb
packages/update-modules/update-modules_1.0.bb
Diffs:
#
# mt diff -r376819ac84d75f0ce8ec06340963023a9c9942a4 -r8c413d0ea6a794422850c0f057cc2e801fe9923e
#
#
#
# patch "packages/gsm/files/gsmd"
# from [b9a426f81bcbcf52b88fe0e13f66505d4a8ca216]
# to [a0900c11652d1a1755019fc170dcdf36658ef086]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [9756c419c7d89327186ad79d5a2bdabac11695b0]
# to [e45be6172fbb275631f81e60264fcdf723f81df1]
#
============================================================
--- packages/gsm/files/gsmd b9a426f81bcbcf52b88fe0e13f66505d4a8ca216
+++ packages/gsm/files/gsmd a0900c11652d1a1755019fc170dcdf36658ef086
@@ -1,106 +1,49 @@
-#!/bin/sh
+##!/bin/sh
#
-# gsmd This shell script starts and stops gsmd.
+# gsmd This shell script starts and stops gsmd.
#
# chkconfig: 345 90 40
# description: Gsmd manages access to a serial- or USB-connected GSM
# processname: gsmd
-# Source configuration
-. /etc/default/gsmd
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
-# Source function library.
-#. /etc/rc.d/init.d/functions
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
-RETVAL=0
-prog="gsmd"
+case "$1" in
+ start)
+ [ -n $GSM_POW ] && ( echo "0" >$GSM_POW; sleep 1 )
+ [ -n $GSM_POW ] && ( echo "1" >$GSM_POW; sleep 1 )
+ [ -n $GSM_RES ] && ( echo "1" >$GSM_RES; sleep 1 )
+ [ -n $GSM_RES ] && ( echo "0" >$GSM_RES; sleep 2 )
-start() {
- # Hack for broken uboot and/or kernel on the neo1973
- dmesg -n1
+ echo -n "Starting GSM daemon: "
+ start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
- if [ -n "${GSM_POW}" ]
- then
- if [ -e "${GSM_POW}" ]
- then
- echo -n "Powering up GSM device..."
- echo "1" > ${GSM_POW}
- sleep 1
- echo "done"
- else
- echo "GSM device not found. Aborting startup"
- return false
- fi
- fi
- # Start daemons.
- echo -n "Starting $prog: "
- # We don't use the daemon function here because of a known bug
- # in initlog -- it spuriously returns a nonzero status when
- # starting daemons that fork themselves. See
- # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629
- # for discussion. Fortunately:
- #
- # 1. gsmd startup can't fail, or at least not in the absence of
- # much larger resource-exhaustion problems that would be very obvious.
- #
- # 2. We don't need all the logging crud that daemon/initlog sets
- # up -- gsmd does its own syslog calls.
- #
- if [ -e "${GSM_DEV}" ]
- then
- gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 &
- echo "success"
- else
- # User needs to symlink ${GPS_DEV} to the right thing
- echo "No ${GSM_DEV} device, aborting gsmd startup."
- fi
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd
- return $RETVAL
-}
+ if [ $? = 0 ]; then
+ echo "gsmd."
+ else
+ echo "(failed.)"
+ fi
+ ;;
+ stop)
+ [ -n $GSM_POW ] && echo "0" >$GSM_POW
-stop() {
- # Stop daemons.
- echo -n "Shutting down $prog: "
- killall gsmd
-# killproc gsmd
- RETVAL=$?
- echo
- if [ $RETVAL -eq 0 ]
- then
- rm -f /var/lock/subsys/gsmd;
- fi
- return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload)
- stop
- start
- RETVAL=$?
- ;;
- condrestart)
- if [ -f /var/lock/subsys/gsmd ]; then
- stop
- start
- RETVAL=$?
- fi
- ;;
- status)
-# status gsmd
-# RETVAL=$?
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|condrestart|status}"
- exit 1
+ echo -n "Stopping GSM daemon: "
+ start-stop-daemon -K -x /usr/sbin/gsmd
+ echo "gsmd."
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ exit
+ ;;
+ *)
+ echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+ exit 1
+ ;;
esac
+exit 0
+
-exit $RETVAL
============================================================
--- packages/gsm/libgsmd_svn.bb 9756c419c7d89327186ad79d5a2bdabac11695b0
+++ packages/gsm/libgsmd_svn.bb e45be6172fbb275631f81e60264fcdf723f81df1
@@ -1,10 +1,10 @@ PV = "0.1+svn${SRCDATE}"
DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
HOMEPAGE = "http://www.openmoko.org"
LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
PV = "0.1+svn${SRCDATE}"
-PR = "r21"
+PR = "r22"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
@@ -46,6 +46,7 @@ RRECOMMENDS_gsmd = "gsmd-plugins"
RDEPENDS_gsmd = "initscripts"
RRECOMMENDS_gsmd = "gsmd-plugins"
+
FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
FILES_${PN}-tools = "${bindir}/*"
FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}"
#
# mt diff -r60fb33a02ef3883ba5e899817c59b6eb330776e0 -r8c413d0ea6a794422850c0f057cc2e801fe9923e
#
#
#
# add_dir "packages/initscripts/initscripts-1.0/gumstix-connex"
#
# add_dir "packages/initscripts/initscripts-1.0/gumstix-verdex"
#
# add_file "packages/bluez/bluez-gnome_0.14.bb"
# content [6cbb9f5eeecaf368ffa6b829edd445c7877dc847]
#
# add_file "packages/bluez/bluez-libs_3.16.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils_3.16.bb"
# content [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
#
# add_file "packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh"
# content [7a5dd97ce6530f6506649235012c1f3dc14875ed]
#
# add_file "packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh"
# content [7a5dd97ce6530f6506649235012c1f3dc14875ed]
#
# add_file "packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch"
# content [aad1fad01b6ce0e521a45dad330521825ac0903f]
#
# patch "classes/efl_base.bbclass"
# from [aabadd6f5cd07bd1ce37b7a34cf28f7031160028]
# to [09892e0f0086d013b90a878b3d2b6d09064a44c8]
#
# patch "classes/kernel.bbclass"
# from [26da2ff033e30db7199c7cf69fc6008850e40a16]
# to [79b0a4830c95b4a3c3463b13135ce60b5d4a616b]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [72f56a86eaabe41773f1417f2934a7ed5a2b288b]
# to [33450d82b33ee860d4ee408cf55294eaf200a8ef]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [4947d0fbf5c2bde2a6e56a3445f9c328b567a585]
# to [6f8d1e9840c32de6d309e80f06dad7662fc4f1a8]
#
# patch "packages/linux/linux-gta01_2.6.22.5.bb"
# from [ef0f1c24d6a7f6f65653201f99d3cd5c60bbe2ee]
# to [73a688164c1e7a63c8c5d590f6d406c88f38d1d4]
#
# patch "packages/openmoko2/openmoko-terminal2/openmoko-terminal.png"
# from [e7db9d314755face71a3ad7fd49d186333e1202f]
# to [67eefa1549cc46741256e2e72bc30463809be1c2]
#
# patch "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
# from [2ea84bd4f21c78174ab58bc7d9d93e18683612a1]
# to [d58082b76e2897e348b38536dcf8f4e4d416212b]
#
# patch "packages/python/python-openmoko_0.1.bb"
# from [718047398e690d79f5a31a2a007d7bedcc7ae4f0]
# to [65cf106fd6b6906685914dd5aa5968d1cd5c7483]
#
# patch "packages/update-modules/update-modules_1.0.bb"
# from [c826ebfc84c887b036affefdc32161fd9f4c103c]
# to [7244af12c753fc05bb699d727f414e78975ec933]
#
============================================================
--- packages/bluez/bluez-gnome_0.14.bb 6cbb9f5eeecaf368ffa6b829edd445c7877dc847
+++ packages/bluez/bluez-gnome_0.14.bb 6cbb9f5eeecaf368ffa6b829edd445c7877dc847
@@ -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"
+
============================================================
--- packages/bluez/bluez-libs_3.16.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.16.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils_3.16.bb a6515be5f7deaf5c7ae08f4d976c5b84644d682f
+++ packages/bluez/bluez-utils_3.16.bb a6515be5f7deaf5c7ae08f4d976c5b84644d682f
@@ -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"
+
+
============================================================
--- packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh 7a5dd97ce6530f6506649235012c1f3dc14875ed
+++ packages/initscripts/initscripts-1.0/gumstix-connex/alignment.sh 7a5dd97ce6530f6506649235012c1f3dc14875ed
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -e /proc/cpu/alignment ]; then
+ echo "2" > /proc/cpu/alignment
+fi
+
============================================================
--- packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh 7a5dd97ce6530f6506649235012c1f3dc14875ed
+++ packages/initscripts/initscripts-1.0/gumstix-verdex/alignment.sh 7a5dd97ce6530f6506649235012c1f3dc14875ed
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -e /proc/cpu/alignment ]; then
+ echo "2" > /proc/cpu/alignment
+fi
+
============================================================
--- packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch aad1fad01b6ce0e521a45dad330521825ac0903f
+++ packages/linux/linux-gta01/fix-EVIOCGRAB-semantics-2.6.22.5.patch aad1fad01b6ce0e521a45dad330521825ac0903f
@@ -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;
+ }
+
============================================================
--- classes/efl_base.bbclass aabadd6f5cd07bd1ce37b7a34cf28f7031160028
+++ classes/efl_base.bbclass 09892e0f0086d013b90a878b3d2b6d09064a44c8
@@ -1,10 +1,5 @@ inherit autotools pkgconfig
inherit autotools pkgconfig
-#do_prepsources () {
-# make clean distclean || true
-#}
-#addtask prepsources after do_fetch before do_unpack
-
SECTION = "e/libs"
HOMEPAGE = "http://www.enlightenment.org"
SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
@@ -17,4 +12,3 @@ FILES_${PN}-dev += "${bindir}/${PN}-conf
PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a"
-
============================================================
--- classes/kernel.bbclass 26da2ff033e30db7199c7cf69fc6008850e40a16
+++ classes/kernel.bbclass 79b0a4830c95b4a3c3463b13135ce60b5d4a616b
@@ -179,7 +179,9 @@ RDEPENDS_kernel = "kernel-base"
FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
FILES_kernel-dev = "/boot/System.map* /boot/config*"
RDEPENDS_kernel = "kernel-base"
-RDEPENDS_kernel-base = "kernel-image"
+# Allow machines to override this dependency if kernel image files are
+# not wanted in images as standard
+RDEPENDS_kernel-base ?= "kernel-image"
PKG_kernel-image = "kernel-image-${KERNEL_VERSION}"
PKG_kernel-base = "kernel-${KERNEL_VERSION}"
ALLOW_EMPTY_kernel = "1"
============================================================
--- conf/machine/include/zaurus-2.6.inc 72f56a86eaabe41773f1417f2934a7ed5a2b288b
+++ conf/machine/include/zaurus-2.6.inc 33450d82b33ee860d4ee408cf55294eaf200a8ef
@@ -67,3 +67,6 @@ zaurus_make_installkit () {
md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
}
+
+# Don't include kernels in standard images for Zaurus machines
+RDEPENDS_kernel-base = ""
============================================================
--- packages/initscripts/initscripts_1.0.bb 4947d0fbf5c2bde2a6e56a3445f9c328b567a585
+++ packages/initscripts/initscripts_1.0.bb 6f8d1e9840c32de6d309e80f06dad7662fc4f1a8
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "SysV init scripts"
SECTION = "base"
PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r98"
+PR = "r99"
SRC_URI = "file://functions \
file://halt \
============================================================
--- packages/linux/linux-gta01_2.6.22.5.bb ef0f1c24d6a7f6f65653201f99d3cd5c60bbe2ee
+++ packages/linux/linux-gta01_2.6.22.5.bb 73a688164c1e7a63c8c5d590f6d406c88f38d1d4
@@ -1,10 +1,10 @@ SRC_URI += "svn://svn.openmoko.org/trunk
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"
============================================================
# packages/openmoko2/openmoko-terminal2/openmoko-terminal.png is binary
============================================================
--- packages/openmoko2/openmoko-terminal2_1.0.0.bb 2ea84bd4f21c78174ab58bc7d9d93e18683612a1
+++ packages/openmoko2/openmoko-terminal2_1.0.0.bb d58082b76e2897e348b38536dcf8f4e4d416212b
@@ -1,10 +1,9 @@ RDEPENDS += "mrxvt"
DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "mrxvt"
-PR = "r4"
-
RCONFLICTS = "openmoko-terminal"
RREPLACES = "openmoko-terminal"
+PR = "r5"
inherit openmoko2
============================================================
--- packages/python/python-openmoko_0.1.bb 718047398e690d79f5a31a2a007d7bedcc7ae4f0
+++ packages/python/python-openmoko_0.1.bb 65cf106fd6b6906685914dd5aa5968d1cd5c7483
@@ -6,7 +6,7 @@ SRC_URI = "svn://svn.projects.openmoko.o
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"
============================================================
--- packages/update-modules/update-modules_1.0.bb c826ebfc84c887b036affefdc32161fd9f4c103c
+++ packages/update-modules/update-modules_1.0.bb 7244af12c753fc05bb699d727f414e78975ec933
@@ -1,9 +1,9 @@ RDEPENDS = "${@base_contains("MACHINE_FE
SECTION = "base"
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 = ""
More information about the Openembedded-commits
mailing list