[oe-commits] org.oe.dev merge of '13170805eb277bcec085eb013dda836930e5bee7'

mickeyl commit oe at amethyst.openembedded.net
Fri Mar 28 15:04:09 UTC 2008


merge of '13170805eb277bcec085eb013dda836930e5bee7'
     and 'd2c1007682618105ff49ee76ac59d9b164de9572'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ee2aa51c8eb93fa5579f4cf49a53eb0cb3e90319
ViewMTN: http://monotone.openembedded.org/revision/info/ee2aa51c8eb93fa5579f4cf49a53eb0cb3e90319
Files:
1
packages/ftpd-topfield/ftpd-topfield_0.7.4.bb
packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
packages/ftpd-topfield/files/syslog.patch
packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
classes/kernel.bbclass
classes/package.bbclass
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux.inc
packages/python/python-dbus_0.82.4.bb
Diffs:

#
# mt diff -r13170805eb277bcec085eb013dda836930e5bee7 -ree2aa51c8eb93fa5579f4cf49a53eb0cb3e90319
#
#
#
# rename "packages/ftpd-topfield/ftpd-topfield_0.7.4.bb"
#     to "packages/ftpd-topfield/ftpd-topfield_0.7.5.bb"
# 
# add_file "packages/ftpd-topfield/files/syslog.patch"
#  content [49ea172de784d2eac6f5f6d268eab53dca579f66]
# 
# add_file "packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch"
#  content [d64355f76f4983d49aa06c5c7f5b438debf72c22]
# 
# patch "classes/kernel.bbclass"
#  from [aa43796485b85a90de8e92d888cb27492a55b831]
#    to [b6e05ecebbfd152cbd0c654bcea62bbcf8f18352]
# 
# patch "classes/package.bbclass"
#  from [906d70a366b88e9727bc076e7246c6de0874bc0f]
#    to [6f3deeb912b24b09204110bd00e94e30f64d3936]
# 
# patch "packages/ftpd-topfield/ftpd-topfield_0.7.5.bb"
#  from [139094f9c7f3a47d4880ca6843b5ae81ca3bc526]
#    to [286b7cb59ed33da44eda89da11f94c7bb318c481]
# 
# patch "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
#  from [1251c42b1b8b4ecdaea05b9eda83b6dc37604eff]
#    to [c1b4c06be7a3fbdca153a8f990cb07da43231f80]
# 
# patch "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
#  from [668b63370db91bbc90e20d8fc70648986af0f35c]
#    to [1e2bfb62d7aa242bc8c8c76ee96145f2b157ae1d]
# 
# patch "packages/linux/linux-ixp4xx_2.6.24.4.bb"
#  from [493df9f1f9f80a8b08911a0846783e5101b6b828]
#    to [0b69f35f287cafb1adc412c0a0ab039833d806e0]
# 
# patch "packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch"
#  from [555dcdc80fa0d4419bbeaa955328961258cf607e]
#    to [c1ba9d58f22e96a7d5fd27cd59af335284d4de5c]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [51870430d0959e153e5ae362218b6f4167e36568]
#    to [d6d6154abb7e12ee339a56d8159976202d70a192]
# 
# patch "packages/linux/linux.inc"
#  from [0321f5531f3d38ef343c01b13c7416df2e74e8ce]
#    to [05a28f69ba86f2b970e011440a9296697b6e57d8]
#
============================================================
--- packages/ftpd-topfield/files/syslog.patch	49ea172de784d2eac6f5f6d268eab53dca579f66
+++ packages/ftpd-topfield/files/syslog.patch	49ea172de784d2eac6f5f6d268eab53dca579f66
@@ -0,0 +1,26 @@
+--- ftpd-topfield/ftpd.c~	2008-02-16 09:49:30.000000000 +1030
++++ ftpd-topfield/ftpd.c	2008-03-24 21:45:15.000000000 +1030
+@@ -1190,6 +1190,7 @@
+ 		if (debug) {
+ 			fprintf(stderr, "Transfer failed %lld bytes %s\n", (long long)current, srcpath);
+ 		}
++		syslog(LOG_INFO, "retrieve: Failed transfer of %s @%Ld", srcpath, (long long)current);
+ 		perror_reply (550, name);
+ 	}
+ 
+@@ -1363,6 +1364,7 @@
+ #endif
+ 
+ 	if (ret != 0) {
++		syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current);
+ 		perror_reply (553, name);
+ 
+ 		LOGCMD (*mode == 'w' ? "put" : "append", name);
+@@ -1451,6 +1453,7 @@
+ 				}
+ 			}
+ 
++			syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current);
+ 			/* Failed to cancel the put, so give up */
+ 			perror_reply (426, "Data Connection");
+ 		}
============================================================
--- packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch	d64355f76f4983d49aa06c5c7f5b438debf72c22
+++ packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch	d64355f76f4983d49aa06c5c7f5b438debf72c22
@@ -0,0 +1,180 @@
+This patch adds support for Sharp CE-RH2 on Akita and CE-RH1 on C7x0.
+
+This patch is a bit ugly:
+- Device specific functions should be moved to platform infrastructure.
+- Maybe define generic *_scoopexp functions handling Akita x Spitz differences.
+
+Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c
+===================================================================
+--- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c	2008-03-08 19:29:02.000000000 +0000
++++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c	2008-03-08 22:23:35.000000000 +0000
+@@ -21,12 +21,10 @@
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ 
+-#ifdef CONFIG_MACH_SPITZ
++#include <asm/mach-types.h>
+ #include <asm/arch/spitz.h>
+-#endif
+-#ifdef CONFIG_MACH_CORGI
++#include <asm/arch/akita.h>
+ #include <asm/arch/corgi.h>
+-#endif
+ 
+ #include <asm/arch/hardware.h>
+ #include <asm/arch/pxa-regs.h>
+@@ -42,12 +40,8 @@
+ 	unsigned char key;
+ };
+ 
+-#ifdef CONFIG_MACH_SPITZ
+-#define REMOTE_AKIN_PULLUP SPITZ_SCP2_AKIN_PULLUP
+-#define REMOTE_SCOOP_DEVICE spitzscoop2_device
+-#define REMOTE_GPIO_INT SPITZ_GPIO_AK_INT
+-#define REMOTE_IRQ_INT SPITZ_IRQ_GPIO_AK_INT
+-static struct remote_control_key remote_keys[] = {
++static struct remote_control_key remote_keys_spitz[] = {
++	/* CE-RH2 values */
+ 	{ 25, 35, KEY_STOPCD},
+ 	{ 55, 65, KEY_PLAYPAUSE},
+ 	{ 85, 95, KEY_NEXTSONG},
+@@ -56,23 +50,15 @@
+ 	{ 180, 190, KEY_MUTE},
+ 	{ 215, 225, KEY_VOLUMEDOWN},
+ };
+-#endif
+-#ifdef CONFIG_MACH_CORGI
+-#define REMOTE_AKIN_PULLUP CORGI_SCP_AKIN_PULLUP
+-#define REMOTE_SCOOP_DEVICE corgiscoop_device
+-#define REMOTE_GPIO_INT CORGI_GPIO_AK_INT
+-#define REMOTE_IRQ_INT CORGI_IRQ_GPIO_AK_INT
+-static struct remote_control_key remote_keys[] = {
+-    //These need to be fixed for the CE-RH1's values
+-	{ 25, 35, KEY_STOPCD},
+-	{ 55, 65, KEY_PLAYPAUSE},
+-	{ 85, 95, KEY_NEXTSONG},
+-	{ 115, 125, KEY_VOLUMEUP},
+-	{ 145, 155, KEY_PREVIOUSSONG},
+-	{ 180, 190, KEY_MUTE},
+-	{ 215, 225, KEY_VOLUMEDOWN},
++static struct remote_control_key remote_keys_corgi[] = {
++	/* CE-RH1 values */
++	{ 27, 35, KEY_STOPCD},
++	{ 7, 13, KEY_PLAYPAUSE},
++	{ 77, 93, KEY_NEXTSONG},
++	{ 115, 132, KEY_VOLUMEUP},
++	{ 46, 58, KEY_PREVIOUSSONG},
++	{ 170, 186, KEY_VOLUMEDOWN},
+ };
+-#endif
+ 
+ #define RELEASE_HI      230
+ #define MAX_EARPHONE    6
+@@ -98,9 +84,17 @@
+ static int get_remocon_raw(void)
+ {
+ 	int i, val;
++	struct remote_control_key *remote_keys;
++
++	if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita())
++		remote_keys = remote_keys_spitz;
++	else
++		remote_keys = remote_keys_corgi;
+ 
+ 	val = sharpsl_pm_pxa_read_max1111(MAX1111_REMCOM);
+-	for (i = 0; i < ARRAY_SIZE(remote_keys); ++i) {
++	for (i = 0; i < (machine_is_borzoi() || machine_is_spitz() || machine_is_akita() ?
++			 ARRAY_SIZE(remote_keys_spitz) : ARRAY_SIZE(remote_keys_corgi));
++			 ++i) {
+ 		if (val >= remote_keys[i].min
+ 			&& val <= remote_keys[i].max) {
+ 			printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, remote_keys[i].key);
+@@ -121,8 +115,12 @@
+ 		data->state = 0;
+ 		data->last_key = 0;
+ 
+-		reset_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP);
+-
++		if (machine_is_borzoi() || machine_is_spitz())
++			reset_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP);
++		else if (machine_is_akita())
++            		akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP);
++		else
++			reset_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP);
+ 		mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS));
+ 	}
+ 	return IRQ_HANDLED;
+@@ -182,7 +180,12 @@
+ 	if (timer) {
+ 		mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS));
+ 	} else {
+-		set_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP);
++		if (machine_is_borzoi() || machine_is_spitz())
++			set_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP);
++		else if (machine_is_akita())
++            		akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP);
++		else
++			set_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP);
+ 		data->handling_press = 0;
+ 	}
+ }
+@@ -192,6 +195,7 @@
+ 	struct sharpsl_rc *sharpsl_rc;
+ 	struct input_dev *input_dev;
+ 	int i, ret;
++	struct remote_control_key *remote_keys;
+ 
+ 	dev_dbg(&pdev->dev, "sharpsl_rc_probe\n");
+ 
+@@ -225,17 +229,32 @@
+ 
+ 	input_dev->evbit[0] = BIT(EV_KEY);
+ 
+-	for (i = 0; i <= ARRAY_SIZE(remote_keys); i++)
++	if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita())
++		remote_keys = remote_keys_spitz;
++	else
++		remote_keys = remote_keys_corgi;
++	for (i = 0; i < (machine_is_borzoi() || machine_is_spitz() || machine_is_akita() ?
++			 ARRAY_SIZE(remote_keys_spitz) : ARRAY_SIZE(remote_keys_corgi));
++			 ++i)
+ 	  set_bit(remote_keys[i].key, input_dev->keybit);
+ 
+ 	input_register_device(sharpsl_rc->input);
+ 
+-	pxa_gpio_mode(REMOTE_GPIO_INT | GPIO_IN);
+-	ret = request_irq(REMOTE_IRQ_INT,
+-					  sharpsl_rc_interrupt,
+-					  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
+-					  "sharpsl_rc",
+-					  sharpsl_rc);
++	if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita()) {
++		pxa_gpio_mode(SPITZ_GPIO_AK_INT | GPIO_IN);
++		ret = request_irq(SPITZ_IRQ_GPIO_AK_INT,
++				  sharpsl_rc_interrupt,
++				  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
++				  "sharpsl_rc",
++				  sharpsl_rc);
++	} else {
++		pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN);
++		ret = request_irq(CORGI_IRQ_GPIO_AK_INT,
++				  sharpsl_rc_interrupt,
++				  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
++				  "sharpsl_rc",
++				  sharpsl_rc);
++	}
+ 	if (ret < 0) {
+ 		dev_dbg(&pdev->dev, "Can't get IRQ: %d!\n", i);
+ 		kfree(sharpsl_rc);
+@@ -252,7 +271,10 @@
+ 
+ 	dev_dbg(&pdev->dev, "sharpsl_rc_remove\n");
+ 
+-	free_irq(REMOTE_IRQ_INT, sharpsl_rc);
++	if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita())
++		free_irq(SPITZ_IRQ_GPIO_AK_INT, sharpsl_rc);
++	else
++		free_irq(CORGI_IRQ_GPIO_AK_INT, sharpsl_rc);
+ 	del_timer_sync(&sharpsl_rc->rctimer);
+ 	input_unregister_device(sharpsl_rc->input);
+ 	kfree(sharpsl_rc);
============================================================
--- classes/kernel.bbclass	aa43796485b85a90de8e92d888cb27492a55b831
+++ classes/kernel.bbclass	b6e05ecebbfd152cbd0c654bcea62bbcf8f18352
@@ -5,6 +5,8 @@ KERNEL_IMAGETYPE ?= "zImage"
 
 KERNEL_IMAGETYPE ?= "zImage"
 
