Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...

diff --git a/MAINTAINERS b/MAINTAINERS
index 2e367d2..97342d5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -38,8 +38,8 @@ Person:     Cliff Brake
 Mail:       cbrake@bec-systems.com
 Website:    http://bec-systems.com
 Interests:  Support in OE for single board computers, web application support
-Machines:   cm-x270, logicpd-pxa270, em-x270, gesbc-9302
-Recipes:    mono argtable vala
+Machines:   cm-x270, em-x270, gesbc-9302
+Recipes:    mono, argtable, vala, socketcan
 
 Person:     Erik Hovland
 Mail:       erik@hovland.org

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4156c97..38f470b 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -208,6 +208,7 @@ SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
+SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
 SRCREV_pn-table ?= "2191"

diff --git a/packages/socketcan/socketcan-modules_svn.bb b/packages/socketcan/socketcan-modules_svn.bb
new file mode 100644 (file)
index 0000000..ce04931
--- /dev/null
+++ b/packages/socketcan/socketcan-modules_svn.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Socketcan kernel modules"
+HOMEPAGE = "http://developer.berlios.de/projects/socketcan/"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.berlios.de/socketcan/trunk;module=kernel;proto=svn"
+
+S = "${WORKDIR}/kernel/2.6"
+
+inherit module
+