From fad5af9a1c119e34b718c40f7a4c6452341d5beb Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 17 Jun 2010 10:24:01 +0200
Subject: libattr: remove libattr because it is clashing with udev/attr and is
 not used by any other recipe

Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-By: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 recipes/xfsprogs/libattr_2.4.43.bb | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 recipes/xfsprogs/libattr_2.4.43.bb

diff --git a/recipes/xfsprogs/libattr_2.4.43.bb b/recipes/xfsprogs/libattr_2.4.43.bb
deleted file mode 100644
index cf846cc25d..0000000000
--- a/recipes/xfsprogs/libattr_2.4.43.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "library functions to get attribute bits"
-HOMEPAGE = "http://oss.sgi.com/projects/xfs"
-LICENSE = "GPL"
-SECTION = "base"
-PR = "r0"
-DEPENDS = "gettext"
-
-SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_${PV}-1.tar.gz"
-S = "${WORKDIR}/attr-${PV}"
-
-PARALLEL_MAKE = ""
-inherit autotools
-EXTRA_OECONF = "--enable-gettext=no --enable-shared=yes"
-
-do_configure () {
-	export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"
-	export DEBUG="-DNDEBUG"
-	oe_runconf
-}
-
-do_install () {
-	export DIST_ROOT=${D}
-	oe_runmake install
-	oe_libinstall -a libattr ${D}${libdir}
-	oe_libinstall -a libattr ${STAGING_LIBDIR}
-}
-
-
-SRC_URI[md5sum] = "91583a14bcbd637adaa9b07ea49c5d4b"
-SRC_URI[sha256sum] = "d358b233b3e2ad235e63fd8697e337006fc7506844e424b0d9dd7a24affec5bf"
-- 
cgit v1.2.3


From 3784cd38607ab46a9a899d8565fe337aaf5a054a Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 17 Jun 2010 10:16:56 +0200
Subject: libcap2: use attr instead of libattr as dependency

* convert to new staging system, by removing do_stage
* bump PR

Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-By: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 recipes/libcap/libcap2_2.16.bb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb
index ebcb981525..92cd50fbcb 100644
--- a/recipes/libcap/libcap2_2.16.bb
+++ b/recipes/libcap/libcap2_2.16.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO
 PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
-DEPENDS = "bison-native flex-native libattr"
-PR = "r0"
+DEPENDS = "bison-native flex-native attr"
+PR = "r1"
 
 BUILD_CFLAGS += "-I${S}/libcap/include"
 CFLAGS += "-I${S}/libcap/include"
@@ -25,11 +25,5 @@ do_install() {
 	oe_libinstall -s -C libcap libcap ${D}${libdir}
 }
 
-do_stage() {
-	install -d ${STAGING_INCDIR}/sys
-	install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/
-	oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR}
-}
-
 SRC_URI[md5sum] = "6e2c9d0f3c3118e41cd07288ba9577ce"
 SRC_URI[sha256sum] = "9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f"
-- 
cgit v1.2.3


From aefd3cbac5a9ef3644c9d1f46b985ac5d815c05d Mon Sep 17 00:00:00 2001
From: Joshua Judson Rosen <rozzin@geekspace.com>
Date: Thu, 17 Jun 2010 13:28:47 +0200
Subject: foxtrotgps: add recipe for FoxtrotGPS 0.99.4

* also add it to shr feeds

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/foxtrotgps/foxtrotgps.inc       | 14 ++++++++++++++
 recipes/foxtrotgps/foxtrotgps_0.99.4.bb |  4 ++++
 recipes/tasks/task-shr-feed.bb          |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 recipes/foxtrotgps/foxtrotgps.inc
 create mode 100644 recipes/foxtrotgps/foxtrotgps_0.99.4.bb

diff --git a/recipes/foxtrotgps/foxtrotgps.inc b/recipes/foxtrotgps/foxtrotgps.inc
new file mode 100644
index 0000000000..752fa5b948
--- /dev/null
+++ b/recipes/foxtrotgps/foxtrotgps.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "FoxtrotGPS is a map and GPS application using OpenStreetMap"
+AUTHOR = "Joshua Judson Rosen <rozzin@geekspace.com>"
+HOMEPAGE = "http://www.foxtrotgps.org/"
+SECTION = "x11/applications"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+DEPENDS = "curl gtk+ gconf sqlite3 libexif"
+
+SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+RRECOMMENDS_${PN} = "gpsd"
+RRECOMMENDS_${PN}_shr = "fso-gpsd"
diff --git a/recipes/foxtrotgps/foxtrotgps_0.99.4.bb b/recipes/foxtrotgps/foxtrotgps_0.99.4.bb
new file mode 100644
index 0000000000..61650443b2
--- /dev/null
+++ b/recipes/foxtrotgps/foxtrotgps_0.99.4.bb
@@ -0,0 +1,4 @@
+require foxtrotgps.inc
+
+SRC_URI[md5sum] = "73f03ba1ee1853dea077aa18518222f7"
+SRC_URI[sha256sum] = "c7fffa0d45f59de0b858c84e57a6325af78f97f3492ef5e4bd75d5bf0c20d689"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 6c6120aaf9..1df20a9f95 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -21,6 +21,7 @@ RDEPENDS_${PN} += "\
 		evopedia \
 		fbreader \
 		ffalarms \
+		foxtrotgps \
 		gpe-calendar \
 		gpe-todo \
 		gpe-scap \
-- 
cgit v1.2.3


From 5a29fcc38a1e26a13b3efd41a947159590c77a4e Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Thu, 17 Jun 2010 11:28:23 -0500
Subject: SlugOS: slugos.inc - Fix bluez dependencies No need to build all of
 bluez if we only depend on the libs.

---
 conf/distro/include/slugos.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 00a10bf20b..5acf90f97f 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -165,13 +165,13 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm	?= "gtk+"
 PREFERRED_PROVIDER_avahi			?= "avahi"
 PREFERRED_PROVIDER_ifupdown			?= "ifupdown"
 PREFERRED_PROVIDER_gconf			?= "gconf"
-PREFERRED_PROVIDER_libqte2			?= "qte"
+PREFERRED_PROVIDER_virtual/libqte2		?= "qte"
 PREFERRED_PROVIDER_virtual/libusb0		?= "libusb-compat"
 
 # we use bluez4 instead of the older bluez3
 DISTRO_BLUETOOTH_MANAGER			= "bluez4"
-PREFERRED_PROVIDER_bluez-utils-dbus		= "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus		= "bluez4"
+PREFERRED_PROVIDER_bluez-libs			= "bluez-libs"
 PREFERRED_PROVIDER_bluez-utils			= "bluez4"
 
 # Include any package preferred versions and srcrevs:
-- 
cgit v1.2.3


From 4ef5087ed7956bda672a133cbe3d11a0fa25397c Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Thu, 17 Jun 2010 12:14:35 -0500
Subject: SlugOS: package feed changes to drop x11, and unbuildable packages
 This set of changes removes packages that pull in libx11, and (temporarily)
 disables packages that won't build, mostly due to gcc 4.4.4 issues.  Only
 tested on LE for the moment.

