[oe-commits] org.oe.dev merge of 'c4d205026ddcefdc82f58f93c8d27038076dee50'

[mwester commit]

merge of 'c4d205026ddcefdc82f58f93c8d27038076dee50'
     and 'e5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c'

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: e995761e9cc807169de17a910a63e2c893092e10
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e995761e9cc807169de17a910a63e2c893092e10
Files:
1
packages/proj4/proj-4_4.9.bb
packages/madwifi/madwifi-ng_r2518-20070626.bb
conf/distro/include/slugos.inc
packages/linux/linux-rp-2.6.20/defconfig-spitz
packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch
Diffs:

#
# mt diff -rc4d205026ddcefdc82f58f93c8d27038076dee50 -re995761e9cc807169de17a910a63e2c893092e10
#
# 
# 
# patch "packages/proj4/proj-4_4.9.bb"
#  from [35b70b196c7ba5d7010365a703e2f9a9b7bc8543]
#    to [8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d]
# 
============================================================
--- packages/proj4/proj-4_4.9.bb	35b70b196c7ba5d7010365a703e2f9a9b7bc8543
+++ packages/proj4/proj-4_4.9.bb	8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d
@@ -1,13 +1,17 @@ LICENSE = "MIT"
 DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
 HOMEPAGE = "http://www.remotesensing.org/proj/"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit autotools pkgconfig
 
 SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz"
 
 S = "${WORKDIR}/proj-4.${PV}"
 
+FILES_${PN} += "${datadir}/proj"
+
 do_stage() {
 	autotools_stage_all
 }


#
# mt diff -re5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c -re995761e9cc807169de17a910a63e2c893092e10
#
# 
# 
# add_file "packages/madwifi/madwifi-ng_r2518-20070626.bb"
#  content [3a9994ed9252cf4eea51127470e69d0f8017024b]
# 
# patch "conf/distro/include/slugos.inc"
#  from [4105c50380f9423e8f6ed3e2a3621f5d19cec855]
#    to [d634625f9bd8ff8d6b2556f51f7ce153b2b45d15]
# 
# patch "packages/linux/linux-rp-2.6.20/defconfig-spitz"
#  from [26634a14250dbbecb1fe7bc686ed78ef9258b7c3]
#    to [fcf9df062363a65137b484ed5c63b84befb552c5]
# 
# patch "packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch"
#  from [83792e28a200bea10cc3a54d3957d2e6e3939cb0]
#    to [91d7f89ef3d420ced74c27bd90028782aa035bf2]
# 
============================================================
--- packages/madwifi/madwifi-ng_r2518-20070626.bb	3a9994ed9252cf4eea51127470e69d0f8017024b
+++ packages/madwifi/madwifi-ng_r2518-20070626.bb	3a9994ed9252cf4eea51127470e69d0f8017024b
@@ -0,0 +1,7 @@
+PR = "r0"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
============================================================
--- conf/distro/include/slugos.inc	4105c50380f9423e8f6ed3e2a3621f5d19cec855
+++ conf/distro/include/slugos.inc	d634625f9bd8ff8d6b2556f51f7ce153b2b45d15
@@ -142,6 +142,6 @@ IGNORE_STRIP_ERRORS = ""
 # Due to upstream instability, and another OE project with conflicting
 # needs, nail down a specific, known-working version of madwifi-ng.
 # Remove this once the madwifi-ng stuff seems to stabilize once again.
-PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
+#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
 
 PREFERRED_VERSION_linux-libc-headers = "2.6.18"
============================================================
--- packages/linux/linux-rp-2.6.20/defconfig-spitz	26634a14250dbbecb1fe7bc686ed78ef9258b7c3
+++ packages/linux/linux-rp-2.6.20/defconfig-spitz	fcf9df062363a65137b484ed5c63b84befb552c5
@@ -431,7 +431,7 @@ CONFIG_BT_HCIUSB=m
 # Bluetooth device drivers
 #
 CONFIG_BT_HCIUSB=m
-# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIUSB_SCO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
============================================================
--- packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch	83792e28a200bea10cc3a54d3957d2e6e3939cb0
+++ packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch	91d7f89ef3d420ced74c27bd90028782aa035bf2
@@ -298,7 +298,7 @@ Index: linux-2.6.20/drivers/input/keyboa
 +	pxa_gpio_mode(REMOTE_GPIO_INT | GPIO_IN);
 +	ret = request_irq(REMOTE_IRQ_INT,
 +					  sharpsl_rc_interrupt,
-+					  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED,
++					  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
 +					  "sharpsl_rc",
 +					  sharpsl_rc);
 +	if (ret < 0) {