[oe-commits] org.oe.dev merge of '2af4eb2f21c9d1e49169b71a6ca239d7fcf48813'

[thesing commit]

merge of '2af4eb2f21c9d1e49169b71a6ca239d7fcf48813'
     and '364678033dd32f6fbcbfefe35ee6db54abedb087'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: d2c1007682618105ff49ee76ac59d9b164de9572
ViewMTN: http://monotone.openembedded.org/revision/info/d2c1007682618105ff49ee76ac59d9b164de9572
Files:
1
classes/package.bbclass
packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
Diffs:

#
# mt diff -r2af4eb2f21c9d1e49169b71a6ca239d7fcf48813 -rd2c1007682618105ff49ee76ac59d9b164de9572
#
#
#
# patch "classes/package.bbclass"
#  from [906d70a366b88e9727bc076e7246c6de0874bc0f]
#    to [6f3deeb912b24b09204110bd00e94e30f64d3936]
#
============================================================
--- 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)


#
# mt diff -r364678033dd32f6fbcbfefe35ee6db54abedb087 -rd2c1007682618105ff49ee76ac59d9b164de9572
#
#
#
# patch "packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch"
#  from [f62d8545ea16f4caf506219c894df3a90724b5c2]
#    to [d64355f76f4983d49aa06c5c7f5b438debf72c22]
#
============================================================
--- packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch	f62d8545ea16f4caf506219c894df3a90724b5c2
+++ packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch	d64355f76f4983d49aa06c5c7f5b438debf72c22
@@ -6,8 +6,8 @@ Index: linux-2.6.24/drivers/input/keyboa
 
 Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c
 ===================================================================
---- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c	2008-03-07 20:47:28.000000000 +0000
-+++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c	2008-03-07 22:36:40.000000000 +0000
+--- 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>
@@ -96,11 +96,11 @@ Index: linux-2.6.24/drivers/input/keyboa
 -		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);
++			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);
++			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;
@@ -110,11 +110,11 @@ Index: linux-2.6.24/drivers/input/keyboa
  	} 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);
++			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);
++			set_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP);
  		data->handling_press = 0;
  	}
  }