---
 conf/distro/include/preferred-slugos-versions.inc |  3 +
 recipes/meta/slugos-packages.bb                   | 68 +++++++++++++++--------
 2 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index c7683b67c3..84b138146b 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -83,3 +83,6 @@ PREFERRED_VERSION_udev				?= "118"
 
 # latest tcl recipe has a bug that overwites regex.h; use the old tcl
 #PREFERRED_VERSION_tcl				?= "8.4.19"
+
+# We need the bluez4 version of the libs, which has default_precedence = -1
+PREFERRED_VERSION_bluez-libs			?= "4.42"
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 53a5598238..20354e999f 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r66"
+PR = "r67"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -21,7 +21,6 @@ ALLOW_EMPTY = "1"
 SLUGOS_PACKAGES = "\
 	alsa-lib \
 	alsa-utils \
-	apex-env \
 	apr \
 	asterisk \
 	asterisk-core-sounds-en-alaw \
@@ -47,8 +46,6 @@ SLUGOS_PACKAGES = "\
 	bind \
 	binutils \
 	bison \
-	bluez-hcidump \
-	bluez4 \
 	bogofilter \
 	bonnie++ \
 	boost \
@@ -62,7 +59,6 @@ SLUGOS_PACKAGES = "\
 	coreutils \
 	cron \
 	cryptsetup \
-	cups \
 	curl \
 	cvs \
 	db \
@@ -93,7 +89,6 @@ SLUGOS_PACKAGES = "\
 	glib-2.0 \
 	gnu-config \
 	gphoto2 \
-	gpsd \
 	grep \
 	groff \
 	gtk-doc \
@@ -101,18 +96,15 @@ SLUGOS_PACKAGES = "\
 	hdparm \
 	hostap-daemon \
 	ifupdown \
-	inetutils \
 	iozone3 \
 	iperf \
 	ipkg-utils \
 	iptables \
-	ircp \
 	joe \
 	jpeg \
 	kexec-tools \
 	lcdproc \
 	less \
-	libao \
 	libdvb \
 	libexif \
 	libid3tag \
@@ -134,10 +126,8 @@ SLUGOS_PACKAGES = "\
 	logrotate \
 	lrzsz \
 	lsof \
-	lvm2 \
 	m4 \
 	madplay \
-	madwifi-ng \
 	mailx \
 	make \
 	man man-pages \
@@ -146,11 +136,9 @@ SLUGOS_PACKAGES = "\
 	mediatomb \
 	memtester \
 	mgetty \
-	miau \
 	microcom \
 	minicom \
 	monit \
-	mpd \
 	mt-daapd \
 	mtd-utils \
 	mutt \
@@ -160,20 +148,14 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	net-tools \
-	netatalk \
 	netcat \
-	netpbm \
 	nfs-utils \
 	ngrep \
 	nmap \
 	ntfs-3g \
 	ntp \
 	ntpclient \
-	obexftp \
-	obexpush \
-	openobex-apps \
 	openntpd \
-	openobex \
 	openssh \
 	openvpn \
 	owfs \
@@ -190,12 +172,9 @@ SLUGOS_PACKAGES = "\
 	puppy \
 	python \
 	quilt \
-	reiserfsprogs reiser4progs \
 	rng-tools \
 	rsync \
-	rtorrent \
 	samba \
-	sane-backends \
 	screen \
 	sed \
 	setpwc \
@@ -215,7 +194,6 @@ SLUGOS_PACKAGES = "\
 	sysfsutils \
 	syslog-ng \
 	tar \
-	task-mokogateway-everything \
 	tcpdump \
 	thttpd \
 	tiff \
@@ -235,7 +213,6 @@ SLUGOS_PACKAGES = "\
 	webcam-server \
 	wget \
 	wireless-tools \
-	wireshark \
 	wpa-supplicant \
         wview-sim \
 	wview-vpro \
@@ -247,6 +224,46 @@ SLUGOS_PACKAGES = "\
 	zlib \
 	"
 
+# Packages that pull in dbus, which pulls in X11 libs.
+SLUGOS_DBUS_PACKAGES = "\
+	cups \
+	gpsd \
+	ircp \
+	obexftp \
+	obexpush \
+	openobex-apps \
+	openobex \
+	rtorrent \
+	task-mokogateway-everything \
+	"
+
+
+# Packages that pull in X11 libs (impractical packages).
+# These are not built by default any more.
+SLUGOS_X11_PACKAGES = "\
+	bluez-hcidump \
+	bluez4 \
+	libao \
+	mpd \
+	netatalk \
+	sane-backends \
+	wireshark \
+	"
+
+# Packages that are broken but need to be fixed!
+#
+# - apex-env: gcc4.4
+# - inetutils: gcc 4.4
+# - lvm2: gcc 4.4 (suspected)
+# - madwifi-ng: gcc 4.4 (and possibly other problems)
+# 
+SLUGOS_BROKEN_BUT_NEED_FIXING_PACKAGES = "\
+	apex-env \
+	inetutils \
+	lvm2 \
+	madwifi-ng \
+	"
+
 # Packages currently broken on all platforms
 # Notes:
 #  ctrlproxy - dependency on tdb.h (part of samba but not packaged/staged).
@@ -263,12 +280,15 @@ SLUGOS_BROKEN_PACKAGES = "\
 	linphone \
 	lirc-modules lirc \
 	madfu \
+	miau \
 	motion \
+	netpbm \
 	openldap \
 	postfix \
 	pvrusb2-mci \
 	pwc \
 	qc-usb-messenger \
+	reiserfsprogs reiser4progs \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
 	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
-- 
cgit v1.2.3


From a84b681daad0736a1ff6e10c7c30fb31ba4d0351 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Thu, 17 Jun 2010 14:03:40 -0700
Subject: Drop old unused crufty MANIFEST variable

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 conf/bitbake.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 397dbc2701..01192948f7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -266,10 +266,6 @@ RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})"
 
 FILES_${PN}-locale = "${datadir}/locale"
 
-# File manifest
-
-export MANIFEST = "${FILESDIR}/manifest"
-
 # file:// search paths
 FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
 FILESPATHBASE = "${FILE_DIRNAME}"
-- 
cgit v1.2.3


From aa8bef28a22bb4d70b482dcb3ba57fbab77cf10d Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Thu, 17 Jun 2010 14:03:20 -0700
Subject: Indentation fixups, caught by python -t

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 classes/cpan-base.bbclass              |  2 +-
 classes/kernel-arch.bbclass            | 10 +++++-----
 classes/package.bbclass                | 34 +++++++++++++++++-----------------
 classes/packaged-staging.bbclass       |  8 ++++----
 classes/sanity.bbclass                 |  2 +-
 classes/siteinfo.bbclass               |  6 +++---
 conf/distro/include/sane-toolchain.inc |  8 ++++----
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index d65b5d944a..379defadb2 100644
--- a/classes/cpan-base.bbclass
+++ b/classes/cpan-base.bbclass
@@ -10,7 +10,7 @@ RDEPENDS  += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
 # Determine the staged version of perl from the perl configuration file
 def get_perl_version(d):
 	import re
-    	cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
+	cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
 	try:
 		f = open(cfg, 'r')
 	except IOError:
diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass
index 8894fa554c..58c8374fa6 100644
--- a/classes/kernel-arch.bbclass
+++ b/classes/kernel-arch.bbclass
@@ -7,12 +7,12 @@
 valid_archs = "alpha cris ia64 \
                x86_64 i386 x86 \
                m68knommu m68k ppc powerpc ppc64  \
-	       sparc sparc64 \
+               sparc sparc64 \
                arm  arm26 \
                m32r mips \
-	       sh sh64 um h8300   \
-	       parisc s390  v850 \
-	       avr32 blackfin"
+               sh sh64 um h8300   \
+               parisc s390  v850 \
+               avr32 blackfin"
 
 def map_kernel_arch(a, d):
 	import re
@@ -25,7 +25,7 @@ def map_kernel_arch(a, d):
 	elif re.match('mipsel$', a):		return 'mips'
 	elif re.match('sh(3|4)$', a):		return 'sh'
 	elif re.match('bfin', a):               return 'blackfin'
-        elif a in valid_archs:			return a
+	elif a in valid_archs:			return a
 	else:
 		bb.error("cannot map '%s' to a linux kernel architecture" % a)
 
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 77a20bf9c5..c3781330bb 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -1029,23 +1029,23 @@ def package_run_hooks(f, d):
 				bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d)
 				line += 1
 			fp.close()
-	                anonqueue = bb.data.getVar("__anonqueue", d, True) or []
-        	        body = [x['content'] for x in anonqueue]
-            	        flag = { 'python' : 1, 'func' : 1 }
-            	        bb.data.setVar("__anonfunc", "\n".join(body), d)
-         		bb.data.setVarFlags("__anonfunc", flag, d)
-		        try:
-                		t = bb.data.getVar('T', d)
-           			bb.data.setVar('T', '${TMPDIR}/', d)
-                		bb.build.exec_func("__anonfunc", d)
-                		bb.data.delVar('T', d)
-                		if t:
-                    			bb.data.setVar('T', t, d)
-		        except Exception, e:
-                		bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
-                		raise
-            		bb.data.delVar("__anonqueue", d)
-            		bb.data.delVar("__anonfunc", d)
+			anonqueue = bb.data.getVar("__anonqueue", d, True) or []
+			body = [x['content'] for x in anonqueue]
+			flag = { 'python' : 1, 'func' : 1 }
+			bb.data.setVar("__anonfunc", "\n".join(body), d)
+			bb.data.setVarFlags("__anonfunc", flag, d)
+			try:
+				t = bb.data.getVar('T', d)
+				bb.data.setVar('T', '${TMPDIR}/', d)
+				bb.build.exec_func("__anonfunc", d)
+				bb.data.delVar('T', d)
+				if t:
+					bb.data.setVar('T', t, d)
+			except Exception, e:
+				bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
+				raise
+			bb.data.delVar("__anonqueue", d)
+			bb.data.delVar("__anonfunc", d)
 
 python package_do_package () {
 	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 8a98940c09..09e86ae99e 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -259,8 +259,8 @@ python packagestage_scenefunc () {
 
         # Remove the stamps and files we added above
         # FIXME - we should really only remove the stamps we added
-	for fname in glob.glob(stamp + '.*'):
-	    oe.path.remove(fname)
+        for fname in glob.glob(stamp + '.*'):
+            oe.path.remove(fname)
 
         oe.path.remove(bb.data.expand("${WORKDIR}/tstage", d))
         if stageok:
@@ -295,8 +295,8 @@ python packagedstage_stampfixing_eventhandler() {
                     # so we need to remove the autogenerated stamps.
                     for task in taskscovered:
                         covered = "%s.do_%s" % (e.stampPrefix[fn], task)
-			oe.path.remove(covered)
-		    oe.path.remove(stamp)
+                        oe.path.remove(covered)
+                    oe.path.remove(stamp)
 }
 
 populate_sysroot_preamble () {
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index dfb3010f82..8eb74530a2 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -141,7 +141,7 @@ def check_sanity(e):
 		if not abi.isdigit():
 			f = file(abifile, "w")
 			f.write(current_abi)
-                elif abi == "3" and current_abi == "4":
+		elif abi == "3" and current_abi == "4":
 			import bb
 			bb.note("Converting staging from layout version 2 to layout version 3")
 			os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data))
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index d7f27054b0..76a86c0bb9 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -47,7 +47,7 @@ def get_siteinfo_list(d):
                "i486-mingw32":            "endian-little bit-32 common-mingw ix86-common",\
                "i586-mingw32":            "endian-little bit-32 common-mingw ix86-common",\
                "i686-mingw32":            "endian-little bit-32 common-mingw ix86-common",\
-	       "ia64-linux":	          "endian-little bit-64 common-linux common-glibc",\
+               "ia64-linux":	          "endian-little bit-64 common-linux common-glibc",\
                "mipsel-linux":            "endian-little bit-32 common-linux common-glibc mips-common",\
                "mipsel-linux-uclibc":     "endian-little bit-32 common-linux common-uclibc mips-common",\
                "mips-linux":              "endian-big bit-32 common-linux common-glibc mips-common",\
@@ -55,8 +55,8 @@ def get_siteinfo_list(d):
                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
                "ppc-linux":               "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
                "ppc64-linux":             "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\
-	       "powerpc-linux":           "endian-big bit-32 common-linux common-glibc powerpc-common",\
-	       "powerpc-linux-gnuspe":       "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
+               "powerpc-linux":           "endian-big bit-32 common-linux common-glibc powerpc-common",\
+               "powerpc-linux-gnuspe":       "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
                "powerpc-linux-uclibc":    "endian-big bit-32 common-linux common-uclibc powerpc-common",\
                "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\
                "sh3-linux":               "endian-little bit-32 common-linux common-glibc sh-common",\
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 1b77f7573b..f61d218fe3 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -141,7 +141,7 @@ ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 def detect_arm_abi (d):
-    	import bb
+	import bb
 	if bb.data.getVar('DISTRO_FEATURES',d) is None:
 		if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
 			return "oabi"
@@ -159,8 +159,8 @@ def compute_os_portion_of_target_triplet (d):
 	armv5te iwmmxt armv7a armv7 armv5teb armv4t"
 	ppc_spe_supporting_arches = "ppce500v2 ppce500"
 	gnu_suffix = ""
-  	if bb.data.getVar('LIBC', d, 1) == "uclibc":
-    		libc_suffix = "uclibc"
+	if bb.data.getVar('LIBC', d, 1) == "uclibc":
+		libc_suffix = "uclibc"
 	else:
 		libc_suffix = ""
 	
@@ -170,7 +170,7 @@ def compute_os_portion_of_target_triplet (d):
 		else:
 			os_suffix = "uclinux"
 	else:
-  		os_suffix = "linux"
+		os_suffix = "linux"
 	bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1)
 
 	if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \
-- 
cgit v1.2.3


From b5fdd85422bb95ef5aceb12bd357e27ece1503e8 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 16 Jun 2010 23:00:37 +0200
Subject: libcgroup: added libcgroup to openembedded

---
 recipes/libcgroup/libcgroup_0.36.2.bb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 recipes/libcgroup/libcgroup_0.36.2.bb

