aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2005-01-27 15:30:53 +0000
committerPhil Blundell <philb@gnu.org>2005-01-27 15:30:53 +0000
commite9f4e1f825c8ae3b8781a20cba20bce0ff4b6237 (patch)
tree1449be9ade43bbbc4a37538b24ba2620749f1df6
parent305de024a7d5c1ea4d31c35cacb35934847dfad3 (diff)
downloadopenembedded-e9f4e1f825c8ae3b8781a20cba20bce0ff4b6237.tar.gz
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/27 15:29:55+00:00 nexus.co.uk!pb add autoload for ircomm-tty kernel module BKrev: 41f9092d_cfYtxXRrcLGdlV7v2i0KA
-rw-r--r--classes/kernel.bbclass2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb2
-rw-r--r--packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb2
-rw-r--r--packages/meta/task-bootstrap.bb2
4 files changed, 5 insertions, 3 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 4bf7aad3d9..b537f35890 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -155,6 +155,8 @@ fi
# defaults
module_autoload_ipv6 = "ipv6"
module_autoload_ipsec = "ipsec"
+module_autoload_ircomm-tty = "ircomm-tty"
+
module_conf_bluez = "alias net-pf-31 bluez"
module_conf_l2cap = "alias bt-proto-0 l2cap"
module_conf_sco = "alias bt-proto-2 sco"
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
index 5e4da53147..2a3b86a6cd 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
KERNEL_CCSUFFIX = "-3.3.3"
COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 1258e0b6e6..a29541a766 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
KERNEL_CCSUFFIX = "-3.3.3"
COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 182fb2cc9f..811fa8cbf3 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Core packages required for a basic installation"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r18"
+PR = "r19"
# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.