+# Add dependency on mkimage for kernels that build a uImage
+
 python __anonymous () {
 
     import bb
@@ -12,7 +14,7 @@ python __anonymous () {
     kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''
     if kerneltype == 'uImage':
     	depends = bb.data.getVar("DEPENDS", d, 1)
-    	depends = "%s u-boot-mkimage-native" % depends
+    	depends = "%s u-boot-mkimage-openmoko-native" % depends
     	bb.data.setVar("DEPENDS", depends, d)
 }
 
============================================================
--- classes/package.bbclass	906d70a366b88e9727bc076e7246c6de0874bc0f
+++ classes/package.bbclass	6f3deeb912b24b09204110bd00e94e30f64d3936
@@ -904,7 +904,7 @@ python package_depchains() {
 	for suffix in pkgs:
 		for pkg in pkgs[suffix]:
 			(base, func) = pkgs[suffix][pkg]
-			if suffix == "-dev":
+			if suffix == "-dev" and not pkg.startswith("kernel-module-"):
 				pkg_adddeprrecs(pkg, base, suffix, func, depends, d)
 			if len(pkgs[suffix]) == 1:
 				pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
============================================================
--- packages/ftpd-topfield/ftpd-topfield_0.7.4.bb	139094f9c7f3a47d4880ca6843b5ae81ca3bc526
+++ packages/ftpd-topfield/ftpd-topfield_0.7.5.bb	286b7cb59ed33da44eda89da11f94c7bb318c481
@@ -3,9 +3,11 @@ LICENSE = "MIT"
 HOMEPAGE = "http://sourceforge.net/projects/puppy"
 SECTION = "net"
 LICENSE = "MIT"
+PR = "r1"
 
-SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_4 \
-	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_4 \
+SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \
+	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \
+	   file://syslog.patch;patch=1 \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name
============================================================
--- packages/linux/linux-ixp4xx/defconfig-2.6.24.4	1251c42b1b8b4ecdaea05b9eda83b6dc37604eff
+++ packages/linux/linux-ixp4xx/defconfig-2.6.24.4	c1b4c06be7a3fbdca153a8f990cb07da43231f80
@@ -30,7 +30,6 @@ CONFIG_BROKEN_ON_SMP=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -217,7 +216,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
@@ -304,9 +303,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
============================================================
--- packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4	668b63370db91bbc90e20d8fc70648986af0f35c
+++ packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4	1e2bfb62d7aa242bc8c8c76ee96145f2b157ae1d
@@ -30,7 +30,6 @@ CONFIG_BROKEN_ON_SMP=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -217,7 +216,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
@@ -305,9 +304,26 @@ CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.4.bb	493df9f1f9f80a8b08911a0846783e5101b6b828
+++ packages/linux/linux-ixp4xx_2.6.24.4.bb	0b69f35f287cafb1adc412c0a0ab039833d806e0
@@ -8,7 +8,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
 	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
============================================================
--- packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch	555dcdc80fa0d4419bbeaa955328961258cf607e
+++ packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch	c1ba9d58f22e96a7d5fd27cd59af335284d4de5c
@@ -1,3 +1,13 @@
+This patch adds support for Sharp CE-RH2 on Spitz.
+
+It is not clean enough to be upstreamed:
+- It is a bit syslog-noisy.
+- Does not support other Zaurus models.
+- Maybe split to more parts:
+  * MAX1111 driver
+  * linear input device
+  * virtual keyboard on top of linear input device
+
 Index: linux-2.6.24/arch/arm/mach-pxa/spitz.c
 ===================================================================
 --- linux-2.6.24.orig/arch/arm/mach-pxa/spitz.c	2008-03-10 17:05:37.000000000 +0000
============================================================
--- packages/linux/linux-rp_2.6.24.bb	51870430d0959e153e5ae362218b6f4167e36568
+++ %s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rd2c1007682618105ff49ee76ac59d9b164de9572 -ree2aa51c8eb93fa5579f4cf49a53eb0cb3e90319
#
#
#
# patch "packages/python/python-dbus_0.82.4.bb"
#  from [aff2c48f361a7ace67a1057330cf36a822c07811]
#    to [ef44ee10f31374784359fe76d1f10cabda60f104]
#
============================================================
--- packages/python/python-dbus_0.82.4.bb	aff2c48f361a7ace67a1057330cf36a822c07811
+++ packages/python/python-dbus_0.82.4.bb	ef44ee10f31374784359fe76d1f10cabda60f104
@@ -4,12 +4,12 @@ RDEPENDS = "python-threading python-io p
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml2"
+PR = "ml3"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
 
-inherit distutils-base autotools
+inherit distutils-base autotools pkgconfig
 
 export BUILD_SYS := "${BUILD_SYS}"
 export HOST_SYS := "${HOST_SYS}"






More information about the Openembedded-commits mailing list