diff --git a/recipes/libcgroup/libcgroup_0.36.2.bb b/recipes/libcgroup/libcgroup_0.36.2.bb
new file mode 100644
index 0000000000..739d3b6497
--- /dev/null
+++ b/recipes/libcgroup/libcgroup_0.36.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Libcgroup"
+PRIORITY = "optional"
+SECTION = "libs"
+LICENSE = "GPL"
+#DEPENDS = "bison-native flex-native"
+PR = "r0"
+
+inherit autotools pkgconfig
+
+DEPENDS = "libpam"
+
+SRC_URI = "http://downloads.sourceforge.net/project/libcg/libcgroup/v0.36.2/v0.36.2.rc/libcgroup-0.36.2.rc.tar.bz2"
+S = "${WORKDIR}/libcgroup-${PV}.rc"
+
+
+SRC_URI[md5sum] = "08df957084cba32e2a28ec1e8e8740f5"
+SRC_URI[sha256sum] = "35e803a4bf4845bb38ec74cca654e9de5d792758b8b1978a4a699ac6689510c9"
+
-- 
cgit v1.2.3


From 1b78440c8d329621a4e8b433112f057833c4dc91 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 16 Jun 2010 23:01:50 +0200
Subject: udev: add version 154

* not fully testet yet so checking with DEFAULT_PREFERENCE = "-1"
* systemd needs it
---
 recipes/udev/udev-154/akita/default              |   4 +
 recipes/udev/udev-154/bug/10-mx31.rules          |  49 +++++++++
 recipes/udev/udev-154/bug/30-BUG.rules           |  26 +++++
 recipes/udev/udev-154/bug/bmi_eventpipe.sh       |   8 ++
 recipes/udev/udev-154/c7x0/default               |   4 +
 recipes/udev/udev-154/cache                      |  18 ++++
 recipes/udev/udev-154/default                    |   4 +
 recipes/udev/udev-154/init                       |  78 ++++++++++++++
 recipes/udev/udev-154/local.rules                |  35 +++++++
 recipes/udev/udev-154/omap3-pandora/local.rules  |  40 ++++++++
 recipes/udev/udev-154/permissions.rules          | 119 +++++++++++++++++++++
 recipes/udev/udev-154/run.rules                  |  14 +++
 recipes/udev/udev-154/spitz/default              |   4 +
 recipes/udev/udev-154/tosa/default               |   4 +
 recipes/udev/udev-154/udev-replace-le16toh.patch |  21 ++++
 recipes/udev/udev-154/udev-replace-lutimes.patch |  25 +++++
 recipes/udev/udev-154/udev.rules                 | 116 +++++++++++++++++++++
 recipes/udev/udev_154.bb                         | 125 +++++++++++++++++++++++
 18 files changed, 694 insertions(+)
 create mode 100644 recipes/udev/udev-154/akita/default
 create mode 100644 recipes/udev/udev-154/bug/10-mx31.rules
 create mode 100644 recipes/udev/udev-154/bug/30-BUG.rules
 create mode 100644 recipes/udev/udev-154/bug/bmi_eventpipe.sh
 create mode 100644 recipes/udev/udev-154/c7x0/default
 create mode 100644 recipes/udev/udev-154/cache
 create mode 100644 recipes/udev/udev-154/default
 create mode 100644 recipes/udev/udev-154/init
 create mode 100644 recipes/udev/udev-154/local.rules
 create mode 100644 recipes/udev/udev-154/omap3-pandora/local.rules
 create mode 100644 recipes/udev/udev-154/permissions.rules
 create mode 100644 recipes/udev/udev-154/run.rules
 create mode 100644 recipes/udev/udev-154/spitz/default
 create mode 100644 recipes/udev/udev-154/tosa/default
 create mode 100644 recipes/udev/udev-154/udev-replace-le16toh.patch
 create mode 100644 recipes/udev/udev-154/udev-replace-lutimes.patch
 create mode 100644 recipes/udev/udev-154/udev.rules
 create mode 100644 recipes/udev/udev_154.bb

diff --git a/recipes/udev/udev-154/akita/default b/recipes/udev/udev-154/akita/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-154/akita/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/bug/10-mx31.rules b/recipes/udev/udev-154/bug/10-mx31.rules
new file mode 100644
index 0000000000..de427fc8b2
--- /dev/null
+++ b/recipes/udev/udev-154/bug/10-mx31.rules
@@ -0,0 +1,49 @@
+KERNEL=="ttyS[0-9]",	NAME="tts/%n",		SYMLINK+="tts%n"
+KERNEL=="ttymxc[0-9]",	NAME="ttymxc/%n",	SYMLINK+="ttymxc%n"
+
+KERNEL=="mxc_mu[0-9]",	NAME="mxc_mu/%n",	SYMLINK+="mxc_mu%n"
+KERNEL=="fb*",		NAME="fb/%n",		SYMLINK+="fb%n"
+KERNEL=="i2c*",		NAME="i2c/%n"
+KERNEL=="mxc_ipc*",	NAME="mxc_ipc/%n"
+KERNEL=="video*",	NAME="v4l/video%n"
+
+KERNEL=="rtc",		NAME="misc/rtc"
+KERNEL=="watchdog",	NAME="misc/watchdog"
+
+KERNEL=="mc13783_adc",	NAME="mc13783_adc",	SYMLINK+="ts"
+KERNEL=="pmic_adc",	NAME="pmic_adc",	SYMLINK+="ts"
+
+# The long class name gets cut off to be mc13783_connectiv in 
+# /sys/class/mc13783_connectivity/mc13783_connectivit
+KERNEL=="mc13783_connectiv*",	NAME="mc13783_connectivity"
+
+KERNEL=="mxc_ssi[0-9]*",	NAME="mxc_ssi/%n",	SYMLINK+="mxc_ssi%n"
+KERNEL=="spi[0-9]*",	NAME="spi/%n",		SYMLINK+="spi%n"
+
+KERNEL=="mtdblock*",	NAME="mtdblock/%n"	SYMLINK+="mtdblock%n"
+KERNEL=="mtd[0-9]",	NAME="mtd/%n"
+
+# A more elegant way of doing this must exist...
+KERNEL=="mtd0ro",	NAME="mtd/0ro"
+KERNEL=="mtd1ro",	NAME="mtd/1ro"
+KERNEL=="mtd2ro",	NAME="mtd/2ro"
+KERNEL=="mtd3ro",	NAME="mtd/3ro"
+KERNEL=="mtd4ro",	NAME="mtd/4ro"
+KERNEL=="mtd5ro",	NAME="mtd/5ro"
+KERNEL=="mtd6ro",	NAME="mtd/6ro"
+KERNEL=="mtd7ro",	NAME="mtd/7ro"
+KERNEL=="mtd8ro",	NAME="mtd/8ro"
+KERNEL=="mtd9ro",	NAME="mtd/9ro"
+
+# Note that we want /dev/dsp linked to /dev/sound/dsp1...
+KERNEL=="dsp",		NAME="sound/dsp"
+KERNEL=="dspW",		NAME="sound/dspW"
+KERNEL=="dsp1",		NAME="sound/dsp1",	SYMLINK+="dsp"
+KERNEL=="mixer",		NAME="sound/mixer",	SYMLINK+="mixer"
+KERNEL=="sequencer",	NAME="sound/sequencer"
+KERNEL=="sequencer2",	NAME="sound/sequencer2"
+
+KERNEL=="ram[0-9]*",	NAME="ram/%n",		SYMLINK+="ram%n"
+
+KERNEL=="dvfs_dptc",	NAME="dvfs_dptc",	SYMLINK+="dptc dvfs"
+
diff --git a/recipes/udev/udev-154/bug/30-BUG.rules b/recipes/udev/udev-154/bug/30-BUG.rules
new file mode 100644
index 0000000000..06faa6bb91
--- /dev/null
+++ b/recipes/udev/udev-154/bug/30-BUG.rules
@@ -0,0 +1,26 @@
+##
+## BUG/BMI specific
+##
+KERNEL=="event*", ATTRS{name}=="bugnav", SYMLINK+="input/bugnav"
+KERNEL=="event*", ATTRS{name}=="bmi_motion", SYMLINK+="input/bmi_motion"
+KERNEL=="event*", ATTRS{name}=="bug_cam", SYMLINK+="input/bmi_cam"
+KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m1", SYMLINK+="input/bmi_audio_m1"
+KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m2", SYMLINK+="input/bmi_audio_m2"
+KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m3", SYMLINK+="input/bmi_audio_m3"
+KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m4", SYMLINK+="input/bmi_audio_m4"
+DEVPATH=="/devices/platform/bugfb.0", SYMLINK+="bugfb"
+KERNEL=="rtc0", SYMLINK+="rtc"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts0", SYMLINK+="input/bmi_lcd_ts0"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts1", SYMLINK+="input/bmi_lcd_ts1"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts2", SYMLINK+="input/bmi_lcd_ts2"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts3", SYMLINK+="input/bmi_lcd_ts3"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts4", SYMLINK+="input/bmi_lcd_ts4"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts5", SYMLINK+="input/bmi_lcd_ts5"
+KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts6", SYMLINK+="input/bmi_lcd_ts6"
+ACTION=="add", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh"
+ACTION=="remove", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh"
+#
+# For USB PBPSD, which we've arbitrarily decided will be module F001
+#
+ACTION=="remove", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh"
+ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh"
diff --git a/recipes/udev/udev-154/bug/bmi_eventpipe.sh b/recipes/udev/udev-154/bug/bmi_eventpipe.sh
new file mode 100644
index 0000000000..acbae56118
--- /dev/null
+++ b/recipes/udev/udev-154/bug/bmi_eventpipe.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# This script passes BMI state variables to the running JVM.
+#
+if [ ${BMIBUS_PRODUCT} != "" ] && [ ${BMIBUS_SLOT} != "" ] && [ ${ACTION} != "" ];
+then                                                                            
+        echo $BMIBUS_PRODUCT 0 $BMIBUS_SLOT $ACTION > /tmp/eventpipe            
+fi
diff --git a/recipes/udev/udev-154/c7x0/default b/recipes/udev/udev-154/c7x0/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-154/c7x0/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/cache b/recipes/udev/udev-154/cache
new file mode 100644
index 0000000000..4db1466817
--- /dev/null
+++ b/recipes/udev/udev-154/cache
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+export TZ=/etc/localtime
+
+[ -f /etc/default/udev ] && . /etc/default/udev
+
+echo "Caching udev devnodes"
+
+			if [ "$DEVCACHE" != "" ]; then
+				echo -n "Populating dev cache"
+				(cd /; tar cf $DEVCACHE dev)
+				mv /tmp/uname /etc/udev/saved.uname
+				mv /tmp/cmdline /etc/udev/saved.cmdline
+				mv /tmp/atags /etc/udev/saved.atags
+				echo
+			fi
+
+exit 0
diff --git a/recipes/udev/udev-154/default b/recipes/udev/udev-154/default
new file mode 100644
index 0000000000..5c4937a9a0
--- /dev/null
+++ b/recipes/udev/udev-154/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/init b/recipes/udev/udev-154/init
new file mode 100644
index 0000000000..f4dc5de2f5
--- /dev/null
+++ b/recipes/udev/udev-154/init
@@ -0,0 +1,78 @@
+#!/bin/sh -e
+
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+export TZ=/etc/localtime
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x /sbin/udevd ] || exit 1
+[ -f /etc/default/udev ] && . /etc/default/udev
+[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+
+kill_udevd() {
+        if [ -x /sbin/pidof ]; then
+                pid=`/sbin/pidof -x udevd`
+                [ -n "$pid" ] && kill $pid
+        fi
+}
+
+export ACTION=add
+# propagate /dev from /sys
+echo "Starting udev"
+
+# mount the tmpfs on /dev, if not already done
+LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+        mount -n -o mode=0755 -t tmpfs none "/dev"
+        mkdir -m 0755 /dev/pts
+        mkdir -m 1777 /dev/shm
+}
+
+if [ "$DEVCACHE" != "" ]; then
+	# Invalidate udev cache if the kernel or its bootargs/cmdline have changed
+	[ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname
+	[ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline
+	[ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
+	if [ -e $DEVCACHE ] && \
+	   cmp -s /tmp/uname /etc/udev/saved.uname && \
+	   cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
+	   cmp -s /tmp/atags /etc/udev/saved.atags; then
+		(cd /; tar xf $DEVCACHE > /dev/null 2>&1)
+		not_first_boot=1
+	fi
+fi
+
+if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then
+	mkdir -p /lib/modules/$(uname -r)
+	depmod -ae
+fi
+
+# make_extra_nodes
+kill_udevd > "/dev/null" 2>&1
+
+        # trigger the sorted events
+        echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+        /sbin/udevd -d
+
+        /sbin/udevadm control --env STARTUP=1
+		if [ "$not_first_boot" != "" ];then
+			/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
+			(/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env STARTUP=)&
+			if [ "$DEVCACHE" != "" ]; then
+				rm -f /tmp/uname
+				rm -f /tmp/cmdline
+				rm -f /tmp/atags
+			fi
+		else
+			/sbin/udevadm trigger
+			/sbin/udevadm settle
+		fi
+
+exit 0
diff --git a/recipes/udev/udev-154/local.rules b/recipes/udev/udev-154/local.rules
new file mode 100644
index 0000000000..da4b38593c
--- /dev/null
+++ b/recipes/udev/udev-154/local.rules
@@ -0,0 +1,35 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+#The first framebuffer is symlinked to /dev/fb
+KERNEL=="fb0",  SYMLINK+="fb"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/recipes/udev/udev-154/omap3-pandora/local.rules b/recipes/udev/udev-154/omap3-pandora/local.rules
new file mode 100644
index 0000000000..e433cf9593
--- /dev/null
+++ b/recipes/udev/udev-154/omap3-pandora/local.rules
@@ -0,0 +1,40 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+#The first framebuffer is symlinked to /dev/fb
+KERNEL=="fb0",  SYMLINK+="fb"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
+
+# Local UDEV rule changes for the Pandora system.
+
+# Let all users access the event devices using EVDEV (the OpenPandora is not multiuser after all).
+KERNEL=="event[0-9]",MODE="0666"
\ No newline at end of file
diff --git a/recipes/udev/udev-154/permissions.rules b/recipes/udev/udev-154/permissions.rules
new file mode 100644
index 0000000000..940d163047
--- /dev/null
+++ b/recipes/udev/udev-154/permissions.rules
@@ -0,0 +1,119 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+# only needed for kernels < v2.6.18-rc1
+ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*",	WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{DRIVER}=="?*",		WAIT_FOR_SYSFS="device/driver"
+
+# devices needed to load the drivers providing them
+KERNEL=="tun",					OPTIONS+="ignore_remove"
+KERNEL=="ppp",					OPTIONS+="ignore_remove"
+KERNEL=="loop[0-9]*",				OPTIONS+="ignore_remove"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+# the aacraid driver is broken and reports that disks removable (see #404927)
+SUBSYSTEM=="block", ATTRS{removable}=="1", \
+	DRIVERS!="aacraid",			GROUP="floppy"
+# all block devices on these buses are "removable"
+SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy"
+
+# IDE devices
+KERNEL=="hd[a-z]|pcd[0-9]*", 			DRIVERS=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+KERNEL=="ht[0-9]*", 				GROUP="tape"
+KERNEL=="nht[0-9]*", 				GROUP="tape"
+
+# SCSI devices
+KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
+SUBSYSTEMS=="scsi", ATTRS{type}=="1",				GROUP="tape"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4",				GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="5",				GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="8",				GROUP="tape"
+
+# USB devices
+KERNEL=="legousbtower*",	MODE="0666"
+KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb",		GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \
+				MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	GROUP="plugdev", \
+	ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="rtc|rtc[0-9]*",			GROUP="audio"
+KERNEL=="kqemu",		MODE="0666"
+KERNEL=="tun",			MODE="0666",
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="irlpt*",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+KERNEL=="lirc[0-9]*",				GROUP="video"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/recipes/udev/udev-154/run.rules b/recipes/udev/udev-154/run.rules
new file mode 100644
index 0000000000..75d71375bb
--- /dev/null
+++ b/recipes/udev/udev-154/run.rules
@@ -0,0 +1,14 @@
+# debugging monitor
+RUN+="socket:/org/kernel/udev/monitor"
+
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
+# ignore the events generated by virtual consoles
+KERNEL=="ptmx",		OPTIONS+="last_rule"
+KERNEL=="console",	OPTIONS+="last_rule"
+KERNEL=="tty"	,	OPTIONS+="last_rule"
+KERNEL=="tty[0-9]*",	OPTIONS+="last_rule"
+KERNEL=="pty*",		OPTIONS+="last_rule"
+SUBSYSTEM=="vc",	OPTIONS+="last_rule"
+
diff --git a/recipes/udev/udev-154/spitz/default b/recipes/udev/udev-154/spitz/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-154/spitz/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/tosa/default b/recipes/udev/udev-154/tosa/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-154/tosa/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/udev-replace-le16toh.patch b/recipes/udev/udev-154/udev-replace-le16toh.patch
new file mode 100644
index 0000000000..7776c9a10e
--- /dev/null
+++ b/recipes/udev/udev-154/udev-replace-le16toh.patch
@@ -0,0 +1,21 @@
+This patch is needed on uclibc.
+
+-Khem
+
+Index: udev-151/extras/ata_id/ata_id.c
+===================================================================
+--- udev-151.orig/extras/ata_id/ata_id.c	2010-06-04 14:08:41.912730501 -0700
++++ udev-151/extras/ata_id/ata_id.c	2010-06-04 14:09:31.492734527 -0700
+@@ -168,7 +168,11 @@ static void disk_identify_fixup_uint16 (
+ 	uint16_t *p;
+ 
+ 	p = (uint16_t *) identify;
+-	p[offset_words] = le16toh (p[offset_words]);
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++	p[offset_words] = p[offset_words];
++#else
++	p[offset_words] = __bswap_16 (p[offset_words]);
++#endif
+ }
+ 
+ /**
diff --git a/recipes/udev/udev-154/udev-replace-lutimes.patch b/recipes/udev/udev-154/udev-replace-lutimes.patch
new file mode 100644
index 0000000000..dd77897345
--- /dev/null
+++ b/recipes/udev/udev-154/udev-replace-lutimes.patch
@@ -0,0 +1,25 @@
+This patch is needed on uclibc
+
+-Khem
+Index: udev-151/udev/udev-node.c
+===================================================================
+--- udev-151.orig/udev/udev-node.c	2010-06-04 14:18:59.082727182 -0700
++++ udev-151/udev/udev-node.c	2010-06-04 14:20:27.485282812 -0700
+@@ -57,7 +57,7 @@ int udev_node_mknod(struct udev_device *
+ 			preserve = 1;
+ 			udev_selinux_lsetfilecon(udev, file, mode);
+ 			/* update time stamp when we re-use the node, like on media change events */
+-			utimes(file, NULL);
++			utimensat(AT_FDCWD, file, NULL, 0);
+ 		} else {
+ 			char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
+ 
+@@ -178,7 +178,7 @@ static int node_symlink(struct udev *ude
+ 					info(udev, "preserve already existing symlink '%s' to '%s'\n",
+ 					     slink, target);
+ 					udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
+-					lutimes(slink, NULL);
++					utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
+ 					goto exit;
+ 				}
+ 			}
diff --git a/recipes/udev/udev-154/udev.rules b/recipes/udev/udev-154/udev.rules
new file mode 100644
index 0000000000..60288c06ed
--- /dev/null
+++ b/recipes/udev/udev-154/udev.rules
@@ -0,0 +1,116 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# workaround for devices which do not report media changes
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
+	ENV{ID_MODEL}=="IOMEGA_ZIP*", OPTIONS+="all_partitions"
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
+	OPTIONS+="all_partitions"
+
+# SCSI devices
+SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \
+	ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \
+				NAME="%c"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="dvb*",			PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \
+				NAME="%c"
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+KERNEL=="evtchn",		NAME="xen/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm*",			NAME="infiniband/%k"
+KERNEL=="rdma_ucm",		NAME="infiniband/%k"
+
+# ALSA devices
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+KERNEL=="zapctl",		NAME="zap/ctl"
+KERNEL=="zaptimer",		NAME="zap/timer"
+KERNEL=="zapchannel",		NAME="zap/channel"
+KERNEL=="zappseudo",		NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",		NAME="zap/%n"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="revalidate",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL=="rfcomm[0-9]*", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
+# MXC UARTs
+KERNEL=="ttymxc[0-4]",   NAME="ttymxc%n"
+
diff --git a/recipes/udev/udev_154.bb b/recipes/udev/udev_154.bb
new file mode 100644
index 0000000000..cd370e801b
--- /dev/null
+++ b/recipes/udev/udev_154.bb
@@ -0,0 +1,125 @@
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.12."
+LICENSE = "GPLv2+"
+
+PR = "r0"
+
+# Untested
+DEFAULT_PREFERENCE = "-1"
+
+# Needed for udev-extras
+DEPENDS = "gperf-native usbutils acl glib-2.0"
+RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
+
+SRC_URI[md5sum] = "4ee3bcc4e326e967167ccb6a6ba04514"
+SRC_URI[sha256sum] = "29d66a5a8499cc6e4f2bcc7f79f2c6b44f4d720cecef2e552f0354d792e40a83"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://mount.blacklist \
+	   file://run.rules \
+	   "
+SRC_URI += " \
+       file://udev.rules \
+       file://devfs-udev.rules \
+       file://links.conf \
+       file://permissions.rules \
+       file://mount.sh \
+       file://network.sh \
+       file://local.rules \
+       file://default \
+       file://init \
+       file://cache \
+"
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+#buglabs's bug device
+SRC_URI_append_bug = " \
+       file://30-BUG.rules \
+       file://10-mx31.rules \
+       file://bmi_eventpipe.sh "
+
+PACKAGE_ARCH_bug = "bug"
+
+inherit update-rc.d autotools
+
+EXTRA_OECONF += " --with-udev-prefix= \
+                  --with-libdir-name=${base_libdir} \
+                  --disable-introspection \
+                  ac_cv_file__usr_share_pci_ids=yes \
+                  ac_cv_file__usr_share_hwdata_pci_ids=no \
+                  ac_cv_file__usr_share_misc_pci_ids=no \
+                  --sbindir=${base_sbindir} \
+                  --libexecdir=${base_libdir}/udev \
+                  --with-rootlibdir=${base_libdir} \
+"
+
+INITSCRIPT_NAME = "udev"
+INITSCRIPT_PARAMS = "start 03 S ."
+
+PACKAGES =+ "libudev libgudev udev-utils"
+
+FILES_libudev = "${libdir}/libudev.so.*"
+FILES_libgudev = "${libdir}/libgudev*.so.*"
+
+FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
+
+RPROVIDES_${PN} = "hotplug"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
+FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
+
+# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
+# is ${prefix}/lib64
+FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit"
+FILES_${PN}-dbg += "/lib/udev/.debug"
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+	install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache
+
+	install -d ${D}${sysconfdir}/default
+	install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
+
+ 	cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/
+	cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/run.rules          ${D}${sysconfdir}/udev/rules.d/run.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	touch ${D}${sysconfdir}/udev/saved.uname
+	touch ${D}${sysconfdir}/udev/saved.cmdline
+	touch ${D}${sysconfdir}/udev/saved.atags
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+}
+
+do_install_append_h2200() {
+	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
+do_install_append_bug() {
+	install -m 0644 ${WORKDIR}/30-BUG.rules ${D}${sysconfdir}/udev/rules.d/30-BUG.rules
+	install -m 0644 ${WORKDIR}/10-mx31.rules ${D}${sysconfdir}/udev/rules.d/10-mx31.rules
+	install -m 0644 ${WORKDIR}/bmi_eventpipe.sh ${D}${sysconfdir}/udev/scripts/bmi_eventpipe.sh
+}
+
+# Create the cache after checkroot has run
+pkg_postinst_${PN}_append() {
+	update-rc.d $OPT udev-cache start 12 S .
+}
-- 
cgit v1.2.3


From 119349c48a0709faec1c06086029aadbdc86f3e5 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 16 Jun 2010 23:03:24 +0200
Subject: systemd: add systemd to openembedded

* not fully functional yet
* needs udev-154 and cgroup enabled in kernel
* halt/reboot don't work with busybox
---
 recipes/systemd/files/disable_xml_generation.patch | 36 +++++++++++++
 recipes/systemd/files/execute.patch                | 17 ++++++
 recipes/systemd/files/getty-serial@.service        | 19 +++++++
 recipes/systemd/files/replace_accpet4.patch        | 26 +++++++++
 recipes/systemd/files/systemadm.patch              | 13 +++++
 recipes/systemd/systemd_git.bb                     | 61 ++++++++++++++++++++++
 6 files changed, 172 insertions(+)
 create mode 100644 recipes/systemd/files/disable_xml_generation.patch
 create mode 100644 recipes/systemd/files/execute.patch
 create mode 100644 recipes/systemd/files/getty-serial@.service
 create mode 100644 recipes/systemd/files/replace_accpet4.patch
 create mode 100644 recipes/systemd/files/systemadm.patch
 create mode 100644 recipes/systemd/systemd_git.bb

diff --git a/recipes/systemd/files/disable_xml_generation.patch b/recipes/systemd/files/disable_xml_generation.patch
new file mode 100644
index 0000000000..47f36b8ecb
--- /dev/null
+++ b/recipes/systemd/files/disable_xml_generation.patch
@@ -0,0 +1,36 @@
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am	2010-06-15 22:58:46.752961117 +0200
++++ git/Makefile.am	2010-06-15 22:59:22.615040570 +0200
+@@ -75,21 +75,6 @@
+ dist_udevrules_DATA = \
+ 	src/99-systemd.rules
+ 
+-dbusinterface_DATA = \
+-	org.freedesktop.systemd1.Manager.xml \
+-	org.freedesktop.systemd1.Job.xml \
+-	org.freedesktop.systemd1.Unit.xml \
+-	org.freedesktop.systemd1.Service.xml \
+-	org.freedesktop.systemd1.Socket.xml \
+-	org.freedesktop.systemd1.Timer.xml \
+-	org.freedesktop.systemd1.Target.xml \
+-	org.freedesktop.systemd1.Device.xml \
+-	org.freedesktop.systemd1.Mount.xml \
+-	org.freedesktop.systemd1.Automount.xml \
+-	org.freedesktop.systemd1.Snapshot.xml \
+-	org.freedesktop.systemd1.Swap.xml \
+-	org.freedesktop.systemd1.Path.xml
+-
+ dist_systemunit_DATA = \
+ 	units/emergency.service \
+ 	units/basic.target \
+@@ -466,9 +451,6 @@
+ 	man/systemd.special.html.in
+ endif
+ 
+-org.freedesktop.systemd1.%.xml: systemd
+-	$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+-
+ CLEANFILES += $(dbusinterface_DATA)
+ 
+ install-data-hook:
diff --git a/recipes/systemd/files/execute.patch b/recipes/systemd/files/execute.patch
new file mode 100644
index 0000000000..c9f88c82ea
--- /dev/null
+++ b/recipes/systemd/files/execute.patch
@@ -0,0 +1,17 @@
+Index: git/src/execute.c
+===================================================================
+--- git.orig/src/execute.c	2010-06-15 11:41:02.792856752 +0200
++++ git/src/execute.c	2010-06-15 11:52:02.899046198 +0200
+@@ -47,6 +47,12 @@
+ #include "cgroup.h"
+ #include "namespace.h"
+ 
++#ifndef SCHED_RESET_ON_FORK
++#  define SCHED_RESET_ON_FORK 0x40000000
++#endif
++
++
++
+ /* This assumes there is a 'tty' group */
+ #define TTY_MODE 0620
+ 
diff --git a/recipes/systemd/files/getty-serial@.service b/recipes/systemd/files/getty-serial@.service
new file mode 100644
index 0000000000..62e4695243
--- /dev/null
+++ b/recipes/systemd/files/getty-serial@.service
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Getty on %I
+Before=getty.target
+After=basic.target
+Conflicts=shutdown.target
+
+[Service]
+Environment=TERM=linux
+ExecStart=/sbin/getty @BAUDRATE@ %I
+Restart=restart-always
+RestartSec=0
+KillMode=process-group
diff --git a/recipes/systemd/files/replace_accpet4.patch b/recipes/systemd/files/replace_accpet4.patch
new file mode 100644
index 0000000000..d57b07af65
--- /dev/null
+++ b/recipes/systemd/files/replace_accpet4.patch
@@ -0,0 +1,26 @@
+Index: git/src/logger.c
+===================================================================
+--- git.orig/src/logger.c	2010-06-15 23:02:38.212932153 +0200
++++ git/src/logger.c	2010-06-15 23:02:51.091686447 +0200
+@@ -331,7 +331,7 @@
+ 
+         assert(s);
+ 
+-        if ((fd = accept4(server_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC)) < 0)
++        if ((fd = accept(server_fd, NULL, NULL)) < 0)
+                 return -errno;
+ 
+         if (s->n_streams >= STREAMS_MAX) {
+Index: git/src/socket.c
+===================================================================
+--- git.orig/src/socket.c	2010-06-15 23:02:16.269606647 +0200
++++ git/src/socket.c	2010-06-15 23:02:31.115021717 +0200
+@@ -1201,7 +1201,7 @@
+         if (w->socket_accept) {
+                 for (;;) {
+ 
+-                        if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
++                        if ((cfd = accept(fd, NULL, NULL)) < 0) {
+ 
+                                 if (errno == EINTR)
+                                         continue;
diff --git a/recipes/systemd/files/systemadm.patch b/recipes/systemd/files/systemadm.patch
new file mode 100644
index 0000000000..b9c09dbbee
--- /dev/null
+++ b/recipes/systemd/files/systemadm.patch
@@ -0,0 +1,13 @@
+Index: git/src/systemadm.vala
+===================================================================
+--- git.orig/src/systemadm.vala	2010-06-15 11:02:35.863509632 +0200
++++ git/src/systemadm.vala	2010-06-15 11:06:16.305986249 +0200
+@@ -297,7 +297,7 @@
+ 
+                 bbox.pack_start(cancel_button, false, true, 0);
+ 
+-                bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
++                bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM);
+ 
+                 manager = bus.get_object(
+                                 "org.freedesktop.systemd1",
diff --git a/recipes/systemd/systemd_git.bb b/recipes/systemd/systemd_git.bb
new file mode 100644
index 0000000000..da9c271792
--- /dev/null
+++ b/recipes/systemd/systemd_git.bb
@@ -0,0 +1,61 @@
+DESCRIPTION = "Systemd a init replacement"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
+LICENSE = "GPL"
+DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"
+PRIORITY = "optional"
+SECTION = "base/shell"
+
+PR_append = "+${SRCPV}"
+
+inherit autotools vala
+
+TAG = "1ebdf2d8793181f31b766b8342391aa1978f9917"
+
+SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git;tag=${TAG} \
+           file://execute.patch \
+           file://systemadm.patch \
+           file://disable_xml_generation.patch \
+           file://replace_accpet4.patch \
+           file://getty-serial@.service \
+          "
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = " --with-distro=debian \
+                 --with-rootdir=${base_prefix} \
+               "
+
+PACKAGES = "${PN} ${PN}-gui ${PN}-dbg ${PN}-doc"
+
+FILES_${PN}-gui = "${bindir}/systemadm"
+
+FILES_${PN} = " ${base_bindir}/* \
+                ${datadir}/dbus-1/services \
+                ${datadir}/dbus-1/system-services \
+                ${datadir}/${PN} \
+                ${sysconfdir} \
+                ${base_libdir}/systemd/* \
+                ${base_libdir}/systemd/system/* \
+                ${base_libdir}/udev/rules.d \
+                /cgroup \
+                ${bindir}/systemd-install \
+               "
+
+FILES_${PN}-dbg += " /lib/systemd/.debug "o
+
+def get_baudrate(bb, d):
+    return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
+    
+
+def get_console(bb, d):
+    return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1]
+
+
+do_install_append(){
+        if [ ! ${@get_baudrate(bb, d)} = "" ]; then
+          sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/getty-serial@.service
+          install ${WORKDIR}/getty-serial@.service ${D}${base_libdir}/systemd/system/
+          ln -sf ${base_libdir}/systemd/system/getty-serial@.service \
+              ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@${@get_console(bb, d)}.service
+        fi
+}
-- 
cgit v1.2.3


From fc07994de9d23162c404771f09cefcb570b8c132 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 17 Jun 2010 16:57:16 +0200
Subject: swig 1.3.39: bump PR

---
 recipes/swig/swig_1.3.39.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/swig/swig_1.3.39.bb b/recipes/swig/swig_1.3.39.bb
index e82c0c05b1..5d1c46ce7a 100644
--- a/recipes/swig/swig_1.3.39.bb
+++ b/recipes/swig/swig_1.3.39.bb
@@ -1,6 +1,6 @@
 require swig.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
 
-- 
cgit v1.2.3


From d5f753d8a5f7b9ded3622805e403ce033fd61304 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 18 Jun 2010 11:09:53 +0200
Subject: libmicrohttpd: fix typo

---
 recipes/xbmc/libmicrohttpd_0.4.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/xbmc/libmicrohttpd_0.4.6.bb b/recipes/xbmc/libmicrohttpd_0.4.6.bb
index 12f581af71..d46448ec3a 100644
--- a/recipes/xbmc/libmicrohttpd_0.4.6.bb
+++ b/recipes/xbmc/libmicrohttpd_0.4.6.bb
@@ -5,7 +5,7 @@ SRC_URI = "ftp://ftp.nluug.nl/pub/gnu/libmicrohttpd//libmicrohttpd-${PV}.tar.gz"
 SRC_URI[md5sum] = "61698da6aa04744ea076c327f66fc05a"
 SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a99e371"
 
-DEPENDS = "libgrypt curl"
+DEPENDS = "libgcrypt curl"
 
 inherit autotools lib_package
 
-- 
cgit v1.2.3


From 7cdfbc23dc652d4c0a43d0cebc27b43fd2421020 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 18 Jun 2010 11:56:40 +0200
Subject: systemd: fix PV and a typo in FILES

---
 recipes/systemd/systemd_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/systemd/systemd_git.bb b/recipes/systemd/systemd_git.bb
index da9c271792..5f98e54b1b 100644
--- a/recipes/systemd/systemd_git.bb
+++ b/recipes/systemd/systemd_git.bb
@@ -5,6 +5,7 @@ DEPENDS = "readline udev dbus libcap2 libcgroup gtk+"
 PRIORITY = "optional"
 SECTION = "base/shell"
 
+PV = "0.0"
 PR_append = "+${SRCPV}"
 
 inherit autotools vala
@@ -41,7 +42,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${bindir}/systemd-install \
                "
 
-FILES_${PN}-dbg += " /lib/systemd/.debug "o
+FILES_${PN}-dbg += " /lib/systemd/.debug "
 
 def get_baudrate(bb, d):
     return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
-- 
cgit v1.2.3


From cdfe641ca1ac5a6a144c9b70d5b3238a12a9d6cd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 18 Jun 2010 12:02:03 +0200
Subject: linux.inc: add config mangler to enable cgroups support, disabled by
 default

* set KERNEL_ENABLE_CGROUPS = "1" in your distro/local.conf to enable this
* CGROUPS were added in 2.6.24
---
 recipes/linux/linux.inc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index e0205890cd..8d430e27d9 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -164,6 +164,23 @@ do_configure_prepend() {
             echo 'CONFIG_DEVTMPFS_MOUNT=y' >> ${S}/.config
         fi
 
+        # Newer inits like systemd need cgroup support
+        if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ;