Major layout change to the packages directory

Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

368 files changed, 25365 insertions, 0 deletions

diff --git a/meta/recipes-core/base-files/base-files/akita/fstab b/meta/recipes-core/base-files/base-files/akita/fstab
new file mode 100644
index 0000000000..5f2c941345
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/akita/fstab
@@ -0,0 +1,16 @@
+/dev/mtdblock2  /       jffs2   rw,noatime      1  1 
+/dev/mtdblock3  /home   jffs2   defaults,noatime        1  2
+proc            /proc   proc    defaults        0  0
+/dev/hda1       /media/cf       auto    defaults,sync,noauto    0  0
+
+tmpfs           /var/volatile   tmpfs   defaults        0  0
+tmpfs           /media/ram      tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
+
+# USB Storage
+/dev/sda1 /media/usbhdd         vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
+
diff --git a/meta/recipes-core/base-files/base-files/akita/rotation b/meta/recipes-core/base-files/base-files/akita/rotation
new file mode 100644
index 0000000000..2a14d60899
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/akita/rotation
@@ -0,0 +1 @@
+270
\ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/c7x0/fstab b/meta/recipes-core/base-files/base-files/c7x0/fstab
new file mode 100644
index 0000000000..e065e8112e
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/c7x0/fstab
@@ -0,0 +1,12 @@
+/dev/mtdblock2  /       jffs2   rw,noatime      1  1 
+/dev/mtdblock3  /home   jffs2   defaults,noatime        1  2
+proc            /proc   proc    defaults        0  0
+/dev/hda1       /media/cf       auto    defaults,sync,noauto    0  0
+
+tmpfs           /var/volatile   tmpfs   defaults        0  0
+tmpfs           /media/ram      tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
diff --git a/meta/recipes-core/base-files/base-files/c7x0/usbd b/meta/recipes-core/base-files/base-files/c7x0/usbd
new file mode 100644
index 0000000000..40931ee8e9
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/c7x0/usbd
@@ -0,0 +1 @@
+usbdmodule=pxa_bi
diff --git a/meta/recipes-core/base-files/base-files/collie/fstab b/meta/recipes-core/base-files/base-files/collie/fstab
new file mode 100644
index 0000000000..dc3499b909
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/collie/fstab
@@ -0,0 +1,8 @@
+/dev/mtdblock4  /       jffs2   defaults        1  1 
+proc            /proc   proc    defaults        0  0
+/dev/hda1       /media/cf       auto    defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002  0  0
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto,noatime,user,exec,suid     0  0
+tmpfs           /var/volatile   tmpfs   defaults        0  0
+
+# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
+#tmpfs          /media/ram      tmpfs   defaults        0  0
diff --git a/meta/recipes-core/base-files/base-files/collie/usbd b/meta/recipes-core/base-files/base-files/collie/usbd
new file mode 100644
index 0000000000..4257614583
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/collie/usbd
@@ -0,0 +1 @@
+usbdmodule=sa1100_bi
diff --git a/meta/recipes-core/base-files/base-files/filesystems b/meta/recipes-core/base-files/base-files/filesystems
new file mode 100644
index 0000000000..653593a432
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/filesystems
@@ -0,0 +1,6 @@
+minix
+fat
+vfat
+ext2
+ext3
+*
diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab
new file mode 100644
index 0000000000..f0eed36ed7
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/fstab
@@ -0,0 +1,12 @@
+# stock fstab - you probably want to override this with a machine specific one
+
+rootfs               /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
+tmpfs                /var/volatile        tmpfs      defaults              0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
+# uncomment this if your device has a SD/MMC/Transflash slot
+#/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
+
diff --git a/meta/recipes-core/base-files/base-files/host.conf b/meta/recipes-core/base-files/base-files/host.conf
new file mode 100644
index 0000000000..1a8c1e1517
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/host.conf
@@ -0,0 +1,2 @@
+order hosts,bind
+multi on
diff --git a/meta/recipes-core/base-files/base-files/htcuniversal/rotation b/meta/recipes-core/base-files/base-files/htcuniversal/rotation
new file mode 100644
index 0000000000..2a14d60899
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/htcuniversal/rotation
@@ -0,0 +1 @@
+270
\ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/hx2000/fstab b/meta/recipes-core/base-files/base-files/hx2000/fstab
new file mode 100644
index 0000000000..2d4b7aae72
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/hx2000/fstab
@@ -0,0 +1,9 @@
+/dev/mtdblock2  /               jffs2   defaults                1  1            
+/dev/mtdblock3  /home   jffs2   defaults        1  1
+
+proc            /proc           proc    defaults        0  0
+sys             /sys        sysfs       defaults        0  0
+
+/dev/hda1               /media/cf       auto    defaults,noauto,noatime,exec,suid       0  0
+tmpfs                   /var/volatile   tmpfs   defaults        0  0
+tmpfs                   /media/ram      tmpfs   defaults        0  0
diff --git a/meta/recipes-core/base-files/base-files/inputrc b/meta/recipes-core/base-files/base-files/inputrc
new file mode 100644
index 0000000000..b5c4c8af24
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/inputrc
@@ -0,0 +1,61 @@
+# /etc/inputrc - global inputrc for libreadline
+# See readline(3readline) and `info rluserman' for more information.
+
+# Be 8 bit clean.
+set input-meta on
+set output-meta on
+
+# To allow the use of 8bit-characters like the german umlauts, comment out
+# the line below. However this makes the meta key not work as a meta key,
+# which is annoying to those which don't need to type in 8-bit characters.
+
+# set convert-meta off
+
+# try to enable the application keypad when it is called.  Some systems
+# need this to enable the arrow keys.
+# set enable-keypad on
+
+# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys
+
+# do not bell on tab-completion 
+# set bell-style none 
+
+# some defaults / modifications for the emacs mode
+$if mode=emacs
+
+# allow the use of the Home/End keys
+# "\e[1~": beginning-of-line
+# "\e[4~": end-of-line
+
+# allow the use of the Delete/Insert keys
+# "\e[3~": delete-char
+# "\e[2~": quoted-insert
+
+# mappings for "page up" and "page down" to step to the beginning/end 
+# of the history
+# "\e[5~": beginning-of-history
+# "\e[6~": end-of-history
+
+# alternate mappings for "page up" and "page down" to search the history
+# "\e[5~": history-search-backward
+# "\e[6~": history-search-forward
+
+# # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
+# "\e[5C": forward-word
+# "\e[5D": backward-word
+# "\e\e[C": forward-word
+# "\e\e[D": backward-word
+
+# $if term=rxvt
+# "\e[8~": end-of-line
+# $endif
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+# "\eOH": beginning-of-line
+# "\eOF": end-of-line
+
+# for freebsd console
+# "\e[H": beginning-of-line
+# "\e[F": end-of-line
+
+$endif
diff --git a/meta/recipes-core/base-files/base-files/issue b/meta/recipes-core/base-files/base-files/issue
new file mode 100644
index 0000000000..329af4665e
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/issue
@@ -0,0 +1,2 @@
+OpenEmbedded Linux \n \l
+
diff --git a/meta/recipes-core/base-files/base-files/issue.net b/meta/recipes-core/base-files/base-files/issue.net
new file mode 100644
index 0000000000..6dc3588b4f
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/issue.net
@@ -0,0 +1,3 @@
+OpenEmbedded Linux %h
+
+
diff --git a/meta/recipes-core/base-files/base-files/licenses/Artistic b/meta/recipes-core/base-files/base-files/licenses/Artistic
new file mode 100644
index 0000000000..5f221241e8
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/Artistic
@@ -0,0 +1,131 @@
+
+
+
+
+                         The "Artistic License"
+
+                                Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+Definitions:
+
+        "Package" refers to the collection of files distributed by the
+        Copyright Holder, and derivatives of that collection of files
+        created through textual modification.
+
+        "Standard Version" refers to such a Package if it has not been
+        modified, or has been modified in accordance with the wishes
+        of the Copyright Holder as specified below.
+
+        "Copyright Holder" is whoever is named in the copyright or
+        copyrights for the package.
+
+        "You" is you, if you're thinking about copying or distributing
+        this Package.
+
+        "Reasonable copying fee" is whatever you can justify on the
+        basis of media cost, duplication charges, time of people involved,
+        and so on.  (You will not be required to justify it to the
+        Copyright Holder, but only to the computing community at large
+        as a market that must bear the fee.)
+
+        "Freely Available" means that no fee is charged for the item
+        itself, though there may be fees involved in handling the item.
+        It also means that recipients of the item may redistribute it
+        under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder.  A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+    a) place your modifications in the Public Domain or otherwise make them
+    Freely Available, such as by posting said modifications to Usenet or
+    an equivalent medium, or placing the modifications on a major archive
+    site such as uunet.uu.net, or by allowing the Copyright Holder to include
+    your modifications in the Standard Version of the Package.
+
+    b) use the modified Package only within your corporation or organization.
+
+    c) rename any non-standard executables so the names do not conflict
+    with standard executables, which must also be provided, and provide
+    a separate manual page for each non-standard executable that clearly
+    documents how it differs from the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+    a) distribute a Standard Version of the executables and library files,
+    together with instructions (in the manual page or equivalent) on where
+    to get the Standard Version.
+
+    b) accompany the distribution with the machine-readable source of
+    the Package with your modifications.
+
+    c) give non-standard executables non-standard names, and clearly
+    document the differences in manual pages (or equivalent), together
+    with instructions on where to get the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package.  You may charge any fee you choose for support of this
+Package.  You may not charge a fee for this Package itself.  However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own.  You may embed this Package's interpreter within
+an executable of yours (by linking); this shall be construed as a mere
+form of aggregation, provided that the complete Standard Version of the
+interpreter is so embedded.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whoever generated
+them, and may be sold commercially, and may be aggregated with this
+Package.  If such scripts or library files are aggregated with this
+Package via the so-called "undump" or "unexec" methods of producing a
+binary executable image, then distribution of such an image shall
+neither be construed as a distribution of this Package nor shall it
+fall under the restrictions of Paragraphs 3 and 4, provided that you do
+not represent such an executable image as a Standard Version of this
+Package.
+
+7. C subroutines (or comparably compiled subroutines in other
+languages) supplied by you and linked into this Package in order to
+emulate subroutines and variables of the language defined by this
+Package shall not be considered part of this Package, but are the
+equivalent of input as in Paragraph 6, provided these subroutines do
+not change the language in any way that would cause it to fail the
+regression tests for the language.
+
+8. Aggregation of this Package with a commercial distribution is always
+permitted provided that the use of this Package is embedded; that is,
+when no overt attempt is made to make this Package's interfaces visible
+to the end user of the commercial distribution.  Such use shall not be
+construed as a distribution of this Package.
+
+9. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+                                The End
diff --git a/meta/recipes-core/base-files/base-files/licenses/BSD b/meta/recipes-core/base-files/base-files/licenses/BSD
new file mode 100644
index 0000000000..c7a0aa4f94
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/BSD
@@ -0,0 +1,26 @@
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/meta/recipes-core/base-files/base-files/licenses/GFDL-1.2 b/meta/recipes-core/base-files/base-files/licenses/GFDL-1.2
new file mode 100644
index 0000000000..4a0fe1c8de
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/GFDL-1.2
@@ -0,0 +1,397 @@
+                GNU Free Documentation License
+                  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/meta/recipes-core/base-files/base-files/licenses/GPL-2 b/meta/recipes-core/base-files/base-files/licenses/GPL-2
new file mode 100644
index 0000000000..d60c31a97a
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/GPL-2
@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/meta/recipes-core/base-files/base-files/licenses/GPL-3 b/meta/recipes-core/base-files/base-files/licenses/GPL-3
new file mode 100644
index 0000000000..4432540474
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/GPL-3
@@ -0,0 +1,676 @@
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/meta/recipes-core/base-files/base-files/licenses/LGPL-2 b/meta/recipes-core/base-files/base-files/licenses/LGPL-2
new file mode 100644
index 0000000000..f5030495bf
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/LGPL-2
@@ -0,0 +1,481 @@
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+                    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/meta/recipes-core/base-files/base-files/licenses/LGPL-2.1 b/meta/recipes-core/base-files/base-files/licenses/LGPL-2.1
new file mode 100644
index 0000000000..b124cf5812
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/LGPL-2.1
@@ -0,0 +1,510 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/meta/recipes-core/base-files/base-files/licenses/LGPL-3 b/meta/recipes-core/base-files/base-files/licenses/LGPL-3
new file mode 100644
index 0000000000..fc8a5de7ed
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/licenses/LGPL-3
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/meta/recipes-core/base-files/base-files/motd b/meta/recipes-core/base-files/base-files/motd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/motd
diff --git a/meta/recipes-core/base-files/base-files/mtx-1/fstab b/meta/recipes-core/base-files/base-files/mtx-1/fstab
new file mode 100644
index 0000000000..ee3fab0c13
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/mtx-1/fstab
@@ -0,0 +1,8 @@
+# /etc/fstab: static file system information. mtx-1
+#
+# <file system> <mount pt>     <type>     <options>         <dump> <pass>
+rootfs          /              auto       defaults          1      1
+tmpfs           /var/volatile  tmpfs      size=10m          0      0
+proc            /proc          proc       defaults          0      0
+devpts          /dev/pts       devpts     mode=0620,gid=5   0      0
+usbdevfs        /proc/bus/usb  usbdevfs   noauto            0      0
diff --git a/meta/recipes-core/base-files/base-files/mtx-1/profile b/meta/recipes-core/base-files/base-files/mtx-1/profile
new file mode 100644
index 0000000000..bedf2fc7d8
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/mtx-1/profile
@@ -0,0 +1,25 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+export PATH PS1
+
+umask 022
+
+alias ll="ls -lah"
\ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/nokia770/fstab b/meta/recipes-core/base-files/base-files/nokia770/fstab
new file mode 100644
index 0000000000..7dbae252fb
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/nokia770/fstab
@@ -0,0 +1,6 @@
+rootfs          /               rootfs     defaults,errors=remount-ro,noatime  0 0
+/dev/mmcblk0p1  /media/card     auto       defaults,noauto,noatime,exec,suid   0 0
+tmpfs           /var/volatile   tmpfs      defaults             0  0
+tmpfs           /media/ram      tmpfs      defaults             0  0
+proc            /proc           proc       defaults             0  0
+usbdevfs        /proc/bus/usb   usbdevfs   noauto               0  0
diff --git a/meta/recipes-core/base-files/base-files/nsswitch.conf b/meta/recipes-core/base-files/base-files/nsswitch.conf
new file mode 100644
index 0000000000..06f03d22a6
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/nsswitch.conf
@@ -0,0 +1,19 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+# If you have the `glibc-doc' and `info' packages installed, try:
+# `info libc "Name Service Switch"' for information about this file.
+
+passwd:         compat
+group:          compat
+shadow:         compat
+
+hosts:          files dns
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
+netgroup:       nis
diff --git a/meta/recipes-core/base-files/base-files/poodle/fstab b/meta/recipes-core/base-files/base-files/poodle/fstab
new file mode 100644
index 0000000000..b96b750eb6
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/poodle/fstab
@@ -0,0 +1,13 @@
+/dev/mtdblock2  /       jffs2   rw,noatime      1  1 
+/dev/mtdblock3  /home   jffs2   defaults,noatime        1  2
+proc            /proc   proc    defaults        0  0
+/dev/hda1       /media/cf       auto    defaults,sync,noauto    0  0
+
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+
+tmpfs           /var/volatile   tmpfs   defaults        0  0
+tmpfs           /media/ram      tmpfs   defaults        0  0
diff --git a/meta/recipes-core/base-files/base-files/poodle/usbd b/meta/recipes-core/base-files/base-files/poodle/usbd
new file mode 100644
index 0000000000..40931ee8e9
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/poodle/usbd
@@ -0,0 +1 @@
+usbdmodule=pxa_bi
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
new file mode 100644
index 0000000000..aa1c20fdb8
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -0,0 +1,32 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/bin/vi"                        # needed for packages like cron
+test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+        TZ="UTC"                # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+                                # for an explanation of how to set this to your local timezone.
+        export TZ
+fi
+
+if [ "$HOME" = "/home/root" ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in /etc/profile.d/* ; do
+    . $i
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/meta/recipes-core/base-files/base-files/rotation b/meta/recipes-core/base-files/base-files/rotation
new file mode 100644
index 0000000000..c227083464
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/rotation
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/share/dot.bashrc b/meta/recipes-core/base-files/base-files/share/dot.bashrc
new file mode 100644
index 0000000000..4be63686c2
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/share/dot.bashrc
@@ -0,0 +1,16 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+
+export PS1='\h:\w\$ '
+umask 022
+
+# You may uncomment the following lines if you want `ls' to be colorized:
+# export LS_OPTIONS='--color=auto'
+# eval `dircolors`
+# alias ls='ls $LS_OPTIONS'
+# alias ll='ls $LS_OPTIONS -l'
+# alias l='ls $LS_OPTIONS -lA'
+#
+# Some more alias to avoid making mistakes:
+# alias rm='rm -i'
+# alias cp='cp -i'
+# alias mv='mv -i'
diff --git a/meta/recipes-core/base-files/base-files/share/dot.profile b/meta/recipes-core/base-files/base-files/share/dot.profile
new file mode 100644
index 0000000000..979793e8b5
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/share/dot.profile
@@ -0,0 +1,10 @@
+# ~/.profile: executed by Bourne-compatible login shells.
+
+if [ -f ~/.bashrc ]; then
+  . ~/.bashrc
+fi
+
+# path set by /etc/profile
+# export PATH
+
+mesg n
diff --git a/meta/recipes-core/base-files/base-files/shells b/meta/recipes-core/base-files/base-files/shells
new file mode 100644
index 0000000000..ce39b3dde7
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/shells
@@ -0,0 +1,8 @@
+# /etc/shells: valid login shells
+/bin/sh
+/bin/ash
+/bin/bash
+/bin/dash
+/bin/ksh
+/usr/bin/ksh
+/usr/bin/screen
diff --git a/meta/recipes-core/base-files/base-files/spitz/fstab b/meta/recipes-core/base-files/base-files/spitz/fstab
new file mode 100644
index 0000000000..3d0e508dfd
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/spitz/fstab
@@ -0,0 +1,28 @@
+# don't mount /dev/mtdblock2 since Spitz uses pivot_root
+# or 2.6 directly boots from the hdd
+# /dev/mtdblock2     /            jffs2   rw,noatime              1  1
+rootfs             /            auto    defaults                1  1
+proc               /proc        proc    defaults                0  0
+# we can use a normal var filesystem with a microdrive
+# tmpfs              /var         tmpfs   defaults                0  0
+tmpfs              /media/ram   tmpfs   defaults                0  0
+
+# Compact Flash memory cards
+/dev/hdc1       /media/cf       auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.4
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
+
+#
+# USB
+#
+/dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
+devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
+usbfs           /proc/bus/usb   usbfs           noauto                0  0
+
+#
+# Harddisk
+#
+/dev/hda2           /home           ext3        defaults    0  0
+/dev/hda3           /media/hdd      vfat        defaults    0  0
diff --git a/meta/recipes-core/base-files/base-files/spitz/rotation b/meta/recipes-core/base-files/base-files/spitz/rotation
new file mode 100644
index 0000000000..2a14d60899
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/spitz/rotation
@@ -0,0 +1 @@
+270
\ No newline at end of file
diff --git a/meta/recipes-core/base-files/base-files/sysctl.conf b/meta/recipes-core/base-files/base-files/sysctl.conf
new file mode 100644
index 0000000000..d466a94eed
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/sysctl.conf
@@ -0,0 +1,29 @@
+#
+# Configuration file for setting system variables in /proc
+#
+
+#kernel.domainname = example.com
+#net/ipv4/icmp_echo_ignore_broadcasts=1
+
+# the following stops low-level messages on console
+#kernel.printk = 4 4 1 7
+
+# enable /proc/$pid/maps privacy so that memory relocations are not
+# visible to other users.
+#kernel.maps_protect = 1
+
+##############################################################3
+# Functions previously found in netbase
+#
+
+# Uncomment the next line to enable Spoof protection (reverse-path filter)
+#net.ipv4.conf.default.rp_filter=1
+
+# Uncomment the next line to enable TCP/IP SYN cookies
+#net.ipv4.tcp_syncookies=1
+
+# Uncomment the next line to enable packet forwarding for IPv4
+#net.ipv4.conf.default.forwarding=1
+
+# Uncomment the next line to enable packet forwarding for IPv6
+#net.ipv6.conf.default.forwarding=1
diff --git a/meta/recipes-core/base-files/base-files/tosa/fstab b/meta/recipes-core/base-files/base-files/tosa/fstab
new file mode 100644
index 0000000000..e065e8112e
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/tosa/fstab
@@ -0,0 +1,12 @@
+/dev/mtdblock2  /       jffs2   rw,noatime      1  1 
+/dev/mtdblock3  /home   jffs2   defaults,noatime        1  2
+proc            /proc   proc    defaults        0  0
+/dev/hda1       /media/cf       auto    defaults,sync,noauto    0  0
+
+tmpfs           /var/volatile   tmpfs   defaults        0  0
+tmpfs           /media/ram      tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
diff --git a/meta/recipes-core/base-files/base-files/tosa/usbd b/meta/recipes-core/base-files/base-files/tosa/usbd
new file mode 100644
index 0000000000..8c80044167
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/tosa/usbd
@@ -0,0 +1,5 @@
+# I know that this was created for usb-client stuff
+# but tosa/2.6 need (un)loading USB Host module
+# on suspend/resume and this way is simplest one ;)
+
+usbdmodule=ohci-hcd
diff --git a/meta/recipes-core/base-files/base-files/usbd b/meta/recipes-core/base-files/base-files/usbd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files/usbd
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
new file mode 100644
index 0000000000..a8f092db09
--- /dev/null
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -0,0 +1,177 @@
+DESCRIPTION = "Miscellaneous files for the base system."
+SECTION = "base"
+PRIORITY = "required"
+PR = "r64"
+LICENSE = "GPLv2"
+
+SRC_URI = "file://rotation \
+           file://nsswitch.conf \
+           file://motd \
+           file://inputrc \
+           file://host.conf \
+           file://profile \
+           file://shells \
+           file://fstab \
+           file://filesystems \
+           file://issue.net \
+           file://issue \
+           file://usbd \
+           file://sysctl.conf \
+           file://share/dot.bashrc \
+           file://share/dot.profile \
+           file://licenses/BSD \
+           file://licenses/GPL-2 \
+           file://licenses/GPL-3 \
+           file://licenses/LGPL-2 \
+           file://licenses/LGPL-2.1 \
+           file://licenses/LGPL-3 \
+           file://licenses/GFDL-1.2 \
+           file://licenses/Artistic"
+S = "${WORKDIR}"
+
+docdir_append = "/${P}"
+dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
+dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
+dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
+           ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \
+           ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
+           ${libdir} ${sbindir} ${datadir} \
+           ${datadir}/common-licenses ${datadir}/dict ${infodir} \
+           ${mandir} ${datadir}/misc ${localstatedir} \
+           ${localstatedir}/backups ${localstatedir}/lib \
+           /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
+           ${localstatedir}/volatile ${localstatedir}/volatile/cache \
+           ${localstatedir}/volatile/lock/subsys \
+           ${localstatedir}/volatile/log \
+           ${localstatedir}/volatile/run \
+           /mnt /media /media/card /media/cf /media/net /media/ram \
+           /media/union /media/realroot /media/hdd \
+           /media/mmc1"
+volatiles = "cache run log lock tmp"
+conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
+             ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
+             ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
+             ${sysconfdir}/default"
+
+#
+# set standard hostname, might be a candidate for a DISTRO variable? :M:
+#
+hostname = "openembedded"
+hostname_slugos = "nslu2"
+hostname_mnci = "MNCI"
+hostname_rt3000 = "MNRT"
+hostname_jlime = "JLime"
+
+do_install () {
+        for d in ${dirs755}; do
+                install -m 0755 -d ${D}$d
+        done
+        for d in ${dirs1777}; do
+                install -m 1777 -d ${D}$d
+        done
+        for d in ${dirs2775}; do
+                install -m 2755 -d ${D}$d
+        done
+        for d in ${volatiles}; do
+                ln -sf volatile/$d ${D}/${localstatedir}/$d
+        done
+        for d in card cf net ram; do
+                ln -sf /media/$d ${D}/mnt/$d
+        done
+
+        if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
+                echo ${MACHINE} > ${D}${sysconfdir}/hostname
+        else
+                echo ${hostname} > ${D}${sysconfdir}/hostname
+        fi
+
+        if [ -n "${DISTRO_NAME}" ]; then
+                echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue
+                echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net
+                if [ -n "${DISTRO_VERSION}" ]; then
+                        echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
+                        echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
+                fi
+                echo "\n \l" >> ${D}${sysconfdir}/issue
+                echo >> ${D}${sysconfdir}/issue
+                echo "%h"    >> ${D}${sysconfdir}/issue.net
+                echo >> ${D}${sysconfdir}/issue.net
+        else
+               install -m 0644 ${WORKDIR}/issue ${D}${sysconfdir}/issue
+               install -m 0644 ${WORKDIR}/issue.net ${D}${sysconfdir}/issue.net
+        fi
+
+        rotation=`cat ${WORKDIR}/rotation`
+        if [ "$rotation" != "0" ]; then
+                install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation
+        fi
+
+        install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/
+        install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
+        install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
+        install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
+        install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
+        install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
+        install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
+        install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
+        install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
+        install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
+        install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
+        install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
+
+        for license in BSD GPL-2 LGPL-2 LGPL-2.1 Artistic GPL-3 LGPL-3 GFDL-1.2; do
+                install -m 0644 ${WORKDIR}/licenses/$license ${D}${datadir}/common-licenses/
+        done
+
+        ln -sf /proc/mounts ${D}${sysconfdir}/mtab
+}
+
+
+do_install_append_mnci () {
+        rmdir ${D}/tmp
+        ln -s var/tmp ${D}/tmp
+}
+
+do_install_append_nylon() {
+        printf "" "" >${D}${sysconfdir}/resolv.conf
+        rm -r ${D}/mnt/*
+        rm -r ${D}/media
+        rm -rf ${D}/tmp
+        ln -sf /var/tmp ${D}/tmp
+}
+
+do_install_append_slugos() {
+        printf "" "" >${D}${sysconfdir}/resolv.conf
+        rm -r ${D}/mnt/*
+        rmdir ${D}/home/root
+        install -m 0755 -d ${D}/root
+        ln -s ../root ${D}/home/root
+}
+
+do_install_append_netbook-pro () {
+        mkdir -p ${D}/initrd
+}
+
+PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg"
+FILES_${PN} = "/"
+FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
+
+# M&N specific packaging
+PACKAGE_ARCH_mnci = "mnci"
+PACKAGE_ARCH_rt3000 = "rt3000"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Unslung distribution specific packaging
+
+PACKAGES_unslung = "${PN}-unslung"
+PACKAGE_ARCH_${PN}-unslung = "nslu2"
+RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk"
+RPROVIDES_${PN}-unslung = "${PN}"
+
+FILES_${PN}-unslung = ""
+
+CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
+CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
new file mode 100644
index 0000000000..8bfd757929
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
@@ -0,0 +1,13 @@
+# set correct uid/gid for mysql, from OE (8836cd807198c224ed23b05fa4f708f096881b27).
+# however poky doesn't include mysql so far. Remove it from patch list, but keep
+# this patch for a while
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+--- base-passwd/group.master.orig       2005-07-08 06:36:07.717990112 +0200
++++ base-passwd/group.master    2005-07-08 06:36:32.000000000 +0200
+@@ -36,4 +36,5 @@
+ staff:*:50:
+ games:*:60:
+ users:*:100:
++mysql:*:64001:
+ nogroup:*:65534:
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
new file mode 100644
index 0000000000..52650166f8
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
@@ -0,0 +1,20 @@
+# use /bin/sh instead of /bin/bash, since the latter may not be included in
+# some images such as minimal
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+#
+# remove "*" for root since we don't have a /etc/shadow so far.
+#
+# by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- base-passwd/passwd.master~nobash
++++ base-passwd/passwd.master
+@@ -1,4 +1,4 @@
+-root:*:0:0:root:/root:/bin/bash
++root::0:0:root:/root:/bin/sh
+ daemon:*:1:1:daemon:/usr/sbin:/bin/sh
+ bin:*:2:2:bin:/bin:/bin/sh
+ sys:*:3:3:sys:/dev:/bin/sh
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
new file mode 100644
index 0000000000..87c4655a04
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
@@ -0,0 +1,11 @@
+# poky uses /home/root instead of /root.
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+--- base-passwd/passwd.master.orig      2005-07-08 06:26:22.000000000 +0200
++++ base-passwd/passwd.master   2005-07-08 06:31:58.000000000 +0200
+@@ -1,4 +1,4 @@
+-root::0:0:root:/root:/bin/sh
++root::0:0:root:/home/root:/bin/sh
+ daemon:*:1:1:daemon:/usr/sbin:/bin/sh
+ bin:*:2:2:bin:/bin:/bin/sh
+ sys:*:3:3:sys:/dev:/bin/sh
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
new file mode 100644
index 0000000000..f0ca8e6280
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "Base system password/group files."
+SECTION = "base"
+PR = "r0"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
+           file://nobash.patch \
+           file://root-home.patch"
+
+S = "${WORKDIR}/base-passwd"
+
+inherit autotools
+
+do_install () {
+        install -d -m 755 ${D}${sbindir}
+        install -p -m 755 update-passwd ${D}${sbindir}/
+        install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8
+        install -p -m 644 man/update-passwd.8 ${D}${mandir}/man8/
+        install -p -m 644 man/update-passwd.pl.8 \
+                ${D}${mandir}/pl/man8/update-passwd.8
+        gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/*
+        install -d -m 755 ${D}${datadir}/base-passwd
+        install -p -m 644 passwd.master ${D}${datadir}/base-passwd/
+        install -p -m 644 group.master ${D}${datadir}/base-passwd/
+
+        install -d -m 755 ${D}${docdir}/${PN}
+        install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
+        gzip -9 ${D}${docdir}/${PN}/*
+        install -p -m 644 README ${D}${docdir}/${PN}/
+        install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
+}
+
+do_install_append_openmn() {
+        echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
+}
+
+
+pkg_postinst () {
+        set -e
+
+        if [ ! -e $D${sysconfdir}/passwd ] ; then
+                cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
+        fi
+
+        if [ ! -e $D${sysconfdir}/group ] ; then
+                cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
+        fi
+        exit 0
+}
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch
new file mode 100644
index 0000000000..803dc411d8
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch
@@ -0,0 +1,22 @@
+# copy commit message from OE as the patch comment:
+#    commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d
+#    Author: Valentin Longchamp <valentin.longchamp@epfl.ch>
+#    Date:   Mon Dec 8 14:43:23 2008 +0100
+
+#    busybox: added support for 921600 speed of serial line
+#
+# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+
+diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
+--- busybox-1.7.2/libbb/speed_table.c   2007-09-03 13:48:41.000000000 +0200
++++ busybox-1.7.2-921600/libbb/speed_table.c    2008-10-09 16:23:26.269592899 +0200
+@@ -52,6 +52,9 @@ static const struct speed_map speeds[] =
+ #ifdef B460800
+        {B460800, 460800/256 + 0x8000U},
+ #endif
++#ifdef B921600
++       {B921600, 921600/256 + 0x8000U},
++#endif
+ };
+ 
+ enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
new file mode 100644
index 0000000000..041aa6c54c
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
@@ -0,0 +1,35 @@
+# copy commit message from OE as the patch comment:
+#    commit 98c24291aa165f53423c27ae033831ce0b3bb676
+#    Author: Roman I Khimov <khimov@altell.ru>
+#    Date:   Thu Mar 26 23:03:58 2009 +0000
+#
+#    busybox: update appletlib dependency patch
+#    
+#    Previous version still failed from time to time on clean-start builds
+#    with 4 bitbake threads and '-j16'. Building busybox as sole target worked
+#    well.
+#    
+#    The reason is that previous version introduced a race between applets make
+#    processes spawned from top-level Makefile and from libbb Makefile.
+#    
+#    Fix it with high-level dependency that doesn't create races.
+#    
+#    Signed-off-by: Koen Kooi <koen@openembedded.org>
+#
+# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+
+Index: busybox-1.13.2/Makefile
+===================================================================
+--- busybox-1.13.2.orig/Makefile        2009-03-19 15:44:37.419270265 +0300
++++ busybox-1.13.2/Makefile     2009-03-19 15:45:57.737521296 +0300
+@@ -471,6 +471,10 @@
+                util-linux/ \
+                util-linux/volume_id/ \
+ 
++# Lib interdeps
++# libbb uses headers generated in applets
++libbb: applets
++
+ endif # KBUILD_EXTMOD
+ 
+ ifeq ($(dot-config),1)
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/defconfig b/meta/recipes-core/busybox/busybox-1.16.2/defconfig
new file mode 100644
index 0000000000..431da94dd2
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/defconfig
@@ -0,0 +1,924 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.16.2
+# Tue Jul  6 14:52:48 2010
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_DESKTOP is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+# CONFIG_SHA256SUM is not set
+# CONFIG_SHA512SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+# CONFIG_SHOWKEY is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_FIRST_SYSTEM_ID=0
+CONFIG_LAST_SYSTEM_ID=0
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+# CONFIG_MKFS_EXT2 is not set
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+# CONFIG_GETOPT is not set
+# CONFIG_FEATURE_GETOPT_LONG is not set
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MAN is not set
+CONFIG_MICROCOM=y
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_UDHCPD=y
+# CONFIG_DHCPRELAY is not set
+CONFIG_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDPSVD is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch
new file mode 100644
index 0000000000..bc9b427ea9
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch
@@ -0,0 +1,20 @@
+# copy commit message from OE as the patch comment:
+#    commit 5a0e1d473ca7aca5ffefffe9a2ec44ae7a1f35bc
+#    Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
+#    Date:   Wed Feb 11 22:40:21 2009 +0100
+#
+#    busybox: fix tar problem with filenames that are exactly 100 bytes
+#
+# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+
+--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig  2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.2/archival/libunarchive/get_header_tar.c       2009-02-11 22:34:52.000000000 +0100
+@@ -252,6 +252,8 @@
+                        file_header->name = concat_path_file(tar.prefix, tar.name);
+                } else
+                        file_header->name = xstrdup(tar.name);
++               if (strlen(file_header->name) > 100) 
++                       file_header->name[100] = 0;
+        }
+ 
+        /* Set bits 12-15 of the files mode */
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
new file mode 100644
index 0000000000..bedb974432
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
@@ -0,0 +1,27 @@
+# copy commit message from OE as the patch comment:
+#    commit f1b326c83be0d95571b991d8d2ee239982380b6b
+#    Author: Martin Jansa <Martin.Jansa@gmail.com>
+#    Date:   Fri Apr 30 15:37:38 2010 +0200
+#
+#    busybox: add patch for installing run-parts to /usr/bin/ instead of /bin
+#    
+#    * otherwise debianutils install will fail with
+#      update-alternatives: Error: cannot register alternative run-parts to /usr/bin/run-parts since it is 
+#    
+#    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+#
+# Poky doesn't have debianutils, but let's keep it for safety
+# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+
+diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
+--- busybox-1.15.3.orig//include/applets.h      2009-12-12 22:13:28.000000000 +0100
++++ busybox-1.15.3/include/applets.h    2010-04-30 15:35:40.000000000 +0200
+@@ -323,7 +323,7 @@
+ IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+ IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
++IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts))
+ IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+ IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
+ IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch b/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
new file mode 100644
index 0000000000..89eeb425ad
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
@@ -0,0 +1,54 @@
+# copy commit message from OE as the patch comment:
+#    commit ec4da6df3ad5b8b03446d0dda9c50a2439ae325a
+#    Author: Denys Dmytriyenko <denis@denix.org>
+#    Date:   Wed Feb 4 11:43:18 2009 -0500
+#
+#    busybox: fix nfsroot issues with resetting IP and deleting routes
+#
+# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+Index: busybox-1.15.3/examples/udhcp/simple.script
+===================================================================
+--- busybox-1.15.3.orig/examples/udhcp/simple.script    2010-06-27 12:17:14.116876946 +0200
++++ busybox-1.15.3/examples/udhcp/simple.script 2010-06-27 12:18:38.607868533 +0200
+@@ -10,10 +10,17 @@
+ BROADCAST="broadcast +"
+ [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+ 
++# return 0 if root is mounted on a network filesystem
++root_is_nfs() {
++       grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
++}
++
+ case "$1" in
+        deconfig)
++               if ! root_is_nfs ; then
+                echo "Setting IP address 0.0.0.0 on $interface"
+-               ifconfig $interface 0.0.0.0
++                       ifconfig $interface 0.0.0.0
++               fi
+                ;;
+ 
+        renew|bound)
+@@ -21,15 +28,17 @@
+                ifconfig $interface $ip $NETMASK $BROADCAST
+ 
+                if [ -n "$router" ] ; then
+-                       echo "Deleting routers"
+-                       while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+-                               :
+-                       done
++                       if ! root_is_nfs ; then
++                               echo "Deleting routers"
++                               while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
++                                       :
++                               done
++                       fi
+ 
+                        metric=0
+                        for i in $router ; do
+                                echo "Adding router $i"
+-                               route add default gw $i dev $interface metric $((metric++))
++                               route add default gw $i dev $interface metric $((metric++)) 2>/dev/null
+                        done
+                fi
+ 
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch
new file mode 100644
index 0000000000..81bca634af
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch
@@ -0,0 +1,22 @@
+# copy commit message from OE as the patch comment
+#   commit c9bb6478a873d6de4c8a0e712435ac9a658a345d
+#   Author: Holger Schurig <schurig@mn-solutions.de>
+#   Date:   Wed Sep 29 08:29:58 2004 +0000
+#
+#   udhcpscript: fixes the "deleting routers" error message in case of no existing default routes
+#
+# Above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+
+Index: busybox-1.15.1/examples/udhcp/simple.script
+===================================================================
+--- busybox-1.15.1.orig/examples/udhcp/simple.script    2009-09-12 17:55:36.000000000 +0200
++++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:51:06.599693412 +0200
+@@ -22,7 +22,7 @@ case "$1" in
+ 
+                if [ -n "$router" ] ; then
+                        echo "Deleting routers"
+-                       while route del default gw 0.0.0.0 dev $interface ; do
++                       while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+                                :
+                        done
+ 
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
new file mode 100644
index 0000000000..8c258135c8
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -0,0 +1,140 @@
+DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides minimalist replacements for most of the utilities you usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox generally have fewer options than their full-featured GNU cousins; however, the options that are included provide the expected functionality and behave very much like their GNU counterparts. BusyBox provides a fairly complete POSIX environment for any small or embedded system."
+HOMEPAGE = "http://www.busybox.net"
+BUGTRACKER = "https://bugs.busybox.net/"
+# bzip2 applet in busybox is based on lightly-modified bzip2 source
+LICENSE = "GPLv2+ & bzip2"
+SECTION = "base"
+PRIORITY = "required"
+
+export EXTRA_CFLAGS = "${CFLAGS}"
+PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
+
+FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
+FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
+
+FILES_${PN} += "${datadir}/udhcpc"
+
+INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
+INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
+INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
+INITSCRIPT_NAME_${PN} = "syslog"
+CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
+
+# This disables the syslog startup links in slugos (see slugos-init)
+INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
+
+inherit cml1 update-rc.d
+
+do_configure () {
+        install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+        cml1_do_configure
+}
+
+do_compile() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        base_do_compile
+}
+
+do_install () {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        install -d ${D}${sysconfdir}/init.d
+        oe_runmake "PREFIX=${D}" install
+        cp -pPR ${S}/_install/* ${D}/
+
+        # Move everything to /busybox (not supposed to end up in any package)
+        install -d ${D}/busybox
+        ls ${D} -R
+
+        cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+        # Move the busybox binary back to /bin
+        install -d ${D}${base_bindir}
+        mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+        # Move back the sh symlink
+        test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+        install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+        install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+        if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+                # Move crond back to /usr/sbin/crond
+                install -d ${D}${sbindir}
+                mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+                install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+        fi
+        if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+                # Move httpd back to /usr/sbin/httpd
+                install -d ${D}${sbindir}
+                mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+                install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+                install -d ${D}/srv/www
+        fi
+        if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
+                # Move udhcpd back to /usr/sbin/udhcpd
+                install -d ${D}${sbindir}
+                mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+                install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+        fi
+        if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+                # Move hwclock back to /sbin/hwclock
+                install -d ${D}${base_sbindir}
+                mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+                install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+        fi
+        if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
+                # Move dhcpc back to /usr/sbin/udhcpc
+                install -d ${D}${base_sbindir}
+                mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+                install -d ${D}${sysconfdir}/udhcpc.d
+                install -d ${D}${datadir}/udhcpc
+                install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+                install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+        fi
+
+        install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
+pkg_postinst_${PN} () {
+        # If we are not making an image we create links for the utilities that doesn't exist
+        # so the update-alternatives script will get the utilities it needs
+        # (update-alternatives have no problem replacing links later anyway)
+        test -n 2> /dev/null || alias test='busybox test'
+        if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
+        
+        # This adds the links, remember that this has to work when building an image too, hence the $D
+        while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
+}
+
+pkg_prerm_${PN} () {
+        # This is so you can make busybox commit suicide - removing busybox with no other packages
+        # providing its files, this will make update-alternatives work, but the update-rc.d part
+        # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+        tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+        ln -s /bin/busybox $tmpdir/[
+        ln -s /bin/busybox $tmpdir/test
+        ln -s /bin/busybox $tmpdir/head
+        ln -s /bin/busybox $tmpdir/sh
+        ln -s /bin/busybox $tmpdir/basename
+        ln -s /bin/busybox $tmpdir/echo
+        ln -s /bin/busybox $tmpdir/mv
+        ln -s /bin/busybox $tmpdir/ln
+        ln -s /bin/busybox $tmpdir/dirname
+        ln -s /bin/busybox $tmpdir/rm
+        ln -s /bin/busybox $tmpdir/sed
+        ln -s /bin/busybox $tmpdir/sort
+        export PATH=$PATH:$tmpdir
+
+        while read link
+        do
+                case "$link" in
+                        /*/*/*) to="../../bin/busybox";;
+                        /bin/*) to="busybox";;
+                        /*/*) to="../bin/busybox";;
+                esac
+                bn=`basename $link`
+                sh /usr/bin/update-alternatives --remove $bn $to
+        done </etc/busybox.links
+}
diff --git a/meta/recipes-core/busybox/busybox_1.16.2.bb b/meta/recipes-core/busybox/busybox_1.16.2.bb
new file mode 100644
index 0000000000..0952f4ddb0
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox_1.16.2.bb
@@ -0,0 +1,24 @@
+require busybox.inc
+PR = "r0"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
+           file://udhcpscript.patch \
+           file://udhcpc-fix-nfsroot.patch \
+           file://B921600.patch \
+           file://get_header_tar.patch \
+           file://busybox-appletlib-dependency.patch \
+           file://run-parts.in.usr-bin.patch \
+           file://find-touchscreen.sh \
+           file://busybox-cron \
+           file://busybox-httpd \
+           file://busybox-udhcpd \
+           file://default.script \
+           file://simple.script \
+           file://hwclock.sh \
+           file://mount.busybox \
+           file://syslog \
+           file://syslog.conf \
+           file://umount.busybox \
+           file://defconfig"
+
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
diff --git a/meta/recipes-core/busybox/files/busybox-cron b/meta/recipes-core/busybox/files/busybox-cron
new file mode 100755
index 0000000000..f0e6b15629
--- /dev/null
+++ b/meta/recipes-core/busybox/files/busybox-cron
@@ -0,0 +1,39 @@
+#!/bin/sh
+DAEMON=/usr/sbin/crond
+NAME=crond
+DESC="Busybox Periodic Command Scheduler"
+ARGS="-c /etc/cron/crontabs"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+        echo -n "starting $DESC: $NAME... "
+        start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
+        echo "done."
+        ;;
+    stop)
+        echo -n "stopping $DESC: $NAME... "
+        start-stop-daemon -K -n $NAME
+        echo "done."
+        ;;
+    restart)
+        echo -n "restarting $DESC: $NAME... "
+        $0 stop
+        $0 start
+        echo "done."
+        ;;
+    reload)
+        echo -n "reloading $DESC: $NAME... "
+        killall -HUP $(basename ${DAEMON})
+        echo "done."
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/busybox/files/busybox-httpd b/meta/recipes-core/busybox/files/busybox-httpd
new file mode 100755
index 0000000000..c8348e54a7
--- /dev/null
+++ b/meta/recipes-core/busybox/files/busybox-httpd
@@ -0,0 +1,44 @@
+#!/bin/sh
+DAEMON=/usr/sbin/httpd
+NAME=httpd
+DESC="Busybox HTTP Daemon"
+HTTPROOT="/srv/www"
+ARGS="-h $HTTPROOT"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+        echo -n "starting $DESC: $NAME... "
+        if [ ! -d $HTTPROOT ]; then
+                echo "$HTTPROOT is missing."
+                exit 1
+        fi
+        start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
+        echo "done."
+        ;;
+    stop)
+        echo -n "stopping $DESC: $NAME... "
+        start-stop-daemon -K -n $NAME
+        echo "done."
+        ;;
+    restart)
+        echo "restarting $DESC: $NAME... "
+        $0 stop
+        $0 start
+        echo "done."
+        ;;
+    reload)
+        echo -n "reloading $DESC: $NAME... "
+        killall -HUP $(basename ${DAEMON})
+        echo "done."
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/busybox/files/busybox-udhcpd b/meta/recipes-core/busybox/files/busybox-udhcpd
new file mode 100755
index 0000000000..c43903e8dc
--- /dev/null
+++ b/meta/recipes-core/busybox/files/busybox-udhcpd
@@ -0,0 +1,43 @@
+#!/bin/sh
+DAEMON=/usr/sbin/udhcpd
+NAME=udhcpd
+DESC="Busybox UDHCP Server"
+ARGS="/etc/udhcpd.conf"
+
+test -f $DAEMON || exit 1
+
+set -e
+
+case "$1" in
+    start)
+        echo -n "starting $DESC: $NAME... "
+        if [ ! -f /etc/udhcpd.conf ]; then
+                echo "error: /etc/udhcpd.conf is missing."
+                exit 1
+        fi
+        /sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
+        echo "done."
+        ;;
+    stop)
+        echo -n "stopping $DESC: $NAME... "
+        /sbin/start-stop-daemon -K -n $NAME
+        echo "done."
+        ;;
+    restart)
+        echo "restarting $DESC: $NAME... "
+        $0 stop
+        $0 start
+        echo "done."
+        ;;
+    reload)
+        echo -n "reloading $DESC: $NAME... "
+        killall -HUP $(basename ${DAEMON})
+        echo "done."
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/busybox/files/default.script b/meta/recipes-core/busybox/files/default.script
new file mode 100644
index 0000000000..f2ac987a27
--- /dev/null
+++ b/meta/recipes-core/busybox/files/default.script
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec run-parts -a "$1" /etc/udhcpc.d
+
diff --git a/meta/recipes-core/busybox/files/find-touchscreen.sh b/meta/recipes-core/busybox/files/find-touchscreen.sh
new file mode 100644
index 0000000000..1582ea891c
--- /dev/null
+++ b/meta/recipes-core/busybox/files/find-touchscreen.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
+        ln -sf /dev/input/$MDEV /dev/input/touchscreen0
+fi
+
+if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then
+        ln -sf /dev/input/$MDEV /dev/input/touchscreen0
+fi
diff --git a/meta/recipes-core/busybox/files/hwclock.sh b/meta/recipes-core/busybox/files/hwclock.sh
new file mode 100644
index 0000000000..2e50425ba8
--- /dev/null
+++ b/meta/recipes-core/busybox/files/hwclock.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          hwclock
+# Required-Start:    
+# Required-Stop:     $local_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: Set system clock
+# Description:       Set system clock to hardware clock, according to the UTC
+#                    setting in /etc/default/rcS (see also rcS(5)).
+### END INIT INFO
+#
+# WARNING:      If your hardware clock is not in UTC/GMT, this script
+#               must know the local time zone. This information is
+#               stored in /etc/localtime. This might be a problem if
+#               your /etc/localtime is a symlink to something in
+#               /usr/share/zoneinfo AND /usr isn't in the root
+#               partition! The workaround is to define TZ either
+#               in /etc/default/rcS, or in the proper place below.
+
+[ ! -x /sbin/hwclock ] && exit 0
+
+. /etc/default/rcS
+
+case "$1" in
+        start)
+                if [ "$VERBOSE" != no ]
+                then
+                        echo "System time was `date`."
+                        echo "Setting the System Clock using the Hardware Clock as reference..."
+                fi
+
+                if [ "$HWCLOCKACCESS" != no ]
+                then
+                        if [ -z "$TZ" ]
+                        then
+                           hwclock --hctosys
+                        else
+                           TZ="$TZ" hwclock --hctosys
+                        fi
+                fi
+
+                if [ "$VERBOSE" != no ]
+                then
+                        echo "System Clock set. System local time is now `date`."
+                fi
+                ;;
+        stop|restart|reload|force-reload)
+                #
+                # Updates the Hardware Clock with the System Clock time.
+                # This will *override* any changes made to the Hardware Clock.
+                #
+                # WARNING: If you disable this, any changes to the system
+                #          clock will not be carried across reboots.
+                #
+                if [ "$VERBOSE" != no ]
+                then
+                        echo "Saving the System Clock time to the Hardware Clock..."
+                fi
+                if [ "$HWCLOCKACCESS" != no ]
+                then
+                        hwclock --systohc
+                fi
+                if [ "$VERBOSE" != no ]
+                then
+                        echo "Hardware Clock updated to `date`."
+                fi
+                exit 0
+                ;;
+        show)
+                if [ "$HWCLOCKACCESS" != no ]
+                then
+                        hwclock --show
+                fi
+                ;;
+        *)
+                echo "Usage: hwclock.sh {start|stop|show|reload|restart}" >&2
+                echo "       start sets kernel (system) clock from hardware (RTC) clock" >&2
+                echo "       stop and reload set hardware (RTC) clock from kernel (system) clock" >&2
+                exit 1
+                ;;
+esac
diff --git a/meta/recipes-core/busybox/files/mount.busybox b/meta/recipes-core/busybox/files/mount.busybox
new file mode 100755
index 0000000000..fef945b7b2
--- /dev/null
+++ b/meta/recipes-core/busybox/files/mount.busybox
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /bin/busybox mount $@
diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script
new file mode 100644
index 0000000000..5cc21b9de2
--- /dev/null
+++ b/meta/recipes-core/busybox/files/simple.script
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# udhcpc script edited by Tim Riker <Tim@Rikers.org>
+
+[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
+
+RESOLV_CONF="/etc/resolv.conf"
+[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+[ -n "$subnet" ] && NETMASK="netmask $subnet"
+
+# return 0 if root is mounted on a network filesystem
+root_is_nfs() {
+        grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
+}
+
+have_bin_ip=0
+if [ -x /bin/ip ]; then
+  have_bin_ip=1
+fi
+
+case "$1" in
+        deconfig)
+                if ! root_is_nfs ; then
+                        if [ $have_bin_ip -eq 1 ]; then
+                                ip addr flush dev $interface
+                                ip link set dev $interface up
+                        else
+                                /sbin/ifconfig $interface 0.0.0.0
+                        fi
+                fi
+                ;;
+
+        renew|bound)
+                if [ $have_bin_ip -eq 1 ]; then
+                        ip addr add dev $interface local $ip/$mask $BROADCAST
+                else
+                        /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
+                fi
+
+                if [ -n "$router" ] ; then
+                        if ! root_is_nfs ; then
+                                if [ $have_bin_ip -eq 1 ]; then
+                                        while ip route del default 2>/dev/null ; do
+                                                :
+                                        done
+                                else
+                                        while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+                                                :
+                                        done
+                                fi
+                        fi
+
+                        metric=0
+                        for i in $router ; do
+                                if [ $have_bin_ip -eq 1 ]; then
+                                        ip route add default via $i metric $((metric++))
+                                else
+                                        route add default gw $i dev $interface metric $((metric++)) 2>/dev/null
+                                fi
+                        done
+                fi
+
+                echo -n > $RESOLV_CONF
+                [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
+                for i in $dns ; do
+                        echo adding dns $i
+                        echo nameserver $i >> $RESOLV_CONF
+                done
+                ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
new file mode 100644
index 0000000000..9edaa15053
--- /dev/null
+++ b/meta/recipes-core/busybox/files/syslog
@@ -0,0 +1,74 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             sysklogd
+# Required-Start:       $remote_fs $time
+# Required-Stop:        $remote_fs $time
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    System logger
+### END INIT INFO
+
+set -e
+
+if [ -f /etc/syslog.conf ]; then
+        . /etc/syslog.conf
+        LOG_LOCAL=0
+        LOG_REMOTE=0
+        for D in $DESTINATION; do
+                if [ "$D" = "buffer" ]; then
+                        SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE"
+                        LOG_LOCAL=1
+                elif [ "$D" = "file" ]; then
+                        if [ -n "$LOGFILE" ]; then
+                                SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
+                        fi
+                        if [ -n "$ROTATESIZE" ]; then
+                                SYSLOG_ARGS="$SYSLOG_ARGS -s $ROTATESIZE"
+                        fi
+                        if [ -n "$ROTATEGENS" ]; then
+                                SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
+                        fi
+                        LOCAL=0
+                elif [ "$D" = "remote" ]; then
+                        SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
+                        LOG_REMOTE=1
+                fi
+        done
+        if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
+                SYSLOG_ARGS="$SYSLOG_ARGS -L"
+        fi
+        if [ -n "$MARKINT" ]; then
+                SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT"
+        fi
+        if [ "$REDUCE" = "yes" ]; then
+                SYSLOG_ARGS="$SYSLOG_ARGS -S"
+        fi
+else
+        # default: log to 16K shm circular buffer
+        SYSLOG_ARGS="-C"
+fi
+
+case "$1" in
+  start)
+        echo -n "Starting syslogd/klogd: "
+        start-stop-daemon -S -b -n syslogd -a /sbin/syslogd -- -n $SYSLOG_ARGS
+        start-stop-daemon -S -b -n klogd -a /sbin/klogd -- -n
+        echo "done"
+        ;;
+  stop)
+        echo -n "Stopping syslogd/klogd: "
+        start-stop-daemon -K -n syslogd
+        start-stop-daemon -K -n klogd
+        echo "done"
+        ;;
+  restart)
+        $0 stop
+        $0 start
+        ;;
+  *)
+        echo "Usage: syslog { start | stop | restart }" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/busybox/files/syslog.conf b/meta/recipes-core/busybox/files/syslog.conf
new file mode 100644
index 0000000000..d4a0e02f5b
--- /dev/null
+++ b/meta/recipes-core/busybox/files/syslog.conf
@@ -0,0 +1,9 @@
+DESTINATION="buffer"            # log destinations (buffer file remote)
+MARKINT=20                      # intervall between --mark-- entries
+LOGFILE=/var/log/messages       # where to log (file)
+REMOTE=loghost:514              # where to log (syslog remote)
+REDUCE=no                       # reduce-size logging
+#ROTATESIZE=0                   # rotate log if grown beyond X [kByte] (incompatible with busybox)
+#ROTATEGENS=3                   # keep X generations of rotated logs (incompatible with busybox)
+BUFFERSIZE=64                   # size of circular buffer [kByte]
+FOREGROUND=no                   # run in foreground (don't use!)
diff --git a/meta/recipes-core/busybox/files/umount.busybox b/meta/recipes-core/busybox/files/umount.busybox
new file mode 100755
index 0000000000..f3731626e6
--- /dev/null
+++ b/meta/recipes-core/busybox/files/umount.busybox
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /bin/busybox umount $@
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
new file mode 100644
index 0000000000..f6bd91e3e0
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- console-tools-0.3.2/contrib/codepage.c~codepage
++++ console-tools-0.3.2/contrib/codepage.c
+@@ -229,7 +229,7 @@
+          return 0;
+ 
+         fprintf(stderr, "\
+-Warning: CP format is a hack!\n
++Warning: CP format is a hack!\n\
+          The files produced may or may not be usable!\n");
+ 
+        sprintf(outfile, "%d.cp", CPEntryHeader.codepage);
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
new file mode 100644
index 0000000000..29012fe884
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
@@ -0,0 +1,10 @@
+--- console-tools-0.3.2/kbdtools/showkey.c~compile      1999-08-25 17:20:08.000000000 -0400
++++ console-tools-0.3.2/kbdtools/showkey.c      2004-05-09 03:03:23.000000000 -0400
+@@ -264,7 +264,6 @@
+          break;
+        case cmd_keymap:
+          printf(")\n");
+-       default:
+        }
+     }
+ 
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4
new file mode 100644
index 0000000000..863c9cfa7e
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4
@@ -0,0 +1,17 @@
+#serial AM1
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4
new file mode 100644
index 0000000000..e4d524cf0f
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4
@@ -0,0 +1,370 @@
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 10
+
+dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). Otherwise, a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.
+dnl LIBDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_WITH_NLS],
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH(included-gettext,
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+        CATOBJEXT=NONE
+
+        dnl Add a version number to the cache macros.
+        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
+        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
+
+        AC_CHECK_HEADER(libintl.h,
+          [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+            [AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+               [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+               gt_cv_func_gnugettext_libc=yes,
+               gt_cv_func_gnugettext_libc=no)])
+
+           if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+             AC_CACHE_CHECK([for GNU gettext in libintl],
+               gt_cv_func_gnugettext_libintl,
+               [gt_save_LIBS="$LIBS"
+                LIBS="$LIBS -lintl $LIBICONV"
+                AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+                  [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+                  gt_cv_func_gnugettext_libintl=yes,
+                  gt_cv_func_gnugettext_libintl=no)
+                LIBS="$gt_save_LIBS"])
+           fi
+
+           dnl If an already present or preinstalled GNU gettext() is found,
+           dnl use it.  But if this macro is used in GNU gettext, and GNU
+           dnl gettext is already preinstalled in libintl, we update this
+           dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+           if test "$gt_cv_func_gnugettext_libc" = "yes" \
+              || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+                   && test "$PACKAGE" != gettext; }; then
+             AC_DEFINE(HAVE_GETTEXT, 1,
+               [Define if the GNU gettext() function is already present or preinstalled.])
+
+             if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+               dnl If iconv() is in a separate libiconv library, then anyone
+               dnl linking with libintl{.a,.so} also needs to link with
+               dnl libiconv.
+               INTLLIBS="-lintl $LIBICONV"
+             fi
+
+             gt_save_LIBS="$LIBS"
+             LIBS="$LIBS $INTLLIBS"
+             AC_CHECK_FUNCS(dcgettext)
+             LIBS="$gt_save_LIBS"
+
+             dnl Search for GNU msgfmt in the PATH.
+             AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+               [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+             AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+             dnl Search for GNU xgettext in the PATH.
+             AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+               [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+
+             CATOBJEXT=.gmo
+           fi
+        ])
+
+        if test "$CATOBJEXT" = "NONE"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        INTLOBJS="\$(GETTOBJS)"
+        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+          [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+          [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+        AC_SUBST(MSGFMT)
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        CATOBJEXT=.gmo
+        INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU msgfmt.
+      if test "$GMSGFMT" != ":"; then
+        dnl If it is no GNU msgfmt we define it as : so that the
+        dnl Makefiles still can work.
+        if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+          : ;
+        else
+          AC_MSG_RESULT(
+            [found msgfmt program is not GNU msgfmt; ignore it])
+          GMSGFMT=":"
+        fi
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+        dnl If it is no GNU xgettext we define it as : so that the
+        dnl Makefiles still can work.
+        if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+          : ;
+        else
+          AC_MSG_RESULT(
+            [found xgettext program is not GNU xgettext; ignore it])
+          XGETTEXT=":"
+        fi
+      fi
+
+      dnl We need to process the po/ directory.
+      POSUB=po
+    fi
+    AC_OUTPUT_COMMANDS(
+     [for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[      ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done])
+
+
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+    dnl because plural.y uses bison specific features. It requires at least
+    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+    dnl compile.
+    dnl bison is only needed for the maintainer (who touches plural.y). But in
+    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+    dnl the rule in general Makefile. Now, some people carelessly touch the
+    dnl files or have a broken "make" program, hence the plural.c rule will
+    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+    dnl present or too old.
+    AC_CHECK_PROGS([INTLBISON], [bison])
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+      dnl Found it, now check the version.
+      AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      AC_MSG_RESULT([$ac_prog_version])
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
+    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+  ])
+
+dnl Usage: Just like AM_WITH_NLS, which see.
+AC_DEFUN([AM_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+
+   AM_ICONV
+   AM_LANGINFO_CODESET
+   AM_LC_MESSAGES
+   AM_WITH_NLS([$1],[$2],[$3])
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Enable libtool support if the surrounding package wishes it.
+   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
+   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+  ])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4
new file mode 100644
index 0000000000..5b88ef231c
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4
@@ -0,0 +1,26 @@
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+        [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+        ],
+        ac_cv_gnu_library_2_1=yes,
+        ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4
new file mode 100644
index 0000000000..17237344af
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4
@@ -0,0 +1,69 @@
+#serial AM2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4
new file mode 100644
index 0000000000..18d47a94f7
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4
@@ -0,0 +1,24 @@
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 2
+
+AC_DEFUN([AM_LC_MESSAGES],
+  [if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4
new file mode 100644
index 0000000000..35dc3da1f7
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4
@@ -0,0 +1,51 @@
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 2
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+        ac_cv_path_$1="$ac_dir/$ac_word"
+        break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
new file mode 100644
index 0000000000..f5b75327e9
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
@@ -0,0 +1,46 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- console-tools-0.3.2/configure.in~configure
++++ console-tools-0.3.2/configure.in
+@@ -2,13 +2,14 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ # Initialize
+-AC_INIT(kbdtools/loadkeys.y)
++AC_INIT
++AC_CONFIG_SRCDIR([kbdtools/loadkeys.y])
+ 
+ define(ct_unicodedata_default,/usr/share/unidata/UnicodeData-2.txt)
+ ct_localdatadir_default=/usr/local/share     # iff --enable-localdatadir without specific dir
+ 
+ #AC_CONFIG_AUX_DIR(autoconf)
+-AC_CANONICAL_SYSTEM
++AC_CANONICAL_TARGET([])
+ AM_INIT_AUTOMAKE(console-tools, 0.3.2)
+ 
+ # Defaults
+@@ -25,7 +26,7 @@
+ # i18n stuff
+ ALL_LINGUAS="cs de ru ga fr"
+ AM_GNU_GETTEXT
+-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
++AC_CONFIG_COMMANDS([default-1],[[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]],[[]])
+ 
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
+ 
+@@ -172,10 +173,11 @@
+ AC_SUBST(CHARMAPDIR)
+ 
+ # Output
+-AC_OUTPUT([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
++AC_CONFIG_FILES([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
+   lib/ctutils/Makefile lib/ctlocal/Makefile lib/generic/Makefile
+   fontfiletools/Makefile vttools/Makefile
+   kbdtools/Makefile screenfonttools/Makefile contrib/Makefile
+   include/Makefile include/lct/Makefile compat/Makefile
+   doc/Makefile doc/man/Makefile examples/Makefile
+   po/Makefile.in intl/Makefile])
++AC_OUTPUT
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
new file mode 100644
index 0000000000..47d7ea54b9
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
@@ -0,0 +1,73 @@
+Patch from Matthias Goebl <oe@m.goebl.net>
+Added via OE bugtracker: bug #478
+
+--- console-tools-0.3.2/kbdtools/kbd_mode.c.orig
++++ console-tools-0.3.2/kbdtools/kbd_mode.c
+@@ -29,11 +29,16 @@
+   OPT("-u --unicode  ", _("UTF-8 mode (UNICODE)"));
+   OPT("-s --scancode ", _("scancode mode (RAW)"));
+   OPT("   --mode={8bit,keycode,unicode,scancode} ", _("set mode"));
++  OPT("-r --rate=RATE ", _("set repeat rate (default: 33)"));
++  OPT("-d --delay=DELAY ", _("set repeat delay (default: 250)"));
+ 
+   OPT("-h --help     ", HELPDESC);
+   OPT("-V --version  ", VERSIONDESC);
+ }
+ 
++int rate=-1;
++int delay=-1;
++
+ static int parse_cmdline (int argc, char *argv[])
+ {
+     int mode = -1;
+@@ -46,11 +51,13 @@
+       { "mode"     , required_argument, NULL, 'm' },
+       { "scancode" , no_argument, NULL, 's' },
+       { "unicode"  , no_argument, NULL, 'u' },
++      { "rate"     , required_argument, NULL, 'r' },
++      { "delay"    , required_argument, NULL, 'd' },
+       { NULL, 0, NULL, 0 }
+     };
+     int c;
+ 
+-    while ( (c = getopt_long (argc, argv, "Vhaksu", long_opts, NULL)) != EOF) 
++    while ( (c = getopt_long (argc, argv, "Vhaksur:d:", long_opts, NULL)) != EOF) 
+       switch (c) {
+       case 'h':
+        usage ();
+@@ -58,6 +65,14 @@
+       case 'V':
+        version ();
+        exit(0);
++      case 'r':
++       rate = atoi(optarg);
++       mode = -2;
++       break;
++      case 'd':
++       delay = atoi(optarg);
++       mode = -2;
++       break;
+       case 'a':
+        mode = K_XLATE;
+        break;
+@@ -129,6 +144,20 @@
+       exit(0);
+     }
+   
++  if ( rate != -1 || delay != -1 )
++    {
++    struct kbd_repeat kbd_rep;
++    kbd_rep.delay = delay;
++    kbd_rep.period = rate;
++    if (ioctl(fd, KDKBDREP, &kbd_rep))
++      {
++       fprintf(stderr, progname);
++       perror(_(": error setting keyboard repeat mode\n"));
++       exit(1);
++      }
++    if(mode==-2) exit(0);
++    }
++  
+   if (ioctl(fd, KDSKBMODE, mode))
+     {
+       fprintf(stderr, progname);
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
new file mode 100644
index 0000000000..c73d8a3d9e
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
@@ -0,0 +1,47 @@
+Fixing the locale issues isn't enough, console-tools also does a couple of
+other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)),
+
+--- console-tools-0.3.2/lib/cfont/fontstruct.c.ark      2005-05-22 19:12:38.000000000 +0000
++++ console-tools-0.3.2/lib/cfont/fontstruct.c  2005-05-22 19:13:23.000000000 +0000
+@@ -50,8 +50,7 @@
+    * get filesize
+    */
+   
+-  /* FIXME: should not use _fileno ! */
+-  if (fstat(fontfile->_fileno, &stbuf) == -1)
++  if (fstat(fileno(fontfile), &stbuf) == -1)
+     goto rsf_return_error;
+   
+   if (S_ISREG(stbuf.st_mode))
+@@ -211,8 +210,7 @@
+    * get filesize
+    */
+   
+-  /* FIXME: should not use _fileno ! */
+-  if (fstat(fontfile->_fileno, &stbuf) == -1)
++  if (fstat(fileno(fontfile), &stbuf) == -1)
+     goto rfg_return_error;
+   
+   if (S_ISREG(stbuf.st_mode))
+--- console-tools-0.3.2/lib/console/acm.c.ark   2005-05-22 19:17:15.000000000 +0000
++++ console-tools-0.3.2/lib/console/acm.c       2005-05-22 19:17:23.000000000 +0000
+@@ -30,7 +30,7 @@
+   lct_boolean parse_failed = False;
+   lct_boolean is_unicode;
+ 
+-  if (fstat(fp->_fileno, &stbuf)) 
++  if (fstat(fileno(fp), &stbuf)) 
+     perror(_("Cannot stat ACM file")), exit(1);
+ 
+   /* first try a wg15-charmap (glibc) file format */
+--- console-tools-0.3.2/include/lct/local.h.ark 2005-05-22 19:08:54.000000000 +0000
++++ console-tools-0.3.2/include/lct/local.h     2005-05-22 19:09:12.000000000 +0000
+@@ -8,7 +8,7 @@
+ #include <locale.h>
+ 
+ 
+-#ifdef HAVE_LOCALE_H
++#if defined(HAVE_LOCALE_H) && defined(HAVE_LIBINTL_H)
+ # include <libintl.h>
+ # define _(String) gettext (String)
+ # ifdef gettext_noop
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
new file mode 100644
index 0000000000..3c5067f102
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -0,0 +1,49 @@
+SECTION = "base"
+LICENSE = "GPL"
+DESCRIPTION = "Allows you to set-up and manipulate the Linux console."
+DEPENDS = "gettext"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
+           file://codepage.patch;patch=1 \
+           file://configure.patch;patch=1 \
+           file://compile.patch;patch=1 \
+           file://kbdrate.patch;patch=1 \
+           file://uclibc-fileno.patch;patch=1 \
+           file://config/*.m4"
+
+export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \
+                  examples po intl compat"
+
+acpaths = "-I config"
+do_configure_prepend () {
+        mkdir -p config
+        cp ${WORKDIR}/config/*.m4 config/
+}
+
+do_compile () {
+        oe_runmake -C lib
+        oe_runmake 'SUBDIRS=${SUBDIRS}'
+}
+
+inherit autotools
+
+do_install () {
+        autotools_do_install
+        mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN}
+        mv ${D}${bindir}/deallocvt ${D}${bindir}/deallocvt.${PN}
+        mv ${D}${bindir}/openvt ${D}${bindir}/openvt.${PN}
+}
+
+pkg_postinst_${PN} () {
+        update-alternatives --install ${bindir}/chvt chvt chvt.${PN} 100
+        update-alternatives --install ${bindir}/deallocvt deallocvt deallocvt.${PN} 100
+        update-alternatives --install ${bindir}/openvt openvt openvt.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+        update-alternatives --remove chvt chvt.${PN}
+        update-alternatives --remove deallocvt deallocvt.${PN}
+        update-alternatives --remove openvt openvt.${PN}
+}
+
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_svn.bb b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
new file mode 100644
index 0000000000..10e1db8123
--- /dev/null
+++ b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A simple tool to wait for a specific signal over DBus"
+HOMEPAGE = "http://svn.o-hand.com/repos/misc/trunk"
+SECTION = "base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "dbus"
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=dbus-wait;proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools
diff --git a/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init b/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init
new file mode 100644
index 0000000000..4abc4cbf73
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init
@@ -0,0 +1,121 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          dbus
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: D-Bus systemwide message bus
+# Description:       D-Bus is a simple interprocess messaging system, used
+#                    for sending messages between applications.
+### END INIT INFO
+#
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      # TODO: --reverse when busybox supports it
+      run-parts --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch b/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
new file mode 100644
index 0000000000..edb63a5faf
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
@@ -0,0 +1,56 @@
+# Update fix-daemon-install patch to use automake magic to avoid the wrapper scripts
+#
+# original by RP, updated to handle dbus-daemon-launch-helper by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
+Index: dbus-1.2.14/bus/Makefile.am
+===================================================================
+--- dbus-1.2.14.orig/bus/Makefile.am    2009-04-17 20:45:29.000000000 +0100
++++ dbus-1.2.14/bus/Makefile.am 2009-11-13 09:47:24.000000000 +0000
+@@ -149,7 +149,7 @@ endif
+ 
+ ## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
+ ## even when not doing "make check"
+-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
++noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test
+ 
+ bus_test_system_SOURCES=                       \
+        $(XML_SOURCES)                          \
+@@ -171,34 +171,22 @@ bus_test_SOURCES=                         \
+ bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
+ bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
+ 
++dbusdaemondir = $(DBUS_DAEMONDIR)
++dbusdaemon_PROGRAMS = dbus-daemon
++
++libexec_PROGRAMS = dbus-daemon-launch-helper
++
+ ## mop up the gcov files
+ clean-local:
+        /bin/rm *.bb *.bbg *.da *.gcov || true
+ 
+-uninstall-hook:
+-       rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
+-       rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
+-
+ install-data-hook:
+-       if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
+-               $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+-               chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+-       fi
+-       $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+        $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+        $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
+        $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
+        $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
+        $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
+-       $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
+-       if test `id -u` -eq 0; then \
+-               chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
+-               chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
+-       else \
+-               echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
+-               echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
+-       fi
+ 
+ #### Init scripts fun
+ SCRIPT_IN_FILES=messagebus.in \
diff --git a/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch
new file mode 100644
index 0000000000..f5c22af129
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch
@@ -0,0 +1,34 @@
+# avoid to check tmp dir at build time. instead uses hard coded /tmp here
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>
+
+--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in      2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+ 
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+-   DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+-   DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+-   DEFAULT_SOCKET_DIR=$TMP
+-else
+-   DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++#   DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++#   DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++#   DEFAULT_SOCKET_DIR=$TMP
++#else
++#   DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+ 
+ if ! test -z "$with_test_socket_dir" ; then
+    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch b/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch
new file mode 100644
index 0000000000..3065557683
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch
@@ -0,0 +1,17 @@
+# not sure the reason for changing link order. Disable it for now, but keep for a while
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
+
+Index: dbus-glib-0.82/dbus/Makefile.am
+===================================================================
+--- dbus-glib-0.82.orig/dbus/Makefile.am        2009-07-16 15:54:44.000000000 +0100
++++ dbus-glib-0.82/dbus/Makefile.am     2009-12-11 09:27:20.000000000 +0000
+@@ -105,7 +105,7 @@
+ 
+ dbus_bash_completion_helper_SOURCES =                  \
+        dbus-bash-completion-helper.c
+-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la
++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat
+ 
+ 
+ EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
diff --git a/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch
new file mode 100644
index 0000000000..32609b9b9c
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch
@@ -0,0 +1,12 @@
+# disable compiling examples
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
+
+--- dbus-glib-0.70/dbus/Makefile.am.orig        2006-07-23 16:04:43.000000000 +0200
++++ dbus-glib-0.70/dbus/Makefile.am     2006-07-23 16:04:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+ 
+ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 
+ 
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
new file mode 100644
index 0000000000..985c565e8b
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "high level language (glib) binding for dbus"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "AFL2.1 | GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
+                    file://dbus/dbus-glib.h;firstline=7;endline=21;md5=833ef01806b4c524fb3678a16300536f"
+SECTION = "base"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+           file://no-examples.patch"
+
+inherit autotools pkgconfig gettext
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
+
+EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
+                --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
+EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.86.bb b/meta/recipes-core/dbus/dbus-glib_0.86.bb
new file mode 100644
index 0000000000..000146ab7e
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.86.bb
@@ -0,0 +1,3 @@
+require dbus-glib.inc
+
+PR = "r0"
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
new file mode 100644
index 0000000000..90a38e66a9
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -0,0 +1,91 @@
+DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed"
+HOMEPAGE = "http://dbus.freedesktop.org"
+SECTION = "base"
+LICENSE = "AFL2.1 | GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
+                    file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
+DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+           file://tmpdir.patch; \
+           file://fix-install-daemon.patch; \
+           file://dbus-1.init"
+
+inherit autotools pkgconfig gettext update-rc.d
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+DEBIANNAME_${PN} = "dbus-1"
+
+PACKAGES =+ "${PN}-lib"
+
+FILES_${PN} = "${bindir}/dbus-daemon* \
+               ${bindir}/dbus-uuidgen \
+               ${bindir}/dbus-launch \
+               ${bindir}/dbus-cleanup-sockets \
+               ${bindir}/dbus-send \
+               ${bindir}/dbus-monitor \
+               ${libexecdir}/dbus* \
+               ${sysconfdir} \
+               ${datadir}/dbus-1/services \
+               ${datadir}/dbus-1/system-services"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+RRECOMMENDS_${PN}-lib = "${PN}"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+
+pkg_postinst_dbus() {
+        # can't do adduser stuff offline
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+
+        MESSAGEUSER=messagebus
+        MESSAGEHOME=/var/run/dbus
+
+        mkdir -p $MESSAGEHOME || true
+        chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+        chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
+                adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
+                        --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+
+        grep -q netdev: /etc/group || addgroup netdev
+        chmod u+s /usr/libexec/dbus-daemon-launch-helper
+
+        # add volatile after new user/grp are created
+        echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
+        /etc/init.d/populate-volatile.sh update
+}
+
+EXTRA_OECONF_X = "--with-x"
+EXTRA_OECONF_X_virtclass-native = "--without-x"
+
+EXTRA_OECONF = "--disable-tests \
+                --disable-checks \
+                --disable-xml-docs \
+                --disable-doxygen-docs \
+                --disable-libaudit \
+                --with-xml=expat \
+                ${EXTRA_OECONF_X}"
+
+do_install() {
+        autotools_do_install
+
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+do_install_virtclass-native() {
+        autotools_do_install
+
+        # for dbus-glib-native introspection generation
+        install -d ${STAGING_DATADIR_NATIVE}/dbus/
+        # N.B. is below install actually required?
+        install -m 0644 bus/session.conf ${STAGING_DATADIR_NATIVE}/dbus/session.conf
+        
+        # dbus-glib-native and dbus-glib need this xml file
+        ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
+}
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/dbus/dbus_1.2.24.bb b/meta/recipes-core/dbus/dbus_1.2.24.bb
new file mode 100644
index 0000000000..8e3e329fde
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.2.24.bb
@@ -0,0 +1,3 @@
+include dbus.inc
+
+PR = "r1"
diff --git a/meta/recipes-core/dropbear/dropbear-0.52/configure.patch b/meta/recipes-core/dropbear/dropbear-0.52/configure.patch
new file mode 100644
index 0000000000..8d11b23f14
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear-0.52/configure.patch
@@ -0,0 +1,27 @@
+Index: dropbear-0.49/configure.in
+===================================================================
+--- dropbear-0.49.orig/configure.in
++++ dropbear-0.49/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+                        AC_MSG_NOTICE(Not using openpty)
+                else
+                        AC_MSG_NOTICE(Using openpty if available)
+-                       AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)])
++                       AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
+                fi
+        ],
+        [
+                AC_MSG_NOTICE(Using openpty if available)
+-               AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)])
++               AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
+        ]
+ )
++
++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then
++       AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)
++       no_ptc_check=yes
++       no_ptmx_check=yes
++fi
+                
+ 
+ AC_ARG_ENABLE(syslog,
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
new file mode 100644
index 0000000000..1d78d5c59b
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -0,0 +1,80 @@
+DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
+HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
+SECTION = "console/network"
+
+# some files are from other projects and have others license terms:
+#   public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c"
+
+DEPENDS = "zlib"
+PROVIDES = "ssh sshd"
+RPROVIDES = "ssh sshd"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
+                 file://urandom-xauth-changes-to-options.h.patch \
+                 file://configure.patch \
+                 file://fix-2kb-keys.patch \
+                 file://allow-nopw.patch;apply=no \
+                 file://init"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = " -I. "
+LD = "${CC}"
+
+SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
+BINCOMMANDS = "dbclient ssh scp"
+EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
+
+DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
+
+do_configure_prepend() {
+        if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" = "debug" ]; then
+                oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
+                patch -p1 < ${WORKDIR}/allow-nopw.patch
+        fi
+}
+
+do_install() {
+        install -d ${D}${sysconfdir} \
+                   ${D}${sysconfdir}/init.d \
+                   ${D}${sysconfdir}/default \
+                   ${D}${sysconfdir}/dropbear \
+                   ${D}${bindir} \
+                   ${D}${sbindir} \
+                   ${D}${localstatedir}
+
+        install -m 0755 dropbearmulti ${D}${sbindir}/
+        ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
+        
+        for i in ${SBINCOMMANDS}
+        do
+                ln -s ./dropbearmulti ${D}${sbindir}/$i
+        done
+        cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
+                                  -e 's,/usr/sbin,${sbindir},g' \
+                                  -e 's,/var,${localstatedir},g' \
+                                  -e 's,/usr/bin,${bindir},g' \
+                                  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+        chmod 755 ${D}${sysconfdir}/init.d/dropbear
+}
+
+pkg_postinst () {
+        update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
+        update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
+}
+
+pkg_postrm_append () {
+  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+  fi
+  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+  fi
+  update-alternatives --remove ssh ${bindir}/dropbearmulti
+  update-alternatives --remove scp ${bindir}/dropbearmulti
+}
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
new file mode 100644
index 0000000000..2ae361c63e
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
@@ -0,0 +1,38 @@
+diff --git a/svr-auth.c b/svr-auth.c
+index 5da0aa7..4de4964 100644
+--- a/svr-auth.c
++++ b/svr-auth.c
+@@ -249,6 +249,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+        }
+ 
+        /* check for an empty password */
++#ifdef DISALLOW_EMPTY_PW
+        if (ses.authstate.pw_passwd[0] == '\0') {
+                TRACE(("leave checkusername: empty pword"))
+                dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+@@ -256,6 +257,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+                send_msg_userauth_failure(0, 1);
+                return DROPBEAR_FAILURE;
+        }
++#endif
+ 
+        TRACE(("shell is %s", ses.authstate.pw_shell))
+ 
+diff --git a/svr-authpasswd.c b/svr-authpasswd.c
+index 53550a2..7b896bd 100644
+--- a/svr-authpasswd.c
++++ b/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+         * since the shadow password may differ to that tested
+         * in auth.c */
+        if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PASSWD
+                dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+                                ses.authstate.pw_name);
+                send_msg_userauth_failure(0, 1);
++#else
++               send_msg_userauth_success();
++#endif
+                return;
+        }
+ 
diff --git a/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch
new file mode 100644
index 0000000000..ba2b19d44a
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch
@@ -0,0 +1,11 @@
+diff -Nurd dropbear-0.45/kex.h dropbear-0.45.patched/kex.h
+--- dropbear-0.45/kex.h 2005-03-06 20:27:02.000000000 -0800
++++ dropbear-0.45.patched/kex.h 2005-03-08 15:22:44.064583279 -0800
+@@ -64,6 +64,6 @@
+ 
+ };
+ 
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+ 
+ #endif /* _KEX_H_ */
diff --git a/meta/recipes-core/dropbear/dropbear/init b/meta/recipes-core/dropbear/dropbear/init
new file mode 100755
index 0000000000..e882bae689
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/init
@@ -0,0 +1,106 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:             sshd
+# Required-Start:       $remote_fs $syslog $networking
+# Required-Stop:        $remote_fs $syslog
+# Default-Start:        2 3 4 5
+# Default-Stop:         1
+# Short-Description:    Dropbear Secure Shell server
+### END INIT INFO
+#
+# Do not configure this file. Edit /etc/default/dropbear instead!
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/dropbear
+NAME=dropbear
+DESC="Dropbear SSH server"
+
+DROPBEAR_PORT=22
+DROPBEAR_EXTRA_ARGS=
+NO_START=0
+
+set -e
+
+test ! -r /etc/default/dropbear || . /etc/default/dropbear
+test "$NO_START" = "0" || exit 0
+test -x "$DAEMON" || exit 0
+test ! -h /var/service/dropbear || exit 0
+
+readonly_rootfs=0
+for flag in `awk '{ if ($2 == "/") { split($4,FLAGS,",") } }; END { for (f in FLAGS) print FLAGS[f] }' </proc/mounts`; do
+  case $flag in
+   ro)
+     readonly_rootfs=1
+     ;;
+  esac
+done
+
+if [ $readonly_rootfs = "1" ]; then
+  mkdir -p /var/lib/dropbear
+  DROPBEAR_RSAKEY_DEFAULT="/var/lib/dropbear/dropbear_rsa_host_key"
+  DROPBEAR_DSSKEY_DEFAULT="/var/lib/dropbear/dropbear_dss_host_key"
+else
+  DROPBEAR_RSAKEY_DEFAULT="/etc/dropbear/dropbear_rsa_host_key"
+  DROPBEAR_DSSKEY_DEFAULT="/etc/dropbear/dropbear_dss_host_key"
+fi
+
+test -z "$DROPBEAR_BANNER" || \
+  DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
+test -n "$DROPBEAR_RSAKEY" || \
+  DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_DEFAULT
+test -n "$DROPBEAR_DSSKEY" || \
+  DROPBEAR_DSSKEY=$DROPBEAR_DSSKEY_DEFAULT
+test -n "$DROPBEAR_KEYTYPES" || \
+  DROPBEAR_KEYTYPES="rsa"
+
+gen_keys() {
+for t in $DROPBEAR_KEYTYPES; do
+  case $t in
+    rsa)
+        test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY
+        ;;
+    dsa)
+        test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY
+        ;;
+  esac
+done
+}
+
+case "$1" in
+  start)
+        echo -n "Starting $DESC: "
+        gen_keys
+        KEY_ARGS=""
+        test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
+        test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
+        start-stop-daemon -S \
+          -x "$DAEMON" -- $KEY_ARGS \
+            -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
+        echo "$NAME."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+        start-stop-daemon -K -x "$DAEMON"
+        echo "$NAME."
+        ;;
+  restart|force-reload)
+        echo -n "Restarting $DESC: "
+        start-stop-daemon -K -x "$DAEMON"
+        sleep 1
+        KEY_ARGS=""
+        test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
+        test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
+        start-stop-daemon -S \
+          -x "$DAEMON" -- $KEY_ARGS \
+            -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
+        echo "$NAME."
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
new file mode 100644
index 0000000000..75ba306565
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
@@ -0,0 +1,12 @@
+diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h
+--- dropbear-0.45/options.h     2005-03-06 20:27:02.000000000 -0800
++++ dropbear-0.45.patched/options.h     2005-03-08 15:25:09.368742090 -0800
+@@ -167,7 +167,7 @@
+ /* The command to invoke for xauth when using X11 forwarding.
+  * "-q" for quiet */
+ #ifndef XAUTH_COMMAND
+-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
new file mode 100644
index 0000000000..51217ea39d
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_0.52.bb
@@ -0,0 +1,3 @@
+require dropbear.inc
+
+PR="r0"
diff --git a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
new file mode 100644
index 0000000000..0999a85153
--- /dev/null
+++ b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
@@ -0,0 +1,32 @@
+Index: eggdbus-0.6/docs/eggdbus/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/docs/eggdbus/Makefile.am
++++ eggdbus-0.6/docs/eggdbus/Makefile.am
+@@ -87,11 +87,7 @@ HTML_IMAGES =                                \
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+ 
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+ CLEANFILES =
+-endif
+ 
+ CLEANFILES +=   *~                             \
+                eggdbus-scan.*                  \
+Index: eggdbus-0.6/docs/tests/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/docs/tests/Makefile.am
++++ eggdbus-0.6/docs/tests/Makefile.am
+@@ -65,11 +65,7 @@ HTML_IMAGES =                                \
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+ 
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+ CLEANFILES =
+-endif
+ 
+ CLEANFILES +=   *~                             \
+                tests-scan.*                    \
diff --git a/meta/recipes-core/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch
new file mode 100644
index 0000000000..2b2cb4985b
--- /dev/null
+++ b/meta/recipes-core/eggdbus/eggdbus/marshal.patch
@@ -0,0 +1,26 @@
+Index: eggdbus-0.6/src/eggdbus/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/src/eggdbus/Makefile.am
++++ eggdbus-0.6/src/eggdbus/Makefile.am
+@@ -130,7 +130,7 @@ BUILT_SOURCES =                                                             \
+        $(NULL)
+ 
+ eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
+-       EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool                                                        \
++       EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool                                                        \
+                --namespace EggDBus                                                                     \
+                --dbus-namespace org.freedesktop.DBus                                                   \
+                --interfaces-only                                                                       \
+Index: eggdbus-0.6/src/tests/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/src/tests/Makefile.am
++++ eggdbus-0.6/src/tests/Makefile.am
+@@ -25,7 +25,7 @@ BUILT_SOURCES =                                                       \
+        $(NULL)
+ 
+ test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
+-       EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool                                                                        \
++       EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool                                                                        \
+          --namespace       "Test"                                                                              \
+          --dbus-namespace  "com.example"                                                                       \
+          --include-header  testtypes.h                                                                         \
diff --git a/meta/recipes-core/eggdbus/eggdbus_0.6.bb b/meta/recipes-core/eggdbus/eggdbus_0.6.bb
new file mode 100644
index 0000000000..3a0d0fed13
--- /dev/null
+++ b/meta/recipes-core/eggdbus/eggdbus_0.6.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "An alternative to dbus-glib. It is designed specifically to make it comfortable to work with very large and potentially complex D-Bus services like e.g. DeviceKit-disks"
+HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
+                    file://src/eggdbus/eggdbus.h;md5=6b312aef57ed8d738b3f131ad037d6c2"
+PR = "r1"
+
+DEPENDS = "dbus glib-2.0 dbus-glib eggdbus-native"
+DEPENDS_virtclass-native = "dbus-native glib-2.0-native dbus-glib-native"
+
+BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \
+          file://gtk-doc.patch;apply=yes \
+          "
+
+SRC_URI = "${BASE_SRC_URI} \
+           file://marshal.patch;apply=yes \
+          "
+
+SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+
+inherit autotools
+
+EXTRA_OECONF = " --disable-man-pages --disable-gtk-doc-html "
+
+BBCLASSEXTEND = "native"
+
+PARALLEL_MAKE = ""
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
new file mode 100644
index 0000000000..4d3e0613b1
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
@@ -0,0 +1,15 @@
+import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+Index: libc/bits/stdio-lock.h
+===================================================================
+--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700
++++ libc/bits/stdio-lock.h      2009-10-28 14:34:54.000000000 -0700
+@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _
+   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
+   _IO_flockfile (_fp)
+ 
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+   _IO_funlockfile (_fp);                                                     \
+   _IO_cleanup_region_end (0)
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch
new file mode 100644
index 0000000000..6ab306180c
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch
@@ -0,0 +1,78 @@
+Index: libc/ports/sysdeps/arm/memcpy.S
+===================================================================
+--- libc.orig/ports/sysdeps/arm/memcpy.S        2009-09-03 16:12:00.000000000 -0700
++++ libc/ports/sysdeps/arm/memcpy.S     2009-10-28 12:51:22.000000000 -0700
+@@ -130,7 +130,12 @@ ENTRY(memcpy)
+                strcsb  r4, [r0], #1
+                strcsb  ip, [r0]
+ 
++#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
++               ldmfd   sp!, {r0, r4, lr}
++                bx      lr
++#else
+                ldmfd   sp!, {r0, r4, pc}
++#endif
+ 
+ 9:             rsb     ip, ip, #4
+                cmp     ip, #2
+Index: libc/ports/sysdeps/arm/memmove.S
+===================================================================
+--- libc.orig/ports/sysdeps/arm/memmove.S       2009-09-03 16:12:00.000000000 -0700
++++ libc/ports/sysdeps/arm/memmove.S    2009-10-28 12:51:22.000000000 -0700
+@@ -144,7 +144,12 @@ ENTRY(memmove)
+                strneb  r3, [r0, #-1]!
+                strcsb  r4, [r0, #-1]!
+                strcsb  ip, [r0, #-1]
++#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
++               ldmfd   sp!, {r0, r4, lr}
++                bx      lr
++#else
+                ldmfd   sp!, {r0, r4, pc}
++#endif
+ 
+ 9:             cmp     ip, #2
+                ldrgtb  r3, [r1, #-1]!
+Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S
+===================================================================
+--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-09-03 16:12:04.000000000 -0700
++++ libc/ports/sysdeps/unix/sysv/linux/arm/clone.S      2009-10-28 12:51:22.000000000 -0700
+@@ -96,8 +96,14 @@ ENTRY(__clone)
+ #endif
+        @ pick the function arg and call address off the stack and execute
+        ldr     r0, [sp, #4]
++#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
++       ldr     ip, [sp], #8
++       mov     lr, pc
++        bx      ip
++#else
+        mov     lr, pc
+        ldr     pc, [sp], #8
++#endif
+ 
+        @ and we are done, passing the return value through r0
+        b       PLTJMP(HIDDEN_JUMPTARGET(_exit))
+Index: libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
+===================================================================
+--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/sysdep.h        2009-09-16 13:58:18.000000000 +0100
++++ libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h     2009-11-03 19:17:16.000000000 +0000
+@@ -129,6 +129,11 @@
+        DO_RET(lr);                                             \
+ 1:     .word C_SYMBOL_NAME(rtld_errno) - 0b - 8;
+ # else
++#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
++#define POP_PC  ldr     lr, [sp], #4; bx lr
++#else
++#define POP_PC  ldr     pc, [sp], #4
++#endif
+ #  define SYSCALL_ERROR_HANDLER                                        \
+ __local_syscall_error:                                         \
+        str     lr, [sp, #-4]!;                                 \
+@@ -138,7 +143,7 @@
+        rsb     r1, r1, #0;                                     \
+        str     r1, [r0];                                       \
+        mvn     r0, #0;                                         \
+-       ldr     pc, [sp], #4;
++        POP_PC;
+ # endif
+ #else
+ # define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used.  */
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch
new file mode 100644
index 0000000000..99c3fef802
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch
@@ -0,0 +1,19 @@
+In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
+make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
+
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+ 
+ #define FUTEX_WAIT             0
+ #define FUTEX_WAKE             1
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf
new file mode 100644
index 0000000000..dfa65edb85
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/usr/local/lib
+/usr/X11R6/lib
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk
new file mode 100644
index 0000000000..d2a28c2dc6
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk
@@ -0,0 +1,11 @@
+#!/usr/bin/make
+
+include $(IN)
+
+all:
+        rm -f $(OUT)
+        touch $(OUT)
+        for locale in $(SUPPORTED-LOCALES); do \
+                [ $$locale = true ] && continue; \
+                echo $$locale | sed 's,/, ,' >> $(OUT); \
+        done
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
new file mode 100644
index 0000000000..57835adcdb
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
@@ -0,0 +1,79 @@
+Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html
+
+This patch scratches an itch.  Each individual gcc command in the
+glibc build is over 1K, which means it takes up a good chunk of my
+terminal.  Most of that is include paths.  Any version of GCC new
+enough to build glibc supports response files, which were added in
+2005.  So use a response file for the static list of include paths.
+Now the build commands are a lot shorter, and easier to use when
+developing glibc.
+
+Tested on x86_64-linux-gnu.  Please apply if acceptable.
+
+-- 
+Daniel Jacobowitz
+CodeSourcery
+
+2010-03-30  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        * Makeconfig (+common-includes): Define.
+        (+includes): Use @$(common-objpfx)includes.
+        * Makefile (postclean): Remove includes and includes.mk.
+        * Makerules ($(common-objpfx)includes.mk): Include and create
+        includes.mk.  Create includes.
+
+Index: libc/Makeconfig
+===================================================================
+--- libc.orig/Makeconfig        2009-10-13 22:55:12.000000000 -0700
++++ libc/Makeconfig     2010-03-31 16:02:37.120489733 -0700
+@@ -678,9 +678,10 @@ endif      # $(+cflags) == ""
+ # library source directory, in the include directory, and in the
+ # current directory.
+ +sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
+++common-includes = $(+sysdep-includes) $(includes) $(sysincludes)
+ +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
+-           $(+sysdep-includes) $(includes) \
+-           $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
++           @$(common-objpfx)includes \
++           $(patsubst %/,-I%,$(..)) $(libio-include) -I.
+ 
+ # Since libio has several internal header files, we use a -I instead
+ # of many little headers in the include directory.
+Index: libc/Makefile
+===================================================================
+--- libc.orig/Makefile  2009-12-09 12:06:28.000000000 -0800
++++ libc/Makefile       2010-03-31 16:02:37.132481508 -0700
+@@ -247,7 +247,7 @@ parent-mostlyclean: common-mostlyclean #
+ parent-clean: parent-mostlyclean common-clean
+ 
+ postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \
+-           $(addprefix $(objpfx),sysd-dirs sysd-rules) \
++           $(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \
+            $(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
+ 
+ clean: parent-clean
+Index: libc/Makerules
+===================================================================
+--- libc.orig/Makerules 2009-12-09 12:06:28.000000000 -0800
++++ libc/Makerules      2010-03-31 16:02:37.140481645 -0700
+@@ -254,6 +254,20 @@ ifndef sysd-rules-done
+ no_deps=t
+ endif
+ 
++-include $(common-objpfx)includes.mk
++ifneq ($(+common-includes),$(saved-includes))
++# Recreate includes.mk (and includes).
++includes-force = FORCE
++FORCE:
++endif
++$(common-objpfx)includes.mk: $(includes-force)
++       -@rm -f $@T $(common-objpfx)includesT
++       for inc in $(+common-includes); do echo "$$inc"; done \
++         > $(common-objpfx)includesT
++       mv -f $(common-objpfx)includesT $(common-objpfx)includes
++       echo 'saved-includes := $(+common-includes)' > $@T
++       mv -f $@T $@
++
+ define o-iterator-doit
+ $(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)
+ endef
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
new file mode 100644
index 0000000000..eb765df178
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -0,0 +1,44 @@
+SECTION = "libs"
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+
+do_configure () {
+        sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+        chmod +x ${S}/configure
+        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        find ${S} -name "configure" | xargs touch
+        ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+                --prefix=/usr \
+                --without-cvs --disable-sanity-checks \
+                --with-headers=${STAGING_DIR_TARGET}${includedir} \
+                --enable-hacker-mode --enable-addons
+}
+
+do_compile () {
+        :
+}
+
+do_install () {
+       oe_runmake cross-compiling=yes install_root=${D} \
+       includedir='${includedir}' prefix='${prefix}' \
+       install-bootstrap-headers=yes install-headers
+
+       oe_runmake csu/subdir_lib
+       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
+       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+       mkdir -p ${D}${includedir}/gnu/
+       touch ${D}${includedir}/gnu/stubs.h
+       cp ${S}/include/features.h ${D}${includedir}/features.h
+
+       if [ -e ${B}/bits/stdio_lim.h ]; then
+               cp ${B}/bits/stdio_lim.h  ${D}${includedir}/bits/
+       fi
+       mkdir -p ${D}${libdir}/
+       install -m 644 csu/crt[1in].o ${D}${libdir}
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o ${D}${libdir}/libc.so
+}
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.12.bb b/meta/recipes-core/eglibc/eglibc-initial_2.12.bb
new file mode 100644
index 0000000000..787c762609
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-initial_2.12.bb
@@ -0,0 +1,6 @@
+require eglibc_${PV}.bb
+require eglibc-initial.inc
+
+do_configure_prepend () {
+        unset CFLAGS
+}
diff --git a/meta/recipes-core/eglibc/eglibc-package.bbclass b/meta/recipes-core/eglibc/eglibc-package.bbclass
new file mode 100644
index 0000000000..4e286afa80
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-package.bbclass
@@ -0,0 +1,381 @@
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a eglibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+inherit qemu
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+
+# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
+# is set. The idea is to avoid running localedef on the target (at first boot)
+# to decrease initial boot time and avoid localedef being killed by the OOM
+# killer which used to effectively break i18n on machines with < 128MB RAM.
+
+# default to disabled until qemu works for everyone
+ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+
+# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
+BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc"
+
+# Set this to zero if you don't want ldconfig in the output package
+USE_LDCONFIG ?= "1"
+
+PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-pic eglibc-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*"
+
+RPROVIDES_eglibc = "glibc"
+RPROVIDES_eglibc-utils = "glibc-utils"
+RPROVIDES_eglibc-pic = "glibc-pic"
+RPROVIDES_eglibc-dev = "glibc-dev"
+RPROVIDES_eglibc-doc = "glibc-doc"
+RPROVIDES_eglibc-locale = "glibc-locale"
+RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
+RPROVIDES_eglibc-thread-db = "glibc-thread-db"
+RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
+RPROVIDES_eglibc-dbg = "glibc-dbg"
+libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
+
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "${base_libdir}/libSegFault*"
+FILES_libcidn = "${base_libdir}/libcidn*.so"
+FILES_libmemusage = "${base_libdir}/libmemusage.so"
+FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
+FILES_sln = "/sbin/sln"
+FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
+FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
+        ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
+FILES_eglibc-gconv = "${libdir}/gconv/*"
+FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug"
+FILES_catchsegv = "${bindir}/catchsegv"
+RDEPENDS_catchsegv = "libsegfault"
+FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so"
+FILES_eglibc-thread-db = "${base_libdir}/libthread_db*"
+FILES_localedef = "${bindir}/localedef"
+RPROVIDES_eglibc-dev += "libc-dev"
+
+DESCRIPTION_sln = "eglibc: create symbolic links between files"
+DESCRIPTION_nscd = "eglibc: name service cache daemon for passwd, group, and hosts"
+DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services"
+DESCRIPTION_ldd = "eglibc: print shared library dependencies"
+DESCRIPTION_localedef = "eglibc: compile locale definition files"
+DESCRIPTION_eglibc-utils = "eglibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
+
+def get_eglibc_fpu_setting(bb, d):
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--without-fp"
+    return ""
+
+EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
+
+OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
+
+do_configure_prepend() {
+        sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
+}
+
+do_install() {
+        oe_runmake install_root=${D} install
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
+        done
+        install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
+        install -d ${D}${libdir}/locale
+        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+        # get rid of some broken files...
+        for i in ${GLIBC_BROKEN_LOCALES}; do
+                grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
+                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+        done
+        rm -f ${D}/etc/rpc
+        rm -rf ${D}${datadir}/zoneinfo
+        rm -rf ${D}${libexecdir}/getconf
+}
+
+TMP_LOCALE="/tmp/locale${libdir}/locale"
+
+locale_base_postinst() {
+#!/bin/sh
+
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+        cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s
+mkdir -p ${libdir}/locale/
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
+}
+
+locale_base_postrm() {
+#!/bin/sh
+
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+        cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
+}
+
+python __anonymous () {
+    enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+
+    if enabled and int(enabled):
+        import re
+
+        target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+        binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or ""
+
+        for regexp in binary_arches.split(" "):
+            r = re.compile(regexp)
+
+            if r.match(target_arch):
+                depends = bb.data.getVar("DEPENDS", d, 1)
+                depends = "%s qemu-native" % depends
+                bb.data.setVar("DEPENDS", depends, d)
+                bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d)
+                break
+}
+
+do_prep_locale_tree() {
+        treedir=${WORKDIR}/locale-tree
+        rm -rf $treedir
+        mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
+        cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n
+        # unzip to avoid parsing errors
+        for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
+                gunzip $i
+        done
+        ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
+        if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.* ]; then
+                cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+        fi
+        install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin
+}
+
+do_collect_bins_from_locale_tree() {
+        treedir=${WORKDIR}/locale-tree
+
+        mkdir -p ${PKGD}${libdir}
+        cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir}
+}
+
+python package_do_split_gconvs () {
+        import os, re
+        if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
+                bb.note("package requested not splitting gconvs")
+                return
+
+        if not bb.data.getVar('PACKAGES', d, 1):
+                return
+
+        libdir = bb.data.getVar('libdir', d, 1)
+        if not libdir:
+                bb.error("libdir not defined")
+                return
+        datadir = bb.data.getVar('datadir', d, 1)
+        if not datadir:
+                bb.error("datadir not defined")
+                return
+
+        gconv_libdir = base_path_join(libdir, "gconv")
+        charmap_dir = base_path_join(datadir, "i18n", "charmaps")
+        locales_dir = base_path_join(datadir, "i18n", "locales")
+        binary_locales_dir = base_path_join(libdir, "locale")
+
+        def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group):
+                deps = []
+                f = open(fn, "r")
+                c_re = re.compile('^copy "(.*)"')
+                i_re = re.compile('^include "(\w+)".*')
+                for l in f.readlines():
+                        m = c_re.match(l) or i_re.match(l)
+                        if m:
+                                dp = legitimize_package_name('eglibc-gconv-%s' % m.group(1))
+                                if not dp in deps:
+                                        deps.append(dp)
+                f.close()
+                if deps != []:
+                        bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+                bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace('eglibc', 'glibc'), d)
+
+        do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', hook=calc_gconv_deps, extra_depends='eglibc-gconv')
+
+        def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group):
+                deps = []
+                f = open(fn, "r")
+                c_re = re.compile('^copy "(.*)"')
+                i_re = re.compile('^include "(\w+)".*')
+                for l in f.readlines():
+                        m = c_re.match(l) or i_re.match(l)
+                        if m:
+                                dp = legitimize_package_name('eglibc-charmap-%s' % m.group(1))
+                                if not dp in deps:
+                                        deps.append(dp)
+                f.close()
+                if deps != []:
+                        bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+                bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace('eglibc', 'glibc'), d)
+
+        do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='')
+
+        def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
+                deps = []
+                f = open(fn, "r")
+                c_re = re.compile('^copy "(.*)"')
+                i_re = re.compile('^include "(\w+)".*')
+                for l in f.readlines():
+                        m = c_re.match(l) or i_re.match(l)
+                        if m:
+                                dp = legitimize_package_name('eglibc-localedata-%s' % m.group(1))
+                                if not dp in deps:
+                                        deps.append(dp)
+                f.close()
+                if deps != []:
+                        bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+                bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace('eglibc', 'glibc'), d)
+
+        do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
+        bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
+
+        supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
+        if not supported or supported == "all":
+            f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+            supported = f.readlines()
+            f.close()
+        else:
+            supported = supported.split()
+            supported = map(lambda s:s.replace(".", " ") + "\n", supported)
+
+        dot_re = re.compile("(.*)\.(.*)")
+
+        # Collate the locales by base and encoding
+        encodings = {}
+        for l in supported:
+                l = l[:-1]
+                (locale, charset) = l.split(" ")
+                m = dot_re.match(locale)
+                if m:
+                        locale = m.group(1)
+                if not encodings.has_key(locale):
+                        encodings[locale] = []
+                encodings[locale].append(charset)
+
+        def output_locale_source(name, locale, encoding):
+                pkgname = 'locale-base-' + legitimize_package_name(name)
+
+                bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef eglibc-localedata-%s eglibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d)
+                rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+                m = re.match("(.*)_(.*)", name)
+                if m:
+                        rprovides += ' virtual-locale-%s' % m.group(1)
+                bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
+                bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+                bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+                bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d)
+                bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d)
+
+        def output_locale_binary(name, locale, encoding):
+                qemu = qemu_target_binary(d) + " -s 1048576"
+                kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1)
+                if kernel_ver:
+                        qemu += " -r %s" % (kernel_ver)
+                pkgname = 'locale-base-' + legitimize_package_name(name)
+                m = re.match("(.*)\.(.*)", name)
+                if m:
+                        eglibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+                else:
+                        eglibc_name = name
+                bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+                bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % eglibc_name, d)
+                rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+                m = re.match("(.*)_(.*)", name)
+                if m:
+                        rprovides += ' virtual-locale-%s' % m.group(1)
+                bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
+                bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+                bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+
+                treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
+                ldlibdir = "%s/lib" % treedir
+                path = bb.data.getVar("PATH", d, 1)
+                i18npath = base_path_join(treedir, datadir, "i18n")
+
+                localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
+                cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, treedir, localedef_opts)
+                bb.note("generating locale %s (%s)" % (locale, encoding))
+                if os.system(cmd):
+                        raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
+
+        def output_locale(name, locale, encoding):
+                use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+                if use_bin:
+                        output_locale_binary(name, locale, encoding)
+                else:
+                        output_locale_source(name, locale, encoding)
+
+        use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+        if use_bin:
+                bb.note("preparing tree for binary locale generation")
+                bb.build.exec_func("do_prep_locale_tree", d)
+
+        # Reshuffle names so that UTF-8 is preferred over other encodings
+        non_utf8 = []
+        for l in encodings.keys():
+                if len(encodings[l]) == 1:
+                        output_locale(l, l, encodings[l][0])
+                        if encodings[l][0] != "UTF-8":
+                                non_utf8.append(l)
+                else:
+                        if "UTF-8" in encodings[l]:
+                                output_locale(l, l, "UTF-8")
+                                encodings[l].remove("UTF-8")
+                        else:
+                                non_utf8.append(l)
+                        for e in encodings[l]:
+                                output_locale('%s.%s' % (l, e), l, e)
+
+        if non_utf8 != []:
+                bb.note("the following locales are supported only in legacy encodings:")
+                bb.note("  " + " ".join(non_utf8))
+
+        use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+        if use_bin:
+                bb.note("collecting binary locales from locale tree")
+                bb.build.exec_func("do_collect_bins_from_locale_tree", d)
+                do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='eglibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True)
+        else:
+                bb.note("generation of binary locales disabled. this may break i18n!")
+
+}
+
+# We want to do this indirection so that we can safely 'return'
+# from the called function even though we're prepending
+python populate_packages_prepend () {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_eglibc', 'libc6', d)
+                bb.data.setVar('PKG_eglibc-dev', 'libc6-dev', d)
+        bb.build.exec_func('package_do_split_gconvs', d)
+}
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
new file mode 100644
index 0000000000..66bb90e83f
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "Embedded GNU C Library"
+HOMEPAGE = "http://www.eglibc.org/home"
+SECTION = "libs"
+PRIORITY = "required"
+LICENSE = "LGPL"
+INC_PR = "r11"
+# nptl needs unwind support in gcc, which can't be built without glibc.
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
+#this leads to circular deps, so lets not add it yet
+#RDEPENDS_ldd += " bash"
+# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
+#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "virtual/libintl virtual/libiconv"
+inherit autotools
+
+LEAD_SONAME = "libc.so"
+
+GLIBC_EXTRA_OECONF ?= ""
+INHIBIT_DEFAULT_DEPS = "1"
+
+ARM_INSTRUCTION_SET = "arm"
+
+PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
new file mode 100644
index 0000000000..a214980707
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -0,0 +1,97 @@
+require eglibc.inc
+
+DEPENDS += "gperf-native"
+FILESPATHPKG =. "eglibc-svn:"
+PR = "r0"
+SRCREV="10809"
+EGLIBC_BRANCH="eglibc-2_12"
+SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+           file://IO-acquire-lock-fix.patch \
+           file://shorten-build-commands.patch \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk"
+S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
+PROVIDES_${PN}-dbg = "glibc-dbg"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+                --without-cvs --disable-profile --disable-debug --without-gd \
+                --enable-clocale=gnu \
+                --enable-add-ons=${GLIBC_ADDONS},ports \
+                --with-headers=${STAGING_INCDIR} \
+                --without-selinux \
+                ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
+
+do_unpack_append() {
+        bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
+        if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
+            rm -rf ${S}/ports
+            mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/
+        fi
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+        if [ -z "`which rpcgen`" ]; then
+                echo "rpcgen not found.  Install glibc-devel."
+                exit 1
+        fi
+        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        find ${S} -name "configure" | xargs touch
+        CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+          yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+          rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+        # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+        unset LDFLAGS
+        base_do_compile
+        (
+                cd ${S}/sunrpc/rpcsvc
+                for r in ${rpcsvc}; do
+                        h=`echo $r|sed -e's,\.x$,.h,'`
+                        rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+                done
+        )
+}
+
+require eglibc-package.bbclass
diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
new file mode 100644
index 0000000000..ff1578f47e
--- /dev/null
+++ b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
@@ -0,0 +1,17 @@
+# avoid to use expat's own *.m4
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-07
+
+diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
+--- expat-2.0.0~orig/configure.in       2006-01-10 19:10:46.000000000 -0600
++++ expat-2.0.0/configure.in    2006-02-10 19:12:24.000000000 -0600
+@@ -50,9 +50,6 @@
+ 
+ AC_CONFIG_HEADER(expat_config.h)
+ 
+-sinclude(conftools/libtool.m4)
+-sinclude(conftools/ac_c_bigendian_cross.m4)
+-
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+ 
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
new file mode 100644
index 0000000000..8c5010e481
--- /dev/null
+++ b/meta/recipes-core/expat/expat.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)"
+HOMEPAGE = "http://expat.sourceforge.net/"
+SECTION = "libs"
+LICENSE = "MIT"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+           file://autotools.patch"
+
+inherit autotools lib_package
+
+# This package uses an archive format known to have issue with some
+# versions of gzip
+do_unpack[depends] += "gzip-native:do_populate_sysroot"
+
+do_configure_prepend () {
+        rm -f ${S}/conftools/libtool.m4
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/expat/expat_2.0.1.bb b/meta/recipes-core/expat/expat_2.0.1.bb
new file mode 100644
index 0000000000..9983fe5838
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.0.1.bb
@@ -0,0 +1,3 @@
+require expat.inc
+
+PR = "r0"
diff --git a/meta/recipes-core/gettext/gettext-0.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.17/autotools.patch
new file mode 100644
index 0000000000..9f16b1881f
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.17/autotools.patch
@@ -0,0 +1,62 @@
+Index: gettext-0.17/gettext-runtime/man/Makefile.am
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/man/Makefile.am   2007-10-07 21:37:36.000000000 +0200
++++ gettext-0.17/gettext-runtime/man/Makefile.am        2008-05-09 22:46:37.000000000 +0200
+@@ -158,8 +158,7 @@
+        $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+        mv t-$@ $@
+ 
+-install-html-local:
+-       $(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+        for file in $(man_HTML); do \
+          if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+          $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.17/gettext-tools/man/Makefile.am
+===================================================================
+--- gettext-0.17.orig/gettext-tools/man/Makefile.am     2007-10-28 00:18:37.000000000 +0200
++++ gettext-0.17/gettext-tools/man/Makefile.am  2008-05-09 22:46:37.000000000 +0200
+@@ -186,8 +186,7 @@
+        $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+        mv t-$@ $@
+ 
+-install-html-local:
+-       $(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+        for file in $(man_HTML); do \
+          if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+          $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac  2008-05-09 22:53:42.000000000 +0200
++++ gettext-0.17/gettext-runtime/libasprintf/configure.ac       2008-05-09 22:53:54.000000000 +0200
+@@ -1,5 +1,5 @@
+ dnl Configuration for the GNU libasprintf library
+-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
++dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
+ dnl
+ dnl This program is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU General Public License as published by
+@@ -54,8 +54,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+-gl_AC_TYPE_LONG_LONG
+-gt_TYPE_LONGDOUBLE
++AC_TYPE_LONG_LONG_INT
+ gt_TYPE_WCHAR_T
+ gt_TYPE_WINT_T
+ AC_CHECK_TYPE([ptrdiff_t], ,
+@@ -79,8 +78,11 @@
+ AC_SUBST([ALLOCA_H])
+ 
+ AC_CHECK_FUNCS([snprintf vasprintf wcslen])
+-AC_CHECK_DECLS([_snprintf])
++dnl Use the _snprintf function only if it is declared (because on NetBSD it
++dnl is defined as a weak alias of snprintf; we prefer to use the latter).
++AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
+ gt_PRINTF_POSIX
++gl_EOVERFLOW
+ 
+ dnl Check for tools needed for formatting the documentation.
+ ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
diff --git a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
new file mode 100644
index 0000000000..0f67cd0b2e
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
@@ -0,0 +1,13 @@
+Index: gettext-0.17/gettext-tools/libgettextpo/error.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h        2008-07-27 21:16:25.561115527 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/error.h     2008-07-27 21:16:52.454440505 +0200
+@@ -49,7 +49,7 @@
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time `error' is called.  */
+ extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
new file mode 100644
index 0000000000..a02457fab8
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
@@ -0,0 +1,50 @@
+When I try to `./autogen.sh --quick' CVS gettext, using git Autoconf,
+things fall over like this (several instances):
+
+| gnulib-m4/openmp.m4:29: error: m4_copy: won't overwrite defined macro: 
+_AC_LANG_OPENMP(C++)
+| gnulib-m4/openmp.m4:29: the top level
+| autom4te: /usr/bin/m4 failed with exit status: 1
+| aclocal: autom4te failed with exit status: 1
+
+I'm not quite sure whether an Autoconf bug/incompatibility is involved
+here (therefore the Cc: to bug-autoconf).  m4_copy wasn't documented in
+earlier Autoconf releases, but there may still have been problematic
+semantic changes, I don't know.
+
+Anyway, the following patch seems to fix it.  OK to apply?
+
+Cheers,
+Ralf
+
+2008-12-03  Ralf Wildenhues  <[EMAIL PROTECTED]>
+
+        * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
+        newer.
+
+Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
+===================================================================
+--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000
++++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4      2010-02-01 10:51:50.697789220 +0000
+@@ -1,11 +1,13 @@
+-# openmp.m4 serial 4
+-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
++# openmp.m4 serial 5
++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ 
+ dnl This file can be removed once we assume autoconf >= 2.62.
+ 
++m4_version_prereq([2.62],, [
++
+ # _AC_LANG_OPENMP
+ # ---------------
+ # Expands to some language dependent source code for testing the presence of
+@@ -90,3 +92,5 @@
+   fi
+   AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
+ ])
++
++])
diff --git a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
new file mode 100644
index 0000000000..111714b543
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
@@ -0,0 +1,15 @@
+Index: gettext-0.17/gettext-tools/src/write-catalog.c
+===================================================================
+--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200
++++ gettext-0.17/gettext-tools/src/write-catalog.c      2008-10-16 18:17:13.000000000 +0200
+@@ -220,7 +220,9 @@
+       /* Open the output file.  */
+       if (!to_stdout)
+        {
+-         fd = open (filename, O_WRONLY | O_CREAT);
++         fd = open (filename, O_WRONLY | O_CREAT,
++                   /* 0666 in portable POSIX notation: */
++                   S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+          if (fd < 0)
+            {
+              const char *errno_description = strerror (errno);
diff --git a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
new file mode 100644
index 0000000000..7b3880bf77
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
@@ -0,0 +1,96 @@
+Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h     2008-07-29 14:51:52.336394636 +0200
++++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h  2008-07-29 14:52:25.546430195 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+ 
+-   Copyright (C) 2007 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+  * the declaration of wcwidth().
+  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+ 
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
+Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h       2008-07-29 14:52:03.886393956 +0200
++++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h    2008-07-29 14:52:50.876388000 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+ 
+-   Copyright (C) 2007 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+  * the declaration of wcwidth().
+  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+ 
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
+Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h     2008-07-29 14:51:58.826395009 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h  2008-07-29 14:52:38.609723575 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+ 
+-   Copyright (C) 2007 Free Software Foundation, Inc.
++   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+  * the declaration of wcwidth().
+  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+ 
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.17.bb
new file mode 100644
index 0000000000..c945891e26
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext_0.17.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "The GNU internationalization library."
+HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
+SECTION = "libs"
+LICENSE = "GPLv3"
+PR = "r5"
+DEPENDS = "gettext-native virtual/libiconv ncurses expat"
+DEPENDS_virtclass-native = ""
+PROVIDES = "virtual/libintl"
+PROVIDES_virtclass-native = ""
+
+SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
+           file://autotools.patch;patch=1 \
+           file://wchar-uclibc.patch;patch=1 \
+           file://use_open_properly.patch;patch=1 \
+           file://m4fix.patch;patch=1 \
+          "
+
+SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+EXTRA_OECONF += "--without-lispdir \
+                 --disable-csharp \
+                 --disable-libasprintf \
+                 --disable-java \
+                 --disable-native-java \
+                 --disable-openmp \
+                 --with-included-glib \
+                 --with-libncurses-prefix=${STAGING_LIBDIR}/.. \
+                 --without-emacs \
+                "
+
+acpaths = '-I ${S}/autoconf-lib-link/m4/ \
+           -I ${S}/gettext-runtime/m4 \
+           -I ${S}/gettext-tools/m4'
+
+
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M    glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M     uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228   KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "libgettextlib libgettextsrc"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch
new file mode 100644
index 0000000000..1676b3e257
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch
@@ -0,0 +1,29 @@
+# copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity.
+#
+# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
+--- glib/tests/threadpool-test.c.old    2008-02-12 06:11:21.000000000 +0100
++++ glib/tests/threadpool-test.c        2008-02-12 06:11:52.000000000 +0100
+@@ -5,8 +5,8 @@
+ 
+ #include <glib.h>
+ 
+-#define DEBUG_MSG(x)
+-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  */
++/* #define DEBUG_MSG(x) */
++#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
+ 
+ #define WAIT                5    /* seconds */
+ #define MAX_THREADS         10
+@@ -124,10 +124,10 @@
+    DEBUG_MSG (("[unused] stopping unused threads"));
+    g_thread_pool_stop_unused_threads ();
+ 
+-   DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++   DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
+ 
+    /* Some time for threads to die. */
+-   g_usleep (G_USEC_PER_SEC);
++   g_usleep (5 * G_USEC_PER_SEC);
+ 
+    DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
+               g_thread_pool_get_num_unused_threads (),
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch
new file mode 100644
index 0000000000..3ba79b8986
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch
@@ -0,0 +1,34 @@
+# Poky renames libtool to $host_alias-libtool.
+# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
+# so we can't call # it at this point. We can safely assume a version is available 
+# from PATH though
+
+--- glib-2.12.10/configure.in.orig      2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in   2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+        LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+        echo "void glib_plugin_test(void) { }" > plugin.c
+-       ${SHELL} ./libtool --mode=compile ${CC} -shared \
++       ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \
+                -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+        AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+                glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch
new file mode 100644
index 0000000000..1f3920f03a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch
@@ -0,0 +1,37 @@
+# handle cast warning. borrow from OE, but updated with a better fix from glib 
+# developing tree.
+#
+# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
+commit bf2719c815d719d1899b4bdb1b81ff6798471094
+Author: Lars Ellenberg <lars.ellenberg@linbit.com>
+Date:   Thu Apr 15 19:03:05 2010 +0200
+
+    Cast to volatile to avoid warnings from -Wcast-qual
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=457641
+
+diff --git a/glib/gatomic.h b/glib/gatomic.h
+index 7d9c318..22b28d9 100644
+--- a/glib/gatomic.h
++++ b/glib/gatomic.h
+@@ -64,16 +64,16 @@ void     g_atomic_pointer_set                  (volatile gpointer G_GNUC_MAY_ALI
+ #else
+ # define g_atomic_int_get(atomic) \
+  ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
+-  (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic)))
++  (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
+ # define g_atomic_int_set(atomic, newval) \
+  ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
+-  (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
++  (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
+ # define g_atomic_pointer_get(atomic) \
+  ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
+-  (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic)))
++  (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
+ # define g_atomic_pointer_set(atomic, newval) \
+  ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
+-  (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
++  (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
+ #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
+ 
+ #define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch
new file mode 100644
index 0000000000..c44e491556
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch
@@ -0,0 +1,19 @@
+# an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container
+# for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d
+# in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4.
+#
+# keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more
+# portable here. mark for upstream
+#
+# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
+--- glib-2.10.3/glib-gettextize.in.old  2006-06-21 12:46:45.000000000 +0100
++++ glib-2.10.3/glib-gettextize.in      2006-06-21 12:48:14.000000000 +0100
+@@ -49,7 +49,7 @@
+     ;;
+ esac
+ 
+-gettext_dir=$prefix/share/glib-2.0/gettext
++gettext_dir=@datadir@/glib-2.0/gettext
+ 
+ while test $# -gt 0; do
+   case "$1" in
diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
new file mode 100644
index 0000000000..ccbbd2b35a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0.inc
@@ -0,0 +1,6 @@
+
+python () {
+    import bb
+    if bb.data.getVar("USE_NLS", d, 1) == "no":
+        raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
new file mode 100644
index 0000000000..d8d1cc52d2
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
@@ -0,0 +1,11 @@
+require glib.inc
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2 \
+           file://configure-libtool.patch \
+           file://gatomic-proper-pointer-get-cast.patch \
+           file://60_wait-longer-for-threads-to-die.patch"
+
+SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
new file mode 100644
index 0000000000..6e7f6a3347
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -0,0 +1,34 @@
+DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on. It works on many UNIX-like platforms, Windows, OS/2 and BeOS"
+# pcre is under BSD;
+# docs/reference/COPYING is with a 'public domai'-like license!
+LICENSE = "LGPLv2+ & BSD & public domain"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+                    file://glib/glib.h;startline=4;endline=17;md5=a4332fe58b076f29d07c9c066d2967b6 \
+                    file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+                    file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \
+                    file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
+                    file://glib/pcre/pcre.h;startline=11;endline=35;md5=000109ccf7c4c470b74046e2cc59f7e3 \
+                    file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
+BUGTRACKER = "http://bugzilla.gnome.org"
+SECTION = "libs"
+
+require glib-2.0.inc
+
+DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl zip"
+DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
+PACKAGES =+ "glib-2.0-utils "
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/glib-${PV}"
+
+EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
+EXTRA_OECONF_virtclass-native = ""
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include"
+
+ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
new file mode 100644
index 0000000000..b9c72262f2
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
@@ -0,0 +1,14 @@
+Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/check_pf.c 2009-06-19 20:45:32.451372131 +0400
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c      2009-06-19 20:45:51.351313426 +0400
+@@ -207,9 +207,6 @@
+                      newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
+                                           ? in6ai_deprecated : 0)
+                                          | ((ifam->ifa_flags
+-                                             & IFA_F_TEMPORARY)
+-                                            ? in6ai_temporary : 0)
+-                                         | ((ifam->ifa_flags
+                                              & IFA_F_HOMEADDRESS)
+                                             ? in6ai_homeaddress : 0));
+                      memcpy (newp->info.addr, address ?: local,
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
new file mode 100644
index 0000000000..28aca83dff
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
@@ -0,0 +1,58 @@
+--- glibc-2.4/stdlib/longlong.h.ark     2006-03-11 22:49:27.000000000 +0100
++++ glibc-2.4/stdlib/longlong.h 2006-03-11 22:55:12.000000000 +0100
+@@ -206,6 +206,14 @@
+             "rI" ((USItype) (bh)),                                     \
+             "r" ((USItype) (al)),                                      \
+             "rI" ((USItype) (bl)) __CLOBBER_CC)
++/* v3m and all higher arches have long multiply support.  */
++#if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__)
++#define umul_ppmm(xh, xl, a, b) \
++  __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
++#define UMUL_TIME 5
++#define smul_ppmm(xh, xl, a, b) \
++  __asm__ ("smull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
++#else                                                     
+ #define umul_ppmm(xh, xl, a, b) \
+ {register USItype __t0, __t1, __t2;                                    \
+   __asm__ ("%@ Inlined umul_ppmm\n"                                    \
+@@ -227,7 +235,13 @@
+           : "r" ((USItype) (a)),                                       \
+             "r" ((USItype) (b)) __CLOBBER_CC );}
+ #define UMUL_TIME 20
++#endif
+ #define UDIV_TIME 100
++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
++#define count_leading_zeros(COUNT,X)   ((COUNT) = __builtin_clz (X))
++#define COUNT_LEADING_ZEROS_0 32
++#endif
++                                                          
+ #endif /* __arm__ */
+ 
+ #if defined (__hppa) && W_TYPE_SIZE == 32
+--- glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c.ark        2006-03-11 22:56:43.000000000 +0100
++++ glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c    2006-03-11 22:58:19.000000000 +0100
+@@ -0,0 +1,24 @@
++/* __clz_tab -- support for longlong.h
++   Copyright (C) 2004 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
++/* Nothing required.  */
++#else
++#include <stdlib/mp_clz_tab.c>
++#endif
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
new file mode 100644
index 0000000000..5c8062ecee
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
@@ -0,0 +1,12 @@
+Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+===================================================================
+--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h        2009-06-19 20:54:35.446686910 +0400
++++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h     2009-06-19 20:54:43.774683370 +0400
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+ 
+ #define FUTEX_WAIT             0
+ #define FUTEX_WAKE             1
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
new file mode 100644
index 0000000000..bc2b3dab84
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
@@ -0,0 +1,758 @@
+--- /dev/null   2004-02-02 20:32:13.000000000 +0000
++++ sysdeps/arm/memmove.S       2004-03-20 18:37:23.000000000 +0000
+@@ -0,0 +1,251 @@
++/*
++ *   Optimized memmove implementation for ARM processors
++ *
++ *     Author:         Nicolas Pitre
++ *     Created:        Dec 23, 2003
++ *     Copyright:      (C) MontaVista Software, Inc.
++ *
++ *   This file is free software; you can redistribute it and/or
++ *   modify it under the terms of the GNU Lesser General Public
++ *   License as published by the Free Software Foundation; either
++ *   version 2.1 of the License, or (at your option) any later version.
++ *
++ *   This file is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *   Lesser General Public License for more details.
++ */
++
++#include <sysdep.h>
++
++
++/*
++ * Endian independent macros for shifting bytes within registers.
++ */
++#ifndef __ARMEB__
++#define pull            lsr
++#define push            lsl
++#else
++#define pull            lsl
++#define push            lsr
++#endif
++
++/*
++ * Enable data preload for architectures that support it (ARMv5 and above)
++ */
++#if defined(__ARM_ARCH_5__) || \
++    defined(__ARM_ARCH_5T__) || \
++    defined(__ARM_ARCH_5TE__)
++#define PLD(code...)   code
++#else
++#define PLD(code...)
++#endif
++
++
++/* char * memmove (char *dst, const char *src) */
++ENTRY(memmove)
++               subs    ip, r0, r1
++               cmphi   r2, ip
++               bls     memcpy(PLT)
++
++               stmfd   sp!, {r0, r4, lr}
++               add     r1, r1, r2
++               add     r0, r0, r2
++               subs    r2, r2, #4
++               blt     25f
++               ands    ip, r0, #3
++       PLD(    pld     [r1, #-4]               )
++               bne     26f
++               ands    ip, r1, #3
++               bne     27f
++
++19:            subs    r2, r2, #4
++               blt     24f
++               subs    r2, r2, #8
++               blt     23f
++               subs    r2, r2, #16
++               blt     22f
++
++       PLD(    pld     [r1, #-32]              )
++       PLD(    subs    r2, r2, #96             )
++               stmfd   sp!, {r5 - r8}
++       PLD(    blt     21f                     )
++
++       PLD(    @ cache alignment               )
++       PLD(    ands    ip, r1, #31             )
++       PLD(    pld     [r1, #-64]              )
++       PLD(    beq     20f                     )
++       PLD(    cmp     r2, ip                  )
++       PLD(    pld     [r1, #-96]              )
++       PLD(    blt     20f                     )
++       PLD(    cmp     ip, #16                 )
++       PLD(    sub     r2, r2, ip              )
++       PLD(    ldmgedb r1!, {r3 - r6}          )
++       PLD(    stmgedb r0!, {r3 - r6}          )
++       PLD(    beq     20f                     )
++       PLD(    and     ip, ip, #15             )
++       PLD(    cmp     ip, #8                  )
++       PLD(    ldr     r3, [r1, #-4]!          )
++       PLD(    ldrge   r4, [r1, #-4]!          )
++       PLD(    ldrgt   r5, [r1, #-4]!          )
++       PLD(    str     r3, [r0, #-4]!          )
++       PLD(    strge   r4, [r0, #-4]!          )
++       PLD(    strgt   r5, [r0, #-4]!          )
++
++20:    PLD(    pld     [r1, #-96]              )
++       PLD(    pld     [r1, #-128]             )
++21:            ldmdb   r1!, {r3, r4, ip, lr}
++               subs    r2, r2, #32
++               stmdb   r0!, {r3, r4, ip, lr}
++               ldmdb   r1!, {r3, r4, ip, lr}
++               stmgedb r0!, {r3, r4, ip, lr}
++               ldmgedb r1!, {r3, r4, ip, lr}
++               stmgedb r0!, {r3, r4, ip, lr}
++               ldmgedb r1!, {r3, r4, ip, lr}
++               subges  r2, r2, #32
++               stmdb   r0!, {r3, r4, ip, lr}
++               bge     20b
++       PLD(    cmn     r2, #96                 )
++       PLD(    bge     21b                     )
++       PLD(    add     r2, r2, #96             )
++               tst     r2, #31
++               ldmfd   sp!, {r5 - r8}
++               ldmeqfd sp!, {r0, r4, pc}
++
++               tst     r2, #16
++22:            ldmnedb r1!, {r3, r4, ip, lr}
++               stmnedb r0!, {r3, r4, ip, lr}
++
++               tst     r2, #8
++23:            ldmnedb r1!, {r3, r4}
++               stmnedb r0!, {r3, r4}
++
++               tst     r2, #4
++24:            ldrne   r3, [r1, #-4]!
++               strne   r3, [r0, #-4]!
++
++25:            ands    r2, r2, #3
++               ldmeqfd sp!, {r0, r4, pc}
++
++               cmp     r2, #2
++               ldrb    r3, [r1, #-1]
++               ldrgeb  r4, [r1, #-2]
++               ldrgtb  ip, [r1, #-3]
++               strb    r3, [r0, #-1]
++               strgeb  r4, [r0, #-2]
++               strgtb  ip, [r0, #-3]
++               ldmfd   sp!, {r0, r4, pc}
++
++26:            cmp     ip, #2
++               ldrb    r3, [r1, #-1]!
++               ldrgeb  r4, [r1, #-1]!
++               ldrgtb  lr, [r1, #-1]!
++               strb    r3, [r0, #-1]!
++               strgeb  r4, [r0, #-1]!
++               strgtb  lr, [r0, #-1]!
++               subs    r2, r2, ip
++               blt     25b
++               ands    ip, r1, #3
++               beq     19b
++
++27:            bic     r1, r1, #3
++               cmp     ip, #2
++               ldr     r3, [r1]
++               beq     35f
++               blt     36f
++
++
++               .macro  backward_copy_shift push pull
++
++               cmp     r2, #12
++       PLD(    pld     [r1, #-4]               )
++               blt     33f
++               subs    r2, r2, #28
++               stmfd   sp!, {r5 - r9}
++               blt     31f
++
++       PLD(    subs    r2, r2, #96             )
++       PLD(    pld     [r1, #-32]              )
++       PLD(    blt     30f                     )
++       PLD(    pld     [r1, #-64]              )
++
++       PLD(    @ cache alignment               )
++       PLD(    ands    ip, r1, #31             )
++       PLD(    pld     [r1, #-96]              )
++       PLD(    beq     29f                     )
++       PLD(    cmp     r2, ip                  )
++       PLD(    pld     [r1, #-128]             )
++       PLD(    blt     29f                     )
++       PLD(    sub     r2, r2, ip              )
++28:    PLD(    mov     r4, r3, push #\push     )
++       PLD(    ldr     r3, [r1, #-4]!          )
++       PLD(    subs    ip, ip, #4              )
++       PLD(    orr     r4, r4, r3, pull #\pull )
++       PLD(    str     r4, [r0, #-4]!          )
++       PLD(    bgt     28b                     )
++
++29:    PLD(    pld     [r1, #-128]             )
++30:            mov     lr, r3, push #\push
++               ldmdb   r1!, {r3 - r9, ip}
++               subs    r2, r2, #32
++               orr     lr, lr, ip, pull #\pull
++               mov     ip, ip, push #\push
++               orr     ip, ip, r9, pull #\pull
++               mov     r9, r9, push #\push
++               orr     r9, r9, r8, pull #\pull
++               mov     r8, r8, push #\push
++               orr     r8, r8, r7, pull #\pull
++               mov     r7, r7, push #\push
++               orr     r7, r7, r6, pull #\pull
++               mov     r6, r6, push #\push
++               orr     r6, r6, r5, pull #\pull
++               mov     r5, r5, push #\push
++               orr     r5, r5, r4, pull #\pull
++               mov     r4, r4, push #\push
++               orr     r4, r4, r3, pull #\pull
++               stmdb   r0!, {r4 - r9, ip, lr}
++               bge     29b
++       PLD(    cmn     r2, #96                 )
++       PLD(    bge     30b                     )
++       PLD(    add     r2, r2, #96             )
++               cmn     r2, #16
++               blt     32f
++31:            mov     r7, r3, push #\push
++               ldmdb   r1!, {r3 - r6}
++               sub     r2, r2, #16
++               orr     r7, r7, r6, pull #\pull
++               mov     r6, r6, push #\push
++               orr     r6, r6, r5, pull #\pull
++               mov     r5, r5, push #\push
++               orr     r5, r5, r4, pull #\pull
++               mov     r4, r4, push #\push
++               orr     r4, r4, r3, pull #\pull
++               stmdb   r0!, {r4 - r7}
++32:            adds    r2, r2, #28
++               ldmfd   sp!, {r5 - r9}
++               blt     34f
++33:            mov     r4, r3, push #\push
++               ldr     r3, [r1, #-4]!
++               subs    r2, r2, #4
++               orr     r4, r4, r3, pull #\pull
++               str     r4, [r0, #-4]!
++               bge     33b
++34:
++               .endm
++
++
++               backward_copy_shift     push=8  pull=24
++               add     r1, r1, #3
++               b       25b
++
++35:            backward_copy_shift     push=16 pull=16
++               add     r1, r1, #2
++               b       25b
++
++36:            backward_copy_shift     push=24 pull=8
++               add     r1, r1, #1
++               b       25b
++
++               .size   memmove, . - memmove
++END(memmove)
++libc_hidden_builtin_def (memmove)
+--- /dev/null   2004-02-02 20:32:13.000000000 +0000
++++ sysdeps/arm/bcopy.S 2004-03-20 18:37:48.000000000 +0000
+@@ -0,0 +1,255 @@
++/*
++ *   Optimized memmove implementation for ARM processors
++ *
++ *     Author:         Nicolas Pitre
++ *     Created:        Dec 23, 2003
++ *     Copyright:      (C) MontaVista Software, Inc.
++ *
++ *   This file is free software; you can redistribute it and/or
++ *   modify it under the terms of the GNU Lesser General Public
++ *   License as published by the Free Software Foundation; either
++ *   version 2.1 of the License, or (at your option) any later version.
++ *
++ *   This file is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *   Lesser General Public License for more details.
++ */
++
++#include <sysdep.h>
++
++
++/*
++ * Endian independent macros for shifting bytes within registers.
++ */
++#ifndef __ARMEB__
++#define pull            lsr
++#define push            lsl
++#else
++#define pull            lsl
++#define push            lsr
++#endif
++
++/*
++ * Enable data preload for architectures that support it (ARMv5 and above)
++ */
++#if defined(__ARM_ARCH_5__) || \
++    defined(__ARM_ARCH_5T__) || \
++    defined(__ARM_ARCH_5TE__)
++#define PLD(code...)   code
++#else
++#define PLD(code...)
++#endif
++
++dst            .req    r1
++src            .req    r0
++
++/* void *bcopy (const char *src, char *dst, size_t size) */
++ENTRY(bcopy)
++               subs    ip, dst, src
++               cmphi   r2, ip
++               movls   r3, r0
++               movls   r0, r1
++               movls   r1, r3
++               bls     memcpy(PLT)
++
++               stmfd   sp!, {r4, lr}
++               add     src, src, r2
++               add     dst, dst, r2
++               subs    r2, r2, #4
++               blt     25f
++               ands    ip, dst, #3
++       PLD(    pld     [src, #-4]              )
++               bne     26f
++               ands    ip, src, #3
++               bne     27f
++
++19:            subs    r2, r2, #4
++               blt     24f
++               subs    r2, r2, #8
++               blt     23f
++               subs    r2, r2, #16
++               blt     22f
++
++       PLD(    pld     [src, #-32]             )
++       PLD(    subs    r2, r2, #96             )
++               stmfd   sp!, {r5 - r8}
++       PLD(    blt     21f                     )
++
++       PLD(    @ cache alignment               )
++       PLD(    ands    ip, src, #31            )
++       PLD(    pld     [src, #-64]             )
++       PLD(    beq     20f                     )
++       PLD(    cmp     r2, ip                  )
++       PLD(    pld     [src, #-96]             )
++       PLD(    blt     20f                     )
++       PLD(    cmp     ip, #16                 )
++       PLD(    sub     r2, r2, ip              )
++       PLD(    ldmgedb src!, {r3 - r6}         )
++       PLD(    stmgedb dst!, {r3 - r6}         )
++       PLD(    beq     20f                     )
++       PLD(    and     ip, ip, #15             )
++       PLD(    cmp     ip, #8                  )
++       PLD(    ldr     r3, [src, #-4]!         )
++       PLD(    ldrge   r4, [src, #-4]!         )
++       PLD(    ldrgt   r5, [src, #-4]!         )
++       PLD(    str     r3, [dst, #-4]!         )
++       PLD(    strge   r4, [dst, #-4]!         )
++       PLD(    strgt   r5, [dst, #-4]!         )
++
++20:    PLD(    pld     [src, #-96]             )
++       PLD(    pld     [src, #-128]            )
++21:            ldmdb   src!, {r3, r4, ip, lr}
++               subs    r2, r2, #32
++               stmdb   dst!, {r3, r4, ip, lr}
++               ldmdb   src!, {r3, r4, ip, lr}
++               stmgedb dst!, {r3, r4, ip, lr}
++               ldmgedb src!, {r3, r4, ip, lr}
++               stmgedb dst!, {r3, r4, ip, lr}
++               ldmgedb src!, {r3, r4, ip, lr}
++               subges  r2, r2, #32
++               stmdb   dst!, {r3, r4, ip, lr}
++               bge     20b
++       PLD(    cmn     r2, #96                 )
++       PLD(    bge     21b                     )
++       PLD(    add     r2, r2, #96             )
++               tst     r2, #31
++               ldmfd   sp!, {r5 - r8}
++               ldmeqfd sp!, {r4, pc}
++
++               tst     r2, #16
++22:            ldmnedb src!, {r3, r4, ip, lr}
++               stmnedb dst!, {r3, r4, ip, lr}
++
++               tst     r2, #8
++23:            ldmnedb src!, {r3, r4}
++               stmnedb dst!, {r3, r4}
++
++               tst     r2, #4
++24:            ldrne   r3, [src, #-4]!
++               strne   r3, [dst, #-4]!
++
++25:            ands    r2, r2, #3
++               ldmeqfd sp!, {dst, r4, pc}
++
++               cmp     r2, #2
++               ldrb    r3, [src, #-1]
++               ldrgeb  r4, [src, #-2]
++               ldrgtb  ip, [src, #-3]
++               strb    r3, [dst, #-1]
++               strgeb  r4, [dst, #-2]
++               strgtb  ip, [dst, #-3]
++               ldmfd   sp!, {dst, r4, pc}
++
++26:            cmp     ip, #2
++               ldrb    r3, [src, #-1]!
++               ldrgeb  r4, [src, #-1]!
++               ldrgtb  lr, [src, #-1]!
++               strb    r3, [dst, #-1]!
++               strgeb  r4, [dst, #-1]!
++               strgtb  lr, [dst, #-1]!
++               subs    r2, r2, ip
++               blt     25b
++               ands    ip, src, #3
++               beq     19b
++
++27:            bic     src, src, #3
++               cmp     ip, #2
++               ldr     r3, [src]
++               beq     35f
++               blt     36f
++
++
++               .macro  backward_copy_shift push pull
++
++               cmp     r2, #12
++       PLD(    pld     [src, #-4]              )
++               blt     33f
++               subs    r2, r2, #28
++               stmfd   sp!, {r5 - r9}
++               blt     31f
++
++       PLD(    subs    r2, r2, #96             )
++       PLD(    pld     [src, #-32]             )
++       PLD(    blt     30f                     )
++       PLD(    pld     [src, #-64]             )
++
++       PLD(    @ cache alignment               )
++       PLD(    ands    ip, src, #31            )
++       PLD(    pld     [src, #-96]             )
++       PLD(    beq     29f                     )
++       PLD(    cmp     r2, ip                  )
++       PLD(    pld     [src, #-128]            )
++       PLD(    blt     29f                     )
++       PLD(    sub     r2, r2, ip              )
++28:    PLD(    mov     r4, r3, push #\push     )
++       PLD(    ldr     r3, [src, #-4]!         )
++       PLD(    subs    ip, ip, #4              )
++       PLD(    orr     r4, r4, r3, pull #\pull )
++       PLD(    str     r4, [dst, #-4]!         )
++       PLD(    bgt     28b                     )
++
++29:    PLD(    pld     [src, #-128]            )
++30:            mov     lr, r3, push #\push
++               ldmdb   src!, {r3 - r9, ip}
++               subs    r2, r2, #32
++               orr     lr, lr, ip, pull #\pull
++               mov     ip, ip, push #\push
++               orr     ip, ip, r9, pull #\pull
++               mov     r9, r9, push #\push
++               orr     r9, r9, r8, pull #\pull
++               mov     r8, r8, push #\push
++               orr     r8, r8, r7, pull #\pull
++               mov     r7, r7, push #\push
++               orr     r7, r7, r6, pull #\pull
++               mov     r6, r6, push #\push
++               orr     r6, r6, r5, pull #\pull
++               mov     r5, r5, push #\push
++               orr     r5, r5, r4, pull #\pull
++               mov     r4, r4, push #\push
++               orr     r4, r4, r3, pull #\pull
++               stmdb   dst!, {r4 - r9, ip, lr}
++               bge     29b
++       PLD(    cmn     r2, #96                 )
++       PLD(    bge     30b                     )
++       PLD(    add     r2, r2, #96             )
++               cmn     r2, #16
++               blt     32f
++31:            mov     r7, r3, push #\push
++               ldmdb   src!, {r3 - r6}
++               sub     r2, r2, #16
++               orr     r7, r7, r6, pull #\pull
++               mov     r6, r6, push #\push
++               orr     r6, r6, r5, pull #\pull
++               mov     r5, r5, push #\push
++               orr     r5, r5, r4, pull #\pull
++               mov     r4, r4, push #\push
++               orr     r4, r4, r3, pull #\pull
++               stmdb   dst!, {r4 - r7}
++32:            adds    r2, r2, #28
++               ldmfd   sp!, {r5 - r9}
++               blt     34f
++33:            mov     r4, r3, push #\push
++               ldr     r3, [src, #-4]!
++               subs    r2, r2, #4
++               orr     r4, r4, r3, pull #\pull
++               str     r4, [dst, #-4]!
++               bge     33b
++34:
++               .endm
++
++
++               backward_copy_shift     push=8  pull=24
++               add     src, src, #3
++               b       25b
++
++35:            backward_copy_shift     push=16 pull=16
++               add     src, src, #2
++               b       25b
++
++36:            backward_copy_shift     push=24 pull=8
++               add     src, src, #1
++               b       25b
++
++               .size   bcopy, . - bcopy
++END(bcopy)
+
+--- /dev/null   2004-02-02 20:32:13.000000000 +0000
++++ sysdeps/arm/memcpy.S        2004-05-02 14:33:22.000000000 +0100
+@@ -0,0 +1,242 @@
++/*
++ *   Optimized memcpy implementation for ARM processors
++ *
++ *     Author:         Nicolas Pitre
++ *     Created:        Dec 23, 2003
++ *     Copyright:      (C) MontaVista Software, Inc.
++ *
++ *   This file is free software; you can redistribute it and/or
++ *   modify it under the terms of the GNU Lesser General Public
++ *   License as published by the Free Software Foundation; either
++ *   version 2.1 of the License, or (at your option) any later version.
++ *
++ *   This file is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *   Lesser General Public License for more details.
++ */
++
++#include <sysdep.h>
++
++
++/*
++ * Endian independent macros for shifting bytes within registers.
++ */
++#ifndef __ARMEB__
++#define pull            lsr
++#define push            lsl
++#else
++#define pull            lsl
++#define push            lsr
++#endif
++
++/*
++ * Enable data preload for architectures that support it (ARMv5 and above)
++ */
++#if defined(__ARM_ARCH_5__) || \
++    defined(__ARM_ARCH_5T__) || \
++    defined(__ARM_ARCH_5TE__)
++#define PLD(code...)   code
++#else
++#define PLD(code...)
++#endif
++
++
++/* char * memcpy (char *dst, const char *src) */
++
++ENTRY(memcpy)
++               subs    r2, r2, #4
++               stmfd   sp!, {r0, r4, lr}
++               blt     7f
++               ands    ip, r0, #3
++       PLD(    pld     [r1, #0]                )
++               bne     8f
++               ands    ip, r1, #3
++               bne     9f
++
++1:             subs    r2, r2, #4
++               blt     6f
++               subs    r2, r2, #8
++               blt     5f
++               subs    r2, r2, #16
++               blt     4f
++
++       PLD(    subs    r2, r2, #65             )
++               stmfd   sp!, {r5 - r8}
++       PLD(    blt     3f                      )
++       PLD(    pld     [r1, #32]               )
++
++       PLD(    @ cache alignment               )
++       PLD(    ands    ip, r1, #31             )
++       PLD(    pld     [r1, #64]               )
++       PLD(    beq     2f                      )
++       PLD(    rsb     ip, ip, #32             )
++       PLD(    cmp     r2, ip                  )
++       PLD(    pld     [r1, #96]               )
++       PLD(    blt     2f                      )
++       PLD(    cmp     ip, #16                 )
++       PLD(    sub     r2, r2, ip              )
++       PLD(    ldmgeia r1!, {r3 - r6}          )
++       PLD(    stmgeia r0!, {r3 - r6}          )
++       PLD(    beq     2f                      )
++       PLD(    and     ip, ip, #15             )
++       PLD(    cmp     ip, #8                  )
++       PLD(    ldr     r3, [r1], #4            )
++       PLD(    ldrge   r4, [r1], #4            )
++       PLD(    ldrgt   r5, [r1], #4            )
++       PLD(    str     r3, [r0], #4            )
++       PLD(    strge   r4, [r0], #4            )
++       PLD(    strgt   r5, [r0], #4            )
++
++2:     PLD(    pld     [r1, #96]               )
++3:             ldmia   r1!, {r3 - r8, ip, lr}
++               subs    r2, r2, #32
++               stmia   r0!, {r3 - r8, ip, lr}
++               bge     2b
++       PLD(    cmn     r2, #65                 )
++       PLD(    bge     3b                      )
++       PLD(    add     r2, r2, #65             )
++               tst     r2, #31
++               ldmfd   sp!, {r5 - r8}
++               ldmeqfd sp!, {r0, r4, pc}
++
++               tst     r2, #16
++4:             ldmneia r1!, {r3, r4, ip, lr}
++               stmneia r0!, {r3, r4, ip, lr}
++
++               tst     r2, #8
++5:             ldmneia r1!, {r3, r4}
++               stmneia r0!, {r3, r4}
++
++               tst     r2, #4
++6:             ldrne   r3, [r1], #4
++               strne   r3, [r0], #4
++
++7:             ands    r2, r2, #3
++               ldmeqfd sp!, {r0, r4, pc}
++
++               cmp     r2, #2
++               ldrb    r3, [r1], #1
++               ldrgeb  r4, [r1], #1
++               ldrgtb  ip, [r1]
++               strb    r3, [r0], #1
++               strgeb  r4, [r0], #1
++               strgtb  ip, [r0]
++               ldmfd   sp!, {r0, r4, pc}
++
++8:             rsb     ip, ip, #4
++               cmp     ip, #2
++               ldrb    r3, [r1], #1
++               ldrgeb  r4, [r1], #1
++               ldrgtb  lr, [r1], #1
++               strb    r3, [r0], #1
++               strgeb  r4, [r0], #1
++               strgtb  lr, [r0], #1
++               subs    r2, r2, ip
++               blt     7b
++               ands    ip, r1, #3
++               beq     1b
++
++9:             bic     r1, r1, #3
++               cmp     ip, #2
++               ldr     lr, [r1], #4
++               beq     17f
++               bgt     18f
++
++
++               .macro  forward_copy_shift pull push
++
++               cmp     r2, #12
++       PLD(    pld     [r1, #0]                )
++               blt     15f
++               subs    r2, r2, #28
++               stmfd   sp!, {r5 - r9}
++               blt     13f
++
++       PLD(    subs    r2, r2, #97             )
++       PLD(    blt     12f                     )
++       PLD(    pld     [r1, #32]               )
++
++       PLD(    @ cache alignment               )
++       PLD(    rsb     ip, r1, #36             )
++       PLD(    pld     [r1, #64]               )
++       PLD(    ands    ip, ip, #31             )
++       PLD(    pld     [r1, #96]               )
++       PLD(    beq     11f                     )
++       PLD(    cmp     r2, ip                  )
++       PLD(    pld     [r1, #128]              )
++       PLD(    blt     11f                     )
++       PLD(    sub     r2, r2, ip              )
++10:    PLD(    mov     r3, lr, pull #\pull     )
++       PLD(    ldr     lr, [r1], #4            )
++       PLD(    subs    ip, ip, #4              )
++       PLD(    orr     r3, r3, lr, push #\push )
++       PLD(    str     r3, [r0], #4            )
++       PLD(    bgt     10b                     )
++
++11:    PLD(    pld     [r1, #128]              )
++12:            mov     r3, lr, pull #\pull
++               ldmia   r1!, {r4 - r9, ip, lr}
++               subs    r2, r2, #32
++               orr     r3, r3, r4, push #\push
++               mov     r4, r4, pull #\pull
++               orr     r4, r4, r5, push #\push
++               mov     r5, r5, pull #\pull
++               orr     r5, r5, r6, push #\push
++               mov     r6, r6, pull #\pull
++               orr     r6, r6, r7, push #\push
++               mov     r7, r7, pull #\pull
++               orr     r7, r7, r8, push #\push
++               mov     r8, r8, pull #\pull
++               orr     r8, r8, r9, push #\push
++               mov     r9, r9, pull #\pull
++               orr     r9, r9, ip, push #\push
++               mov     ip, ip, pull #\pull
++               orr     ip, ip, lr, push #\push
++               stmia   r0!, {r3 - r9, ip}
++               bge     11b
++       PLD(    cmn     r2, #97                 )
++       PLD(    bge     12b                     )
++       PLD(    add     r2, r2, #97             )
++               cmn     r2, #16
++               blt     14f
++13:            mov     r3, lr, pull #\pull
++               ldmia   r1!, {r4 - r6, lr}
++               sub     r2, r2, #16
++               orr     r3, r3, r4, push #\push
++               mov     r4, r4, pull #\pull
++               orr     r4, r4, r5, push #\push
++               mov     r5, r5, pull #\pull
++               orr     r5, r5, r6, push #\push
++               mov     r6, r6, pull #\pull
++               orr     r6, r6, lr, push #\push
++               stmia   r0!, {r3 - r6}
++14:            adds    r2, r2, #28
++               ldmfd   sp!, {r5 - r9}
++               blt     16f
++15:            mov     r3, lr, pull #\pull
++               ldr     lr, [r1], #4
++               subs    r2, r2, #4
++               orr     r3, r3, lr, push #\push
++               str     r3, [r0], #4
++               bge     15b
++16:
++               .endm
++
++
++               forward_copy_shift      pull=8  push=24
++               sub     r1, r1, #3
++               b       7b
++
++17:            forward_copy_shift      pull=16 push=16
++               sub     r1, r1, #2
++               b       7b
++
++18:            forward_copy_shift      pull=24 push=8
++               sub     r1, r1, #1
++               b       7b
++
++               .size   memcpy, . - memcpy
++END(memcpy)
++libc_hidden_builtin_def (memcpy)
++
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
new file mode 100644
index 0000000000..2fedfa6db0
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
@@ -0,0 +1,10 @@
+--- glibc-2.4/elf/Versions.ark  2006-03-11 23:30:09.000000000 +0100
++++ glibc-2.4/elf/Versions      2006-03-11 23:31:44.000000000 +0100
+@@ -63,5 +63,7 @@
+     _dl_debug_state;
+     # Pointer protection.
+     __pointer_chk_guard;
++    # for ldconfig
++    _dl_cache_libcmp;
+   }
+ }
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf b/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
new file mode 100644
index 0000000000..ddd777db2a
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/usr/local/lib
+include /etc/ld.so.conf.d/*
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
new file mode 100644
index 0000000000..1f32f6d7f2
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
@@ -0,0 +1,11 @@
+--- glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h~        Thu May 27 13:16:33 1999
++++ glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h Thu May 27 13:17:55 1999
+@@ -71,7 +71,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define        _PATH_DEV       "/dev/"
+ #define        _PATH_TMP       "/tmp/"
+-#define        _PATH_VARDB     "/var/db/"
++#define        _PATH_VARDB     "/var/lib/misc/"
+ #define        _PATH_VARRUN    "/var/run/"
+ #define        _PATH_VARTMP    "/var/tmp/"
+ 
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk b/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
new file mode 100644
index 0000000000..d2a28c2dc6
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
@@ -0,0 +1,11 @@
+#!/usr/bin/make
+
+include $(IN)
+
+all:
+        rm -f $(OUT)
+        touch $(OUT)
+        for locale in $(SUPPORTED-LOCALES); do \
+                [ $$locale = true ] && continue; \
+                echo $$locale | sed 's,/, ,' >> $(OUT); \
+        done
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
new file mode 100644
index 0000000000..47e7dedc30
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
@@ -0,0 +1,35 @@
+/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _SYS_SELECT_H
+# error "Never use <bits/select.h> directly; include <sys/select.h> instead."
+#endif
+
+
+/* We don't use `memset' because this would require a prototype and
+   the array isn't too big.  */
+#define __FD_ZERO(s) \
+  do {                                                                        \
+    unsigned int __i;                                                         \
+    fd_set *__arr = (s);                                                      \
+    for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i)          \
+      __FDS_BITS (__arr)[__i] = 0;                                            \
+  } while (0)
+#define __FD_SET(d, s)     (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d))
+#define __FD_CLR(d, s)     (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d))
+#define __FD_ISSET(d, s)   ((__FDS_BITS (s)[__FDELT(d)] & __FDMASK(d)) != 0)
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
new file mode 100644
index 0000000000..b3184d1de9
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
@@ -0,0 +1,75 @@
+/* System-dependent timing definitions.  Generic version.
+   Copyright (C) 1996,1997,1999-2002,2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ * Never include this file directly; use <time.h> instead.
+ */
+
+#ifndef __need_timeval
+# ifndef _BITS_TIME_H
+#  define _BITS_TIME_H  1
+
+/* ISO/IEC 9899:1990 7.12.1: <time.h>
+   The macro `CLOCKS_PER_SEC' is the number per second of the value
+   returned by the `clock' function. */
+/* CAE XSH, Issue 4, Version 2: <time.h>
+   The value of CLOCKS_PER_SEC is required to be 1 million on all
+   XSI-conformant systems. */
+#  define CLOCKS_PER_SEC  1000000l
+
+#  if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
+/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
+   presents the real value for clock ticks per second for the system.  */
+#   include <bits/types.h>
+extern long int __sysconf (int);
+#   define CLK_TCK ((__clock_t) __sysconf (2))  /* 2 is _SC_CLK_TCK */
+#  endif
+
+#  ifdef __USE_POSIX199309
+/* Identifier for system-wide realtime clock.  */
+#   define CLOCK_REALTIME               0
+/* Monotonic system-wide clock.  */
+#   define CLOCK_MONOTONIC              1
+/* High-resolution timer from the CPU.  */
+#   define CLOCK_PROCESS_CPUTIME_ID     2
+/* Thread-specific CPU-time clock.  */
+#   define CLOCK_THREAD_CPUTIME_ID      3
+
+/* Flag to indicate time is absolute.  */
+#   define TIMER_ABSTIME                1
+#  endif
+
+# endif /* bits/time.h */
+#endif
+
+#ifdef __need_timeval
+# undef __need_timeval
+# ifndef _STRUCT_TIMEVAL
+#  define _STRUCT_TIMEVAL       1
+#  include <bits/types.h>
+
+/* A time value that is accurate to the nearest
+   microsecond but also has a range of years.  */
+struct timeval
+  {
+    __time_t tv_sec;            /* Seconds.  */
+    __suseconds_t tv_usec;      /* Microseconds.  */
+  };
+# endif /* struct timeval */
+#endif  /* need timeval */
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
new file mode 100644
index 0000000000..65c8a9fe90
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
@@ -0,0 +1,200 @@
+/* bits/types.h -- definitions of __*_t types underlying *_t types.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ * Never include this file directly; use <sys/types.h> instead.
+ */
+
+#ifndef _BITS_TYPES_H
+#define _BITS_TYPES_H   1
+
+#include <features.h>
+#include <bits/wordsize.h>
+
+#define __need_size_t
+#include <stddef.h>
+
+/* Convenience types.  */
+typedef unsigned char __u_char;
+typedef unsigned short int __u_short;
+typedef unsigned int __u_int;
+typedef unsigned long int __u_long;
+
+/* Fixed-size types, underlying types depend on word size and compiler.  */
+typedef signed char __int8_t;
+typedef unsigned char __uint8_t;
+typedef signed short int __int16_t;
+typedef unsigned short int __uint16_t;
+typedef signed int __int32_t;
+typedef unsigned int __uint32_t;
+#if __WORDSIZE == 64
+typedef signed long int __int64_t;
+typedef unsigned long int __uint64_t;
+#elif defined __GLIBC_HAVE_LONG_LONG
+__extension__ typedef signed long long int __int64_t;
+__extension__ typedef unsigned long long int __uint64_t;
+#endif
+
+/* quad_t is also 64 bits.  */
+#if __WORDSIZE == 64
+typedef long int __quad_t;
+typedef unsigned long int __u_quad_t;
+#elif defined __GLIBC_HAVE_LONG_LONG
+__extension__ typedef long long int __quad_t;
+__extension__ typedef unsigned long long int __u_quad_t;
+#else
+typedef struct
+{
+  long __val[2];
+} __quad_t;
+typedef struct
+{
+  __u_long __val[2];
+} __u_quad_t;
+#endif
+
+
+/* The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+   macros for each of the OS types we define below.  The definitions
+   of those macros must use the following macros for underlying types.
+   We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+   variants of each of the following integer types on this machine.
+
+        16              -- "natural" 16-bit type (always short)
+        32              -- "natural" 32-bit type (always int)
+        64              -- "natural" 64-bit type (long or long long)
+        LONG32          -- 32-bit type, traditionally long
+        QUAD            -- 64-bit type, always long long
+        WORD            -- natural type of __WORDSIZE bits (int or long)
+        LONGWORD        -- type of __WORDSIZE bits, traditionally long
+
+   We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+   conventional uses of `long' or `long long' type modifiers match the
+   types we define, even when a less-adorned type would be the same size.
+   This matters for (somewhat) portably writing printf/scanf formats for
+   these types, where using the appropriate l or ll format modifiers can
+   make the typedefs and the formats match up across all GNU platforms.  If
+   we used `long' when it's 64 bits where `long long' is expected, then the
+   compiler would warn about the formats not matching the argument types,
+   and the programmer changing them to shut up the compiler would break the
+   program's portability.
+
+   Here we assume what is presently the case in all the GCC configurations
+   we support: long long is always 64 bits, long is always word/address size,
+   and int is always 32 bits.  */
+
+#define __S16_TYPE              short int
+#define __U16_TYPE              unsigned short int
+#define __S32_TYPE              int
+#define __U32_TYPE              unsigned int
+#define __SLONGWORD_TYPE        long int
+#define __ULONGWORD_TYPE        unsigned long int
+#if __WORDSIZE == 32
+# define __SQUAD_TYPE           __quad_t
+# define __UQUAD_TYPE           __u_quad_t
+# define __SWORD_TYPE           int
+# define __UWORD_TYPE           unsigned int
+# define __SLONG32_TYPE         long int
+# define __ULONG32_TYPE         unsigned long int
+# define __S64_TYPE             __quad_t
+# define __U64_TYPE             __u_quad_t
+/* We want __extension__ before typedef's that use nonstandard base types
+   such as `long long' in C89 mode.  */
+# define __STD_TYPE             __extension__ typedef
+#elif __WORDSIZE == 64
+# define __SQUAD_TYPE           long int
+# define __UQUAD_TYPE           unsigned long int
+# define __SWORD_TYPE           long int
+# define __UWORD_TYPE           unsigned long int
+# define __SLONG32_TYPE         int
+# define __ULONG32_TYPE         unsigned int
+# define __S64_TYPE             long int
+# define __U64_TYPE             unsigned long int
+/* No need to mark the typedef with __extension__.   */
+# define __STD_TYPE             typedef
+#else
+# error
+#endif
+#include <bits/typesizes.h>     /* Defines __*_T_TYPE macros.  */
+
+
+__STD_TYPE __DEV_T_TYPE __dev_t;        /* Type of device numbers.  */
+__STD_TYPE __UID_T_TYPE __uid_t;        /* Type of user identifications.  */
+__STD_TYPE __GID_T_TYPE __gid_t;        /* Type of group identifications.  */
+__STD_TYPE __INO_T_TYPE __ino_t;        /* Type of file serial numbers.  */
+__STD_TYPE __INO64_T_TYPE __ino64_t;    /* Type of file serial numbers (LFS).*/
+__STD_TYPE __MODE_T_TYPE __mode_t;      /* Type of file attribute bitmasks.  */
+__STD_TYPE __NLINK_T_TYPE __nlink_t;    /* Type of file link counts.  */
+__STD_TYPE __OFF_T_TYPE __off_t;        /* Type of file sizes and offsets.  */
+__STD_TYPE __OFF64_T_TYPE __off64_t;    /* Type of file sizes and offsets (LFS).  */
+__STD_TYPE __PID_T_TYPE __pid_t;        /* Type of process identifications.  */
+__STD_TYPE __FSID_T_TYPE __fsid_t;      /* Type of file system IDs.  */
+__STD_TYPE __CLOCK_T_TYPE __clock_t;    /* Type of CPU usage counts.  */
+__STD_TYPE __RLIM_T_TYPE __rlim_t;      /* Type for resource measurement.  */
+__STD_TYPE __RLIM64_T_TYPE __rlim64_t;  /* Type for resource measurement (LFS).  */
+__STD_TYPE __ID_T_TYPE __id_t;          /* General type for IDs.  */
+__STD_TYPE __TIME_T_TYPE __time_t;      /* Seconds since the Epoch.  */
+__STD_TYPE __USECONDS_T_TYPE __useconds_t; /* Count of microseconds.  */
+__STD_TYPE __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds.  */
+
+__STD_TYPE __DADDR_T_TYPE __daddr_t;    /* The type of a disk address.  */
+__STD_TYPE __SWBLK_T_TYPE __swblk_t;    /* Type of a swap block maybe?  */
+__STD_TYPE __KEY_T_TYPE __key_t;        /* Type of an IPC key.  */
+
+/* Clock ID used in clock and timer functions.  */
+__STD_TYPE __CLOCKID_T_TYPE __clockid_t;
+
+/* Timer ID returned by `timer_create'.  */
+__STD_TYPE __TIMER_T_TYPE __timer_t;
+
+/* Type to represent block size.  */
+__STD_TYPE __BLKSIZE_T_TYPE __blksize_t;
+
+/* Types from the Large File Support interface.  */
+
+/* Type to count number of disk blocks.  */
+__STD_TYPE __BLKCNT_T_TYPE __blkcnt_t;
+__STD_TYPE __BLKCNT64_T_TYPE __blkcnt64_t;
+
+/* Type to count file system blocks.  */
+__STD_TYPE __FSBLKCNT_T_TYPE __fsblkcnt_t;
+__STD_TYPE __FSBLKCNT64_T_TYPE __fsblkcnt64_t;
+
+/* Type to count file system nodes.  */
+__STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t;
+__STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_t;
+
+__STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error.  */
+
+/* These few don't really vary by system, they always correspond
+   to one of the other defined types.  */
+typedef __off64_t __loff_t;     /* Type of file sizes and offsets (LFS).  */
+typedef __quad_t *__qaddr_t;
+typedef char *__caddr_t;
+
+/* Duplicates info from stdint.h but this is used in unistd.h.  */
+__STD_TYPE __SWORD_TYPE __intptr_t;
+
+/* Duplicate info from sys/socket.h.  */
+__STD_TYPE __U32_TYPE __socklen_t;
+
+
+#undef __STD_TYPE
+
+#endif /* bits/types.h */
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
new file mode 100644
index 0000000000..e9226c4174
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
@@ -0,0 +1,66 @@
+/* bits/typesizes.h -- underlying types for *_t.  Generic version.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _BITS_TYPES_H
+# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
+#endif
+
+#ifndef _BITS_TYPESIZES_H
+#define _BITS_TYPESIZES_H       1
+
+/* See <bits/types.h> for the meaning of these macros.  This file exists so
+   that <bits/types.h> need not vary across different GNU platforms.  */
+
+#define __DEV_T_TYPE            __UQUAD_TYPE
+#define __UID_T_TYPE            __U32_TYPE
+#define __GID_T_TYPE            __U32_TYPE
+#define __INO_T_TYPE            __ULONGWORD_TYPE
+#define __INO64_T_TYPE          __UQUAD_TYPE
+#define __MODE_T_TYPE           __U32_TYPE
+#define __NLINK_T_TYPE          __UWORD_TYPE
+#define __OFF_T_TYPE            __SLONGWORD_TYPE
+#define __OFF64_T_TYPE          __SQUAD_TYPE
+#define __PID_T_TYPE            __S32_TYPE
+#define __RLIM_T_TYPE           __ULONGWORD_TYPE
+#define __RLIM64_T_TYPE         __UQUAD_TYPE
+#define __BLKCNT_T_TYPE         __SLONGWORD_TYPE
+#define __BLKCNT64_T_TYPE       __SQUAD_TYPE
+#define __FSBLKCNT_T_TYPE       __ULONGWORD_TYPE
+#define __FSBLKCNT64_T_TYPE     __UQUAD_TYPE
+#define __FSFILCNT_T_TYPE       __ULONGWORD_TYPE
+#define __FSFILCNT64_T_TYPE     __UQUAD_TYPE
+#define __ID_T_TYPE             __U32_TYPE
+#define __CLOCK_T_TYPE          __SLONGWORD_TYPE
+#define __TIME_T_TYPE           __SLONGWORD_TYPE
+#define __USECONDS_T_TYPE       __U32_TYPE
+#define __SUSECONDS_T_TYPE      __SLONGWORD_TYPE
+#define __DADDR_T_TYPE          __S32_TYPE
+#define __SWBLK_T_TYPE          __SLONGWORD_TYPE
+#define __KEY_T_TYPE            __S32_TYPE
+#define __CLOCKID_T_TYPE        __S32_TYPE
+#define __TIMER_T_TYPE          void *
+#define __BLKSIZE_T_TYPE        __SLONGWORD_TYPE
+#define __FSID_T_TYPE           struct { int __val[2]; }
+#define __SSIZE_T_TYPE          __SWORD_TYPE
+
+/* Number of descriptors that can fit in an `fd_set'.  */
+#define __FD_SETSIZE            1024
+
+
+#endif /* bits/typesizes.h */
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
new file mode 100644
index 0000000000..09200dd43b
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
@@ -0,0 +1,35 @@
+--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200
++++ glibc-2.9/configure.in      2009-10-22 15:37:33.000000000 +0200
+@@ -844,10 +844,10 @@
+ # Accept binutils 2.13 or newer.
+ AC_CHECK_PROG_VER(AS, $AS, --version,
+                  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
+-                 [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
++                 [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as")
+ AC_CHECK_PROG_VER(LD, $LD, --version,
+                  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
+-                 [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
++                 [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld")
+ 
+ # We need the physical current working directory.  We cannot use the
+ # "pwd -P" shell builtin since that's not portable.  Instead we try to
+--- glibc-2.9.orig/configure    2009-02-26 22:28:17.000000000 +0100
++++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200
+@@ -4531,7 +4531,7 @@
+   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    2.1[3-9]*)
++    2.1[3-9]* | 2.2*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 
+@@ -4594,7 +4594,7 @@
+   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    2.1[3-9]*)
++    2.1[3-9]* | 2.2*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
new file mode 100644
index 0000000000..a552cf0d1f
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
@@ -0,0 +1,13 @@
+Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+--- /tmp/stdio-lock.h   2008-03-04 18:51:15.555038993 +0100
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h       2008-03-04 18:51:28.445035052 +0100
+@@ -50,6 +50,8 @@
+   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
+   _IO_flockfile (_fp)
+ 
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+   _IO_funlockfile (_fp);                                                     \
+   _IO_cleanup_region_end (0)
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
new file mode 100644
index 0000000000..7eb17179ba
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
@@ -0,0 +1,15 @@
+http://sourceware.org/ml/libc-ports/2008-04/msg00005.html
+
+
+Index: glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
+===================================================================
+--- glibc-2.6.1.orig/ports/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-09-12 18:08:18.000000000 -0700
++++ glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c      2008-09-12 18:08:28.000000000 -0700
+@@ -45,7 +45,6 @@
+ #include <sys/mman.h>
+ 
+ #include <linux/version.h>
+-#include <asm/page.h>
+ #include <sys/sysctl.h>
+ 
+ #define PATH_ARM_SYSTYPE       "/etc/arm_systype"
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
new file mode 100644
index 0000000000..3cff6bbcfa
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
@@ -0,0 +1,343 @@
+From libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org Tue Oct 31 17:37:21 2006
+Return-Path: <libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org>
+Delivered-To: listarch-libc-ports at sources dot redhat dot com
+Received: (qmail 17273 invoked by alias); 31 Oct 2006 17:37:20 -0000
+Received: (qmail 17262 invoked by uid 22791); 31 Oct 2006 17:37:19 -0000
+X-Spam-Status: No, hits=-2.5 required=5.0       tests=AWL,BAYES_00,TW_CP
+X-Spam-Check-By: sourceware.org
+Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17)     by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Tue, 31 Oct 2006 17:37:11 +0000
+Received: from drow by nevyn.them.org with local (Exim 4.54)    id 1GexXw-0007Dj-30; Tue, 31 Oct 2006 12:37:08 -0500
+Date: Tue, 31 Oct 2006 12:37:08 -0500
+From: Daniel Jacobowitz <drow at false dot org>
+To: Mike Frysinger <vapier at gentoo dot org>
+Cc: libc-ports at sourceware dot org, Philip Balister <philip dot balister at gmail dot com>
+Subject: Re: Problem with glibc-2.5 on ARM
+Message-ID: <20061031173708.GJ20468@nevyn.them.org>
+References: <499146270610241149ibe030e0nd9d6b177a95b346e@mail.gmail.com> <499146270610241254u7cadf63ej2edf05cedbc5266f@mail.gmail.com> <20061024195837.GA20181@nevyn.them.org> <200610291954.27022.vapier@gentoo.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <200610291954 dot 27022 dot vapier at gentoo dot org>
+User-Agent: Mutt/1.5.13 (2006-08-11)
+X-IsSubscribed: yes
+Mailing-List: contact libc-ports-help at sourceware dot org; run by ezmlm
+Precedence: bulk
+List-Subscribe: <mailto:libc-ports-subscribe at sourceware dot org>
+List-Post: <mailto:libc-ports at sourceware dot org>
+List-Help: <mailto:libc-ports-help at sourceware dot org>, <http://sourceware dot org/lists dot html#faqs>
+Sender: libc-ports-owner at sourceware dot org
+Delivered-To: mailing list libc-ports at sourceware dot org
+
+On Sun, Oct 29, 2006 at 07:54:25PM -0500, Mike Frysinger wrote:
+> On Tuesday 24 October 2006 15:58, Daniel Jacobowitz wrote:
+> > ARM is going to need a slightly different version of that file, I
+> > guess.
+> 
+> would declaring req with attribute packed not help ?
+> -mike
+
+Nope.  "struct rtgenmsg" would still have size 4.
+
+Philip, are you still at all interested in this for the old ABI?
+I don't have time to test this patch right now, but I think it
+will work.
+
+-- 
+Daniel Jacobowitz
+CodeSourcery
+
+2006-10-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        * sysdeps/unix/sysv/linux/arm/check_pf.c: New file.
+        * sysdeps/unix/sysv/linux/arm/eabi/check_pf.c: New file.
+
+Index: sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+RCS file: sysdeps/unix/sysv/linux/arm/check_pf.c
+diff -N sysdeps/unix/sysv/linux/arm/check_pf.c
+--- /dev/null   1 Jan 1970 00:00:00 -0000
++++ sysdeps/unix/sysv/linux/arm/check_pf.c      31 Oct 2006 17:29:58 -0000
+@@ -0,0 +1,274 @@
++/* Determine protocol families for which interfaces exist.  ARM Linux version.
++   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <assert.h>
++#include <errno.h>
++#include <ifaddrs.h>
++#include <netdb.h>
++#include <stddef.h>
++#include <string.h>
++#include <time.h>
++#include <unistd.h>
++#include <sys/socket.h>
++
++#include <asm/types.h>
++#include <linux/netlink.h>
++#include <linux/rtnetlink.h>
++
++#include <not-cancel.h>
++#include <kernel-features.h>
++
++
++#ifndef IFA_F_TEMPORARY
++# define IFA_F_TEMPORARY IFA_F_SECONDARY
++#endif
++#ifndef IFA_F_HOMEADDRESS
++# define IFA_F_HOMEADDRESS 0
++#endif
++
++
++static int
++make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
++             struct in6addrinfo **in6ai, size_t *in6ailen)
++{
++  struct req
++  {
++    struct nlmsghdr nlh;
++    struct rtgenmsg g;
++  } req;
++  struct sockaddr_nl nladdr;
++
++  /* struct rtgenmsg consists of a single byte but the ARM ABI rounds
++     it up to a word.  Clear the padding explicitly here.  */
++  assert (sizeof (req.g) == 4);
++  memset (&req.g, '\0', sizeof (req.g));
++
++  req.nlh.nlmsg_len = sizeof (req);
++  req.nlh.nlmsg_type = RTM_GETADDR;
++  req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
++  req.nlh.nlmsg_pid = 0;
++  req.nlh.nlmsg_seq = time (NULL);
++  req.g.rtgen_family = AF_UNSPEC;
++
++  memset (&nladdr, '\0', sizeof (nladdr));
++  nladdr.nl_family = AF_NETLINK;
++
++  if (TEMP_FAILURE_RETRY (__sendto (fd, (void *) &req, sizeof (req), 0,
++                                   (struct sockaddr *) &nladdr,
++                                   sizeof (nladdr))) < 0)
++    return -1;
++
++  *seen_ipv4 = false;
++  *seen_ipv6 = false;
++
++  bool done = false;
++  char buf[4096];
++  struct iovec iov = { buf, sizeof (buf) };
++  struct in6ailist
++  {
++    struct in6addrinfo info;
++    struct in6ailist *next;
++  } *in6ailist = NULL;
++  size_t in6ailistlen = 0;
++
++  do
++    {
++      struct msghdr msg =
++       {
++         (void *) &nladdr, sizeof (nladdr),
++         &iov, 1,
++         NULL, 0,
++         0
++       };
++
++      ssize_t read_len = TEMP_FAILURE_RETRY (__recvmsg (fd, &msg, 0));
++      if (read_len < 0)
++       return -1;
++
++      if (msg.msg_flags & MSG_TRUNC)
++       return -1;
++
++      struct nlmsghdr *nlmh;
++      for (nlmh = (struct nlmsghdr *) buf;
++          NLMSG_OK (nlmh, (size_t) read_len);
++          nlmh = (struct nlmsghdr *) NLMSG_NEXT (nlmh, read_len))
++       {
++         if (nladdr.nl_pid != 0 || (pid_t) nlmh->nlmsg_pid != pid
++             || nlmh->nlmsg_seq != req.nlh.nlmsg_seq)
++           continue;
++
++         if (nlmh->nlmsg_type == RTM_NEWADDR)
++           {
++             struct ifaddrmsg *ifam = (struct ifaddrmsg *) NLMSG_DATA (nlmh);
++
++             switch (ifam->ifa_family)
++               {
++               case AF_INET:
++                 *seen_ipv4 = true;
++                 break;
++               case AF_INET6:
++                 *seen_ipv6 = true;
++
++                 if (ifam->ifa_flags & (IFA_F_DEPRECATED
++                                        | IFA_F_TEMPORARY
++                                        | IFA_F_HOMEADDRESS))
++                   {
++                     struct rtattr *rta = IFA_RTA (ifam);
++                     size_t len = (nlmh->nlmsg_len
++                                   - NLMSG_LENGTH (sizeof (*ifam)));
++                     void *local = NULL;
++                     void *address = NULL;
++                     while (RTA_OK (rta, len))
++                       {
++                         switch (rta->rta_type)
++                           {
++                           case IFA_LOCAL:
++                             local = RTA_DATA (rta);
++                             break;
++
++                           case IFA_ADDRESS:
++                             address = RTA_DATA (rta);
++                             break;
++                           }
++
++                         rta = RTA_NEXT (rta, len);
++                       }
++
++                     struct in6ailist *newp = alloca (sizeof (*newp));
++                     newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
++                                          ? in6ai_deprecated : 0)
++                                         | ((ifam->ifa_flags
++                                             & IFA_F_TEMPORARY)
++                                            ? in6ai_temporary : 0)
++                                         | ((ifam->ifa_flags
++                                             & IFA_F_HOMEADDRESS)
++                                            ? in6ai_homeaddress : 0));
++                     memcpy (newp->info.addr, address ?: local,
++                             sizeof (newp->info.addr));
++                     newp->next = in6ailist;
++                     in6ailist = newp;
++                     ++in6ailistlen;
++                   }
++                 break;
++               default:
++                 /* Ignore.  */
++                 break;
++               }
++           }
++         else if (nlmh->nlmsg_type == NLMSG_DONE)
++           /* We found the end, leave the loop.  */
++           done = true;
++       }
++    }
++  while (! done);
++
++  close_not_cancel_no_status (fd);
++
++  if (in6ailist != NULL)
++    {
++      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
++      if (*in6ai == NULL)
++       return -1;
++
++      *in6ailen = in6ailistlen;
++
++      do
++       {
++         (*in6ai)[--in6ailistlen] = in6ailist->info;
++         in6ailist = in6ailist->next;
++       }
++      while (in6ailist != NULL);
++    }
++
++  return 0;
++}
++
++
++/* We don't know if we have NETLINK support compiled in in our
++   Kernel.  */
++#if __ASSUME_NETLINK_SUPPORT == 0
++/* Define in ifaddrs.h.  */
++extern int __no_netlink_support attribute_hidden;
++#else
++# define __no_netlink_support 0
++#endif
++
++
++void
++attribute_hidden
++__check_pf (bool *seen_ipv4, bool *seen_ipv6,
++           struct in6addrinfo **in6ai, size_t *in6ailen)
++{
++  *in6ai = NULL;
++  *in6ailen = 0;
++
++  if (! __no_netlink_support)
++    {
++      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
++
++      struct sockaddr_nl nladdr;
++      memset (&nladdr, '\0', sizeof (nladdr));
++      nladdr.nl_family = AF_NETLINK;
++
++      socklen_t addr_len = sizeof (nladdr);
++
++      if (fd >= 0
++         && __bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
++         && __getsockname (fd, (struct sockaddr *) &nladdr, &addr_len) == 0
++         && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
++                          in6ai, in6ailen) == 0)
++       /* It worked.  */
++       return;
++
++      if (fd >= 0)
++       __close (fd);
++
++#if __ASSUME_NETLINK_SUPPORT == 0
++      /* Remember that there is no netlink support.  */
++      __no_netlink_support = 1;
++#else
++      /* We cannot determine what interfaces are available.  Be
++        pessimistic.  */
++      *seen_ipv4 = true;
++      *seen_ipv6 = true;
++#endif
++    }
++
++#if __ASSUME_NETLINK_SUPPORT == 0
++  /* No netlink.  Get the interface list via getifaddrs.  */
++  struct ifaddrs *ifa = NULL;
++  if (getifaddrs (&ifa) != 0)
++    {
++      /* We cannot determine what interfaces are available.  Be
++        pessimistic.  */
++      *seen_ipv4 = true;
++      *seen_ipv6 = true;
++      return;
++    }
++
++  struct ifaddrs *runp;
++  for (runp = ifa; runp != NULL; runp = runp->ifa_next)
++    if (runp->ifa_addr->sa_family == PF_INET)
++      *seen_ipv4 = true;
++    else if (runp->ifa_addr->sa_family == PF_INET6)
++      *seen_ipv6 = true;
++
++  (void) freeifaddrs (ifa);
++#endif
++}
+Index: sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
+===================================================================
+RCS file: sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
+diff -N sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
+--- /dev/null   1 Jan 1970 00:00:00 -0000
++++ sysdeps/unix/sysv/linux/arm/eabi/check_pf.c 31 Oct 2006 17:29:58 -0000
+@@ -0,0 +1 @@
++#include <sysdeps/unix/sysv/linux/check_pf.c>
+
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
new file mode 100644
index 0000000000..2fb8854b49
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
@@ -0,0 +1,11 @@
+--- glibc-2.5/elf/ldd.bash.in.org       2006-04-30 16:06:20.000000000 +0000
++++ glibc-2.5/elf/ldd.bash.in   2007-03-30 19:18:57.000000000 +0000
+@@ -110,7 +110,7 @@
+ # environments where the executed program might not have permissions
+ # to write to the console/tty.  But only bash 3.x supports the pipefail
+ # option, and we don't bother to handle the case for older bash versions.
+-if set -o pipefail 2> /dev/null; then
++if false; then
+   try_trace() {
+     eval $add_env '"$@"' | cat
+   }
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
new file mode 100644
index 0000000000..9994d4f879
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
@@ -0,0 +1,18 @@
+This patch moves ld.so.cache from /etc to /var/run. This is for devices
+where /etc is JFFS2 or CRAMFS but /var is a ramdisk.
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libc/sysdeps/generic/dl-cache.h~ldsocache-varrun
++++ libc/sysdeps/generic/dl-cache.h
+@@ -29,7 +29,7 @@
+ #endif
+ 
+ #ifndef LD_SO_CACHE
+-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
++# define LD_SO_CACHE "/var/run/ld.so.cache"
+ #endif
+ 
+ #ifndef add_system_dir
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
new file mode 100644
index 0000000000..28c957f243
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
@@ -0,0 +1,12 @@
+--- glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+@@ -73,6 +73,9 @@
+ # define DOCARGS_5     DOCARGS_4
+ # define UNDOCARGS_5   UNDOCARGS_4
+ 
++# define DOCARGS_6     DOCARGS_5
++# define UNDOCARGS_6   UNDOCARGS_5
++
+ # ifdef IS_IN_libpthread
+ #  define CENABLE      bl PLTJMP(__pthread_enable_asynccancel)
+ #  define CDISABLE     bl PLTJMP(__pthread_disable_asynccancel)
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
new file mode 100644
index 0000000000..04616032ad
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
@@ -0,0 +1,38 @@
+2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
+
+       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
+       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
+
+
+
+Index: sysdeps/unix/sysv/linux/i386/sysdep.h
+===================================================================
+--- sysdeps/unix/sysv/linux/i386/sysdep.h       (revision 1469)
++++ sysdeps/unix/sysv/linux/i386/sysdep.h       (working copy)
+@@ -29,6 +29,10 @@
+ #include <dl-sysdep.h>
+ #include <tls.h>
+ 
++#if defined __i686 && defined __ASSEMBLER__
++#undef __i686
++#define __i686 __i686
++#endif
+ 
+ /* For Linux we can use the system call table in the header file
+        /usr/include/asm/unistd.h
+Index: nptl/sysdeps/pthread/pt-initfini.c
+===================================================================
+--- nptl/sysdeps/pthread/pt-initfini.c  (revision 1469)
++++ nptl/sysdeps/pthread/pt-initfini.c  (working copy)
+@@ -45,6 +45,11 @@
+ /* Embed an #include to pull in the alignment and .end directives. */
+ asm ("\n#include \"defs.h\"");
+ 
++asm ("\n#if defined __i686 && defined __ASSEMBLER__");
++asm ("\n#undef __i686");
++asm ("\n#define __i686 __i686");
++asm ("\n#endif");
++
+ /* The initial common code ends here. */
+ asm ("\n/*@HEADER_ENDS*/");
+ 
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
new file mode 100644
index 0000000000..18a46ad4f1
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
@@ -0,0 +1,26 @@
+--- glibc-2.4/nptl/sysdeps/pthread/configure.in.ark     2006-03-12 00:41:40.000000000 +0100
++++ glibc-2.4/nptl/sysdeps/pthread/configure.in 2006-03-12 00:44:08.000000000 +0100
+@@ -45,5 +45,6 @@
+     AC_MSG_ERROR([the compiler must support C cleanup handling])
+   fi
+ else
+-  AC_MSG_ERROR(forced unwind support is required)
++  AC_MSG_WARN([forced unwind support is required, can't be verified while crosscompiling])
++  AC_DEFINE(HAVE_FORCED_UNWIND)
+ fi
+--- glibc-2.4/nptl/sysdeps/pthread/configure.ark        2006-03-12 00:42:47.000000000 +0100
++++ glibc-2.4/nptl/sysdeps/pthread/configure    2006-03-12 00:44:08.000000000 +0100
+@@ -153,7 +153,10 @@
+    { (exit 1); exit 1; }; }
+   fi
+ else
+-  { { echo "$as_me:$LINENO: error: forced unwind support is required" >&5
+-echo "$as_me: error: forced unwind support is required" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "$as_me:$LINENO: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&5
++echo "$as_me: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&2;}
++  cat >>confdefs.h <<\_ACEOF
++#define HAVE_FORCED_UNWIND 1
++_ACEOF
++
+ fi
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
new file mode 100644
index 0000000000..884609a5a3
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
@@ -0,0 +1,39 @@
+--- nscd/nscd.init
++++ nscd/nscd.init
+@@ -48,9 +48,8 @@
+ 
+ start () {
+     [ -d /var/run/nscd ] || mkdir /var/run/nscd
+-    [ -d /var/db/nscd ] || mkdir /var/db/nscd
+     echo -n $"Starting $prog: "
+-    daemon /usr/sbin/nscd
++    /usr/sbin/nscd
+     RETVAL=$?
+     echo
+     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
+@@ -67,12 +66,10 @@
+        # a non-privileged user
+        rm -f /var/run/nscd/nscd.pid
+        rm -f /var/run/nscd/socket
+-               success $"$prog shutdown"
+-    else
+-               failure $"$prog shutdown"
+     fi
+-    echo
+-    return $RETVAL
++    echo "Done."
++    # If nscd did not run, return 0 according to LSB.
++    return 0
+ }
+ 
+ restart() {
+@@ -104,7 +101,8 @@
+        ;;
+     force-reload | reload)
+        echo -n $"Reloading $prog: "
+-       killproc /usr/sbin/nscd -HUP
++       # Use killall, initscripts-1.0-r115 don't support -HUP yet.
++       killall -HUP /usr/sbin/nscd
+        RETVAL=$?
+        echo
+        ;;
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
new file mode 100644
index 0000000000..1046efb2a1
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
@@ -0,0 +1,25 @@
+diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c      2006-04-14 07:44:30.000000000 +0200
++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c      2006-12-08 12:53:32.202227000 +0100
+@@ -25,6 +25,9 @@
+ #include <sysdep.h>
+ #include <ldsodefs.h>
+ 
++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++
++
+ static const double almost_half = 0.5000000000000001;  /* 0.5 + 2^-53 */
+ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
+ static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
+diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c     2006-04-14 07:44:30.000000000 +0200
++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c     2006-12-08 12:53:36.992227000 +0100
+@@ -25,6 +25,8 @@
+ #include <sysdep.h>
+ #include <ldsodefs.h>
+ 
++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++
+ static const float almost_half = 0.50000006;   /* 0.5 + 2^-24 */
+ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
+ static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
new file mode 100644
index 0000000000..67bfc9467d
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
@@ -0,0 +1,13 @@
+Index: glibc-2.9/Makerules
+===================================================================
+--- glibc-2.9.orig/Makerules    2009-09-14 16:39:21.000000000 +0100
++++ glibc-2.9/Makerules 2009-09-14 16:39:50.000000000 +0100
+@@ -173,6 +173,8 @@
+ # it's used in sysd-rules, below.
+ $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \
+                                           %.sym $(common-before-compile)
++       rm -f $(@:.h=.h.d)
++       rm -f $(@:.h.d=.h)
+        $(AWK) -f $< $(filter %.sym,$^) \
+        | $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \
+                -MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)'
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
new file mode 100644
index 0000000000..8d864db91a
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-initial.inc
@@ -0,0 +1,53 @@
+SECTION = "libs"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+
+do_configure () {
+        sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+        chmod +x ${S}/configure
+        find ${S} -name "configure" | xargs touch
+        ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+                --without-cvs --disable-sanity-checks \
+                --with-headers=${STAGING_DIR_TARGET}${includedir} \
+                --enable-hacker-mode
+        if grep -q GLIBC_2.3 ${S}/ChangeLog; then
+                # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
+                # Fortunately, we don't need errlist-compat.c, since we just need .h files,
+                # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
+                # Another workaround might be to tell configure to not use any cross options to $(CC).
+                # The real fix would be to get install-headers to not generate errlist-compat.c.
+                make sysdeps/gnu/errlist.c
+                mkdir -p stdio-common
+                touch stdio-common/errlist-compat.c
+        fi
+}
+
+do_compile () {
+        :
+}
+
+do_install () {
+        oe_runmake cross-compiling=yes install_root=${D} \
+        includedir='${includedir}' prefix='${prefix}' \
+        install-bootstrap-headers=yes install-headers
+
+        oe_runmake csu/subdir_lib
+        # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+        # so do them by hand.  We can tolerate an empty stubs.h for the moment.
+        # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+        mkdir -p ${D}${includedir}/gnu/
+        touch ${D}${includedir}/gnu/stubs.h
+        cp ${S}/include/features.h ${D}${includedir}/features.h
+
+        if [ -e ${B}/bits/stdio_lim.h ]; then
+                cp ${B}/bits/stdio_lim.h  ${D}${includedir}/bits/
+        fi
+        mkdir -p ${D}${libdir}/
+        install -m 644 csu/crt[1in].o ${D}${libdir}
+        ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+                -o ${D}${libdir}/libc.so
+}
diff --git a/meta/recipes-core/glibc/glibc-initial_2.10.1.bb b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb
new file mode 100644
index 0000000000..d66297090f
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb
@@ -0,0 +1,6 @@
+require glibc_${PV}.bb
+require glibc-initial.inc
+
+do_configure_prepend () {
+        unset CFLAGS
+}
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
new file mode 100644
index 0000000000..858bc522b5
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -0,0 +1,84 @@
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+
+# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
+# is set. The idea is to avoid running localedef on the target (at first boot)
+# to decrease initial boot time and avoid localedef being killed by the OOM
+# killer which used to effectively break i18n on machines with < 128MB RAM.
+
+# default to disabled until qemu works for everyone
+ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+
+# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
+BINARY_LOCALE_ARCHES ?= "arm.*"
+
+
+inherit glibc-package
+
+def get_glibc_fpu_setting(bb, d):
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--without-fp"
+    return ""
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
+
+OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
+
+do_install() {
+        oe_runmake install_root=${D} install
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
+        done
+        install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
+        install -d ${D}${libdir}/locale
+        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+        # get rid of some broken files...
+        for i in ${GLIBC_BROKEN_LOCALES}; do
+                grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
+                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+        done
+        rm -f ${D}{sysconfdir}/rpc
+        rm -f ${D}${includedir}/scsi/sg.h
+        rm -f ${D}${includedir}/scsi/scsi_ioctl.h
+        rm -f ${D}${includedir}/scsi/scsi.h
+}
+
+
+python __anonymous () {
+    enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+
+    if enabled and int(enabled):
+        import re
+
+        target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+        binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or ""
+
+        for regexp in binary_arches.split(" "):
+            r = re.compile(regexp)
+
+            if r.match(target_arch):
+                depends = bb.data.getVar("DEPENDS", d, 1)
+                depends = "%s qemu-native" % depends
+                bb.data.setVar("DEPENDS", depends, d)
+                bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile", d)
+                break
+}
+
+
+
diff --git a/meta/recipes-core/glibc/glibc-stage.inc b/meta/recipes-core/glibc/glibc-stage.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-stage.inc
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
new file mode 100644
index 0000000000..ecaf593b22
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -0,0 +1,42 @@
+DESCRIPTION = "GNU C Library"
+HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
+BUGTRACKER = "http://sources.redhat.com/bugzilla/"
+SECTION = "libs"
+PRIORITY = "required"
+LICENSE = "LGPLv2.1+ & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+                    file://elf/cache.c;beginline=1;endline=17;md5=926aac25497b1de7d630b4749005d208 \
+                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
+                    file://bits/types.h;beginline=1;endline=18;md5=267938e7c0538e76f734551ec6ea908d"
+# nptl needs unwind support in gcc, which can't be built without glibc.
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
+#this leads to circular deps, so lets not add it yet
+#RDEPENDS_ldd += " bash"
+#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "virtual/libintl virtual/libiconv"
+
+inherit autotools
+
+GLIBC_EXTRA_OECONF ?= ""
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_rig_locales() {
+        # If indicated, only build a limited selection of locales
+        if [ "x${LIMIT_BUILT_LOCALES}" != "x" ]; then
+                INFILE="${S}/localedata/SUPPORTED"
+                OUTFILE="${S}/localedata/SUPPORTED.tmp"
+                head -n 3 $INFILE > $OUTFILE
+                for i in ${LIMIT_BUILT_LOCALES}; do
+                        echo 
+                        grep $i $INFILE >> $OUTFILE
+                done
+                head --lines=-1 $OUTFILE > $INFILE
+                tail --lines=1 $OUTFILE | sed 's#\\##' >> $INFILE
+        fi
+}
+
+addtask rig_locales before do_compile after do_configure
+
+ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
new file mode 100644
index 0000000000..2a118a4af6
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -0,0 +1,161 @@
+require glibc.inc
+
+ARM_INSTRUCTION_SET = "arm"
+
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
+
+PR = "r0"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
+
+#          file://noinfo.patch;patch=1
+#          file://ldconfig.patch;patch=1;pnum=0
+#          file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#          \
+#          file://arm-ioperm.patch;patch=1;pnum=0 \
+#          file://ldd.patch;patch=1;pnum=0 \
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
+           ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
+           ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
+           file://nscd-init.patch;striplevel=0 \
+           file://arm-memcpy.patch \
+           file://arm-longlong.patch \
+           file://fhs-linux-paths.patch \
+           file://dl-cache-libcmp.patch \
+           file://ldsocache-varrun.patch \
+           file://nptl-crosscompile.patch \
+           file://glibc-check_pf.patch;striplevel=0 \
+           file://ldd-unbash.patch \
+           file://glibc-arm-IO-acquire-lock-fix.diff \
+           file://generic-bits_select.h \
+           file://generic-bits_types.h \
+           file://generic-bits_typesizes.h \
+           file://generic-bits_time.h \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk \
+           file://march-i686.patch;striplevel=0 \
+           file://rulesfix.patch \
+           file://glibc-2.9-enable-binutils-2.2.patch"
+
+# Build fails on sh3 and sh4 without additional patches
+SRC_URI_append_sh3 = " file://no-z-defs.patch"
+SRC_URI_append_sh4 = " file://no-z-defs.patch"
+
+#powerpc patches to add support for soft-float
+SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff"
+
+S = "${WORKDIR}/glibc-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+# We need this for nativesdk
+export libc_cv_slibdir = "${base_libdir}"
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+                --without-cvs --disable-profile --disable-debug --without-gd \
+                --enable-clocale=gnu \
+                --enable-add-ons=${GLIBC_ADDONS} \
+                --with-headers=${STAGING_INCDIR} \
+                --without-selinux \
+                ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+do_munge() {
+        # Integrate ports and libidn into tree
+        mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
+        mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
+
+        # Ports isn't really working... Fix it
+        # Some of this is rather dirty, but it seems to be the only
+        # quick way to get this cruft to compile
+        rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+        ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+        cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+        cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+        cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+        cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h
+        cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h
+        cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h
+        cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h
+        # Copy in generic stuff for not yet implemented headers
+        for i in ${S}/bits/*.h; do
+                F=`basename $i`
+                [ "$F" = "local_lim.h" ] && continue
+                [ "$F" = "errno.h" ] && continue
+                test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+        done
+        # This is harmful; we need to get the one from nptl/sysdeps/pthreads
+        rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h
+        # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h
+        rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h
+        # Obsoleted by sysdeps/gnu/bits/utmp.h
+        rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h
+}
+
+addtask munge before do_patch after do_unpack
+
+
+do_configure () {
+# /var/db was not included to FHS
+        sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+        if [ -z "`which rpcgen`" ]; then
+                echo "rpcgen not found.  Install glibc-devel."
+                exit 1
+        fi
+        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+          yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+          rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+        # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+        unset LDFLAGS
+        base_do_compile
+        (
+                cd ${S}/sunrpc/rpcsvc
+                for r in ${rpcsvc}; do
+                        h=`echo $r|sed -e's,\.x$,.h,'`
+                        rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+                done
+        )
+}
+
+require glibc-stage.inc
+
+require glibc-package.inc
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.5/32and64bit.patch b/meta/recipes-core/glibc/ldconfig-native-2.5/32and64bit.patch
new file mode 100644
index 0000000000..4f8d3a39ca
--- /dev/null
+++ b/meta/recipes-core/glibc/ldconfig-native-2.5/32and64bit.patch
@@ -0,0 +1,289 @@
+Index: ldconfig-native-2.5/readelflib.c
+===================================================================
+--- ldconfig-native-2.5.orig/readelflib.c       2009-05-19 09:40:17.000000000 +0100
++++ ldconfig-native-2.5/readelflib.c    2009-05-19 09:56:18.000000000 +0100
+@@ -40,38 +40,190 @@
+ 
+ /* Returns 0 if everything is ok, != 0 in case of error.  */
+ int
+-process_elf_file (const char *file_name, const char *lib, int *flag,
++process_elf_file32 (const char *file_name, const char *lib, int *flag,
+                  unsigned int *osversion, char **soname, void *file_contents,
+                  size_t file_length)
+ {
+   int i;
+   unsigned int j;
+-  ElfW(Addr) loadaddr;
++  Elf32_Addr loadaddr;
+   unsigned int dynamic_addr;
+   size_t dynamic_size;
+   char *program_interpreter;
+ 
+-  ElfW(Ehdr) *elf_header;
+-  ElfW(Phdr) *elf_pheader, *segment;
+-  ElfW(Dyn) *dynamic_segment, *dyn_entry;
++  Elf32_Ehdr *elf_header;
++  Elf32_Phdr *elf_pheader, *segment;
++  Elf32_Dyn *dynamic_segment, *dyn_entry;
+   char *dynamic_strings;
+ 
+-  elf_header = (ElfW(Ehdr) *) file_contents;
++  elf_header = (Elf32_Ehdr *) file_contents;
+   *osversion = 0;
+ 
+-  if (elf_header->e_ident [EI_CLASS] != ElfW (CLASS))
++  if (elf_header->e_type != ET_DYN)
++    {
++      error (0, 0, _("%s is not a shared object file (Type: %d).\n"), file_name,
++            elf_header->e_type);
++      return 1;
++    }
++
++  /* Get information from elf program header.  */
++  elf_pheader = (Elf32_Phdr *) (elf_header->e_phoff + file_contents);
++  check_ptr (elf_pheader);
++
++  /* The library is an elf library, now search for soname and
++     libc5/libc6.  */
++  *flag = FLAG_ELF;
++
++  loadaddr = -1;
++  dynamic_addr = 0;
++  dynamic_size = 0;
++  program_interpreter = NULL;
++  for (i = 0, segment = elf_pheader;
++       i < elf_header->e_phnum; i++, segment++)
+     {
+-      if (opt_verbose)
++      check_ptr (segment);
++
++      switch (segment->p_type)
+        {
+-         if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
+-           error (0, 0, _("%s is a 32 bit ELF file.\n"), file_name);
+-         else if (elf_header->e_ident [EI_CLASS] == ELFCLASS64)
+-           error (0, 0, _("%s is a 64 bit ELF file.\n"), file_name);
+-         else
+-           error (0, 0, _("Unknown ELFCLASS in file %s.\n"), file_name);
++       case PT_LOAD:
++         if (loadaddr == (Elf32_Addr) -1)
++           loadaddr = segment->p_vaddr - segment->p_offset;
++         break;
++
++       case PT_DYNAMIC:
++         if (dynamic_addr)
++           error (0, 0, _("more than one dynamic segment\n"));
++
++         dynamic_addr = segment->p_offset;
++         dynamic_size = segment->p_filesz;
++         break;
++
++       case PT_INTERP:
++         program_interpreter = (char *) (file_contents + segment->p_offset);
++         check_ptr (program_interpreter);
++
++         /* Check if this is enough to classify the binary.  */
++         for (j = 0; j < sizeof (interpreters) / sizeof (interpreters [0]);
++              ++j)
++           if (strcmp (program_interpreter, interpreters[j].soname) == 0)
++             {
++               *flag = interpreters[j].flag;
++               break;
++             }
++         break;
++
++       case PT_NOTE:
++         if (!*osversion && segment->p_filesz == 32 && segment->p_align >= 4)
++           {
++             Elf32_Word *abi_note = (Elf32_Word *) (file_contents
++                                                    + segment->p_offset);
++             if (abi_note [0] == 4 && abi_note [1] == 16 && abi_note [2] == 1
++                 && memcmp (abi_note + 3, "GNU", 4) == 0)
++               *osversion = (abi_note [4] << 24) |
++                            ((abi_note [5] & 0xff) << 16) |
++                            ((abi_note [6] & 0xff) << 8) |
++                            (abi_note [7] & 0xff);
++           }
++         break;
++
++       default:
++         break;
+        }
+-      return 1;
++
+     }
++  if (loadaddr == (Elf32_Addr) -1)
++    {
++      /* Very strange. */
++      loadaddr = 0;
++    }
++
++  /* Now we can read the dynamic sections.  */
++  if (dynamic_size == 0)
++    return 1;
++
++  dynamic_segment = (Elf32_Dyn *) (file_contents + dynamic_addr);
++  check_ptr (dynamic_segment);
++
++  /* Find the string table.  */
++  dynamic_strings = NULL;
++  for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++       ++dyn_entry)
++    {
++      check_ptr (dyn_entry);
++      if (dyn_entry->d_tag == DT_STRTAB)
++       {
++         dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
++         check_ptr (dynamic_strings);
++         break;
++       }
++    }
++
++  if (dynamic_strings == NULL)
++    return 1;
++
++  /* Now read the DT_NEEDED and DT_SONAME entries.  */
++  for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++       ++dyn_entry)
++    {
++      if (dyn_entry->d_tag == DT_NEEDED || dyn_entry->d_tag == DT_SONAME)
++       {
++         char *name = dynamic_strings + dyn_entry->d_un.d_val;
++         check_ptr (name);
++
++         if (dyn_entry->d_tag == DT_NEEDED)
++           {
++
++             if (*flag == FLAG_ELF)
++               {
++                 /* Check if this is enough to classify the binary.  */
++                 for (j = 0;
++                      j < sizeof (known_libs) / sizeof (known_libs [0]);
++                      ++j)
++                   if (strcmp (name, known_libs [j].soname) == 0)
++                     {
++                       *flag = known_libs [j].flag;
++                       break;
++                     }
++               }
++           }
++
++         else if (dyn_entry->d_tag == DT_SONAME)
++           *soname = xstrdup (name);
++
++         /* Do we have everything we need?  */
++         if (*soname && *flag != FLAG_ELF)
++           return 0;
++       }
++    }
++
++  /* We reach this point only if the file doesn't contain a DT_SONAME
++     or if we can't classify the library.  If it doesn't have a
++     soname, return the name of the library.  */
++  if (*soname == NULL)
++    *soname = xstrdup (lib);
++
++  return 0;
++}
++
++int
++process_elf_file64 (const char *file_name, const char *lib, int *flag,
++                 unsigned int *osversion, char **soname, void *file_contents,
++                 size_t file_length)
++{
++  int i;
++  unsigned int j;
++  Elf64_Addr loadaddr;
++  unsigned int dynamic_addr;
++  size_t dynamic_size;
++  char *program_interpreter;
++
++  Elf64_Ehdr *elf_header;
++  Elf64_Phdr *elf_pheader, *segment;
++  Elf64_Dyn *dynamic_segment, *dyn_entry;
++  char *dynamic_strings;
++
++  elf_header = (Elf64_Ehdr *) file_contents;
++  *osversion = 0;
+ 
+   if (elf_header->e_type != ET_DYN)
+     {
+@@ -81,7 +233,7 @@
+     }
+ 
+   /* Get information from elf program header.  */
+-  elf_pheader = (ElfW(Phdr) *) (elf_header->e_phoff + file_contents);
++  elf_pheader = (Elf64_Phdr *) (elf_header->e_phoff + file_contents);
+   check_ptr (elf_pheader);
+ 
+   /* The library is an elf library, now search for soname and
+@@ -100,7 +252,7 @@
+       switch (segment->p_type)
+        {
+        case PT_LOAD:
+-         if (loadaddr == (ElfW(Addr)) -1)
++         if (loadaddr == (Elf64_Addr) -1)
+            loadaddr = segment->p_vaddr - segment->p_offset;
+          break;
+ 
+@@ -129,7 +281,7 @@
+        case PT_NOTE:
+          if (!*osversion && segment->p_filesz == 32 && segment->p_align >= 4)
+            {
+-             ElfW(Word) *abi_note = (ElfW(Word) *) (file_contents
++             Elf64_Word *abi_note = (Elf64_Word *) (file_contents
+                                                     + segment->p_offset);
+              if (abi_note [0] == 4 && abi_note [1] == 16 && abi_note [2] == 1
+                  && memcmp (abi_note + 3, "GNU", 4) == 0)
+@@ -145,7 +297,7 @@
+        }
+ 
+     }
+-  if (loadaddr == (ElfW(Addr)) -1)
++  if (loadaddr == (Elf64_Addr) -1)
+     {
+       /* Very strange. */
+       loadaddr = 0;
+@@ -155,7 +307,7 @@
+   if (dynamic_size == 0)
+     return 1;
+ 
+-  dynamic_segment = (ElfW(Dyn) *) (file_contents + dynamic_addr);
++  dynamic_segment = (Elf64_Dyn *) (file_contents + dynamic_addr);
+   check_ptr (dynamic_segment);
+ 
+   /* Find the string table.  */
+@@ -218,3 +370,33 @@
+ 
+   return 0;
+ }
++/* Returns 0 if everything is ok, != 0 in case of error.  */
++int
++process_elf_file (const char *file_name, const char *lib, int *flag,
++                 unsigned int *osversion, char **soname, void *file_contents,
++                 size_t file_length)
++{
++  int i;
++  unsigned int j;
++  ElfW(Addr) loadaddr;
++  unsigned int dynamic_addr;
++  size_t dynamic_size;
++  char *program_interpreter;
++
++  ElfW(Ehdr) *elf_header;
++  ElfW(Phdr) *elf_pheader, *segment;
++  ElfW(Dyn) *dynamic_segment, *dyn_entry;
++  char *dynamic_strings;
++
++  elf_header = (ElfW(Ehdr) *) file_contents;
++  *osversion = 0;
++
++  if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
++    return process_elf_file32(file_name, lib,flag, osversion, soname, file_contents, file_length);
++  else if (elf_header->e_ident [EI_CLASS] == ELFCLASS64)
++    return process_elf_file64(file_name, lib,flag, osversion, soname, file_contents, file_length);
++  error (0, 0, _("Unknown ELFCLASS in file %s.\n"), file_name);
++  return 1;
++}
++
++
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig-native-2.5.tar.bz2 b/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig-native-2.5.tar.bz2
new file mode 100644
index 0000000000..693b35ced2
--- /dev/null
+++ b/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig-native-2.5.tar.bz2
diff --git a/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig.patch b/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig.patch
new file mode 100644
index 0000000000..d143a075f5
--- /dev/null
+++ b/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig.patch
@@ -0,0 +1,460 @@
+---
+ cache.c        |   11 +-
+ chroot_canon.c |    7 +
+ dl-cache.c     |  235 ---------------------------------------------------------
+ dl-cache.h     |    3 
+ ldconfig.c     |   27 ++++--
+ readlib.c      |    7 +
+ xstrdup.c      |   11 --
+ 7 files changed, 45 insertions(+), 256 deletions(-)
+
+Index: 1/cache.c
+===================================================================
+--- 1.orig/cache.c      2007-11-23 17:05:44.000000000 +0000
++++ 1/cache.c   2007-11-23 17:05:56.000000000 +0000
+@@ -15,6 +15,9 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #include <errno.h>
+ #include <error.h>
+ #include <dirent.h>
+@@ -29,8 +32,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+-#include <ldconfig.h>
+-#include <dl-cache.h>
++#include "ldconfig.h"
++#include "dl-cache.h"
++# define N_(msgid)  msgid
++#define _(msg) msg
+ 
+ struct cache_entry
+ {
+@@ -230,8 +235,6 @@ init_cache (void)
+   entries = NULL;
+ }
+ 
+-
+-
+ static
+ int compare (const struct cache_entry *e1, const struct cache_entry *e2)
+ {
+Index: 1/chroot_canon.c
+===================================================================
+--- 1.orig/chroot_canon.c       2007-11-23 17:05:44.000000000 +0000
++++ 1/chroot_canon.c    2007-11-23 17:05:56.000000000 +0000
+@@ -16,6 +16,9 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -26,7 +29,9 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
+-#include <ldconfig.h>
++#include "ldconfig.h"
++
++#define __set_errno(Val) errno = (Val)
+ 
+ #ifndef PATH_MAX
+ #define PATH_MAX 1024
+Index: 1/dl-cache.c
+===================================================================
+--- 1.orig/dl-cache.c   2007-11-23 17:05:44.000000000 +0000
++++ 1/dl-cache.c        2007-11-23 17:05:56.000000000 +0000
+@@ -19,12 +19,12 @@
+ 
+ #include <assert.h>
+ #include <unistd.h>
+-#include <ldsodefs.h>
++//#include "ldsodefs.h"
+ #include <sys/mman.h>
+ #include <dl-cache.h>
+ #include <dl-procinfo.h>
+ 
+-#include <stdio-common/_itoa.h>
++//#include "_itoa.h"
+ 
+ #ifndef _DL_PLATFORMS_COUNT
+ # define _DL_PLATFORMS_COUNT 0
+@@ -38,103 +38,7 @@ static size_t cachesize;
+ /* 1 if cache_data + PTR points into the cache.  */
+ #define _dl_cache_verify_ptr(ptr) (ptr < cache_data_size)
+ 
+-#define SEARCH_CACHE(cache) \
+-/* We use binary search since the table is sorted in the cache file.         \
+-   The first matching entry in the table is returned.                        \
+-   It is important to use the same algorithm as used while generating        \
+-   the cache file.  */                                                       \
+-do                                                                           \
+-  {                                                                          \
+-    left = 0;                                                                \
+-    right = cache->nlibs - 1;                                                \
+-                                                                             \
+-    while (left <= right)                                                    \
+-      {                                                                              \
+-       __typeof__ (cache->libs[0].key) key;                                  \
+-                                                                             \
+-       middle = (left + right) / 2;                                          \
+-                                                                             \
+-       key = cache->libs[middle].key;                                        \
+-                                                                             \
+-       /* Make sure string table indices are not bogus before using          \
+-          them.  */                                                          \
+-       if (! _dl_cache_verify_ptr (key))                                     \
+-         {                                                                   \
+-           cmpres = 1;                                                       \
+-           break;                                                            \
+-         }                                                                   \
+-                                                                             \
+-       /* Actually compare the entry with the key.  */                       \
+-       cmpres = _dl_cache_libcmp (name, cache_data + key);                   \
+-       if (__builtin_expect (cmpres == 0, 0))                                \
+-         {                                                                   \
+-           /* Found it.  LEFT now marks the last entry for which we          \
+-              know the name is correct.  */                                  \
+-           left = middle;                                                    \
+-                                                                             \
+-           /* There might be entries with this name before the one we        \
+-              found.  So we have to find the beginning.  */                  \
+-           while (middle > 0)                                                \
+-             {                                                               \
+-               __typeof__ (cache->libs[0].key) key;                          \
+-                                                                             \
+-               key = cache->libs[middle - 1].key;                            \
+-               /* Make sure string table indices are not bogus before        \
+-                  using them.  */                                            \
+-               if (! _dl_cache_verify_ptr (key)                              \
+-                   /* Actually compare the entry.  */                        \
+-                   || _dl_cache_libcmp (name, cache_data + key) != 0)        \
+-                 break;                                                      \
+-               --middle;                                                     \
+-             }                                                               \
+-                                                                             \
+-           do                                                                \
+-             {                                                               \
+-               int flags;                                                    \
+-               __typeof__ (cache->libs[0]) *lib = &cache->libs[middle];      \
+-                                                                             \
+-               /* Only perform the name test if necessary.  */               \
+-               if (middle > left                                             \
+-                   /* We haven't seen this string so far.  Test whether the  \
+-                      index is ok and whether the name matches.  Otherwise   \
+-                      we are done.  */                                       \
+-                   && (! _dl_cache_verify_ptr (lib->key)                     \
+-                       || (_dl_cache_libcmp (name, cache_data + lib->key)    \
+-                           != 0)))                                           \
+-                 break;                                                      \
+-                                                                             \
+-               flags = lib->flags;                                           \
+-               if (_dl_cache_check_flags (flags)                             \
+-                   && _dl_cache_verify_ptr (lib->value))                     \
+-                 {                                                           \
+-                   if (best == NULL || flags == GLRO(dl_correct_cache_id))   \
+-                     {                                                       \
+-                       HWCAP_CHECK;                                          \
+-                       best = cache_data + lib->value;                       \
+-                                                                             \
+-                       if (flags == GLRO(dl_correct_cache_id))               \
+-                         /* We've found an exact match for the shared        \
+-                            object and no general `ELF' release.  Stop       \
+-                            searching.  */                                   \
+-                         break;                                              \
+-                     }                                                       \
+-                 }                                                           \
+-             }                                                               \
+-           while (++middle <= right);                                        \
+-           break;                                                            \
+-       }                                                                     \
+-                                                                             \
+-       if (cmpres < 0)                                                       \
+-         left = middle + 1;                                                  \
+-       else                                                                  \
+-         right = middle - 1;                                                 \
+-      }                                                                              \
+-  }                                                                          \
+-while (0)
+-
+-
+ int
+-internal_function
+ _dl_cache_libcmp (const char *p1, const char *p2)
+ {
+   while (*p1 != '\0')
+@@ -173,139 +77,4 @@ _dl_cache_libcmp (const char *p1, const 
+ }
+ 
+ 
+-/* Look up NAME in ld.so.cache and return the file name stored there,
+-   or null if none is found.  */
+ 
+-const char *
+-internal_function
+-_dl_load_cache_lookup (const char *name)
+-{
+-  int left, right, middle;
+-  int cmpres;
+-  const char *cache_data;
+-  uint32_t cache_data_size;
+-  const char *best;
+-
+-  /* Print a message if the loading of libs is traced.  */
+-  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))
+-    _dl_debug_printf (" search cache=%s\n", LD_SO_CACHE);
+-
+-  if (cache == NULL)
+-    {
+-      /* Read the contents of the file.  */
+-      void *file = _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize,
+-                                              PROT_READ);
+-
+-      /* We can handle three different cache file formats here:
+-        - the old libc5/glibc2.0/2.1 format
+-        - the old format with the new format in it
+-        - only the new format
+-        The following checks if the cache contains any of these formats.  */
+-      if (file != MAP_FAILED && cachesize > sizeof *cache
+-         && memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1) == 0)
+-       {
+-         size_t offset;
+-         /* Looks ok.  */
+-         cache = file;
+-
+-         /* Check for new version.  */
+-         offset = ALIGN_CACHE (sizeof (struct cache_file)
+-                               + cache->nlibs * sizeof (struct file_entry));
+-
+-         cache_new = (struct cache_file_new *) ((void *) cache + offset);
+-         if (cachesize < (offset + sizeof (struct cache_file_new))
+-             || memcmp (cache_new->magic, CACHEMAGIC_VERSION_NEW,
+-                        sizeof CACHEMAGIC_VERSION_NEW - 1) != 0)
+-           cache_new = (void *) -1;
+-       }
+-      else if (file != MAP_FAILED && cachesize > sizeof *cache_new
+-              && memcmp (file, CACHEMAGIC_VERSION_NEW,
+-                         sizeof CACHEMAGIC_VERSION_NEW - 1) == 0)
+-       {
+-         cache_new = file;
+-         cache = file;
+-       }
+-      else
+-       {
+-         if (file != MAP_FAILED)
+-           __munmap (file, cachesize);
+-         cache = (void *) -1;
+-       }
+-
+-      assert (cache != NULL);
+-    }
+-
+-  if (cache == (void *) -1)
+-    /* Previously looked for the cache file and didn't find it.  */
+-    return NULL;
+-
+-  best = NULL;
+-
+-  if (cache_new != (void *) -1)
+-    {
+-      uint64_t platform;
+-
+-      /* This is where the strings start.  */
+-      cache_data = (const char *) cache_new;
+-
+-      /* Now we can compute how large the string table is.  */
+-      cache_data_size = (const char *) cache + cachesize - cache_data;
+-
+-      platform = _dl_string_platform (GLRO(dl_platform));
+-      if (platform != (uint64_t) -1)
+-       platform = 1ULL << platform;
+-
+-      /* Only accept hwcap if it's for the right platform.  */
+-#ifdef USE_TLS
+-# define _DL_HWCAP_TLS_MASK (1LL << 63)
+-#else
+-# define _DL_HWCAP_TLS_MASK 0
+-#endif
+-#define HWCAP_CHECK \
+-      if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion))         \
+-       continue;                                                             \
+-      if (_DL_PLATFORMS_COUNT                                                \
+-         && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0                           \
+-         && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform)                   \
+-       continue;                                                             \
+-      if (lib->hwcap                                                         \
+-         & ~(GLRO(dl_hwcap) | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK))      \
+-       continue
+-      SEARCH_CACHE (cache_new);
+-    }
+-  else
+-    {
+-      /* This is where the strings start.  */
+-      cache_data = (const char *) &cache->libs[cache->nlibs];
+-
+-      /* Now we can compute how large the string table is.  */
+-      cache_data_size = (const char *) cache + cachesize - cache_data;
+-
+-#undef HWCAP_CHECK
+-#define HWCAP_CHECK do {} while (0)
+-      SEARCH_CACHE (cache);
+-    }
+-
+-  /* Print our result if wanted.  */
+-  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)
+-      && best != NULL)
+-    _dl_debug_printf ("  trying file=%s\n", best);
+-
+-  return best;
+-}
+-
+-#ifndef MAP_COPY
+-/* If the system does not support MAP_COPY we cannot leave the file open
+-   all the time since this would create problems when the file is replaced.
+-   Therefore we provide this function to close the file and open it again
+-   once needed.  */
+-void
+-_dl_unload_cache (void)
+-{
+-  if (cache != NULL && cache != (struct cache_file *) -1)
+-    {
+-      __munmap (cache, cachesize);
+-      cache = NULL;
+-    }
+-}
+-#endif
+Index: 1/dl-cache.h
+===================================================================
+--- 1.orig/dl-cache.h   2007-11-23 17:05:44.000000000 +0000
++++ 1/dl-cache.h        2007-11-23 17:05:56.000000000 +0000
+@@ -101,5 +101,4 @@ struct cache_file_new
+ (((addr) + __alignof__ (struct cache_file_new) -1)     \
+  & (~(__alignof__ (struct cache_file_new) - 1)))
+ 
+-extern int _dl_cache_libcmp (const char *p1, const char *p2)
+-     internal_function;
++extern int _dl_cache_libcmp (const char *p1, const char *p2);
+Index: 1/ldconfig.c
+===================================================================
+--- 1.orig/ldconfig.c   2007-11-23 17:05:44.000000000 +0000
++++ 1/ldconfig.c        2007-11-23 17:05:56.000000000 +0000
+@@ -15,6 +15,9 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #define PROCINFO_CLASS static
+ #include <alloca.h>
+ #include <argp.h>
+@@ -37,10 +40,20 @@
+ #include <glob.h>
+ #include <libgen.h>
+ 
+-#include <ldconfig.h>
+-#include <dl-cache.h>
++#include "ldconfig.h"
++#include "dl-cache.h"
++
++#include "dl-procinfo.h"
++
++#include "argp.h"
++
++
++#define SYSCONFDIR "/etc"
++#define LIBDIR "/usr/lib"
++#define SLIBDIR "/lib"
++# define N_(msgid)  msgid
++#define _(msg) msg
+ 
+-#include <dl-procinfo.h>
+ 
+ #ifdef _DL_FIRST_PLATFORM
+ # define _DL_FIRST_EXTRA (_DL_FIRST_PLATFORM + _DL_PLATFORMS_COUNT)
+@@ -53,7 +66,7 @@
+ #endif
+ 
+ /* Get libc version number.  */
+-#include <version.h>
++#include "version.h"
+ 
+ #define PACKAGE _libc_intl_domainname
+ 
+@@ -143,8 +156,8 @@ static const struct argp_option options[
+   { NULL, 0, NULL, 0, NULL, 0 }
+ };
+ 
+-#define PROCINFO_CLASS static
+-#include <dl-procinfo.c>
++//#define PROCINFO_CLASS static
++//#include <dl-procinfo.c>
+ 
+ /* Short description of program.  */
+ static const char doc[] = N_("Configure Dynamic Linker Run Time Bindings.");
+@@ -281,7 +294,7 @@ parse_opt (int key, char *arg, struct ar
+ static void
+ print_version (FILE *stream, struct argp_state *state)
+ {
+-  fprintf (stream, "ldconfig (GNU %s) %s\n", PACKAGE, VERSION);
++  fprintf (stream, "ldconfig (Hacked Poky Version)\n");
+   fprintf (stream, gettext ("\
+ Copyright (C) %s Free Software Foundation, Inc.\n\
+ This is free software; see the source for copying conditions.  There is NO\n\
+Index: 1/readlib.c
+===================================================================
+--- 1.orig/readlib.c    2007-11-23 17:05:44.000000000 +0000
++++ 1/readlib.c 2007-11-23 17:05:56.000000000 +0000
+@@ -21,6 +21,9 @@
+    development version.  Besides the simplification, it has also been
+    modified to read some other file formats.  */
+ 
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #include <a.out.h>
+ #include <elf.h>
+ #include <error.h>
+@@ -34,7 +37,9 @@
+ #include <sys/stat.h>
+ #include <gnu/lib-names.h>
+ 
+-#include <ldconfig.h>
++#include "ldconfig.h"
++
++#define _(msg) msg
+ 
+ #define Elf32_CLASS ELFCLASS32
+ #define Elf64_CLASS ELFCLASS64
+Index: 1/xstrdup.c
+===================================================================
+--- 1.orig/xstrdup.c    2007-11-23 17:05:44.000000000 +0000
++++ 1/xstrdup.c 2007-11-23 17:05:56.000000000 +0000
+@@ -15,15 +15,10 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
++#define _GNU_SOURCE
++
++#include <string.h>
+ 
+-#if defined STDC_HEADERS || defined HAVE_STRING_H || _LIBC
+-# include <string.h>
+-#else
+-# include <strings.h>
+-#endif
+ void *xmalloc (size_t n) __THROW;
+ char *xstrdup (char *string) __THROW;
+ 
diff --git a/meta/recipes-core/glibc/ldconfig-native_2.5.bb b/meta/recipes-core/glibc/ldconfig-native_2.5.bb
new file mode 100644
index 0000000000..d08787af6d
--- /dev/null
+++ b/meta/recipes-core/glibc/ldconfig-native_2.5.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "A standalone native ldconfig build"
+
+SRC_URI = "file://ldconfig-native-2.5.tar.bz2 \
+           file://ldconfig.patch;patch=1 \
+           file://32and64bit.patch;patch=1"
+
+PR = "r1"
+
+inherit native
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_compile () {
+        $CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
+}
+
+do_install () {
+        install -d ${D}/${bindir}/
+        install ldconfig ${D}/${bindir}/
+}
diff --git a/meta/recipes-core/images/poky-image-base.bb b/meta/recipes-core/images/poky-image-base.bb
new file mode 100644
index 0000000000..d214642c40
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-base.bb
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+IMAGE_FEATURES += "apps-console-core"
+
+inherit poky-image
diff --git a/meta/recipes-core/images/poky-image-directdisk.inc b/meta/recipes-core/images/poky-image-directdisk.inc
new file mode 100644
index 0000000000..64144b9abf
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-directdisk.inc
@@ -0,0 +1,8 @@
+inherit boot-directdisk
+
+do_bootdirectdisk_prepend () {
+        import bb
+        fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
+        if 'ext3' not in fstypes:
+                bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
+}
\ No newline at end of file
diff --git a/meta/recipes-core/images/poky-image-live.inc b/meta/recipes-core/images/poky-image-live.inc
new file mode 100644
index 0000000000..7f8dd8fba5
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-live.inc
@@ -0,0 +1,18 @@
+AUTO_SYSLINUXCFG = "1"
+INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
+APPEND += "root=/dev/ram0 "
+TIMEOUT = "10"
+
+EXCLUDE_FROM_WORLD = "1"
+
+do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
+
+inherit bootimg
+
+do_bootimg_prepend () {
+        import bb
+        fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
+        if 'ext3' not in fstypes:
+                bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
+}
+
diff --git a/meta/recipes-core/images/poky-image-minimal-directdisk.bb b/meta/recipes-core/images/poky-image-minimal-directdisk.bb
new file mode 100644
index 0000000000..e068464607
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-minimal-directdisk.bb
@@ -0,0 +1,9 @@
+require poky-image-directdisk.inc
+
+DESCRIPTION = "Minimal Bootable Direct Disk Image"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
+
+do_bootdirectdisk[depends] += "poky-image-minimal:do_rootfs"
+
+
diff --git a/meta/recipes-core/images/poky-image-minimal-initramfs.bb b/meta/recipes-core/images/poky-image-minimal-initramfs.bb
new file mode 100644
index 0000000000..ef7784b626
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-minimal-initramfs.bb
@@ -0,0 +1,8 @@
+# Simple initramfs image. Mostly used for live images.
+
+IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd"
+
+export IMAGE_BASENAME = "poky-image-minimal-initramfs"
+IMAGE_LINGUAS = ""
+
+inherit poky-image
diff --git a/meta/recipes-core/images/poky-image-minimal-live.bb b/meta/recipes-core/images/poky-image-minimal-live.bb
new file mode 100644
index 0000000000..7d9aa5f154
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-minimal-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Minimal Bootable Live Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-minimal:do_rootfs"
diff --git a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb b/meta/recipes-core/images/poky-image-minimal-mtdutils.bb
new file mode 100644
index 0000000000..d786131d98
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-minimal-mtdutils.bb
@@ -0,0 +1,6 @@
+#
+# Copyright (C) 2008 OpenedHand Ltd.
+#
+require poky-image-minimal.bb
+
+IMAGE_INSTALL += "mtd-utils"
diff --git a/meta/recipes-core/images/poky-image-minimal.bb b/meta/recipes-core/images/poky-image-minimal.bb
new file mode 100644
index 0000000000..44710a4ca8
--- /dev/null
+++ b/meta/recipes-core/images/poky-image-minimal.bb
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}"
+
+IMAGE_LINGUAS = " "
+
+inherit poky-image
+
+# remove not needed ipkg informations
+ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta/recipes-core/initrdscripts/files/init-boot.sh b/meta/recipes-core/initrdscripts/files/init-boot.sh
new file mode 100644
index 0000000000..9d804fc3a7
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/files/init-boot.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+mkdir /proc
+mkdir /sys
+mount -t proc proc /proc
+mount -t sysfs sysfs /sys
+
+exec sh
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
new file mode 100644
index 0000000000..ecd0a1b44a
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -0,0 +1,170 @@
+#!/bin/sh -e
+#
+# Copyright (C) 2008 Intel
+#
+# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
+#
+
+# We need 20 Mb for the boot partition
+boot_size=20
+
+# 5% for the swap
+swap_ratio=5
+
+found="no"
+
+echo "Searching for a hard drive..."
+for device in 'hda' 'hdb' 'sda' 'sdb'
+  do
+  if [ -e /sys/block/${device}/removable ]; then
+      if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then
+          found="yes"
+
+          while true; do
+              echo "Found drive at /dev/${device}. Do you want to install moblin there ? [y/n]"
+              read answer
+              if [ "$answer" = "y" ] ; then
+                  break
+              fi
+          
+              if [ "$answer" = "n" ] ; then
+                  found=no
+                  break
+              fi
+
+              echo "Please answer by y or n"
+          done
+      fi
+  fi
+
+  if [ "$found" = "yes" ]; then
+      break;
+  fi
+
+done
+
+if [ "$found" = "no" ]; then
+      exit 1      
+fi
+
+echo "Installing image on /dev/${device}"
+
+#
+# The udev automounter can cause pain here, kill it
+#
+rm -f /etc/udev/scripts/mount*
+
+#
+# Unmount anything the automounter had mounted
+#
+umount /dev/${device} 2> /dev/null || /bin/true
+umount /dev/${device}1 2> /dev/null || /bin/true
+umount /dev/${device}2 2> /dev/null || /bin/true
+umount /dev/${device}3 2> /dev/null || /bin/true
+umount /dev/${device}4 2> /dev/null || /bin/true
+umount /dev/${device}5 2> /dev/null || /bin/true
+umount /dev/${device}6 2> /dev/null || /bin/true
+
+if [ ! -b /dev/sda ] ; then
+    mknod /dev/sda b 8 0
+fi
+
+if [ ! -b /dev/sdb ] ; then
+    mknod /dev/sdb b 8 16
+fi
+
+if [ ! -b /dev/loop0 ] ; then
+    mknod /dev/loop0 b 7 0
+fi
+
+mkdir -p /tmp
+cat /proc/mounts > /etc/mtab
+
+disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//")
+
+swap_size=$((disk_size*5/100))
+rootfs_size=$((disk_size-boot_size-swap_size))
+
+rootfs_start=$((boot_size + 1))
+rootfs_end=$((rootfs_start+rootfs_size))
+swap_start=$((rootfs_end+1))
+
+bootfs=/dev/${device}1
+rootfs=/dev/${device}2
+swap=/dev/${device}3
+
+echo "*****************"
+echo "Boot partition size:   $boot_size MB (/dev/${device}1)"
+echo "Rootfs partition size: $rootfs_size MB (/dev/${device}2)"
+echo "Swap partition size:   $swap_size MB (/dev/${device}3)"
+echo "*****************"
+echo "Deleting partition table on /dev/${device} ..."
+dd if=/dev/zero of=/dev/${device} bs=512 count=2
+
+echo "Creating new partition table on /dev/${device} ..."
+parted /dev/${device} mklabel msdos
+
+echo "Creating boot partition on /dev/${device}1"
+parted /dev/${device} mkpartfs primary ext2 0 $boot_size
+
+echo "Creating rootfs partition on /dev/${device}2"
+parted /dev/${device} mkpartfs primary ext2 $rootfs_start $rootfs_end 
+
+echo "Creating swap partition on /dev/${device}3"
+parted /dev/${device} mkpartfs primary linux-swap $swap_start $disk_size
+
+parted /dev/${device} print
+
+echo "Formatting /dev/${device}1 to ext2..."
+mkfs.ext3 $bootfs
+
+echo "Formatting /dev/${device}2 to ext3..."
+mkfs.ext3 $rootfs
+
+echo "Formatting swap partition...(/dev/${device}3)"
+mkswap $swap
+
+mkdir /ssd
+mkdir /rootmnt
+
+mount $rootfs /ssd
+mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
+
+echo "Copying rootfs files..."
+cp -a /rootmnt/* /ssd
+
+if [ -d /ssd/etc/ ] ; then
+    echo "$swap                swap             swap       defaults              0  0" >> /ssd/etc/fstab
+
+    # We dont want udev to mount our root device while we're booting...
+    if [ -d /ssd/etc/udev/ ] ; then
+        echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist
+    fi
+fi
+
+umount /ssd
+umount /rootmnt
+
+echo "Preparing boot partition..."
+mount $bootfs /ssd
+grub-install --root-directory=/ssd /dev/${device}
+
+echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
+
+echo "default 0" > /ssd/boot/grub/menu.lst
+echo "timeout 30" >> /ssd/boot/grub/menu.lst
+echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst
+echo "root  (hd0,0)" >> /ssd/boot/grub/menu.lst
+echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
+
+cp /media/$1/vmlinuz /ssd/boot/
+
+umount /ssd
+sync
+
+echo "Remove your installation media, and press ENTER"
+
+read enter
+
+echo "Rebooting..."
+reboot -f
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
new file mode 100644
index 0000000000..c96b1f47c3
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+ROOT_MOUNT="/rootfs/"
+ROOT_IMAGE=rootfs.img
+MOUNT="/bin/mount"
+UMOUNT="/bin/umount"
+
+early_setup() {
+    mkdir /proc
+    mkdir /sys
+    mount -t proc proc /proc
+    mount -t sysfs sysfs /sys
+    udevd --daemon
+}
+
+read_args() {
+    [ -z "$CMDLINE" ] && CMDLINE=`cat /proc/cmdline`
+    for arg in $CMDLINE; do
+        optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+        case $arg in
+            root=*)
+                ROOT_DEVICE=$optarg ;;
+            rootfstype=*)
+                ROOT_FSTYPE=$optarg ;;
+            rootdelay=*)
+                rootdelay=$optarg ;;
+            LABEL=*)
+                label=$optarg ;;
+            video=*)
+                video_mode=$arg ;;
+            vga=*)
+                vga_mode=$arg ;;
+        esac
+    done
+}
+
+boot_live_root() {
+    killall udevd
+    cd $ROOT_MOUNT
+    exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init
+}
+
+fatal() {
+    echo $1 >$CONSOLE
+    echo >$CONSOLE
+    exec sh
+}
+
+early_setup
+
+[ -z "$CONSOLE" ] && CONSOLE="/dev/console"
+
+read_args
+
+echo "Waiting for removable media..."
+while true
+do
+  for i in `ls /media 2>/dev/null`; do
+      if [ -f /media/$i/$ROOT_IMAGE ] ; then
+          found="yes"
+          break
+      fi
+  done
+  if [ "$found" = "yes" ]; then
+      break;
+  fi
+  sleep 1
+done
+
+case $label in
+    boot)
+        mkdir $ROOT_MOUNT
+        mknod /dev/loop0 b 7 0
+
+        if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ROOT_IMAGE $ROOT_MOUNT ; then
+            fatal "Couldnt mount rootfs image"
+        else
+            boot_live_root
+        fi
+        ;;
+    install)
+        if [ -f /media/$i/$ROOT_IMAGE ] ; then
+            ./install.sh $i $ROOT_IMAGE $video_mode $vga_mode
+        else
+            fatal "Couldnt find install script"
+        fi
+
+        # If we're getting here, we failed...
+        fatal "Installation image failed"
+        ;;
+esac
+
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
new file mode 100644
index 0000000000..04ce51fafa
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTON = "A live image init script"
+LICENSE = "MIT"
+
+SRC_URI = "file://init-boot.sh"
+
+PR = "r0"
+
+do_install() {
+        install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /init "
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
new file mode 100644
index 0000000000..ba36a58049
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTON = "A live image init script"
+LICENSE = "MIT"
+
+SRC_URI = "file://init-live.sh"
+
+PR = "r2"
+
+do_install() {
+        install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /init "
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
new file mode 100644
index 0000000000..b15621b668
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTON = "A live image init script"
+LICENSE = "MIT"
+
+SRC_URI = "file://init-install.sh"
+
+PR = "r3"
+
+RDEPENDS="grub parted e2fsprogs-mke2fs"
+
+do_install() {
+        install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = " /install.sh "
+
+# Alternatives to grub need adding for other arch support
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh b/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
new file mode 100644
index 0000000000..b577b9a03a
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: alignment
+# Required-Start:    mountkernfs
+# Required-Stop:     mountkernfs
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+
+if [ -e /proc/cpu/alignment ]; then
+   echo "3" > /proc/cpu/alignment
+fi
+
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/banner.sh b/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
new file mode 100644
index 0000000000..9e2b091252
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: banner
+# Required-Start:
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+
+if [ ! -e /dev/tty ]; then
+    /bin/mknod -m 0666 /dev/tty c 5 0
+fi
+
+if ( > /dev/tty0 ) 2>/dev/null; then
+    vtmaster=/dev/tty0
+elif ( > /dev/vc/0 ) 2>/dev/null; then
+    vtmaster=/dev/vc/0
+elif ( > /dev/console ) 2>/dev/null; then
+    vtmaster=/dev/console
+else
+    vtmaster=/dev/null
+fi
+echo > $vtmaster
+echo "Please wait: booting..." > $vtmaster
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
new file mode 100755
index 0000000000..bd11f9a2fc
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -0,0 +1,78 @@
+### BEGIN INIT INFO
+# Provides:          bootmisc
+# Required-Start:    $local_fs mountvirtfs
+# Required-Stop:     $local_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: Misc and other.
+### END INIT INFO
+
+. /etc/default/rcS
+#
+# Put a nologin file in /etc to prevent people from logging in before
+# system startup is complete.
+#
+if test "$DELAYLOGIN" = yes
+then
+  echo "System bootup in progress - please wait" > /etc/nologin
+  cp /etc/nologin /etc/nologin.boot
+fi
+
+#
+# Set pseudo-terminal access permissions.
+#
+if test -c /dev/ttyp0
+then
+        chmod 666 /dev/tty[p-za-e][0-9a-f]
+        chown root:tty /dev/tty[p-za-e][0-9a-f]
+fi
+
+#
+# Apply /proc settings if defined
+#
+SYSCTL_CONF="/etc/sysctl.conf"
+if [ -f "${SYSCTL_CONF}" ]
+then
+        if [ -x "/sbin/sysctl" ]
+        then
+                /sbin/sysctl -p "${SYSCTL_CONF}"
+        else
+                echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>."
+        fi
+fi
+
+#
+# Update /etc/motd.
+#
+if test "$EDITMOTD" != no
+then
+        uname -a > /etc/motd.tmp
+        sed 1d /etc/motd >> /etc/motd.tmp
+        mv /etc/motd.tmp /etc/motd
+fi
+
+#
+# This is as good a place as any for a sanity check
+# /tmp should be a symlink to /var/tmp to cut down on the number
+# of mounted ramdisks.
+if test ! -L /tmp && test -d /var/tmp
+then
+        rm -rf /tmp
+        ln -sf /var/tmp /tmp
+fi
+
+# Set the system clock from hardware clock
+# If the timestamp is 1 day or more recent than the current time,
+# use the timestamp instead.
+/etc/init.d/hwclock.sh start
+if test -e /etc/timestamp2
+then
+        SYSTEMDATE=`date "+%Y%m%d%2H%2M"`
+        read TIMESTAMP < /etc/timestamp2
+        NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE + 10000 \)`
+        if [ $NEEDUPDATE -eq 1 ]; then 
+                date $TIMESTAMP
+                /etc/init.d/hwclock.sh stop
+        fi
+fi
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
new file mode 100755
index 0000000000..91897d4cbb
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
@@ -0,0 +1,49 @@
+### BEGIN INIT INFO
+# Provides:          checkfs
+# Required-Start:    checkroot
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Check all other file systems
+### END INIT INFO
+
+. /etc/default/rcS
+
+#
+# Check the rest of the filesystems.
+#
+if test ! -f /fastboot
+then
+    if test -f /forcefsck
+    then
+        force="-f"
+    else
+        force=""
+    fi
+    if test "$FSCKFIX"  = yes
+    then
+        fix="-y"
+    else
+        fix="-a"
+    fi
+    spinner="-C"
+    case "$TERM" in
+        dumb|network|unknown|"") spinner="" ;;
+    esac
+    test "`uname -m`" = "s390" && spinner="" # This should go away
+    test "$VERBOSE" != no && echo "Checking all filesystems..."
+    fsck $spinner -R -A $fix $force
+    if test "$?" -gt 1
+    then
+      echo
+      echo "fsck failed.  Please repair manually."
+      echo
+      echo "CONTROL-D will exit from this shell and continue system startup."
+      echo
+      # Start a single user shell on the console
+      /sbin/sulogin $CONSOLE
+    fi
+fi
+rm -f /fastboot /forcefsck
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
new file mode 100755
index 0000000000..02697ce9bf
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
@@ -0,0 +1,137 @@
+### BEGIN INIT INFO
+# Provides:          checkroot
+# Required-Start:    udev
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Check to root file system.
+### END INIT INFO
+
+. /etc/default/rcS
+
+#
+# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
+# from this script *before anything else* with a timeout, like SCO does.
+#
+test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
+
+#
+# Read /etc/fstab.
+#
+exec 9< /etc/fstab
+rootmode=rw
+rootopts=rw
+rootcheck=no
+swap_on_md=no
+devfs=
+while read fs mnt type opts dump pass junk <&9
+do
+        case "$fs" in
+                ""|\#*)
+                        continue;
+                        ;;
+                /dev/md*)
+                        # Swap on md device.
+                        test "$type" = swap && swap_on_md=yes
+                        ;;
+                /dev/*)
+                        ;;
+                *)
+                        # Might be a swapfile.
+                        test "$type" = swap && swap_on_md=yes
+                        ;;
+        esac
+        test "$type" = devfs && devfs="$fs"
+        test "$mnt" != / && continue
+        rootopts="$opts"
+        test "$pass" = 0 -o "$pass" = "" && rootcheck=no
+        case "$opts" in
+                ro|ro,*|*,ro|*,ro,*)
+                        rootmode=ro
+                        ;;
+        esac
+done
+exec 0>&9 9>&-
+
+#
+# Activate the swap device(s) in /etc/fstab. This needs to be done
+# before fsck, since fsck can be quite memory-hungry.
+#
+test "$VERBOSE" != no && echo "Activating swap"
+swapon -a 2> /dev/null
+
+#
+# Check the root filesystem.
+#
+if test -f /fastboot || test $rootcheck = no
+then
+  test $rootcheck = yes && echo "Fast boot, no filesystem check"
+else
+  #
+  # Ensure that root is quiescent and read-only before fsck'ing.
+  #
+  mount -n -o remount,ro /
+  if test $? = 0
+  then
+    if test -f /forcefsck
+    then
+        force="-f"
+    else
+        force=""
+    fi
+    if test "$FSCKFIX" = yes
+    then
+        fix="-y"
+    else
+        fix="-a"
+    fi
+    spinner="-C"
+    case "$TERM" in
+        dumb|network|unknown|"") spinner="" ;;
+    esac
+    test `uname -m` = s390 && spinner="" # This should go away
+    test "$VERBOSE" != no && echo "Checking root filesystem..."
+    fsck $spinner $force $fix /
+    #
+    # If there was a failure, drop into single-user mode.
+    #
+    # NOTE: "failure" is defined as exiting with a return code of
+    # 2 or larger.  A return code of 1 indicates that filesystem
+    # errors were corrected but that the boot may proceed.
+    #
+    if test "$?" -gt 1
+    then
+      # Surprise! Re-directing from a HERE document (as in
+      # "cat << EOF") won't work, because the root is read-only.
+      echo
+      echo "fsck failed.  Please repair manually and reboot.  Please note"
+      echo "that the root filesystem is currently mounted read-only.  To"
+      echo "remount it read-write:"
+      echo
+      echo "   # mount -n -o remount,rw /"
+      echo
+      echo "CONTROL-D will exit from this shell and REBOOT the system."
+      echo
+      # Start a single user shell on the console
+      /sbin/sulogin $CONSOLE
+      reboot -f
+    fi
+  else
+    echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
+    echo
+  fi
+fi
+
+#
+#       If the root filesystem was not marked as read-only in /etc/fstab,
+#       remount the rootfs rw but do not try to change mtab because it
+#       is on a ro fs until the remount succeeded. Then clean up old mtabs
+#       and finally write the new mtab.
+#
+mount -n -o remount,$rootmode /
+if test "$rootmode" = rw
+then
+        ln -sf /proc/mounts /dev/mtab
+fi
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/device_table.txt b/meta/recipes-core/initscripts/initscripts-1.0/device_table.txt
new file mode 100644
index 0000000000..a302c5aca3
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/device_table.txt
@@ -0,0 +1,197 @@
+#/dev/          d       775     0       0       -       -       -       -       -
+#/dev/msys      d       775     0       0       -       -       -       -       -
+#/dev/pts       d       775     0       0       -       -       -       -       -
+#/var           d       775     0       0       -       -       -       -       -
+/boot/var/empty d       755     0       3       -       -       -       -
+/dev/apm_bios   c       660     0       46      10      134     -       -       -
+/dev/audio      c       660     0       29      14      4       -       -       -
+/dev/audio1     c       660     0       29      14      20      -       -       -
+/dev/audio2     c       660     0       29      14      36      -       -       -
+/dev/audio3     c       660     0       29      14      52      -       -       -
+/dev/bty        c       644     0       0       60      0       0       1       5
+/dev/sharp_fl   c       640     0       44      254     0       -       -       -
+/dev/console    c       660     0       5       5       1       -       -
+/dev/cusa0      c       640     0       0       205     5       -       -       -
+/dev/cusa1      c       640     0       0       205     6       -       -       -
+/dev/cusa2      c       640     0       0       205     7       -       -       -
+/dev/dsp        c       660     0       29      14      3       -       -       -
+/dev/dsp1       c       660     0       29      14      19      -       -       -
+/dev/dsp2       c       660     0       29      14      35      -       -       -
+/dev/dsp3       c       660     0       29      14      51      -       -       -
+/dev/fb         c       660     0       44      29      0       0       32      2
+/dev/fb0autodetect      c       660     0       44      29      1       -       -       -
+/dev/fb0current c       660     0       44      29      0       -       -       -
+#/dev/fb1       c       660     0       44      29      32      -       -       -
+/dev/fb1autodetect      c       660     0       44      29      33      -       -       -
+/dev/fb1current c       660     0       44      29      32      -       -       -
+/dev/full       c       666     0       7       -       -       -
+/dev/hda        b       660     0       6       3       0       -       -       -
+/dev/hda        b       660     0       6       3       1       1       1       20
+/dev/hdb        b       660     0       6       3       64      -       -       -
+/dev/hdb        b       660     0       6       3       65      1       1       20
+/dev/hdc        b       660     0       6       22      0       -       -       -
+/dev/hdc        b       660     0       6       22      1       1       1       20
+/dev/initctl    p       600     0       0       -       -       -       -
+/dev/i2c0       c       660     0       0       89      0       -       -       -
+/dev/inportbm   c       660     0       0       10      2       -       -       -
+/dev/input/event c      660     0       0       13      64      0       1       20
+/dev/ircomm0    c       640     0       0       161     0       -       -       -
+/dev/jbm        c       660     0       0       10      4       -       -       -
+/dev/kmem       c       640     0       15      1       2       -       -       -
+/dev/lirc       c       660     0       5       61      0       -       -       -
+/dev/logibm     c       660     0       0       10      0       -       -       -
+/dev/loop0      b       660     0       11      7       0       -       -       -
+/dev/loop1      b       660     0       11      7       1       -       -       -
+/dev/mem        c       640     0       15      1       1       -       -       -
+/dev/mixer      c       666     0       0       14      0       -       -       -
+/dev/mixer1     c       666     0       0       14      16      -       -       -
+/dev/mixer2     c       666     0       0       14      32      -       -       -
+/dev/mixer3     c       666     0       0       14      48      -       -       -
+/dev/mmcda      b       640     0       0       60      0       -       -       -
+/dev/mmcda1     b       640     0       0       60      1       -       -       -
+/dev/mmcda2     b       640     0       0       60      2       -       -       -
+/dev/msys/fla   b       660     0       11      100     0       -       -       -
+/dev/msys/fla1  b       660     0       11      100     1       -       -       -
+/dev/msys/fla2  b       660     0       11      100     2       -       -       -
+/dev/msys/fla3  b       660     0       11      100     3       -       -       -
+/dev/msys/fla4  b       660     0       11      100     4       -       -       -
+/dev/msys/flb   b       660     0       11      100     64      -       -       -
+/dev/msys/flb1  b       660     0       11      100     65      -       -       -
+/dev/msys/flb2  b       660     0       11      100     66      -       -       -
+/dev/msys/flb3  b       660     0       11      100     67      -       -       -
+/dev/msys/flb4  b       660     0       11      100     68      -       -       -
+/dev/mtd        c       660     0       6       90      0       0       2       8
+/dev/mtdblock   b       640     0       0       31      0       0       1       8
+/dev/nst0       c       664     0       11      9       128     -       -       -
+/dev/nst0a      c       664     0       11      9       224     -       -       -
+/dev/nst0l      c       664     0       11      9       160     -       -       -
+/dev/nst0m      c       664     0       11      9       192     -       -       -
+/dev/nst1       c       664     0       11      9       129     -       -       -
+/dev/nst1a      c       664     0       11      9       225     -       -       -
+/dev/nst1l      c       664     0       11      9       161     -       -       -
+/dev/nst1m      c       664     0       11      9       193     -       -       -
+/dev/null       c       666     0       0       1       3       -       -       -
+/dev/par0       c       660     0       7       6       0       -       -       -
+/dev/par1       c       660     0       7       6       1       -       -       -
+/dev/par2       c       660     0       7       6       2       -       -       -
+/dev/port       c       640     0       15      1       4       -       -       -
+/dev/ppp        c       640     0       0       108     0       -       -       -
+/dev/psaux      c       660     0       0       10      1       -       -       -
+/dev/ptmx       c       666     0       5       5       2       -       -       -
+/dev/ptya0      c       660     0       5       2       176     -       -       -
+/dev/ptya1      c       660     0       5       2       177     -       -       -
+/dev/ptya2      c       660     0       5       2       178     -       -       -
+/dev/ptya3      c       660     0       5       2       179     -       -       -
+/dev/ptya4      c       660     0       5       2       180     -       -       -
+/dev/ptya5      c       660     0       5       2       181     -       -       -
+/dev/ptya6      c       660     0       5       2       182     -       -       -
+/dev/ptya7      c       660     0       5       2       183     -       -       -
+/dev/ptya8      c       660     0       5       2       184     -       -       -
+/dev/ptya9      c       660     0       5       2       185     -       -       -
+/dev/ptyaa      c       660     0       5       2       186     -       -       -
+/dev/ptyab      c       660     0       5       2       187     -       -       -
+/dev/ptyac      c       660     0       5       2       188     -       -       -
+/dev/ptyad      c       660     0       5       2       189     -       -       -
+/dev/ptyae      c       660     0       5       2       190     -       -       -
+/dev/ptyaf      c       660     0       5       2       191     -       -       -
+/dev/ram        b       640     0       0       1       0       0       1       4
+/dev/random     c       444     0       0       1       8       -       -       -
+/dev/rfcomm0    c       660     0       0       216     0       -       -       -
+/dev/rfcomm1    c       660     0       0       216     1       -       -       -
+/dev/rfcomm2    c       660     0       0       216     2       -       -       -
+/dev/rfcomm3    c       660     0       0       216     3       -       -       -
+/dev/rfcomm4    c       660     0       0       216     4       -       -       -
+/dev/rfcomm5    c       660     0       0       216     5       -       -       -
+/dev/rfcomm6    c       660     0       0       216     6       -       -       -
+/dev/rfcomm7    c       660     0       0       216     7       -       -       -
+/dev/rfcomm8    c       660     0       0       216     8       -       -       -
+/dev/rfcomm9    c       660     0       0       216     9       -       -       -
+/dev/rfcomm10   c       660     0       0       216     10      -       -       -
+/dev/rfcomm11   c       660     0       0       216     11      -       -       -
+/dev/rfcomm12   c       660     0       0       216     12      -       -       -
+/dev/rfcomm13   c       660     0       0       216     13      -       -       -
+/dev/rfcomm14   c       660     0       0       216     14      -       -       -
+/dev/rfcomm15   c       660     0       0       216     15      -       -       -
+/dev/rmidi0     c       660     0       0       35      64      -       -       -
+/dev/rmidi1     c       660     0       0       35      65      -       -       -
+/dev/rmidi2     c       660     0       0       35      66      -       -       -
+/dev/rmidi3     c       660     0       0       35      67      -       -       -
+/dev/rtc        c       660     0       47      10      135     -       -       -
+/dev/scd0       b       660     0       6       11      0       -       -       -
+/dev/scd1       b       660     0       6       11      1       -       -       -
+/dev/sda        b       660     0       6       8       0       -       -       -
+/dev/sda1       b       660     0       6       8       1       -       -       -
+/dev/sda2       b       660     0       6       8       2       -       -       -
+/dev/sda3       b       660     0       6       8       3       -       -       -
+/dev/sda4       b       660     0       6       8       4       -       -       -
+/dev/sda5       b       660     0       6       8       5       -       -       -
+/dev/sda6       b       660     0       6       8       6       -       -       -
+/dev/sda7       b       660     0       6       8       7       -       -       -
+/dev/sda8       b       660     0       6       8       8       -       -       -
+/dev/sda9       b       660     0       6       8       9       -       -       -
+/dev/sdb        b       660     0       6       8       16      -       -       -
+/dev/sdb1       b       660     0       6       8       17      -       -       -
+/dev/sdb2       b       660     0       6       8       18      -       -       -
+/dev/sdb3       b       660     0       6       8       19      -       -       -
+/dev/sdb4       b       660     0       6       8       20      -       -       -
+/dev/sdb5       b       660     0       6       8       21      -       -       -
+/dev/sdb6       b       660     0       6       8       22      -       -       -
+/dev/sdb7       b       660     0       6       8       23      -       -       -
+/dev/sdb8       b       660     0       6       8       24      -       -       -
+/dev/sdb9       b       660     0       6       8       25      -       -       -
+/dev/sdc        b       660     0       6       8       32      -       -       -
+/dev/sdc1       b       660     0       6       8       33      -       -       -
+/dev/sdc2       b       660     0       6       8       34      -       -       -
+/dev/sdc3       b       660     0       6       8       35      -       -       -
+/dev/sdc4       b       660     0       6       8       36      -       -       -
+/dev/sdc5       b       660     0       6       8       37      -       -       -
+/dev/sdc6       b       660     0       6       8       38      -       -       -
+/dev/sdc7       b       660     0       6       8       39      -       -       -
+/dev/sdc8       b       660     0       6       8       40      -       -       -
+/dev/sdc9       b       660     0       6       8       41      -       -       -
+/dev/sd_slotstat        c       660     0       6       10      240     -       -       -
+/dev/sharp_audioctl     c       660     0       29      10      213     -       -       -
+/dev/sharp_buz  c       660     0       29      10      211     -       -       -
+/dev/sharp_kbdctl       c       660     0       45      10      214     -       -       -
+/dev/sharp_led  c       660     0       48      10      210     -       -       -
+/dev/sharp_ts   c       640     0       45      11      0       -       -       -
+/dev/smtpe0     c       640     0       0       35      128     -       -       -
+/dev/smtpe1     c       640     0       0       35      129     -       -       -
+/dev/smtpe2     c       640     0       0       35      130     -       -       -
+/dev/smtpe3     c       640     0       0       35      131     -       -       -
+/dev/sndstat    c       660     0       29      14      6       -       -       -
+/dev/snd/seq    c       660     0       0       116     1       -       -       -
+/dev/snd/timer  c       660     0       0       116     33      -       -       -
+/dev/snd/controlC0      c       660     0       0       116     0       -       -       -
+/dev/snd/controlC1      c       660     0       0       116     32      -       -       -
+/dev/snd/controlC2      c       660     0       0       116     64      -       -       -
+/dev/snd/controlC3      c       660     0       0       116     96      -       -       -
+/dev/snd/hwC0D0 c       660     0       0       116     4       -       -       -
+/dev/snd/hwC0D1 c       660     0       0       116     5       -       -       -
+/dev/snd/hwC0D2 c       660     0       0       116     6       -       -       -
+/dev/snd/hwC0D3 c       660     0       0       116     7       -       -       -
+/dev/snd/pcmC0D0c       c       660     0       0       116     24      -       -       -
+/dev/snd/pcmC0D0p       c       660     0       0       116     16      -       -       -
+/dev/snd/pcmC0D1c       c       660     0       0       116     25      -       -       -
+/dev/snd/pcmC0D1p       c       660     0       0       116     17      -       -       -
+/dev/snd/pcmC0D2c       c       660     0       0       116     26      -       -       -
+/dev/snd/pcmC0D2p       c       660     0       0       116     18      -       -       -
+/dev/snd/pcmC0D3c       c       660     0       0       116     27      -       -       -
+/dev/snd/pcmC0D3p       c       660     0       0       116     19      -       -       -
+/dev/st0        c       660     0       11      9       0       -       -       -
+/dev/st0a       c       660     0       11      9       96      -       -       -
+/dev/st0l       c       660     0       11      9       32      -       -       -
+/dev/st0m       c       660     0       11      9       64      -       -       -
+/dev/st1        c       660     0       11      9       1       -       -       -
+/dev/st1a       c       660     0       11      9       97      -       -       -
+/dev/st1l       c       660     0       11      9       33      -       -       -
+/dev/st1m       c       660     0       11      9       65      -       -       -
+/dev/tty        c       664     0       5       5       0       -       -       -
+/dev/tty        c       666     0       5       4       0       0       1       9
+/dev/ttyS       c       640     0       5       4       64      0       1       4
+/dev/ttySA      c       640     0       5       204     5       0       1       4
+/dev/ttyUSB     c       660     0       5       188     0       0       1       2
+/dev/urandom    c       644     0       0       1       9       -       -       -
+/dev/usbmouse   c       640     0       45      10      32      -       -       -
+/dev/zero       c       644     0       0       1       5       -       -       -
+/dev/input/mice c       660     0       0       13      63      -       -       -
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/devpts b/meta/recipes-core/initscripts/initscripts-1.0/devpts
new file mode 100644
index 0000000000..4a0978b404
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/devpts
@@ -0,0 +1,5 @@
+# GID of the `tty' group
+TTYGRP=5
+ 
+# Set to 600 to have `mesg n' be the default
+TTYMODE=620
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh b/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
new file mode 100755
index 0000000000..18202adcc7
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          devpts
+# Required-Start: udev
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Mount /dev/pts file systems.
+### END INIT INFO
+
+. /etc/default/devpts
+
+if grep -q devpts /proc/filesystems
+then
+        #
+        #       Create multiplexor device.
+        #
+        test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2
+
+        #
+        #       Mount /dev/pts if needed.
+        #
+        if ! grep -q devpts /proc/mounts
+        then
+                mkdir -p /dev/pts
+                mount -t devpts devpts /dev/pts -ogid=${TTYGRP},mode=${TTYMODE}
+        fi
+fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/finish.sh b/meta/recipes-core/initscripts/initscripts-1.0/finish.sh
new file mode 100755
index 0000000000..183a384faa
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/finish.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          finish.sh
+# Required-Start:    $remote_fs rmnologin
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# Short-Description: Finish system start
+# Description:       
+### END INIT INFO
+
+if ! test -e /etc/.configured; then
+        > /etc/.configured
+fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/functions b/meta/recipes-core/initscripts/initscripts-1.0/functions
new file mode 100644
index 0000000000..689fd32b39
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/functions
@@ -0,0 +1,14 @@
+# -*-Shell-script-*-
+#
+# functions     This file contains functions to be used by most or all
+#               shell scripts in the /etc/init.d directory.
+#
+
+machine_id() {          # return the machine ID
+    awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
+}
+
+killproc() {            # kill the named process(es)
+    pid=`/bin/pidof $1`
+    [ "$pid" != "" ] && kill $pid
+}
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/halt b/meta/recipes-core/initscripts/initscripts-1.0/halt
new file mode 100755
index 0000000000..609b793b7c
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/halt
@@ -0,0 +1,29 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          halt
+# Required-Start:
+# Required-Stop:
+# Default-Start:
+# Default-Stop:      0
+# Short-Description: Execute the halt command.
+# Description:
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# See if we need to cut the power.
+if test -x /etc/init.d/ups-monitor
+then
+        /etc/init.d/ups-monitor poweroff
+fi
+
+# Don't shut down drives if we're using RAID.
+hddown="-h"
+if grep -qs '^md.*active' /proc/mdstat
+then
+        hddown=""
+fi
+
+halt -d -f -i -p $hddown
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
new file mode 100755
index 0000000000..4399ee7b18
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
@@ -0,0 +1,13 @@
+### BEGIN INIT INFO
+# Provides:          hostname
+# Required-Start:
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Set hostname based on /etc/hostname
+### END INIT INFO
+
+if test -f /etc/hostname
+then
+        hostname -F /etc/hostname
+fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/jornada6xx/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
new file mode 100755
index 0000000000..9e2d3cfc85
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
@@ -0,0 +1,211 @@
+#
+# checkroot.sh  Check to root filesystem.
+#
+# Version:      @(#)checkroot.sh  2.84  25-Jan-2002  miquels@cistron.nl
+#
+
+. /etc/default/rcS
+
+#
+# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
+# from this script *before anything else* with a timeout, like SCO does.
+#
+test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
+
+#
+# Ensure that bdflush (update) is running before any major I/O is
+# performed (the following fsck is a good example of such activity :).
+#
+test -x /sbin/update && update
+
+#
+# Read /etc/fstab.
+#
+exec 9>&0 </etc/fstab
+rootmode=rw
+rootopts=rw
+test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
+swap_on_md=no
+devfs=
+while read fs mnt type opts dump pass junk
+do
+        case "$fs" in
+                ""|\#*)
+                        continue;
+                        ;;
+                /dev/md*)
+                        # Swap on md device.
+                        test "$type" = swap && swap_on_md=yes
+                        ;;
+                /dev/*)
+                        ;;
+                *)
+                        # Might be a swapfile.
+                        test "$type" = swap && swap_on_md=yes
+                        ;;
+        esac
+        
+        test "$type" = devfs && devfs="$fs"
+
+        # Currently we do not care about the other entries
+        if test "$mnt" = "/"
+        then
+                #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]"
+
+                rootopts="$opts"                
+                roottype="$type"
+
+                #The "spinner" is broken on busybox sh  
+                TERM=dumb
+                        
+                test "$pass" = 0 -o "$pass" = "" && rootcheck=no
+                
+                # Enable fsck for ext2 and ext3 rootfs, disable for everything else                             
+                case "$type" in
+                ext3)   rootcheck=yes;;
+                *)              rootcheck=no;;
+                esac
+                
+                if test "$rootcheck" = yes
+                then
+                        if ! test -x "/sbin/fsck.${roottype}"
+                        then
+                                echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n"
+                                rootcheck=no
+                        fi
+                fi
+                
+                case "$opts" in
+                        ro|ro,*|*,ro|*,ro,*)
+                                rootmode=ro
+                                ;;
+                esac
+        fi
+done
+exec 0>&9 9>&-
+
+#
+# Activate the swap device(s) in /etc/fstab. This needs to be done
+# before fsck, since fsck can be quite memory-hungry.
+#
+doswap=no
+test -d /proc/1 || mount -n /proc
+case "`uname -r`" in
+        2.[0123].*)
+                if test $swap_on_md = yes && grep -qs resync /proc/mdstat
+                then
+                        test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing"
+                else
+                        doswap=yes
+                fi
+                ;;
+        *)
+                doswap=yes
+                ;;
+esac
+if test $doswap = yes
+then
+        test "$VERBOSE" != no && echo "Activating swap"
+        swapon -a 2> /dev/null
+fi
+
+#
+# Check the root filesystem.
+#
+if test -f /fastboot || test $rootcheck = no
+then
+  test $rootcheck = yes && echo "Fast boot, no filesystem check"
+else
+  #
+  # Ensure that root is quiescent and read-only before fsck'ing.
+  #
+  mount -n -o remount,ro /
+  if test $? = 0
+  then
+    if test -f /forcefsck
+    then
+        force="-f"
+    else
+        force=""
+    fi
+    if test "$FSCKFIX" = yes
+    then
+        fix="-y"
+    else
+        fix="-a"
+    fi
+    spinner="-C"
+    case "$TERM" in
+        dumb|network|unknown|"") spinner="" ;;
+    esac
+    test `uname -m` = s390 && spinner="" # This should go away
+    test "$VERBOSE" != no && echo "Checking root filesystem..."
+    fsck $spinner $force $fix /
+    #
+    # If there was a failure, drop into single-user mode.
+    #
+    # NOTE: "failure" is defined as exiting with a return code of
+    # 2 or larger.  A return code of 1 indicates that filesystem
+    # errors were corrected but that the boot may proceed.
+    #
+    if test "$?" -gt 1
+    then
+    
+      # Since this script is run very early in the boot-process, it should be safe to assume that the
+      # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot
+      # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal
+      chvt 1
+    
+      # Surprise! Re-directing from a HERE document (as in
+      # "cat << EOF") won't work, because the root is read-only.
+      echo
+      echo "fsck failed.  Please repair manually and reboot.  Please note"
+      echo "that the root filesystem is currently mounted read-only.  To"
+      echo "remount it read-write:"
+      echo
+      echo "   # mount -n -o remount,rw /"
+      echo
+      echo "CONTROL-D will exit from this shell and REBOOT the system."
+      echo
+      # Start a single user shell on the console
+      /sbin/sulogin $CONSOLE
+      reboot -f
+    fi
+  else
+    echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
+    echo
+  fi
+fi
+
+#
+#       If the root filesystem was not marked as read-only in /etc/fstab,
+#       remount the rootfs rw but do not try to change mtab because it
+#       is on a ro fs until the remount succeeded. Then clean up old mtabs
+#       and finally write the new mtab.
+#       This part is only needed if the rootfs was mounted ro.
+#
+if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then
+        exit 0
+fi
+
+#       Add a second check, which seems to be needed for some kernel versions
+if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then
+        exit 0
+fi
+
+
+echo "Remounting root file system..."
+mount -n -o remount,$rootmode /
+if test "$rootmode" = rw
+then
+        if test ! -L /etc/mtab
+        then
+                rm -f /etc/mtab~ /etc/nologin
+                : > /etc/mtab
+        fi
+        mount -f -o remount /
+        mount -f /proc
+        test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
+fi
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/jornada7xx/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
new file mode 100755
index 0000000000..9e2d3cfc85
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
@@ -0,0 +1,211 @@
+#
+# checkroot.sh  Check to root filesystem.
+#
+# Version:      @(#)checkroot.sh  2.84  25-Jan-2002  miquels@cistron.nl
+#
+
+. /etc/default/rcS
+
+#
+# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
+# from this script *before anything else* with a timeout, like SCO does.
+#
+test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
+
+#
+# Ensure that bdflush (update) is running before any major I/O is
+# performed (the following fsck is a good example of such activity :).
+#
+test -x /sbin/update && update
+
+#
+# Read /etc/fstab.
+#
+exec 9>&0 </etc/fstab
+rootmode=rw
+rootopts=rw
+test "$ENABLE_ROOTFS_FSCK" = yes && rootcheck="yes" || rootcheck="no"
+swap_on_md=no
+devfs=
+while read fs mnt type opts dump pass junk
+do
+        case "$fs" in
+                ""|\#*)
+                        continue;
+                        ;;
+                /dev/md*)
+                        # Swap on md device.
+                        test "$type" = swap && swap_on_md=yes
+                        ;;
+                /dev/*)
+                        ;;
+                *)
+                        # Might be a swapfile.
+                        test "$type" = swap && swap_on_md=yes
+                        ;;
+        esac
+        
+        test "$type" = devfs && devfs="$fs"
+
+        # Currently we do not care about the other entries
+        if test "$mnt" = "/"
+        then
+                #echo "[$fs] [$mnt] [$type] [$opts] [$dump] [$pass] [$junk]"
+
+                rootopts="$opts"                
+                roottype="$type"
+
+                #The "spinner" is broken on busybox sh  
+                TERM=dumb
+                        
+                test "$pass" = 0 -o "$pass" = "" && rootcheck=no
+                
+                # Enable fsck for ext2 and ext3 rootfs, disable for everything else                             
+                case "$type" in
+                ext3)   rootcheck=yes;;
+                *)              rootcheck=no;;
+                esac
+                
+                if test "$rootcheck" = yes
+                then
+                        if ! test -x "/sbin/fsck.${roottype}"
+                        then
+                                echo -e "\n * * * WARNING: /sbin/fsck.${roottype} is missing! * * *\n"
+                                rootcheck=no
+                        fi
+                fi
+                
+                case "$opts" in
+                        ro|ro,*|*,ro|*,ro,*)
+                                rootmode=ro
+                                ;;
+                esac
+        fi
+done
+exec 0>&9 9>&-
+
+#
+# Activate the swap device(s) in /etc/fstab. This needs to be done
+# before fsck, since fsck can be quite memory-hungry.
+#
+doswap=no
+test -d /proc/1 || mount -n /proc
+case "`uname -r`" in
+        2.[0123].*)
+                if test $swap_on_md = yes && grep -qs resync /proc/mdstat
+                then
+                        test "$VERBOSE" != no && echo "Not activating swap - RAID array resyncing"
+                else
+                        doswap=yes
+                fi
+                ;;
+        *)
+                doswap=yes
+                ;;
+esac
+if test $doswap = yes
+then
+        test "$VERBOSE" != no && echo "Activating swap"
+        swapon -a 2> /dev/null
+fi
+
+#
+# Check the root filesystem.
+#
+if test -f /fastboot || test $rootcheck = no
+then
+  test $rootcheck = yes && echo "Fast boot, no filesystem check"
+else
+  #
+  # Ensure that root is quiescent and read-only before fsck'ing.
+  #
+  mount -n -o remount,ro /
+  if test $? = 0
+  then
+    if test -f /forcefsck
+    then
+        force="-f"
+    else
+        force=""
+    fi
+    if test "$FSCKFIX" = yes
+    then
+        fix="-y"
+    else
+        fix="-a"
+    fi
+    spinner="-C"
+    case "$TERM" in
+        dumb|network|unknown|"") spinner="" ;;
+    esac
+    test `uname -m` = s390 && spinner="" # This should go away
+    test "$VERBOSE" != no && echo "Checking root filesystem..."
+    fsck $spinner $force $fix /
+    #
+    # If there was a failure, drop into single-user mode.
+    #
+    # NOTE: "failure" is defined as exiting with a return code of
+    # 2 or larger.  A return code of 1 indicates that filesystem
+    # errors were corrected but that the boot may proceed.
+    #
+    if test "$?" -gt 1
+    then
+    
+      # Since this script is run very early in the boot-process, it should be safe to assume that the
+      # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot
+      # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal
+      chvt 1
+    
+      # Surprise! Re-directing from a HERE document (as in
+      # "cat << EOF") won't work, because the root is read-only.
+      echo
+      echo "fsck failed.  Please repair manually and reboot.  Please note"
+      echo "that the root filesystem is currently mounted read-only.  To"
+      echo "remount it read-write:"
+      echo
+      echo "   # mount -n -o remount,rw /"
+      echo
+      echo "CONTROL-D will exit from this shell and REBOOT the system."
+      echo
+      # Start a single user shell on the console
+      /sbin/sulogin $CONSOLE
+      reboot -f
+    fi
+  else
+    echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
+    echo
+  fi
+fi
+
+#
+#       If the root filesystem was not marked as read-only in /etc/fstab,
+#       remount the rootfs rw but do not try to change mtab because it
+#       is on a ro fs until the remount succeeded. Then clean up old mtabs
+#       and finally write the new mtab.
+#       This part is only needed if the rootfs was mounted ro.
+#
+if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then
+        exit 0
+fi
+
+#       Add a second check, which seems to be needed for some kernel versions
+if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then
+        exit 0
+fi
+
+
+echo "Remounting root file system..."
+mount -n -o remount,$rootmode /
+if test "$rootmode" = rw
+then
+        if test ! -L /etc/mtab
+        then
+                rm -f /etc/mtab~ /etc/nologin
+                : > /etc/mtab
+        fi
+        mount -f -o remount /
+        mount -f /proc
+        test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
+fi
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
new file mode 100755
index 0000000000..9d4f97b683
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
@@ -0,0 +1,38 @@
+### BEGIN INIT INFO
+# Provides:          mountall
+# Required-Start:    mountvirtfs
+# Required-Stop: 
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Mount all filesystems.
+# Description:
+### END INIT INFO
+
+. /etc/default/rcS
+
+#
+# Mount local filesystems in /etc/fstab. For some reason, people
+# might want to mount "proc" several times, and mount -v complains
+# about this. So we mount "proc" filesystems without -v.
+#
+test "$VERBOSE" != no && echo "Mounting local filesystems..."
+mount -at nonfs,nosmbfs,noncpfs 2>/dev/null
+
+#
+# We might have mounted something over /dev, see if /dev/initctl is there.
+#
+if test ! -p /dev/initctl
+then
+        rm -f /dev/initctl
+        mknod -m 600 /dev/initctl p
+fi
+kill -USR1 1
+
+#
+# Execute swapon command again, in case we want to swap to
+# a file on a now mounted filesystem.
+#
+swapon -a 2> /dev/null
+
+: exit 0
+
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
new file mode 100755
index 0000000000..46c58b16a8
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
@@ -0,0 +1,83 @@
+### BEGIN INIT INFO
+# Provides:          mountnfs
+# Required-Start:    $local_fs $network $portmap
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+
+. /etc/default/rcS
+
+#
+#       Run in a subshell because of I/O redirection.
+#
+test -f /etc/fstab && (
+
+#
+#       Read through fstab line by line. If it is NFS, set the flag
+#       for mounting NFS filesystems. If any NFS partition is found and it
+#       not mounted with the nolock option, we start the portmapper.
+#
+portmap=no
+mount_nfs=no
+mount_smb=no
+mount_ncp=no
+while read device mountpt fstype options
+do
+        case "$device" in
+                ""|\#*)
+                        continue
+                        ;;
+        esac
+
+        case "$options" in
+                *noauto*)
+                        continue
+                        ;;
+        esac
+
+        if test "$fstype" = nfs
+        then
+                mount_nfs=yes
+                case "$options" in
+                        *nolock*)
+                                ;;
+                        *)
+                                portmap=yes
+                                ;;
+                esac
+        fi
+        if test "$fstype" = smbfs
+        then
+                mount_smb=yes
+        fi
+        if test "$fstype" = ncpfs
+        then
+                mount_ncp=yes
+        fi
+done
+
+exec 0>&1
+
+if test "$portmap" = yes
+then
+        if test -x /sbin/portmap
+        then
+                echo -n "Starting portmapper... "
+                start-stop-daemon --start --quiet --exec /sbin/portmap
+                sleep 2
+        fi
+fi
+
+if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes
+then
+        echo "Mounting remote filesystems..."
+        test "$mount_nfs" = yes && mount -a -t nfs
+        test "$mount_smb" = yes && mount -a -t smbfs
+        test "$mount_ncp" = yes && mount -a -t ncpfs
+fi
+
+) < /etc/fstab
+
+: exit 0
+
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/om-gta01/inittab b/meta/recipes-core/initscripts/initscripts-1.0/om-gta01/inittab
new file mode 100644
index 0000000000..8d313b2a58
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/om-gta01/inittab
@@ -0,0 +1,48 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel.
+id:5:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# Shut down if kernel sends us SIGINT or SIGPWR
+ca::ctrlaltdel:/sbin/halt -p
+pf::powerfailnow:/sbin/halt -p
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+
+# NOTE: FIC GTA01 has this odd multiplexer on ttySAC0 since
+#       GSM shares it with the serial output. We only allow
+#       the getty in runlevel 2 to cope with that. gsmd gets
+#       started in runlevel 3.        -- mickey@openmoko.org
+S:2:respawn:/sbin/getty 115200 ttySAC0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/openmn/extractfs b/meta/recipes-core/initscripts/initscripts-1.0/openmn/extractfs
new file mode 100755
index 0000000000..7e57dedd2d
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/openmn/extractfs
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if (grep -q 'tmpfs.*/var.*tmpfs' /proc/mounts)
+then
+        test "$VERBOSE" != no && echo "Copying /var filesystem..."
+        cp -a /boot/var /
+fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/openmn/packages b/meta/recipes-core/initscripts/initscripts-1.0/openmn/packages
new file mode 100755
index 0000000000..2566487d2d
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/openmn/packages
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Original author: ???
+#
+# Additions by Steph Meslin-Weber:
+# x Percentage display
+# x Dot display of dependency installations
+# - removed both of above
+# - display is now X of Y packages and current package name being installed
+
+#. /etc/default/rcS
+
+reconfigure () {
+        pkg=$1
+        path=$2
+        isdependent=$3
+        test -e "$path/info/$pkg.control" || return 1
+        depends="`cat $path/info/$pkg.control|grep Depends|cut -d: -f2`"
+        
+        # make sure we haven't already installed this package
+        isthere=`cat /tmp/.configured.list|grep $pkg`
+        if test "$isthere" != ""; then
+                return 1
+        fi      
+
+        if test "$depends" != ""; then
+                for dep in $depends; do
+                        (echo $log|grep $dep >/dev/null 2>&1) || ( reconfigure $dep $path "$max" "$pkg" && log="$log $dep"; )
+                done
+        fi
+
+        echo -ne " ${pkg}"
+        
+        test -e "$path/info/$pkg.prerm" && $path/info/$pkg.prerm unconfigure >/dev/null 2>&1
+        test -e "$path/info/$pkg.postinst" && $path/info/$pkg.postinst configure >/dev/null 2>&1
+        
+        log="$log $pkg"
+
+        # append the installed package name to the list
+        echo -ne "$pkg\n" >> /tmp/.configured.list
+
+        echo
+        return 0
+}
+
+if test ! -e /etc/.configured; then
+        echo "Reconfiguring all packages installed to root:"
+
+        # create unique packages list file
+        rm -f /tmp/.configured.list
+        touch /tmp/.configured.list
+
+        log=""
+
+        for control in /usr/lib/ipkg/info/*.control; do
+                package=`echo $control|sed -e 's,.*/,,g; s,\.control,,g;'`
+                (echo $log|grep $package >/dev/null 2>&1) || reconfigure $package /usr/lib/ipkg
+        done
+
+        # cleanup unique packages list file
+        rm -f /tmp/.configured.list
+fi      
+
+test -f /usr/lib/ipkg/info/task-ramses || ipkg install task-ramses
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/openmn/umountfs b/meta/recipes-core/initscripts/initscripts-1.0/openmn/umountfs
new file mode 100755
index 0000000000..399194109b
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/openmn/umountfs
@@ -0,0 +1,17 @@
+#! /bin/sh
+#
+# umountfs      Turn off swap and unmount all local filesystems.
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+echo "Deactivating swap..."
+swapoff -a
+
+# We leave /proc mounted.
+echo "Unmounting local filesystems..."
+umount -f -a -r
+
+mount -o remount,ro /
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
new file mode 100755
index 0000000000..1813fd1240
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -0,0 +1,197 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:             volatile
+# Required-Start:       $local_fs
+# Required-Stop:      $local_fs
+# Default-Start:        S
+# Default-Stop:
+# Short-Description:  Populate the volatile filesystem
+### END INIT INFO
+
+. /etc/default/rcS
+
+CFGDIR="/etc/default/volatiles"
+TMPROOT="/var/tmp"
+COREDEF="00_core"
+
+[ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems."
+
+create_file() {
+        EXEC=" 
+        touch \"$1\"; 
+        chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 
+        chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " 
+
+        test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache
+
+        [ -e "$1" ] && {
+          [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+        } || {
+          eval $EXEC &
+        }
+}
+
+mk_dir() {
+        EXEC=" 
+        mkdir -p \"$1\"; 
+        chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 
+        chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
+
+        test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache
+        
+        [ -e "$1" ] && {
+          [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+        } || {
+          eval $EXEC &
+        }
+}
+
+link_file() {
+        EXEC="test -e \"$2\" -o -L $2 || ln -s \"$1\" \"$2\" >/dev/tty0 2>&1" 
+
+        test "$VOLATILE_ENABLE_CACHE" = yes && echo "   $EXEC" >> /etc/volatile.cache
+        
+        [ -e "$2" ] && {
+          echo "Cannot create link over existing -${TNAME}-." >&2
+        } || {
+          eval $EXEC &
+        }
+}
+
+check_requirements() {
+
+  cleanup() {
+    rm "${TMP_INTERMED}"
+    rm "${TMP_DEFINED}"
+    rm "${TMP_COMBINED}"
+    }
+    
+  CFGFILE="$1"
+
+  [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0
+
+  TMP_INTERMED="${TMPROOT}/tmp.$$"
+  TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
+  TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
+
+
+  cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+  cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
+  cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+
+  NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
+  NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
+
+  [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && {
+    echo "Undefined users:"
+    diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+    cleanup
+    return 1
+    }
+
+
+  cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+  cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}"
+  cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+
+  NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"
+  NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`"
+
+  [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && {
+    echo "Undefined groups:"
+    diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+    cleanup
+    return 1
+    }
+
+  # Add checks for required directories here
+
+  cleanup
+  return 0
+  }
+
+apply_cfgfile() {
+
+  CFGFILE="$1"
+
+  check_requirements "${CFGFILE}" || {
+    echo "Skipping ${CFGFILE}"
+    return 1
+    }
+
+  cat ${CFGFILE} | grep -v "^#" | \
+  while read LINE; do
+
+    eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
+
+    [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+
+
+    [ "${TTYPE}" = "l" ] && {
+      TSOURCE="$TLTARGET"
+      [ -L "${TNAME}" ] || {
+        [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+        link_file "${TSOURCE}" "${TNAME}" &
+        }
+      continue
+      }
+
+    [ -L "${TNAME}" ] && {
+      [ "${VERBOSE}" != "no" ] && echo "Found link."
+      NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
+      echo ${NEWNAME} | grep -v "^/" >/dev/null && {
+        TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
+        [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
+        } || {
+        TNAME="${NEWNAME}"
+        [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
+        }
+      }
+
+    case "${TTYPE}" in
+      "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
+            create_file "${TNAME}" &
+            ;;
+      "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
+            mk_dir "${TNAME}" &
+            # Add check to see if there's an entry in fstab to mount.
+            ;;
+      *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
+            continue
+            ;;
+    esac
+
+
+    done
+
+  return 0
+
+  }
+
+clearcache=0
+exec 9</proc/cmdline
+while read line <&9
+do
+        case "$line" in
+                *clearcache*)  clearcache=1
+                               ;;
+                *)             continue
+                               ;;
+        esac
+done
+exec 9>&-
+
+if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate" -a "x$clearcache" = "x0"
+then
+        sh /etc/volatile.cache
+else    
+        rm -f /etc/volatile.cache
+        for file in `ls -1 "${CFGDIR}" | sort`; do
+                apply_cfgfile "${CFGDIR}/${file}"
+        done
+fi
+
+if test -f /etc/ld.so.cache -a ! -f /var/run/ld.so.cache
+then
+        ln -s /etc/ld.so.cache /var/run/ld.so.cache
+fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/reboot b/meta/recipes-core/initscripts/initscripts-1.0/reboot
new file mode 100755
index 0000000000..4c55885aba
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/reboot
@@ -0,0 +1,15 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          reboot
+# Required-Start:
+# Required-Stop:
+# Default-Start:
+# Default-Stop:      6
+# Short-Description: Execute the reboot command.
+# Description:
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+echo -n "Rebooting... "
+reboot -d -f -i
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh b/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
new file mode 100755
index 0000000000..417efc2456
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          rmnologin
+# Required-Start:    $remote_fs $all
+# Required-Stop: 
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# Short-Description: Remove /etc/nologin at boot
+# Description:       This script removes the /etc/nologin file as the
+#                    last step in the boot process, if DELAYLOGIN=yes.
+#                    If DELAYLOGIN=no, /etc/nologin was not created by
+#                    bootmisc earlier in the boot process.
+### END INIT INFO
+
+if test -f /etc/nologin.boot
+then
+        rm -f /etc/nologin /etc/nologin.boot
+fi
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
new file mode 100644
index 0000000000..75e43001b8
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          save-rtc
+# Required-Start:
+# Required-Stop:     $local_fs hwclock
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: Store system clock into file
+# Description:       
+### END INIT INFO
+
+# Update the timestamp
+date +%Y%m%d%2H%2M > /etc/timestamp2
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sendsigs b/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
new file mode 100755
index 0000000000..2b0f8f3631
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
@@ -0,0 +1,21 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          sendsigs
+# Required-Start:    
+# Required-Stop:     umountnfs
+# Default-Start:
+# Default-Stop:      0 6
+# Short-Description: Kill all remaining processes.
+# Description: 
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# Kill all processes.
+echo "Sending all processes the TERM signal..."
+killall5 -15
+sleep 5
+echo "Sending all processes the KILL signal..."
+killall5 -9
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/single b/meta/recipes-core/initscripts/initscripts-1.0/single
new file mode 100755
index 0000000000..0cad693f20
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/single
@@ -0,0 +1,24 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          single
+# Required-Start:    $local_fs $all killprocs
+# Required-Stop:
+# Default-Start:     1
+# Default-Stop:
+# Short-Description: executed by init(8) upon entering runlevel 1 (single).
+### END INIT INFO
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+
+# Kill all processes.
+echo "Sending all processes the TERM signal..."
+killall5 -15
+sleep 5
+echo "Sending all processes the KILL signal..."
+killall5 -9
+
+# We start update here, since we just killed it.
+test -x /sbin/update && update
+
+echo "Entering single-user mode..."
+exec init -t1 S
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
new file mode 100644
index 0000000000..be28bb35bf
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          mountvirtfs
+# Required-Start:
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Mount kernel virtual file systems.
+# Description:       Mount initial set of virtual filesystems the kernel
+#                    provides and that are required by everything.
+### END INIT INFO
+
+if [ -e /proc ] && ! [ -e /proc/mounts ]; then
+  mount -t proc proc /proc
+fi
+
+if [ -e /sys ] && grep -q sysfs /proc/filesystems; then
+  mount sysfs /sys -t sysfs
+fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountfs b/meta/recipes-core/initscripts/initscripts-1.0/umountfs
new file mode 100755
index 0000000000..5c6793dc9c
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -0,0 +1,24 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          umountfs
+# Required-Start:
+# Required-Stop:     
+# Default-Start:
+# Default-Stop:      0 6
+# Short-Description: Turn off swap and unmount all local file systems.
+# Description:
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+echo "Deactivating swap..."
+swapoff -a
+
+# We leave /proc mounted.
+echo "Unmounting local filesystems..."
+mount -o remount,ro /mnt/ram
+umount -f -a -r
+
+mount -o remount,ro /
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
new file mode 100755
index 0000000000..a4fb821d91
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
@@ -0,0 +1,32 @@
+### BEGIN INIT INFO
+# Provides:          umountnfs
+# Required-Start:
+# Required-Stop:     umountfs
+# Should-Stop:       $network $portmap
+# Default-Start:
+# Default-Stop:      0 6
+# Short-Description: Unmount all network filesystems
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# Write a reboot record to /var/log/wtmp before unmounting
+halt -w
+
+echo "Unmounting remote filesystems..."
+
+test -f /etc/fstab && (
+
+#
+#       Read through fstab line by line and unount network file systems
+#
+while read device mountpt fstype options
+do
+        if test "$fstype" = nfs ||  test "$fstype" = smbfs ||  test "$fstype" = ncpfs
+        then
+                umount -f $mountpt
+        fi
+done
+) < /etc/fstab
+
+: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom
new file mode 100755
index 0000000000..b6d807cf3b
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom
@@ -0,0 +1,46 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          urandom
+# Required-Start:    $local_fs mountvirtfs
+# Required-Stop:     $local_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: Save and restore the random seed
+# Description:       Save the random seed on shutdown and restore it on boot,
+#                    to ensure that the seed isn't predicable on startup
+#                    (because the boot process is predictable)
+### END INIT INFO
+
+test -c /dev/urandom || exit 0
+. /etc/default/rcS
+
+case "$1" in
+        start|"")
+                test "$VERBOSE" != no && echo "Initializing random number generator..."
+                # Load and then save 512 bytes,
+                # which is the size of the entropy pool
+                if test -f /var/lib/urandom/random-seed
+                then
+                        cat /var/lib/urandom/random-seed >/dev/urandom
+                fi
+                rm -f /var/lib/urandom/random-seed
+                umask 077
+                dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \
+                        >/dev/null 2>&1 || echo "urandom start: failed."
+                umask 022
+                ;;
+        stop)
+                # Carry a random seed from shut-down to start-up;
+                # see documentation in linux/drivers/char/random.c
+                test "$VERBOSE" != no && echo "Saving random seed..."
+                umask 077
+                dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \
+                        >/dev/null 2>&1 || echo "urandom stop: failed."
+                ;;
+        *)
+                echo "Usage: urandom {start|stop}" >&2
+                exit 1
+                ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
new file mode 100644
index 0000000000..b2ae2794dc
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -0,0 +1,39 @@
+# This configuration file lists filesystem objects that should get verified
+# during startup and be created if missing.
+#
+# Every line must either be a comment starting with #
+# or a definition of format:
+# <type> <owner> <group> <mode> <path> <linksource>
+# where the items are separated by whitespace !
+#
+# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
+#
+# A linking example:
+# l root root 0777 /var/test /tmp/testfile
+# f root root 0644 /var/test none
+#
+# Understanding links:
+# When populate-volatile is to verify/create a directory or file, it will first
+# check it's existence. If a link is found to exist in the place of the target,
+# the path of the target is replaced with the target the link points to.
+# Thus, if a link is in the place to be verified, the object will be created
+# in the place the link points to instead.
+# This explains the order of "link before object" as in the example above, where
+# a link will be created at /var/test pointing to /tmp/testfile and due to this
+# link the file defined as /var/test will actually be created as /tmp/testfile.
+d root root 0755 /var/volatile/cache none
+d root root 1777 /var/volatile/lock none
+d root root 0755 /var/volatile/log none
+d root root 0755 /var/volatile/run none
+d root root 1777 /var/volatile/tmp none
+l root root 0755 /var/cache /var/volatile/cache
+l root root 1777 /var/lock /var/volatile/lock
+l root root 0755 /var/log /var/volatile/log
+l root root 0755 /var/run /var/volatile/run
+l root root 1777 /var/tmp /var/volatile/tmp
+d root root 0755 /var/lock/subsys none
+f root root 0664 /var/log/wtmp none
+f root root 0664 /var/run/utmp none
+l root root 0644 /etc/resolv.conf /var/run/resolv.conf
+f root root 0644 /var/run/resolv.conf none
+
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
new file mode 100644
index 0000000000..0d79b53a8c
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -0,0 +1,121 @@
+DESCRIPTION = "SysV init scripts"
+SECTION = "base"
+PRIORITY = "required"
+DEPENDS = "makedevs"
+RDEPENDS = "makedevs"
+LICENSE = "GPLv2"
+PR = "r122"
+
+SRC_URI = "file://functions \
+           file://halt \
+           file://umountfs \
+           file://devpts.sh \
+           file://devpts \
+           file://hostname.sh \
+           file://mountall.sh \
+           file://banner.sh \
+           file://finish.sh \
+           file://bootmisc.sh \
+           file://mountnfs.sh \
+           file://reboot \
+           file://checkfs.sh \
+           file://single \
+           file://sendsigs \
+           file://urandom \
+           file://rmnologin.sh \
+           file://checkroot.sh \
+           file://umountnfs.sh \
+           file://sysfs.sh \
+           file://device_table.txt \
+           file://populate-volatile.sh \
+           file://volatiles \
+           file://save-rtc.sh"
+
+SRC_URI_append_arm = " file://alignment.sh"
+
+KERNEL_VERSION = ""
+
+do_install () {
+#
+# Create directories and install device independent scripts
+#
+        install -d ${D}${sysconfdir}/init.d
+        install -d ${D}${sysconfdir}/rcS.d
+        install -d ${D}${sysconfdir}/rc0.d
+        install -d ${D}${sysconfdir}/rc1.d
+        install -d ${D}${sysconfdir}/rc2.d
+        install -d ${D}${sysconfdir}/rc3.d
+        install -d ${D}${sysconfdir}/rc4.d
+        install -d ${D}${sysconfdir}/rc5.d
+        install -d ${D}${sysconfdir}/rc6.d
+        install -d ${D}${sysconfdir}/default
+        install -d ${D}${sysconfdir}/default/volatiles
+
+        install -m 0644    ${WORKDIR}/functions         ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/bootmisc.sh       ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/checkroot.sh      ${D}${sysconfdir}/init.d
+#       install -m 0755    ${WORKDIR}/finish.sh         ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/halt              ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/hostname.sh       ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/mountall.sh       ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/mountnfs.sh       ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/reboot            ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/rmnologin.sh      ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/sendsigs          ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/single            ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/umountnfs.sh      ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/urandom           ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/devpts            ${D}${sysconfdir}/default
+        install -m 0755    ${WORKDIR}/sysfs.sh          ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/save-rtc.sh       ${D}${sysconfdir}/init.d
+        install -m 0644    ${WORKDIR}/volatiles         ${D}${sysconfdir}/default/volatiles/00_core
+        if [ "${TARGET_ARCH}" = "arm" ]; then
+                install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
+        fi
+#
+# Install device dependent scripts
+#
+        install -m 0755 ${WORKDIR}/banner.sh    ${D}${sysconfdir}/init.d/banner.sh
+        install -m 0755 ${WORKDIR}/umountfs     ${D}${sysconfdir}/init.d/umountfs
+#
+# Create runlevel links
+#
+        ln -sf          ../init.d/rmnologin.sh  ${D}${sysconfdir}/rc2.d/S99rmnologin.sh
+        ln -sf          ../init.d/rmnologin.sh  ${D}${sysconfdir}/rc3.d/S99rmnologin.sh
+        ln -sf          ../init.d/rmnologin.sh  ${D}${sysconfdir}/rc4.d/S99rmnologin.sh
+        ln -sf          ../init.d/rmnologin.sh  ${D}${sysconfdir}/rc5.d/S99rmnologin.sh
+        ln -sf          ../init.d/sendsigs      ${D}${sysconfdir}/rc6.d/S20sendsigs
+#       ln -sf          ../init.d/urandom       ${D}${sysconfdir}/rc6.d/S30urandom
+        ln -sf          ../init.d/umountnfs.sh  ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
+        ln -sf          ../init.d/umountfs      ${D}${sysconfdir}/rc6.d/S40umountfs
+        # udev will run at S55 if installed
+        ln -sf          ../init.d/reboot        ${D}${sysconfdir}/rc6.d/S90reboot
+        ln -sf          ../init.d/sendsigs      ${D}${sysconfdir}/rc0.d/S20sendsigs
+#       ln -sf          ../init.d/urandom       ${D}${sysconfdir}/rc0.d/S30urandom
+        ln -sf          ../init.d/umountnfs.sh  ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
+        ln -sf          ../init.d/umountfs      ${D}${sysconfdir}/rc0.d/S40umountfs
+        # udev will run at S55 if installed
+        ln -sf          ../init.d/halt          ${D}${sysconfdir}/rc0.d/S90halt
+        ln -sf          ../init.d/save-rtc.sh   ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
+        ln -sf          ../init.d/save-rtc.sh   ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
+        ln -sf          ../init.d/banner.sh     ${D}${sysconfdir}/rcS.d/S02banner.sh
+        ln -sf          ../init.d/checkroot.sh  ${D}${sysconfdir}/rcS.d/S10checkroot.sh
+#       ln -sf          ../init.d/checkfs.sh    ${D}${sysconfdir}/rcS.d/S30checkfs.sh
+        ln -sf          ../init.d/mountall.sh   ${D}${sysconfdir}/rcS.d/S35mountall.sh
+        ln -sf          ../init.d/hostname.sh   ${D}${sysconfdir}/rcS.d/S39hostname.sh
+        ln -sf          ../init.d/mountnfs.sh   ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
+        ln -sf          ../init.d/bootmisc.sh   ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
+#       ln -sf          ../init.d/urandom       ${D}${sysconfdir}/rcS.d/S55urandom
+#       ln -sf          ../init.d/finish.sh     ${D}${sysconfdir}/rcS.d/S99finish.sh
+        # udev will run at S04 if installed
+        ln -sf          ../init.d/sysfs.sh      ${D}${sysconfdir}/rcS.d/S03sysfs.sh
+        ln -sf          ../init.d/populate-volatile.sh  ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
+        ln -sf          ../init.d/devpts.sh     ${D}${sysconfdir}/rcS.d/S38devpts.sh
+        if [ "${TARGET_ARCH}" = "arm" ]; then
+                ln -sf  ../init.d/alignment.sh  ${D}${sysconfdir}/rcS.d/S06alignment.sh
+        fi
+
+        install -m 0755         ${WORKDIR}/device_table.txt             ${D}${sysconfdir}/device_table
+}
diff --git a/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
new file mode 100755
index 0000000000..2e4867aa75
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
@@ -0,0 +1,1066 @@
+--- libjpeg7-7.orig/config.sub
++++ libjpeg7-7/config.sub
+@@ -1,4 +1,10 @@
+ #! /bin/sh
++# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
++if [ -x /usr/share/misc/config.sub ]; then
++   /usr/share/misc/config.sub $*
++   exit $?
++fi
++
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+--- libjpeg7-7.orig/config.guess
++++ libjpeg7-7/config.guess
+@@ -1,4 +1,10 @@
+ #! /bin/sh
++# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
++if [ -x /usr/share/misc/config.guess ]; then
++   /usr/share/misc/config.guess $*
++   exit $?
++fi
++
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+--- libjpeg7-7.orig/debian/libjpeg7-dev.files
++++ libjpeg7-7/debian/libjpeg7-dev.files
+@@ -0,0 +1,4 @@
++usr/include
++usr/lib/libjpeg.a
++usr/lib/libjpeg.la
++usr/lib/libjpeg.so
+--- libjpeg7-7.orig/debian/libjpeg-progs.README.Debian
++++ libjpeg7-7/debian/libjpeg-progs.README.Debian
+@@ -0,0 +1,13 @@
++libjpeg-progs for Debian
++========================
++
++This package contains programs for manipulating JPEG files:
++   cjpeg/djpeg: convert to/from the JPEG file format
++   rdjpgcom/wrjpgcom: read/write comments in JPEG files
++   jpegtran: lossless transformations of JPEG files
++   jpegexiforient/exifautotran: manipulate EXIF orientation tag
++       
++Thanks for using Debian!
++
++--
++Bill Allombert <ballombe@debian.org>  Sun, 05 Jul 2009 15:18:59 +0200
+--- libjpeg7-7.orig/debian/shlibs.local
++++ libjpeg7-7/debian/shlibs.local
+@@ -0,0 +1 @@
++libjpeg                7       libjpeg7
+--- libjpeg7-7.orig/debian/rules
++++ libjpeg7-7/debian/rules
+@@ -0,0 +1,71 @@
++#!/usr/bin/make -f
++# Made with the aid of debmake, by Christoph Lameter,
++# based on the sample debian/rules file for GNU hello by Ian Jackson.
++
++package=libjpeg
++
++export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++export CFLAGS=-D_REENTRANT -g -Wall
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++CFLAGS += -O0
++else
++CFLAGS += -O2
++endif
++
++#export DH_VERBOSE=1
++
++build: build-stamp 
++build-stamp: 
++       dh_testdir
++       ./configure --prefix=/usr --mandir=/usr/share/man \
++        --enable-static --enable-shared \
++        --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) 
++       $(MAKE)
++ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
++       $(MAKE) check
++endif
++       $(MAKE) -C debian/extra
++
++       touch build-stamp
++
++clean:
++       dh_testdir
++       dh_testroot
++       -rm -f build-stamp
++       if [ -f Makefile ]; then $(MAKE) distclean; fi
++       $(MAKE) clean -C debian/extra
++       dh_clean
++
++binary-indep: 
++
++binary-arch: build
++       dh_testdir 
++       dh_testroot 
++       dh_clean -k
++       dh_installdirs 
++       $(MAKE) install DESTDIR=`pwd`/debian/tmp
++       $(MAKE) install -C debian/extra prefix=/usr DESTDIR=`pwd`/debian/tmp
++       # fix jconfig.h 
++       rm debian/tmp/usr/include/jconfig.h
++       sed -e "s/#\(undef\|define\) HAVE_\(LOCALE\|\(STD\(DEF\|LIB\)\)\)_H 1//g" \
++               jconfig.h > debian/tmp/usr/include/jconfig.h
++       # separate out lib package
++       dh_movefiles
++       # Finish it off with debhelper
++       dh_installdocs README
++       dh_installexamples 
++       dh_installchangelogs change.log
++       dh_strip --dbg-package=libjpeg7-dbg
++       dh_compress 
++       dh_fixperms 
++       dh_installdeb 
++       dh_shlibdeps -l`pwd`/debian/libjpeg7/usr/lib 
++       dh_gencontrol 
++       dh_md5sums 
++       dh_builddeb 
++
++binary:        binary-indep binary-arch
++
++.PHONY: clean binary-indep binary-arch binary build
+--- libjpeg7-7.orig/debian/libjpeg7-dev.README.Debian
++++ libjpeg7-7/debian/libjpeg7-dev.README.Debian
+@@ -0,0 +1,18 @@
++IJG JPEG for Debian
++===================
++
++The following patch has been applied to the headers files:
++
++--- jconfig.h: Remove unused symbol HAVE_STDDEF_H, HAVE_STDLIB_H and
++HAVE_LOCALE_H since they are not used by the installed headers files and cause
++problem with autoconf.
++
++This can theoretically cause problems if your software relies on theses symbols
++being defined by this header. If it ever happens, please define them manually.
++
++Note: this is not Debian-specific, others distributions apply similar patches.
++
++Thanks for using Debian!
++
++---
++Bill Allombert <ballombe@debian.org>  Sun, 05 Jul 2009 15:17:56 +0200
+--- libjpeg7-7.orig/debian/shlibs
++++ libjpeg7-7/debian/shlibs
+@@ -0,0 +1 @@
++libjpeg                7       libjpeg7
+--- libjpeg7-7.orig/debian/control
++++ libjpeg7-7/debian/control
+@@ -0,0 +1,52 @@
++Source: libjpeg7
++Maintainer: Bill Allombert <ballombe@debian.org>
++Section: graphics
++Priority: optional
++Build-Depends: debhelper (>= 5), autotools-dev
++Standards-Version: 3.8.2
++
++Package: libjpeg7
++Architecture: any
++Section: libs
++Description: The Independent JPEG Group's JPEG runtime library
++ The Independent JPEG Group's JPEG library is a library for handling
++ JPEG files.
++ .
++ This package contains the shared library.
++Depends: ${shlibs:Depends}
++
++Package: libjpeg7-dev
++Architecture: any
++Section: libdevel
++Description: Development files for the IJG JPEG library
++ The Independent JPEG Group's JPEG library is a library for handling
++ JPEG files.
++ .
++ This package contains the static library, headers and documentation.
++Depends: libjpeg7 (=${binary:Version}), libc-dev
++Conflicts: libjpeg62-dev
++Replaces: libjpeg62-dev
++
++Package: libjpeg7-dbg
++Architecture: any
++Section: debug
++Priority: extra
++Description: Development files for the IJG JPEG library
++ The Independent JPEG Group's JPEG library is a library for handling
++ JPEG files.
++ .
++ This package contains the debugging symbols for libjpeg.
++Provides: libjpeg-dbg
++Depends: libjpeg7 (=${binary:Version})
++Conflicts: libjpeg62-dbg
++Replaces: libjpeg62-dbg
++
++Package: libjpeg-progs
++Architecture: any
++Description: Programs for manipulating JPEG files
++ This package contains programs for manipulating JPEG files:
++  cjpeg/djpeg: convert to/from the JPEG file format
++  rdjpgcom/wrjpgcom: read/write comments in JPEG files
++  jpegtran: lossless transformations of JPEG files
++  jpegexiforient/exifautotran: manipulate EXIF orientation tag
++Depends: ${shlibs:Depends}
+--- libjpeg7-7.orig/debian/libjpeg7.files
++++ libjpeg7-7/debian/libjpeg7.files
+@@ -0,0 +1,2 @@
++/usr/lib/libjpeg.so.7.0.0
++/usr/lib/libjpeg.so.7
+--- libjpeg7-7.orig/debian/postinst
++++ libjpeg7-7/debian/postinst
+@@ -0,0 +1,8 @@
++#!/bin/sh -e
++
++#DEBHELPER#
++
++if [ "$1" = "configure" ]; then
++      ldconfig
++fi
++       
+--- libjpeg7-7.orig/debian/compat
++++ libjpeg7-7/debian/compat
+@@ -0,0 +1 @@
++5
+--- libjpeg7-7.orig/debian/libjpeg7-dev.examples
++++ libjpeg7-7/debian/libjpeg7-dev.examples
+@@ -0,0 +1 @@
++example.c
+--- libjpeg7-7.orig/debian/changelog
++++ libjpeg7-7/debian/changelog
+@@ -0,0 +1,245 @@
++libjpeg7 (7-1) unstable; urgency=low
++
++  * The "Yoan" release.
++  * New upstream release. closes: #535350
++    - This release includes configure.ac and Makefile.am. closes: #346126  
++    - All patches merged upstream.
++    - Remove dpatch support.
++  * debian/control:
++    - Remove Build-Dependency on libtool and sharutils.
++    - Move libjpeg7-dbg to debug section.
++    - Bump standard version to 3.8.2.
++  * Skip test-suite if nocheck is set. closes: #451222
++
++ -- Bill Allombert <ballombe@debian.org>  Sun, 05 Jul 2009 15:29:27 +0200
++
++libjpeg6b (6b-14) unstable; urgency=low
++
++  * The "Lino" release.
++  * exifautotran:
++    - fix typo in manpage. closes: #376371, thanks Reuben Thomas.
++    - preserve file mode. closes: #383379, thanks Vincent Arkesteijn.
++  * debian/control, debian/rules, debian/compat:
++    + switch to debhelper v5
++    + add libjpeg-dbg debugging package.
++  * debian/rules: remove - before "make clean" rules.
++  * Add patch 204_jpegtran_man to improve readability of manpage.
++    closes: #437453. Thanks Jorgen Grahn.
++  * jpegexiforient.1: Apply patch from Jorgen Grahn to improve formatting.
++    closes: #437446.
++
++ -- Bill Allombert <ballombe@debian.org>  Thu, 16 Aug 2007 22:59:21 +0200
++
++libjpeg6b (6b-13) unstable; urgency=low
++
++  * The "If at first you don't succeed..." release. 
++  * Change --enable-maxmem to 1024, following Guido advice.
++    This should fix the slowdowns with large files (for large < 1Gb):
++    closes: #356556, #365025, Thanks Nicolas.
++    If you hit performance problems, please set the JPEGMEM variable to
++    about half your available RAM, see jpegtran(1).
++  * Update libjpeg-progs README.Debian to reflect the new patch set and
++    the JPEGMEM feature.
++  * Bump standard version to 3.7.2.
++
++ -- Bill Allombert <ballombe@debian.org>  Fri,  5 May 2006 19:14:25 +0200
++
++libjpeg6b (6b-12) unstable; urgency=low
++
++  * The "vote for me" release
++  * Bump standard version to 3.6.2.
++  * Run  'make test' instead of home-made test-suite.
++  * Switch to debhelper v4.
++  * libjpeg is now configured with --enable-maxmem=32. This limits the memory
++    usage to 32Mb and it can be overrided by JPEGMEM. Without this flag
++    JPEGMEM is ignored and there were no limits.
++    closes: #346023. Thanks C. Scott Ananian.
++
++ -- Bill Allombert <ballombe@debian.org>  Thu,  2 Mar 2006 18:52:44 +0100
++
++libjpeg6b (6b-11) unstable; urgency=high
++
++  * The "Silencio" release
++  * exifautotran: Apply patch by Uwe Zeisberger to fix bad temporary file
++    handling.  closes: #340079
++
++ -- Bill Allombert <ballombe@debian.org>  Sun, 20 Nov 2005 20:57:07 +0100
++
++libjpeg6b (6b-10) unstable; urgency=low
++
++  * The "timeout" release.
++  * Rebuild with current toolchain.
++  * Depends on libc-dev instead of libc6-dev. closes: #294696
++    Thanks Joel Aelwyn for discussing thoroughly the matter.
++  * Instead of copying /usr/bin/libtool, we replace it by a script that
++    call libtool (using standard path search). Remarked by Jesus Climent.
++  * debian/control: remove pre-hamm cruft.
++  * Add jpegexiforient and jpegautotran by Guido Vollbeding
++    <http://sylvana.net/jpegcrop/exif_orientation.html> as proposed by Philip
++    Armstrong. closes: #257061. 
++  * Run the test-suite at build time instead of shipping it in the package:
++    - /usr/share/doc/libjpeg-progs/tests: removed.
++    - debian/control: Add Build-Depends on sharutils for uuencode.
++    - debian/libjpeg-progs.dirs: removed.
++    - debian/libjpeg-progs.test: removed.
++
++ -- Bill Allombert <ballombe@debian.org>  Tue,  1 Mar 2005 19:43:26 +0100
++
++libjpeg6b (6b-9) unstable; urgency=low
++
++  * The "I'm all for aggressive goals" release.
++  * Rebuild with new libtool. closes: #201943.
++  * patch 100_crop: Updated from Guido Vollbeding <guido@jpegclub.org>
++    to include patches 203_jpegtran_errmsg,204_perfect.
++  * patch 200_crop_man: Include 205_perfect_man.
++  * patches 203_jpegtran_errmsg, 204_perfect, 205_perfect_man: removed
++  * Add patch 203_rdppm: fix cjpeg issue with 16-bit PPM files. closes: #208937
++  * Bump standard version to 3.6.1.
++  * Update debian/edit-patch.
++
++ -- Bill Allombert <ballombe@debian.org>  Mon,  8 Sep 2003 16:22:08 +0200
++
++libjpeg6b (6b-8) unstable; urgency=low
++
++  * The "I *hate* when that happens" release.
++  * Move libjpeg62-dev to libdevel section.
++  * See debian/README.sources for detail about the (d)patch system.
++  * debian/rules: avoid to run configure twice.
++  * Add patches 204_perfect and 205_perfect_man. They implement the
++    -perfect jpegtran option as proposed by Mark W. Eichin. closes: #189027
++  * Bump standard version to 3.5.10.
++  * Use /usr/bin/libtool instead of ldconfig-generated libtool, and remove
++    various libtool related kludges, including patch 301_configure.
++    closes: #195281. Thanks Robert Millan for the suggestion.
++  * Remove patch 302_makefile. Fix debian/rules instead.
++
++ -- Bill Allombert <ballombe@debian.org>  Sat, 31 May 2003 16:16:59 +0200
++
++libjpeg6b (6b-7) unstable; urgency=low
++
++  * Rebuild with new gcc/new glibc/new debhelper.
++  * Add -g to build options according to new policy.
++  * Add support for DEB_BUILD_OPTIONS noopt. nostrip is handled by dh_strip.
++  * Bump standard version to 3.5.9.
++  * Extend description a bit (If you have a better one please email me!).
++  * Use dpatch to handle the patches.
++
++ -- Bill Allombert <ballombe@debian.org>  Sun, 16 Mar 2003 12:19:36 +0100
++
++libjpeg6b (6b-6) unstable; urgency=low
++
++  * The "Try to break sarge before it even got a name" release
++  * jpegtran: better error messages when opening files.
++    closes: #147516 Thanks Mark W. Eichin.
++  * Add debian/patch dir with my patches.
++  * Add extern "C" if we are under C++. 
++    closes: #113167 Thanks, Fredrik Jagenheim.
++  * Remove HAVE_STD{LIB,DEF}_H from jconfig.h since they are not used and
++    conflict with autoconf. closes: #109516 Thanks <Benedikt.Roth@gmx.net>
++  * Add README.Debian in /usr/share/libjpeg62-dev
++
++ -- Bill Allombert <ballombe@debian.org>  Mon,  3 Jun 2002 19:34:08 +0200
++
++libjpeg6b (6b-5) unstable; urgency=low
++
++  * jpeg-->JPEG in libjpeg-progs description.
++  * Add lib path to dh_shlibdeps to avoid warning.
++  * Apply patch from <http://sylvana.net/jpegcrop/croppatch.tar.gz> by
++    <guido@jpegclub.org> closes: #129412 Thanks, Colin Marquardt.
++
++ -- Bill Allombert <ballombe@debian.org>  Mon, 20 May 2002 11:55:22 +0200
++
++libjpeg6b (6b-4) unstable; urgency=low
++
++  * Avoid bashism in debian/rules.
++  * Update libtool to 1.3.5. (1.4 will break). 
++    closes: #52095 Thanks, <Marcus.Brinkmann@ruhr-uni-bochum.de>
++  * Patch config.guess to use version in the autotools-dev package. 
++  * Correct Section: field of libjpeg62 and libjpeg62-dev.
++
++ -- Bill Allombert <ballombe@debian.org>  Tue, 20 Nov 2001 10:23:47 +0100
++
++libjpeg6b (6b-3) unstable; urgency=low
++
++  * The "Where is ltconfig ?" release.
++  * Remove jconfig.h in debian/rules clean and do some clean up.
++  * Install libjpeg.la per Policy 11.2.
++  * Remove duplicate wizard.doc file in libjpeg62-dev. 
++  * Use dpkg-architecture instead of config.guess.
++  * Patch config.sub to use version in the autotools-dev package. 
++    closes: #85558, #120039
++  * Patch rdjpgcom.c to use locales for isprint check on comment chars.
++    closes: #116589 Thanks, Neal H Walfield <neal@cs.uml.edu>
++  * Apply patch from <http://sylvana.net/jpegcrop/transupp.c> by
++    <guido@jpegclub.org> closes: #114415 Thanks, <Jean-Marc.Notin@loria.fr>
++    
++ -- Bill Allombert <ballombe@debian.org>  Tue, 13 Nov 2001 21:41:49 +0000
++
++libjpeg6b (6b-2) unstable; urgency=low
++
++  * New Maintainer. Mark, If you want back the package, just ask!
++  * Acknowledge previous NMU: 
++    Jordi: closes: #74087, #24330, #24291
++    Colin: closes: #80752
++    Joel: closes: #25324, #27033, #28341
++  * Write source location as a valid URL in debian/copyright. 
++    closes: #118628 Thanks, Doug Porter <dsp@debian.org>.
++  * Fix formating of description of libjpeg-progs. 
++    closes: #114378 Thanks, Colin Watson <cjwatson@flatline.org.uk>.
++  * Install jpegint.h header needed by some apps. closes: #100171
++  * Remove unused/empty debian/postrm.
++    closes: #24849 Thanks, Adrian Bridgett <adrian.bridgett@zetnet.co.uk>.
++  * Install wizard.doc file. closes: #64807 Thanks <amc@arwen.cs.berkeley.edu>.
++  * Fix libjpeg-progs test.sh.
++  * Fix lintian bugs: typo in copyright, emacs user info in changelog.
++  * Fix false lintian bug: unsafe ldconfig in postinst, by reformatting.
++  * Remove "-g" from CFLAGS per Policy 11.1, hoping m68k is fixed now.
++  * Remove libtool and Makefile in debian/rules clean.
++  * Fix the test system. As a side effect, 
++    closes: #109195 Thanks Daniel Schepler <schepler@math.berkeley.edu>
++  * Standards-Version is now 3.5.6.
++
++ -- Bill Allombert <ballombe@debian.org>  Fri,  9 Nov 2001 22:40:16 +0100
++
++libjpeg6b (6b-1.3) frozen unstable; urgency=low
++
++  * Non-Maintainer Upload.
++  * Added Build-Depends.
++  * Gil Bahat <coutal@netvision.net.il> did the rest of the changes.
++  * Close bug regarding non-standard jpegs not being processed 
++    (closes: #74087).
++  * The output gifs are uncompressed, so have no UNISYS patent issues.
++    (closes: #24330, #24291).
++  * Standards-Version is now 3.0.0.
++
++ -- Jordi Mallach <jordi@debian.org>  Sat, 24 Feb 2001 22:17:38 +0100
++
++libjpeg6b (6b-1.2) frozen unstable; urgency=low (HIGH for m68k)
++
++  * Non-maintainer release.
++  * Recompile for m68k since existing djpeg binary claims all jpegs I have
++    are invalid (yet hamm djpeg has no problem with them).
++    Specifically, added "-O2 -g -Wall" to CFLAGS -- possible gcc bug?
++
++ -- Chris Lawrence <lawrencc@debian.org>  Tue, 10 Nov 1998 20:57:38 -0600
++
++libjpeg6b (6b-1.1) frozen unstable; urgency=high
++
++  * Non-maintainer release.
++  * Use upstream library soname (62).
++  * Removed libjpeg-gif package, as the source notes
++    that the GIF reading has been removed, and the GIFs written
++    do not infringe on the LZW patent.
++
++ -- Joel Klecker <espy@debian.org>  Thu, 22 Oct 1998 05:49:48 -0700
++
++libjpeg6b (6b-1) unstable; urgency=low
++
++  * New binary packages for 6b
++  * New upstream release
++
++ -- Mark Mickan <mmickan@debian.org>  Tue,  7 Jul 1998 22:27:10 +0930
++
++Local variables:
++mode: debian-changelog
++End:
+--- libjpeg7-7.orig/debian/libjpeg-progs.files
++++ libjpeg7-7/debian/libjpeg-progs.files
+@@ -0,0 +1,2 @@
++usr/bin
++usr/share/man/man1
+--- libjpeg7-7.orig/debian/libjpeg7-dev.docs
++++ libjpeg7-7/debian/libjpeg7-dev.docs
+@@ -0,0 +1,3 @@
++libjpeg.txt
++structure.txt
++coderules.txt
+--- libjpeg7-7.orig/debian/libjpeg-progs.docs
++++ libjpeg7-7/debian/libjpeg-progs.docs
+@@ -0,0 +1,2 @@
++usage.txt
++wizard.txt
+--- libjpeg7-7.orig/debian/copyright
++++ libjpeg7-7/debian/copyright
+@@ -0,0 +1,96 @@
++This is Debian's prepackaged version of the `jpeg library' by the Independent
++JPEG Group.
++
++This package was created by Mark Mickan <mmickan@debian.org> from sources
++which can be found at ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
++
++It is partly based on the libjpeg6a package originally put together by
++Andy Guy <awpguy@acs.ucalgary.ca> and later maintained by Mark Mickan.
++
++Current Debian maintainer is Bill Allombert <ballombe@debian.org>.
++
++LEGAL ISSUES [ from README supplied with source - MM ]
++============
++
++In plain English:
++
++1. We don't promise that this software works.  (But if you find any bugs,
++   please let us know!)
++2. You can use this software for whatever you want.  You don't have to pay us.
++3. You may not pretend that you wrote this software.  If you use it in a
++   program, you must acknowledge somewhere in your documentation that
++   you've used the IJG code.
++
++In legalese:
++
++The authors make NO WARRANTY or representation, either express or implied,
++with respect to this software, its quality, accuracy, merchantability, or
++fitness for a particular purpose.  This software is provided "AS IS", and you,
++its user, assume the entire risk as to its quality and accuracy.
++
++This software is copyright (C) 1991-2009, Thomas G. Lane, Guido Vollbeding.
++All Rights Reserved except as specified below.
++
++Permission is hereby granted to use, copy, modify, and distribute this
++software (or portions thereof) for any purpose, without fee, subject to these
++conditions:
++(1) If any part of the source code for this software is distributed, then this
++README file must be included, with this copyright and no-warranty notice
++unaltered; and any additions, deletions, or changes to the original files
++must be clearly indicated in accompanying documentation.
++(2) If only executable code is distributed, then the accompanying
++documentation must state that "this software is based in part on the work of
++the Independent JPEG Group".
++(3) Permission for use of this software is granted only if the user accepts
++full responsibility for any undesirable consequences; the authors accept
++NO LIABILITY for damages of any kind.
++
++These conditions apply to any software derived from or based on the IJG code,
++not just to the unmodified library.  If you use our work, you ought to
++acknowledge us.
++
++Permission is NOT granted for the use of any IJG author's name or company name
++in advertising or publicity relating to this software or products derived from
++it.  This software may be referred to only as "the Independent JPEG Group's
++software".
++
++We specifically permit and encourage the use of this software as the basis of
++commercial products, provided that all warranty or liability claims are
++assumed by the product vendor.
++
++
++ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
++sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
++ansi2knr.c is NOT covered by the above copyright and conditions, but instead
++by the usual distribution terms of the Free Software Foundation; principally,
++that you must include source code if you redistribute it.  (See the file
++ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
++of any program generated from the IJG code, this does not limit you more than
++the foregoing paragraphs do.
++
++The Unix configuration script "configure" was produced with GNU Autoconf.
++It is copyright by the Free Software Foundation but is freely distributable.
++The same holds for its supporting scripts (config.guess, config.sub,
++ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
++by M.I.T. but is also freely distributable.
++
++It appears that the arithmetic coding option of the JPEG spec is covered by
++patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
++legally be used without obtaining one or more licenses.  For this reason,
++support for arithmetic coding has been removed from the free JPEG software.
++(Since arithmetic coding provides only a marginal gain over the unpatented
++Huffman mode, it is unlikely that very many implementations will support it.)
++So far as we are aware, there are no patent restrictions on the remaining
++code.
++
++The IJG distribution formerly included code to read and write GIF files.
++To avoid entanglement with the Unisys LZW patent, GIF reading support has
++been removed altogether, and the GIF writer has been simplified to produce
++"uncompressed GIFs".  This technique does not use the LZW algorithm; the
++resulting GIF files are larger than usual, but are readable by all standard
++GIF decoders.
++
++We are required to state that
++    "The Graphics Interchange Format(c) is the Copyright property of
++    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
++    CompuServe Incorporated."
+--- libjpeg7-7.orig/debian/extra/jpegexiforient.c
++++ libjpeg7-7/debian/extra/jpegexiforient.c
+@@ -0,0 +1,299 @@
++/*

++ * jpegexiforient.c

++ *

++ * This is a utility program to get and set the Exif Orientation Tag.

++ * It can be used together with jpegtran in scripts for automatic

++ * orientation correction of digital camera pictures.

++ *

++ * The Exif orientation value gives the orientation of the camera

++ * relative to the scene when the image was captured.  The relation

++ * of the '0th row' and '0th column' to visual position is shown as

++ * below.

++ *

++ * Value | 0th Row     | 0th Column

++ * ------+-------------+-----------

++ *   1   | top         | left side

++ *   2   | top         | rigth side

++ *   3   | bottom      | rigth side

++ *   4   | bottom      | left side

++ *   5   | left side   | top

++ *   6   | right side  | top

++ *   7   | right side  | bottom

++ *   8   | left side   | bottom

++ *

++ * For convenience, here is what the letter F would look like if it were

++ * tagged correctly and displayed by a program that ignores the orientation

++ * tag:

++ *

++ *   1        2       3      4         5            6           7          8

++ *

++ * 888888  888888      88  88      8888888888  88                  88  8888888888

++ * 88          88      88  88      88  88      88  88          88  88      88  88

++ * 8888      8888    8888  8888    88          8888888888  8888888888          88

++ * 88          88      88  88

++ * 88          88  888888  888888

++ *

++ */

++

++#include <stdio.h>

++#include <stdlib.h>

++

++static FILE * myfile;          /* My JPEG file */

++

++static unsigned char exif_data[65536L];

++

++/* Return next input byte, or EOF if no more */

++#define NEXTBYTE()  getc(myfile)

++

++/* Error exit handler */

++#define ERREXIT(msg)  (exit(0))

++

++/* Read one byte, testing for EOF */

++static int

++read_1_byte (void)

++{

++  int c;

++

++  c = NEXTBYTE();

++  if (c == EOF)

++    ERREXIT("Premature EOF in JPEG file");

++  return c;

++}

++

++/* Read 2 bytes, convert to unsigned int */

++/* All 2-byte quantities in JPEG markers are MSB first */

++static unsigned int

++read_2_bytes (void)

++{

++  int c1, c2;

++

++  c1 = NEXTBYTE();

++  if (c1 == EOF)

++    ERREXIT("Premature EOF in JPEG file");

++  c2 = NEXTBYTE();

++  if (c2 == EOF)

++    ERREXIT("Premature EOF in JPEG file");

++  return (((unsigned int) c1) << 8) + ((unsigned int) c2);

++}

++

++static const char * progname;  /* program name for error messages */

++

++static void

++usage (FILE *out)

++/* complain about bad command line */

++{

++  fprintf(out, "jpegexiforient reads or writes the Exif Orientation Tag ");

++  fprintf(out, "in a JPEG Exif file.\n");

++

++  fprintf(out, "Usage: %s [switches] jpegfile\n", progname);

++

++  fprintf(out, "Switches:\n");

++  fprintf(out, "  --help     display this help and exit\n");

++  fprintf(out, "  --version  output version information and exit\n");

++  fprintf(out, "  -n         Do not output the trailing newline\n");

++  fprintf(out, "  -1 .. -8   Set orientation value 1 .. 8\n");

++}

++

++/*

++ * The main program.

++ */

++

++int

++main (int argc, char **argv)

++{

++  int n_flag, set_flag;

++  unsigned int length, i;

++  int is_motorola; /* Flag for byte order */

++  unsigned int offset, number_of_tags, tagnum;

++

++  progname = argv[0];

++  if (progname == NULL || progname[0] == 0)

++    progname = "jpegexiforient";       /* in case C library doesn't provide it */

++

++  if (argc < 2) { usage(stderr); return 1; }

++

++  n_flag = 0; set_flag = 0;

++

++  i = 1;

++  while (argv[i][0] == '-') {

++    switch (argv[i][1]) {

++    case '-': 

++      switch (argv[i][2]) {

++        case 'h': usage(stdout); return 0;

++        case 'v': fprintf(stdout,"jpegexiforient\n"); return 0;

++        }

++    case 'n':

++      n_flag = 1;

++      break;

++    case '1':

++    case '2':

++    case '3':

++    case '4':

++    case '5':

++    case '6':

++    case '7':

++    case '8':

++      set_flag = argv[i][1] - '0';

++      break;

++    default:

++      usage(stderr); return 1;

++    }

++    if (++i >= argc) { usage(stderr); return 1; }

++  }

++

++  if (set_flag) {

++    if ((myfile = fopen(argv[i], "rb+")) == NULL) {

++      fprintf(stderr, "%s: can't open %s\n", progname, argv[i]);

++      return 0;

++    }

++  } else {

++    if ((myfile = fopen(argv[i], "rb")) == NULL) {

++      fprintf(stderr, "%s: can't open %s\n", progname, argv[i]);

++      return 0;

++    }

++  }

++

++  /* Read File head, check for JPEG SOI + Exif APP1 */

++  for (i = 0; i < 4; i++)

++    exif_data[i] = (unsigned char) read_1_byte();

++  if (exif_data[0] != 0xFF ||

++      exif_data[1] != 0xD8 ||

++      exif_data[2] != 0xFF ||

++      exif_data[3] != 0xE1)

++    return 0;

++

++  /* Get the marker parameter length count */

++  length = read_2_bytes();

++  /* Length includes itself, so must be at least 2 */

++  /* Following Exif data length must be at least 6 */

++  if (length < 8)

++    return 0;

++  length -= 8;

++  /* Read Exif head, check for "Exif" */

++  for (i = 0; i < 6; i++)

++    exif_data[i] = (unsigned char) read_1_byte();

++  if (exif_data[0] != 0x45 ||

++      exif_data[1] != 0x78 ||

++      exif_data[2] != 0x69 ||

++      exif_data[3] != 0x66 ||

++      exif_data[4] != 0 ||

++      exif_data[5] != 0)

++    return 0;

++  /* Read Exif body */

++  for (i = 0; i < length; i++)

++    exif_data[i] = (unsigned char) read_1_byte();

++

++  if (length < 12) return 0; /* Length of an IFD entry */

++

++  /* Discover byte order */

++  if (exif_data[0] == 0x49 && exif_data[1] == 0x49)

++    is_motorola = 0;

++  else if (exif_data[0] == 0x4D && exif_data[1] == 0x4D)

++    is_motorola = 1;

++  else

++    return 0;

++

++  /* Check Tag Mark */

++  if (is_motorola) {

++    if (exif_data[2] != 0) return 0;

++    if (exif_data[3] != 0x2A) return 0;

++  } else {

++    if (exif_data[3] != 0) return 0;

++    if (exif_data[2] != 0x2A) return 0;

++  }

++

++  /* Get first IFD offset (offset to IFD0) */

++  if (is_motorola) {

++    if (exif_data[4] != 0) return 0;

++    if (exif_data[5] != 0) return 0;

++    offset = exif_data[6];

++    offset <<= 8;

++    offset += exif_data[7];

++  } else {

++    if (exif_data[7] != 0) return 0;

++    if (exif_data[6] != 0) return 0;

++    offset = exif_data[5];

++    offset <<= 8;

++    offset += exif_data[4];

++  }

++  if (offset > length - 2) return 0; /* check end of data segment */

++

++  /* Get the number of directory entries contained in this IFD */

++  if (is_motorola) {

++    number_of_tags = exif_data[offset];

++    number_of_tags <<= 8;

++    number_of_tags += exif_data[offset+1];

++  } else {

++    number_of_tags = exif_data[offset+1];

++    number_of_tags <<= 8;

++    number_of_tags += exif_data[offset];

++  }

++  if (number_of_tags == 0) return 0;

++  offset += 2;

++

++  /* Search for Orientation Tag in IFD0 */

++  for (;;) {

++    if (offset > length - 12) return 0; /* check end of data segment */

++    /* Get Tag number */

++    if (is_motorola) {

++      tagnum = exif_data[offset];

++      tagnum <<= 8;

++      tagnum += exif_data[offset+1];

++    } else {

++      tagnum = exif_data[offset+1];

++      tagnum <<= 8;

++      tagnum += exif_data[offset];

++    }

++    if (tagnum == 0x0112) break; /* found Orientation Tag */

++    if (--number_of_tags == 0) return 0;

++    offset += 12;

++  }

++

++  if (set_flag) {

++    /* Set the Orientation value */

++    if (is_motorola) {

++      exif_data[offset+2] = 0; /* Format = unsigned short (2 octets) */

++      exif_data[offset+3] = 3;

++      exif_data[offset+4] = 0; /* Number Of Components = 1 */

++      exif_data[offset+5] = 0;

++      exif_data[offset+6] = 0;

++      exif_data[offset+7] = 1;

++      exif_data[offset+8] = 0;

++      exif_data[offset+9] = (unsigned char)set_flag;

++      exif_data[offset+10] = 0;

++      exif_data[offset+11] = 0;

++    } else {

++      exif_data[offset+2] = 3; /* Format = unsigned short (2 octets) */

++      exif_data[offset+3] = 0;

++      exif_data[offset+4] = 1; /* Number Of Components = 1 */

++      exif_data[offset+5] = 0;

++      exif_data[offset+6] = 0;

++      exif_data[offset+7] = 0;

++      exif_data[offset+8] = (unsigned char)set_flag;

++      exif_data[offset+9] = 0;

++      exif_data[offset+10] = 0;

++      exif_data[offset+11] = 0;

++    }

++    fseek(myfile, (4 + 2 + 6 + 2) + offset, SEEK_SET);

++    fwrite(exif_data + 2 + offset, 1, 10, myfile);

++  } else {

++    /* Get the Orientation value */

++    if (is_motorola) {

++      if (exif_data[offset+8] != 0) return 0;

++      set_flag = exif_data[offset+9];

++    } else {

++      if (exif_data[offset+9] != 0) return 0;

++      set_flag = exif_data[offset+8];

++    }

++    if (set_flag > 8) return 0;

++  }

++

++  /* Write out Orientation value */

++  if (n_flag)

++    printf("%c", '0' + set_flag);

++  else

++    printf("%c\n", '0' + set_flag);

++

++  /* All done. */

++  return 0;

++}

+--- libjpeg7-7.orig/debian/extra/exifautotran.1
++++ libjpeg7-7/debian/extra/exifautotran.1
+@@ -0,0 +1,13 @@
++.TH EXIFAUTOTRAN "1" "February 2005" "exifautotran" "User Commands"
++.SH NAME
++exifautotran \- Transforms Exif files so that Orientation becomes 1
++.SH DESCRIPTION
++exifautotran [list of files]
++.PP
++Take a list of files as input and transform them in place so that the
++Orientation becomes 1.
++.SH "AUTHOR"
++    Guido Vollbeding <guido@jpegclub.org>
++.SH "SEE ALSO"
++.BR jpegtran(1)
++.BR jpegexiforient(1)
+--- libjpeg7-7.orig/debian/extra/jpegexiforient.1
++++ libjpeg7-7/debian/extra/jpegexiforient.1
+@@ -0,0 +1,73 @@
++.TH JPEGEXIFORIENT "1" "February 2005" "jpegexiforient" "User Commands"
++.SH NAME
++jpegexiforient \- reads or writes the Exif Orientation Tag
++.SH SYNOPSIS
++.B jpegexiforient
++[\fIswitches\fR] \fIjpegfile\fR
++.SH DESCRIPTION
++.
++This is a utility program to get and set the Exif Orientation Tag.
++It can be used together with jpegtran in scripts for automatic
++orientation correction of digital camera pictures.
++.PP
++The Exif orientation value gives the orientation of the camera
++relative to the scene when the image was captured.  The relation
++of the '0th row' and '0th column' to visual position is shown as
++below.
++.IP
++.nf
++.ft CR
++Value | 0th Row     | 0th Column
++------+-------------+-----------
++  1   | top         | left side
++  2   | top         | rigth side
++  3   | bottom      | rigth side
++  4   | bottom      | left side
++  5   | left side   | top
++  6   | right side  | top
++  7   | right side  | bottom
++  8   | left side   | bottom
++.fi
++.PP
++For convenience, here is what the letter F would look like if it were
++tagged correctly and displayed by a program that ignores the orientation
++tag:
++.IP
++.nf
++.ft CB
++  1        2       3      4     
++
++888888  888888      88  88      
++88          88      88  88      
++8888      8888    8888  8888    
++88          88      88  88
++88          88  888888  888888
++
++    5            6           7          8
++                                               
++8888888888  88                  88  8888888888
++88  88      88  88          88  88      88  88
++88          8888888888  8888888888          88
++.fi
++.PP
++jpegexiforient output the Exif Orientation Tag in a JPEG Exif file.
++With the options -1 .. -8, it can also be used to set the tag.
++.
++.SS "OPTIONS"
++.TP
++\fB\-\-help\fR
++display this help and exit
++.TP
++\fB\-\-version\fR
++output version information and exit
++.TP
++\fB\-n\fR
++Do not output the trailing newline
++.TP
++\fB\-1\fR .. \fB\-8\fR
++Set orientation value 1 .. 8
++.SH "AUTHOR"
++ Guido Vollbeding <guido@jpegclub.org>
++.SH "SEE ALSO"
++.BR jpegtran(1)
++.BR exifautotran(1)
+--- libjpeg7-7.orig/debian/extra/exifautotran
++++ libjpeg7-7/debian/extra/exifautotran
+@@ -0,0 +1,50 @@
++#!/bin/sh
++# exifautotran [list of files]
++#
++# Transforms Exif files so that Orientation becomes 1
++#
++
++trap "if test -n \"\$tempfile\"; then rm -f \"\$tempfile\"; fi" INT QUIT TERM
++
++for i
++do
++ case $i in
++ -v|--version) echo "exifautotran"; exit 0;;
++ -h|--help) 
++             cat <<EOF
++exifautotran [list of files]
++
++Transforms Exif files so that Orientation becomes 1
++EOF
++             exit 0;;
++ esac
++
++ case `jpegexiforient -n "$i"` in
++ 1) transform="";;
++ 2) transform="-flip horizontal";;
++ 3) transform="-rotate 180";;
++ 4) transform="-flip vertical";;
++ 5) transform="-transpose";;
++ 6) transform="-rotate 90";;
++ 7) transform="-transverse";;
++ 8) transform="-rotate 270";;
++ *) transform="";;
++ esac
++ if test -n "$transform"; then
++  tempfile=`mktemp`;
++  if test "$?" -ne "0"; then
++    echo "Failed to create temporary file" >&2
++    exit 1;
++  fi
++  echo Executing: jpegtran -copy all $transform $i >&2
++  jpegtran -copy all $transform "$i" > $tempfile
++  if test $? -ne 0; then
++   echo Error while transforming $i - skipped. >&2
++   rm "$tempfile"
++  else
++   cp "$tempfile" "$i"
++   rm "$tempfile"
++   jpegexiforient -1 "$i" > /dev/null
++  fi
++ fi
++done
+--- libjpeg7-7.orig/debian/extra/Makefile
++++ libjpeg7-7/debian/extra/Makefile
+@@ -0,0 +1,22 @@
++CFLAGS = -O2 -Wall -g
++CC = cc
++INSTALL = install -m755 -o root -g root
++INSTALLDIR = install -m755 -o root -g root -d
++DESTDIR =
++prefix  = /usr/local
++bindir  = $(prefix)/bin
++mandir  = $(prefix)/share/man/man1
++
++all: jpegexiforient
++
++jpegexiforient: jpegexiforient.c
++       $(CC) $(CFLAGS) -o jpegexiforient jpegexiforient.c
++clean:
++       -rm -f jpegexiforient
++install:
++       $(INSTALLDIR) $(DESTDIR)$(bindir) 
++       $(INSTALLDIR) $(DESTDIR)$(mandir) 
++       $(INSTALL) jpegexiforient    $(DESTDIR)$(bindir)
++       $(INSTALL) jpegexiforient.1  $(DESTDIR)$(mandir)
++       $(INSTALL) exifautotran      $(DESTDIR)$(bindir)
++       $(INSTALL) exifautotran.1    $(DESTDIR)$(mandir)
diff --git a/meta/recipes-core/jpeg/jpeg_8b.bb b/meta/recipes-core/jpeg/jpeg_8b.bb
new file mode 100644
index 0000000000..53847e715a
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg_8b.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
+HOMEPAGE = "http://www.ijg.org/"
+BUGTRACKER = ""
+
+LICENSE ="jpeg"
+LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe21d \
+                    file://jpeglib.h;endline=14;md5=dd06b5575519f735ec2565ed36ce62e7 \
+                    file://djpeg.c;endline=13;md5=ca89254925da06fef47e4b6468233432"
+
+SECTION = "libs"
+PRIORITY = "required"
+
+DEPENDS = "libtool-cross"
+DEPENDS_virtclass-native = "libtool-native"
+
+PR = "r0"
+
+SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
+           file://debian-libjpeg7_7-1.diff;patch=1"
+
+inherit autotools 
+
+EXTRA_OECONF="--enable-static --enable-shared"
+EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"'
+
+CFLAGS_append = " -D_REENTRANT"
+
+do_configure_prepend () {
+        rm -f ${S}/ltconfig
+        rm -f ${S}/ltmain.sh
+}
+
+do_install() {
+        install -d ${D}${bindir} ${D}${includedir} \
+                   ${D}${mandir}/man1 ${D}${libdir}
+        oe_runmake 'DESTDIR=${D}' install
+}
+
+PACKAGES =+             "jpeg-tools "
+FILES_jpeg-tools =      "${bindir}/*"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
new file mode 100644
index 0000000000..5aba6a7875
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -0,0 +1,43 @@
+DESCRIPTION = "GNOME XML Parser library"
+HOMEPAGE = "http://www.xmlsoft.org/"
+BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bb90c48926316d9af6e2d70ca7013ade \
+                    file://hash.c;beginline=6;endline=15;md5=ce702952bfddd7aee22639a2d6b54136 \
+                    file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \
+                    file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e"
+
+DEPENDS_virtclass-native = "python-native"
+DEPENDS =+ "zlib"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
+           file://libxml-64bit.patch"
+
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n"
+
+# required for pythong binding
+export HOST_SYS
+export BUILD_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR
+
+export LDFLAGS += "-ldl"
+
+python populate_packages_prepend () {
+        # autonamer would call this libxml2-2, but we don't want that
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_libxml2', 'libxml2', d)
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config ${libdir}/xml2Conf.sh"
+FILES_${PN}-utils += "${bindir}/*"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/libxml/libxml2/libxml-64bit.patch b/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
new file mode 100644
index 0000000000..fcb7d34fa7
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
@@ -0,0 +1,20 @@
+---
+ libxml.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- libxml2-2.6.29.orig/libxml.h
++++ libxml2-2.6.29/libxml.h
+@@ -11,10 +11,13 @@
+ 
+ #ifndef NO_LARGEFILE_SOURCE
+ #ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE
+ #endif
++#ifndef _LARGEFILE64_SOURCE
++#define _LARGEFILE64_SOURCE
++#endif
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
+ #endif
+ #endif
+ 
diff --git a/meta/recipes-core/libxml/libxml2_2.7.7.bb b/meta/recipes-core/libxml/libxml2_2.7.7.bb
new file mode 100644
index 0000000000..deb28b3954
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2_2.7.7.bb
@@ -0,0 +1,3 @@
+require libxml2.inc
+
+PR = "r1"
diff --git a/meta/recipes-core/netbase/netbase/colinux/interfaces b/meta/recipes-core/netbase/netbase/colinux/interfaces
new file mode 100644
index 0000000000..0e495e164e
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/colinux/interfaces
@@ -0,0 +1,8 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+iface eth0 inet dhcp
diff --git a/meta/recipes-core/netbase/netbase/epia/interfaces b/meta/recipes-core/netbase/netbase/epia/interfaces
new file mode 100644
index 0000000000..673618f636
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/epia/interfaces
@@ -0,0 +1,10 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Ethernet
+auto eth0
+iface eth0 inet dhcp
+
diff --git a/meta/recipes-core/netbase/netbase/hosts b/meta/recipes-core/netbase/netbase/hosts
new file mode 100644
index 0000000000..2f332451b5
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/hosts
@@ -0,0 +1,2 @@
+127.0.0.1       localhost.localdomain           localhost
+
diff --git a/meta/recipes-core/netbase/netbase/init b/meta/recipes-core/netbase/netbase/init
new file mode 100644
index 0000000000..8a67e1cef2
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/init
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          networking
+# Required-Start:    $local_fs mountvirtfs
+# Required-Stop:     $local_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: Raise network interfaces and configure them
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+if ! [ -x /sbin/ifup ]; then
+    exit 0
+fi
+
+case "$1" in
+    start)
+        echo -n "Configuring network interfaces... "
+        ifup -a
+        echo "done."
+        ;;
+    stop)
+        if sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts | 
+          grep -q "^/ nfs$"; then
+            echo "NOT deconfiguring network interfaces: / is an NFS mount"
+        elif sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |  
+          grep -q "^/ smbfs$"; then
+            echo "NOT deconfiguring network interfaces: / is an SMB mount"
+        elif sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\2/p' /proc/mounts | 
+          grep -qE '^(nfs|smbfs|ncp|coda)$'; then
+            echo "NOT deconfiguring network interfaces: network shares still mounted."
+        else
+            echo -n "Deconfiguring network interfaces... "
+            ifdown -a
+            echo "done."
+        fi
+        ;;
+    force-reload|restart)
+        echo -n "Reconfiguring network interfaces... "
+        ifdown -a
+        ifup -a
+        echo "done."
+        ;;
+    *)
+        echo "Usage: /etc/init.d/networking {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/netbase/netbase/interfaces b/meta/recipes-core/netbase/netbase/interfaces
new file mode 100644
index 0000000000..b06924fa94
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/interfaces
@@ -0,0 +1,30 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+        wireless_mode managed
+        wireless_essid any
+        wpa-driver wext
+        wpa-conf /etc/wpa_supplicant.conf
+
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+iface usb0 inet static
+        address 192.168.7.2
+        netmask 255.255.255.0
+        network 192.168.7.0
+        gateway 192.168.7.1
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
diff --git a/meta/recipes-core/netbase/netbase/mtx-1/interfaces b/meta/recipes-core/netbase/netbase/mtx-1/interfaces
new file mode 100644
index 0000000000..a7c6da5752
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/mtx-1/interfaces
@@ -0,0 +1,29 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Ethernet
+auto eth0
+iface eth0 inet dhcp
+
+# wlan interface 1 for clients
+auto wlan0
+iface wlan0 inet static
+        address 10.0.0.1
+        netmask 255.0.0.0
+        wireless_mode master
+        wireless_essid cube-ap
+        wireless_channel 1
+        
+# wlan interface 2 for mesh
+auto wlan1
+iface wlan1 inet static
+        address 172.16.0.1
+        netmask 255.240.0.0
+        broadcast 172.31.255.255
+        wireless_mode ad-hoc
+        wireless_essid cube-mesh
+        wireless_channel 11
+        wireless_rts 250
diff --git a/meta/recipes-core/netbase/netbase/nfsroot b/meta/recipes-core/netbase/netbase/nfsroot
new file mode 100644
index 0000000000..fc384a8ea5
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/nfsroot
@@ -0,0 +1,39 @@
+#! /bin/sh
+
+# In case the interface is used as nfsroot, avoid ifup, otherwise
+# nfsroot may lose response
+
+nfsroot=0
+
+if test "x$IFACE" = xlo ; then
+        exit 0
+fi
+
+exec 9<&0 < /proc/mounts
+while read dev mtpt fstype rest; do
+    if test $mtpt = "/" ; then
+        case $fstype in
+            nfs | nfs4)
+                nfsroot=1
+                nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'`
+                break
+                ;;
+            *)
+                ;;
+        esac
+    fi
+done
+exec 0<&9 9<&-
+
+test $nfsroot -eq 0 && exit 0
+
+if test -x /sbin/ip ; then
+    nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
+fi
+
+if test "x$IFACE" = "x$nfs_iface" ; then
+    echo "ifup skipped for nfsroot interface $nfs_iface"
+    exit 1
+fi
+
+exit 0
diff --git a/meta/recipes-core/netbase/netbase/nokia800/interfaces b/meta/recipes-core/netbase/netbase/nokia800/interfaces
new file mode 100644
index 0000000000..16967763e5
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/nokia800/interfaces
@@ -0,0 +1,5 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
diff --git a/meta/recipes-core/netbase/netbase/openmn/hosts b/meta/recipes-core/netbase/netbase/openmn/hosts
new file mode 100644
index 0000000000..0205b98fc2
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/openmn/hosts
@@ -0,0 +1,2 @@
+127.0.0.1               localhost.localdomain localhost
+192.168.233.1           www.mn-solutions.de
diff --git a/meta/recipes-core/netbase/netbase/openmn/interfaces b/meta/recipes-core/netbase/netbase/openmn/interfaces
new file mode 100644
index 0000000000..9ebe9b8ff1
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/openmn/interfaces
@@ -0,0 +1,10 @@
+auto lo
+auto eth1
+
+iface lo inet loopback
+
+iface eth0 inet dhcp
+
+iface eth1 inet dhcp
+        wireless_mode managed
+        wireless_essid any
diff --git a/meta/recipes-core/netbase/netbase/qemuarm/interfaces b/meta/recipes-core/netbase/netbase/qemuarm/interfaces
new file mode 100644
index 0000000000..f657944f0f
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/qemuarm/interfaces
@@ -0,0 +1,13 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet static
+        address 192.168.7.2
+        netmask 255.255.255.0
+        network 192.168.7.0
+        gateway 192.168.7.1
diff --git a/meta/recipes-core/netbase/netbase/qemuarmv6/interfaces b/meta/recipes-core/netbase/netbase/qemuarmv6/interfaces
new file mode 100644
index 0000000000..f657944f0f
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/qemuarmv6/interfaces
@@ -0,0 +1,13 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet static
+        address 192.168.7.2
+        netmask 255.255.255.0
+        network 192.168.7.0
+        gateway 192.168.7.1
diff --git a/meta/recipes-core/netbase/netbase/qemuarmv7/interfaces b/meta/recipes-core/netbase/netbase/qemuarmv7/interfaces
new file mode 100644
index 0000000000..f657944f0f
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/qemuarmv7/interfaces
@@ -0,0 +1,13 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet static
+        address 192.168.7.2
+        netmask 255.255.255.0
+        network 192.168.7.0
+        gateway 192.168.7.1
diff --git a/meta/recipes-core/netbase/netbase/qemux86/interfaces b/meta/recipes-core/netbase/netbase/qemux86/interfaces
new file mode 100644
index 0000000000..9b442355fd
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/qemux86/interfaces
@@ -0,0 +1,15 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet static
+        address 192.168.7.2
+        netmask 255.255.255.0
+        network 192.168.7.0
+        gateway 192.168.7.1
+
+
diff --git a/meta/recipes-core/netbase/netbase/tosa/interfaces b/meta/recipes-core/netbase/netbase/tosa/interfaces
new file mode 100644
index 0000000000..0da7168535
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/tosa/interfaces
@@ -0,0 +1,24 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+  wireless_type wlan-ng
+  wireless_mode Managed
+  pre-up modprobe prism2_usb
+#  pre-up /sbin/usbctl on 1
+#  post-down /sbin/usbctl off 1
+  post-down rmmod prism2_usb
+
+# Wired or wireless interfaces
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Zaurus usbnet
+iface usbd0 inet dhcp
+
+# usbnet from the other side
+iface usb0 inet dhcp
diff --git a/meta/recipes-core/netbase/netbase/wrt54/interfaces b/meta/recipes-core/netbase/netbase/wrt54/interfaces
new file mode 100644
index 0000000000..8b2852ac51
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/wrt54/interfaces
@@ -0,0 +1,23 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# loopback interface
+auto lo
+iface lo inet loopback
+
+# the 4 LAN ports
+auto vlan0
+iface vlan0 inet static
+        address 192.168.1.1
+        netmask 255.255.255.0
+
+# WAN port
+auto vlan1
+iface vlan1 inet dhcp
+
+# wireless interface
+auto eth1
+iface eth1 inet static
+        wireless_mode master
+        wireless_essid wrt
+        address 10.0.0.1
+        netmask 255.255.255.0
diff --git a/meta/recipes-core/netbase/netbase/xxs1500/interfaces b/meta/recipes-core/netbase/netbase/xxs1500/interfaces
new file mode 100644
index 0000000000..23ccccd2dd
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase/xxs1500/interfaces
@@ -0,0 +1,15 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Ethernet
+auto eth0 eth1
+iface eth0 inet static
+        address 192.168.127.1
+        netmask 255.255.255.0   
+        
+iface eth1 inet static
+        address 192.168.128.1
+        netmask 255.255.255.0
diff --git a/meta/recipes-core/netbase/netbase_4.41.bb b/meta/recipes-core/netbase/netbase_4.41.bb
new file mode 100644
index 0000000000..88b524ffd2
--- /dev/null
+++ b/meta/recipes-core/netbase/netbase_4.41.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "This package provides the necessary infrastructure for basic TCP/IP based networking"
+HOMEPAGE = "http://packages.debian.org/netbase"
+SECTION = "base"
+LICENSE = "GPLv2"
+PR = "r0"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "networking"
+INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
+# On MNCI etc, start very late so that our own apps come up faster
+INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
+# On SlugOS (NSLU2) delay the stop until after network apps have exited
+# Do not stop in single user - there's no way to sulogin!
+INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ."
+
+SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
+           file://init \
+           file://hosts \
+           file://interfaces \
+           file://nfsroot"
+
+do_install () {
+        install -d ${D}${sysconfdir}/init.d \
+                   ${D}${sbindir} \
+                   ${D}${mandir}/man8 \
+                   ${D}${sysconfdir}/network/if-pre-up.d \
+                   ${D}${sysconfdir}/network/if-up.d \
+                   ${D}${sysconfdir}/network/if-down.d \
+                   ${D}${sysconfdir}/network/if-post-down.d
+        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
+        install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
+        install -m 0644 etc-rpc ${D}${sysconfdir}/rpc
+        install -m 0644 etc-protocols ${D}${sysconfdir}/protocols
+        install -m 0644 etc-services ${D}${sysconfdir}/services
+        install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
+        install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d
+
+        # Disable network manager on machines that commonly do NFS booting
+        case "${MACHINE}" in
+                "omap-3430sdp" | "omap-3430ldp" | "omap-2430sdp" | "qemuarm" | "qemux86" )
+                        touch ${D}${sysconfdir}/network/nm-disabled-eth0
+                        ;;
+                *)
+                        ;;
+        esac
+}
+
+CONFFILES_${PN} = "${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
+
+PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
+PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
+PACKAGE_ARCH_omap-2430sdp = "${MACHINE_ARCH}"
+PACKAGE_ARCH_qemuarm = "${MACHINE_ARCH}"
+PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"
diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init
new file mode 100755
index 0000000000..66c85e9335
--- /dev/null
+++ b/meta/recipes-core/psplash/files/psplash-init
@@ -0,0 +1,29 @@
+#!/bin/sh 
+### BEGIN INIT INFO
+# Provides:             psplash
+# Required-Start:
+# Required-Stop:
+# Default-Start:        S
+# Default-Stop:
+### END INIT INFO
+
+read CMDLINE < /proc/cmdline
+for x in $CMDLINE; do
+        case $x in
+        psplash=false)
+                echo "Boot splashscreen disabled" 
+                exit 0;
+                ;;
+        esac
+done
+
+export TMPDIR=/mnt/.psplash
+mount tmpfs -t tmpfs $TMPDIR -o,size=40k
+
+rotation=0
+if [ -e /etc/rotation ]; then
+        read rotation < /etc/rotation
+fi
+
+/usr/bin/psplash --angle $rotation &
+
diff --git a/meta/recipes-core/psplash/psplash_svn.bb b/meta/recipes-core/psplash/psplash_svn.bb
new file mode 100644
index 0000000000..1e53ef1f1b
--- /dev/null
+++ b/meta/recipes-core/psplash/psplash_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
+HOMEPAGE = "http://svn.o-hand.com/view/misc/trunk/psplash/"
+SECTION = "base"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://psplash.h;md5=a87c39812c1e37f3451567cc29a29c8f"
+
+PV = "0.0+svnr${SRCREV}"
+PR = "r5"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
+           file://psplash-init"
+
+S = "${WORKDIR}/psplash"
+
+inherit autotools pkgconfig update-rc.d
+
+FILES_${PN} += "/mnt/.psplash"
+
+do_install_prepend() {
+        install -d ${D}/mnt/.psplash/
+        install -d ${D}${sysconfdir}/init.d/
+        install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh
+}
+
+INITSCRIPT_NAME = "psplash.sh"
+INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
new file mode 100644
index 0000000000..b9511f088e
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
@@ -0,0 +1,23 @@
+# The src Makefile was checking for libcrypt.a on the host, not in the
+# build environment.  This patch checks for $LCRYPT in the environment
+# and uses it if it's there.
+# - jdike@linux.intel.com
+
+Index: sysvinit-2.88dsf/src/Makefile
+===================================================================
+--- sysvinit-2.88dsf.orig/src/Makefile
++++ sysvinit-2.88dsf/src/Makefile
+@@ -85,9 +85,13 @@ else
+ endif
+ 
+ # Additional libs for GNU libc.
++ifneq ($(LCRYPT),)
++  SULOGINLIBS  += $(LCRYPT)
++else
+ ifneq ($(wildcard /usr/lib*/libcrypt.a),)
+   SULOGINLIBS  += -lcrypt
+ endif
++endif
+ 
+ all:           $(BIN) $(SBIN) $(USRBIN)
+ 
diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
new file mode 100644
index 0000000000..5978cea076
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
@@ -0,0 +1,81 @@
+diff --git a/src/Makefile b/src/Makefile
+index e2b8028..3e11e92 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -65,7 +65,14 @@ else
+   INSTALL_DATA = install -m 644
+ endif
+ INSTALL_DIR    = install -m 755 -d
+-MANDIR         = /usr/share/man
++
++ROOT         ?=
++base_bindir  ?= /bin
++base_sbindir ?= /sbin
++bindir       ?= /usr/bin
++sysconfdir   ?= /etc
++includedir   ?= /usr/include
++mandir       ?= /usr/share/man
+ 
+ ifeq ($(WITH_SELINUX),yes)
+   SELINUX_DEF  =  -DWITH_SELINUX
+@@ -138,39 +145,39 @@ clobber:  cleanobjs
+ distclean:     clobber
+ 
+ install:
+-               $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
+-               $(INSTALL_DIR) $(ROOT)/usr/bin/
++               $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/
++               $(INSTALL_DIR) $(ROOT)$(bindir)/
+                for i in $(BIN); do \
+-                       $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
++                       $(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \
+                done
+                for i in $(SBIN); do \
+-                       $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
++                       $(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \
+                done
+                for i in $(USRBIN); do \
+-                       $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
++                       $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
+                done
+-               # $(INSTALL_DIR) $(ROOT)/etc/
+-               # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
+-               ln -sf halt $(ROOT)/sbin/reboot
+-               ln -sf halt $(ROOT)/sbin/poweroff
+-               ln -sf init $(ROOT)/sbin/telinit
+-               ln -sf /sbin/killall5 $(ROOT)/bin/pidof
+-               if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+-                       ln -sf last $(ROOT)/usr/bin/lastb; \
++               # $(INSTALL_DIR) $(ROOT)$(sysconfdir)/
++               # $(INSTALL_EXEC) initscript.sample $(ROOT)$(sysconfdir)/
++               ln -sf halt $(ROOT)$(base_sbindir)/reboot
++               ln -sf halt $(ROOT)$(base_sbindir)/poweroff
++               ln -sf init $(ROOT)$(base_sbindir)/telinit
++               ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
++               if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
++                       ln -sf last $(ROOT)$(bindir)/lastb; \
+                fi
+-               $(INSTALL_DIR) $(ROOT)/usr/include/
+-               $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+-               $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
+-               $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
+-               $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
++               $(INSTALL_DIR) $(ROOT)$(includedir)/
++               $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
++               $(INSTALL_DIR) $(ROOT)$(mandir)/man1/
++               $(INSTALL_DIR) $(ROOT)$(mandir)/man5/
++               $(INSTALL_DIR) $(ROOT)$(mandir)/man8/
+                for i in $(MAN1); do \
+-                       $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
++                       $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man1/; \
+                done
+                for i in $(MAN5); do \
+-                       $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \
++                       $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man5/; \
+                done
+                for i in $(MAN8); do \
+-                       $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \
++                       $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man8/; \
+                done
+ ifeq ($(ROOT),)
+                #
diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
new file mode 100755
index 0000000000..f8f07a050f
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
@@ -0,0 +1,85 @@
+#! /bin/sh
+#
+# bootlogd      One of the first scripts to be executed. Starts or stops
+#               the bootlogd log program. If this script is called as
+#               "stop-bootlogd", it will stop the daemon instead of
+#               starting it even when called with the "start" argument.
+#
+# Version:      @(#)bootlogd  2.85-12  21-Mar-2004  miquels@cistron.nl
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/sbin/bootlogd
+NAME=bootlogd
+DESC="Bootlog daemon"
+
+test -f $DAEMON || exit 0
+
+[ -r /etc/default/bootlogd ] && . /etc/default/bootlogd
+
+## set -e # not needed
+
+case "$BOOTLOGD_ENABLE" in
+        [Nn]*)
+                exit 0
+                ;;
+esac
+
+STOPPER=
+ACTION="$1"
+case "$0" in
+        *stop-bootlog*)
+                STOPPER=Y
+                if [ "$ACTION" = start ]
+                then
+                        ACTION=stop
+                fi
+                ;;
+esac
+
+case "$ACTION" in
+        start)
+                echo -n "Starting $DESC: "
+                if [ -d /proc/1/. ]
+                then
+                        umask 027
+                        start-stop-daemon --start --quiet \
+                                --exec $DAEMON -- -r
+                else
+                        $DAEMON -r
+                fi
+                echo "$NAME."
+                ;;
+        stop)
+                echo -n "Stopping $DESC: "
+                start-stop-daemon --stop --quiet --exec $DAEMON
+
+                if [ "$STOPPER" ] && [ -f /var/log/boot ] && \
+                   [ -f /var/log/boot~ ]
+                then
+                        cd /var/log
+                        chgrp adm boot
+                        savelog -p -c 5 boot > /dev/null 2>&1
+                        mv boot.0 boot
+                        mv boot~ boot.0
+                fi
+
+                echo "$NAME."
+                ;;
+         restart|force-reload)
+                echo -n "Restarting $DESC: "
+                start-stop-daemon --stop --quiet --exec $DAEMON
+                sleep 1
+                start-stop-daemon --start --quiet --exec $DAEMON
+                echo "$NAME."
+                ;;
+        *)
+                N=${0##*/}
+                N=${N#[SK]??}
+                echo "Usage: $N {start|stop|restart|force-reload}" >&2
+                exit 1
+                ;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-core/sysvinit/sysvinit/inittab b/meta/recipes-core/sysvinit/sysvinit/inittab
new file mode 100644
index 0000000000..6abbdf4558
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/inittab
@@ -0,0 +1,30 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel.
+id:5:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
diff --git a/meta/recipes-core/sysvinit/sysvinit/need b/meta/recipes-core/sysvinit/sysvinit/need
new file mode 100644
index 0000000000..4d84bbeee7
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/need
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# need binary that doesnt do anything, supplied for simpleinit
+# vs sysvinit compatibility for the supplied startup scripts
+
+exit 0
diff --git a/meta/recipes-core/sysvinit/sysvinit/postinst b/meta/recipes-core/sysvinit/sysvinit/postinst
new file mode 100644
index 0000000000..b6fe547fa4
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/postinst
@@ -0,0 +1,17 @@
+#!/bin/busybox ash
+
+action="$1"
+oldversion="$2"
+
+umask 022
+
+if [ "$action" != configure ]
+then
+        exit 0
+fi
+
+update-alternatives --install /sbin/init init /sbin/sysvinit 25
+update-alternatives --install /sbin/need need /sbin/need.sysvinit 25
+update-alternatives --install /sbin/provide provide /sbin/provide.sysvinit 25
+
+exit 0
diff --git a/meta/recipes-core/sysvinit/sysvinit/prerm b/meta/recipes-core/sysvinit/sysvinit/prerm
new file mode 100644
index 0000000000..704a29ffd5
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" != "upgrade" ]; then
+        update-alternatives --remove need /sbin/need.sysvinit
+        update-alternatives --remove provide /sbin/provide.sysvinit
+        update-alternatives --remove init /sbin/sysvinit
+fi
+
+exit 0
diff --git a/meta/recipes-core/sysvinit/sysvinit/provide b/meta/recipes-core/sysvinit/sysvinit/provide
new file mode 100644
index 0000000000..c90cf3537b
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/provide
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# provide binary that doesnt do anything, supplied for simpleinit
+# vs sysvinit compatibility for the supplied startup scripts
+
+exit 0
diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
new file mode 100755
index 0000000000..dce31a5c98
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/rc
@@ -0,0 +1,179 @@
+#!/bin/sh
+#
+# rc            This file is responsible for starting/stopping
+#               services when the runlevel changes.
+#
+#               Optimization feature:
+#               A startup script is _not_ run when the service was
+#               running in the previous runlevel and it wasn't stopped
+#               in the runlevel transition (most Debian services don't
+#               have K?? links in rc{1,2,3,4,5} )
+#
+# Author:       Miquel van Smoorenburg <miquels@cistron.nl>
+#               Bruce Perens <Bruce@Pixar.com>
+#
+# Version:      @(#)rc  2.78  07-Nov-1999  miquels@cistron.nl
+#
+
+. /etc/default/rcS
+export VERBOSE
+
+startup_progress() {
+    step=$(($step + $step_change))
+    if [ "$num_steps" != "0" ]; then
+        progress=$((($step * $progress_size / $num_steps) + $first_step))
+    else
+        progress=$progress_size
+    fi
+    #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
+    #if type psplash-write >/dev/null 2>&1; then
+    #    TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
+    #fi
+    if [ -e /mnt/.psplash/psplash_fifo ]; then
+        echo "PROGRESS $progress" > /mnt/.psplash/psplash_fifo
+    fi
+}
+
+
+#
+# Start script or program.
+#
+startup() {
+  # Handle verbosity
+  [ "$VERBOSE" = very ] && echo "INIT: Running $@..."
+
+  case "$1" in
+        *.sh)
+                # Source shell script for speed.
+                (
+                        trap - INT QUIT TSTP
+                        scriptname=$1
+                        shift
+                        . $scriptname
+                )
+                ;;
+        *)
+                "$@"
+                ;;
+  esac
+  startup_progress
+}
+
+  # Ignore CTRL-C only in this shell, so we can interrupt subprocesses.
+  trap ":" INT QUIT TSTP
+
+  # Set onlcr to avoid staircase effect.
+  stty onlcr 0>&1
+
+  # Now find out what the current and what the previous runlevel are.
+
+  runlevel=$RUNLEVEL
+  # Get first argument. Set new runlevel to this argument.
+  [ "$1" != "" ] && runlevel=$1
+  if [ "$runlevel" = "" ]
+  then
+        echo "Usage: $0 <runlevel>" >&2
+        exit 1
+  fi
+  previous=$PREVLEVEL
+  [ "$previous" = "" ] && previous=N
+
+  export runlevel previous
+
+  # Is there an rc directory for this new runlevel?
+  if [ -d /etc/rc$runlevel.d ]
+  then
+        # Find out where in the progress bar the initramfs got to.
+        PROGRESS_STATE=0
+        #if [ -f /dev/.initramfs/progress_state ]; then
+        #    . /dev/.initramfs/progress_state
+        #fi
+
+        # Split the remaining portion of the progress bar into thirds
+        progress_size=$(((100 - $PROGRESS_STATE) / 3))
+
+        case "$runlevel" in
+                0|6)
+                        # Count down from -100 to 0 and use the entire bar
+                        first_step=-100
+                        progress_size=100
+                        step_change=1
+                        ;;
+                S)
+                        # Begin where the initramfs left off and use 2/3
+                        # of the remaining space
+                        first_step=$PROGRESS_STATE
+                        progress_size=$(($progress_size * 2))
+                        step_change=1
+                        ;;
+                *)
+                        # Begin where rcS left off and use the final 1/3 of
+                        # the space (by leaving progress_size unchanged)
+                        first_step=$(($progress_size * 2 + $PROGRESS_STATE))
+                        step_change=1
+                        ;;
+        esac
+
+        num_steps=0
+        for s in /etc/rc$runlevel.d/[SK]*; do
+            case "${s##/etc/rc$runlevel.d/S??}" in
+                gdm|xdm|kdm|reboot|halt)
+                    break
+                    ;;
+            esac
+            num_steps=$(($num_steps + 1))
+        done
+        step=0
+
+        # First, run the KILL scripts.
+        if [ $previous != N ]
+        then
+                for i in /etc/rc$runlevel.d/K[0-9][0-9]*
+                do
+                        # Check if the script is there.
+                        [ ! -f $i ] && continue
+
+                        # Stop the service.
+                        startup $i stop
+                done
+        fi
+
+        # Now run the START scripts for this runlevel.
+        for i in /etc/rc$runlevel.d/S*
+        do
+                [ ! -f $i ] && continue
+
+                if [ $previous != N ] && [ $previous != S ]
+                then
+                        #
+                        # Find start script in previous runlevel and
+                        # stop script in this runlevel.
+                        #
+                        suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]}
+                        stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix
+                        previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix
+                        #
+                        # If there is a start script in the previous level
+                        # and _no_ stop script in this level, we don't
+                        # have to re-start the service.
+                        #
+                        [ -f $previous_start ] && [ ! -f $stop ] && continue
+                fi
+                case "$runlevel" in
+                        0|6)
+                                startup $i stop
+                                ;;
+                        *)
+                                startup $i start
+                                ;;
+                esac
+        done
+  fi
+
+#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
+#if [ "x$runlevel" != "xS" ]; then
+#    if type psplash-write >/dev/null 2>&1; then
+#        TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
+#       umount /mnt/.psplash
+#    fi
+#fi
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS b/meta/recipes-core/sysvinit/sysvinit/rcS
new file mode 100755
index 0000000000..080b04f32f
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/rcS
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# rcS           Call all S??* scripts in /etc/rcS.d in
+#               numerical/alphabetical order.
+#
+# Version:      @(#)/etc/init.d/rcS  2.76  19-Apr-1999  miquels@cistron.nl
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+runlevel=S
+prevlevel=N
+umask 022
+export PATH runlevel prevlevel
+
+#       Make sure proc is mounted
+#
+[ -d "/proc/1" ] || mount /proc
+
+#
+#       Source defaults.
+#
+. /etc/default/rcS
+
+#
+#       Trap CTRL-C &c only in this shell so we can interrupt subprocesses.
+#
+trap ":" INT QUIT TSTP
+
+#
+#       Call all parts in order.
+#
+exec /etc/init.d/rc S
+
+
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS-default b/meta/recipes-core/sysvinit/sysvinit/rcS-default
new file mode 100644
index 0000000000..7ad3c7bf8f
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit/rcS-default
@@ -0,0 +1,25 @@
+#
+#       Defaults for the boot scripts in /etc/rcS.d
+#
+
+# Time files in /tmp are kept in days.
+TMPTIME=0
+# Set to yes if you want sulogin to be spawned on bootup
+SULOGIN=no
+# Set to no if you want to be able to login over telnet/rlogin
+# before system startup is complete (as soon as inetd is started)
+DELAYLOGIN=no
+# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not.
+# UTC=yes
+# Set VERBOSE to "no" if you would like a more quiet bootup.
+VERBOSE=no
+# Set EDITMOTD to "no" if you don't want /etc/motd to be editted automatically
+EDITMOTD=no
+# Whether to fsck root on boot
+ENABLE_ROOTFS_FSCK=no
+# Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
+FSCKFIX=yes
+# Set TICKADJ to the correct tick value for this specific machine
+#TICKADJ=10000
+# Enable caching in populate-volatile.sh
+VOLATILE_ENABLE_CACHE=yes
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
new file mode 100644
index 0000000000..db38064548
--- /dev/null
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -0,0 +1,135 @@
+DESCRIPTION = "System-V like init."
+HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/"
+SECTION = "base"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
+PR = "r1"
+
+# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
+# Set PACKAGE_ARCH appropriately.
+PACKAGE_ARCH_${PN}-inittab = "${MACHINE_ARCH}"
+
+RDEPENDS_${PN} = "${PN}-inittab"
+
+PACKAGES =+ "bootlogd ${PN}-inittab"
+FILES_bootlogd = "/etc/init.d/bootlogd /etc/init.d/stop-bootlogd /etc/rc?.d/S*bootlogd /sbin/bootlogd"
+FILES_${PN}-inittab = "${sysconfdir}/inittab"
+CONFFILES_${PN}-inittab = "${sysconfdir}/inittab"
+
+USE_VT ?= "1"
+SYSVINIT_ENABLED_GETTYS ?= "1"
+
+SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \
+           file://install.patch \
+           file://crypt-lib.patch \
+           file://need \
+           file://provide \
+           file://inittab \
+           file://rcS-default \
+           file://rc \
+           file://rcS \
+           file://bootlogd.init"
+
+S = "${WORKDIR}/sysvinit-${PV}"
+B = "${S}/src"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "init"
+ALTERNATIVE_LINK = "${base_sbindir}/init"
+ALTERNATIVE_PATH = "${base_sbindir}/init.sysvinit"
+ALTERNATIVE_PRIORITY = "50"
+
+PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
+FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
+FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit"
+FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
+
+CFLAGS_prepend = "-D_GNU_SOURCE "
+export LCRYPT = "-lcrypt"
+EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \
+                 'base_sbindir=${base_sbindir}' \
+                 'bindir=${bindir}' \
+                 'sbindir=${sbindir}' \
+                 'sysconfdir=${sysconfdir}' \
+                 'includedir=${includedir}' \
+                 'mandir=${mandir}'"
+
+do_install () {
+        oe_runmake 'ROOT=${D}' install
+        install -d ${D}${sysconfdir} \
+                   ${D}${sysconfdir}/default \
+                   ${D}${sysconfdir}/init.d
+        install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
+        if [ ! -z "${SERIAL_CONSOLE}" ]; then
+                echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
+        fi
+        if [ "${USE_VT}" = "1" ]; then
+                cat <<EOF >>${D}${sysconfdir}/inittab
+# ${base_sbindir}/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+#
+
+EOF
+
+                for n in ${SYSVINIT_ENABLED_GETTYS}
+                do
+                        echo "$n:2345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab
+                done
+                echo "" >> ${D}${sysconfdir}/inittab
+        fi
+        install -m 0644    ${WORKDIR}/rcS-default       ${D}${sysconfdir}/default/rcS
+        install -m 0755    ${WORKDIR}/rc                ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/rcS               ${D}${sysconfdir}/init.d
+        install -m 0755    ${WORKDIR}/bootlogd.init     ${D}${sysconfdir}/init.d/bootlogd
+        ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd
+        install -d ${D}${sysconfdir}/rcS.d
+        ln -sf ../init.d/bootlogd ${D}${sysconfdir}/rcS.d/S07bootlogd
+        for level in 2 3 4 5; do
+                install -d ${D}${sysconfdir}/rc$level.d
+                ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
+        done
+        mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.${PN}
+        mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN}
+        mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
+        mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
+        mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+        mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN}
+        mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
+        mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
+        mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
+}
+
+pkg_postinst_${PN} () {
+        update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
+        update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
+        update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
+        update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${PN} 200
+        update-alternatives --install ${bindir}/last last last.${PN} 200
+        update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
+        update-alternatives --install ${bindir}/wall wall wall.${PN} 200
+}
+
+pkg_prerm_${PN} () {
+        update-alternatives --remove halt halt.${PN}
+        update-alternatives --remove reboot reboot.${PN}
+        update-alternatives --remove shutdown shutdown.${PN}
+        update-alternatives --remove poweroff poweroff.${PN}
+        update-alternatives --remove last last.${PN}
+        update-alternatives --remove mesg mesg.${PN}
+        update-alternatives --remove wall wall.${PN}
+}
+
+pkg_postinst_sysvinit-pidof () {
+        update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
+}
+
+pkg_prerm_sysvinit-pidof () {
+        update-alternatives --remove pidof pidof.${PN}
+}
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
new file mode 100644
index 0000000000..9873c060cc
--- /dev/null
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -0,0 +1,385 @@
+DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
+LICENSE = "MIT"
+PR = "r69"
+
+inherit task
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = ' \
+            task-base \
+            task-base-extended \
+            task-distro-base \
+            task-machine-base \
+            \
+            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
+            \
+            ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
+            \
+            ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
+            ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
+            \
+            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
+            '
+
+ALLOW_EMPTY = "1"
+
+#
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#
+# linux-hotplug or none
+#
+HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
+
+#
+# dropbear, openssh or none
+#
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+#
+# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
+#
+PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
+
+#
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+#
+# task-base contain stuff needed for base system (machine related)
+#
+RDEPENDS_task-base = "\
+    task-distro-base \
+    task-machine-base \
+    ${DISTRO_SSH_DAEMON} \
+    ${HOTPLUG} \
+    \
+    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
+    ${@base_contains('MACHINE_FEATURES', 'phone', 'task-base-phone', '',d)} \
+    \
+    ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
+    \
+    ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
+    "
+# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
+
+RDEPENDS_task-base-extended = "\
+    task-base \
+    ${ADD_WIFI} \
+    ${ADD_BT} \
+    "
+
+ADD_WIFI = ""
+ADD_BT = ""
+
+python __anonymous () {
+    # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
+    # then include task-base-wifi in task-base
+
+    import bb
+
+    distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split())
+    machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).split())
+
+    if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
+        bb.data.setVar("ADD_BT", "task-base-bluetooth", d)
+
+    if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
+        bb.data.setVar("ADD_WIFI", "task-base-wifi", d)
+}
+
+#
+# packages added by distribution
+#
+DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}"
+RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
+RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
+
+#
+# packages added by machine config
+#
+RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
+RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
+
+RDEPENDS_task-base-kernel24 = "\
+    modutils-depmod"
+
+RDEPENDS_task-base-kernel26 = "\
+    sysfsutils \
+    module-init-tools"
+
+RRECOMMENDS_task-base-kernel24 = "\
+    kernel-module-input \
+    kernel-module-uinput"
+
+RRECOMMENDS_task-base-kernel26 = "\
+    kernel-module-nls-utf8 \
+    kernel-module-input \
+    kernel-module-uinput \
+    kernel-module-rtc-dev \
+    kernel-module-rtc-proc \
+    kernel-module-rtc-sysfs \
+    kernel-module-rtc-sa1100 \
+    kernel-module-unix"
+
+RDEPENDS_task-base-keyboard = "\
+    keymaps"
+
+RDEPENDS_task-base-pci = "\
+    pciutils"
+
+RDEPENDS_task-base-acpi = "\
+    acpid \
+    libacpi "
+
+RDEPENDS_task-base-apm = "\
+    apm \
+    apmd"
+
+RDEPENDS_task-base-ext2 = "\
+    hdparm \
+    e2fsprogs \
+    e2fsprogs-e2fsck \
+    e2fsprogs-mke2fs"
+
+RRECOMMENDS_task-base-vfat = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-module-nls-iso8859-1 \
+    kernel-module-nls-cp437"
+
+RDEPENDS_task-base-alsa = "\
+    alsa-utils-alsactl \
+    alsa-utils-alsamixer"
+
+RRECOMMENDS_task-base-alsa = "\
+    kernel-module-snd-mixer-oss \
+    kernel-module-snd-pcm-oss"
+
+RDEPENDS_task-base-pcmcia = "\
+    ${PCMCIA_MANAGER} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
+    "
+
+RRECOMMENDS_task-base-pcmcia = "\
+    ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
+    kernel-module-pcmcia \
+    kernel-module-airo-cs \
+    kernel-module-pcnet-cs \
+    kernel-module-serial-cs \
+    kernel-module-ide-cs \
+    kernel-module-ide-disk \
+    "
+
+task-base-pcmcia24 = "\
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
+    "
+
+task-base-pcmcia26 = "\
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
+
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
+
+RDEPENDS_task-base-bluetooth = "\ 
+    bluez4 \
+    "
+
+RRECOMMENDS_task-base-bluetooth = "\
+    kernel-module-bluetooth \
+    kernel-module-l2cap \
+    kernel-module-rfcomm \
+    kernel-module-hci-vhci \
+    kernel-module-bnep \
+    kernel-module-hidp \
+    kernel-module-hci-uart \
+    kernel-module-sco \
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
+    "
+# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
+# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer.
+
+RDEPENDS_task-base-irda = "\
+    irda-utils"
+
+RRECOMMENDS_task-base-irda = "\
+    kernel-module-pxaficp-ir \
+    kernel-module-irda \
+    kernel-module-ircomm \
+    kernel-module-ircomm-tty \
+    kernel-module-irlan \
+    ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
+    kernel-module-irport \
+    kernel-module-irtty \
+    kernel-module-irtty-sir \
+    kernel-module-sir-dev \
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
+
+RRECOMMENDS_task-base-usbgadget = "\
+    kernel-module-pxa27x_udc \
+    kernel-module-gadgetfs \
+    kernel-module-g-file-storage \
+    kernel-module-g-serial \
+    kernel-module-g-ether"
+
+RDEPENDS_task-base-usbhost = "\
+    usbutils "
+
+RRECOMMENDS_task-base-usbhost = "\
+    kernel-module-uhci-hcd \
+    kernel-module-ohci-hcd \
+    kernel-module-ehci-hcd \
+    kernel-module-usbcore \
+    kernel-module-usbhid \
+    kernel-module-usbnet \
+    kernel-module-sd-mod \
+    kernel-module-scsi-mod \
+    kernel-module-usbmouse \
+    kernel-module-mousedev \
+    kernel-module-usbserial \
+    kernel-module-usb-storage "
+
+RDEPENDS_task-base-ppp = "\
+    ppp \
+    ppp-dialin"
+
+RRECOMMENDS_task-base-ppp = "\
+    kernel-module-ppp-async \
+    kernel-module-ppp-deflate \
+    kernel-module-ppp-generic \
+    kernel-module-ppp-mppe \
+    kernel-module-slhc"
+
+RDEPENDS_task-base-ipsec = "\
+    openswan"
+
+RRECOMMENDS_task-base-ipsec = "\
+    kernel-module-ipsec"
+
+#
+# task-base-wifi contain everything needed to get WiFi working
+# WEP/WPA connection needs to be supported out-of-box
+#
+RDEPENDS_task-base-wifi = "\
+    wireless-tools \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
+    wpa-supplicant"
+
+RRECOMMENDS_task-base-wifi = "\
+    ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
+    kernel-module-ieee80211-crypt \
+    kernel-module-ieee80211-crypt-ccmp \
+    kernel-module-ieee80211-crypt-tkip \
+    kernel-module-ieee80211-crypt-wep \
+    kernel-module-ecb \
+    kernel-module-arc4 \
+    kernel-module-crypto_algapi \
+    kernel-module-cryptomgr \
+    kernel-module-michael-mic \
+    kernel-module-aes-generic \
+    kernel-module-aes"
+
+RRECOMMENDS_task-base-smbfs = "\
+    kernel-module-cifs \
+    kernel-module-smbfs"
+
+RRECOMMENDS_task-base-cramfs = "\
+    kernel-module-cramfs"
+
+#
+# task-base-nfs provides ONLY client support - server is in nfs-utils package
+#
+RDEPENDS_task-base-nfs = "\
+    portmap"
+
+RRECOMMENDS_task-base-nfs = "\
+    kernel-module-nfs "
+
+RDEPENDS_task-base-zeroconf = "\
+    avahi-daemon"
+
+RDEPENDS_task-base-raid = "\
+        "
+
+RDEPENDS_task-base-screen = "\
+        "
+
+#
+# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
+#
+RDEPENDS_task-base-touchscreen = "\
+    "
+
+RDEPENDS_task-base-ipv6 = "\
+    "
+
+RRECOMMENDS_task-base-ipv6 = "\
+    kernel-module-ipv6 "
+
+RDEPENDS_task-base-serial = "\
+    setserial \
+    lrzsz "
+
+RDEPENDS_task-base-phone = "\
+    gsmd \
+    libgsmd-tools"
diff --git a/meta/recipes-core/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-poky-boot.bb
new file mode 100644
index 0000000000..4143369cd3
--- /dev/null
+++ b/meta/recipes-core/tasks/task-poky-boot.bb
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
+LICENSE = "MIT"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+DEPENDS = "virtual/kernel"
+ALLOW_EMPTY = "1"
+PR = "r7"
+
+#
+# Set by the machine configuration with packages essential for device bootup
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS_task-poky-boot = "\
+    base-files \
+    base-passwd \
+    busybox \
+    initscripts \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
+    modutils-initscripts \
+    netbase \
+    sysvinit \
+    tinylogin \
+    udev \
+    ${VIRTUAL-RUNTIME_update-alternatives} \
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-poky-boot = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta/recipes-core/tinylogin/tinylogin-1.4/add-system.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/add-system.patch
new file mode 100644
index 0000000000..18b4e47ad7
--- /dev/null
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/add-system.patch
@@ -0,0 +1,115 @@
+? add-system.patch
+? cvs-20040608.patch
+? familiar
+? pod2htmd.tmp
+? pod2htmi.tmp
+? system.diff
+? tinylogin_1.4-20030620.1_arm.ipk
+? tinylogin_1.4-20030620.1_arm.ipk.asc
+? tinylogin_1.4-20030620.1_arm.ipk.upload.html
+? tinylogin_1.4-20030620.2_arm.ipk
+? tinylogin_1.4-20030620.2_arm.ipk.asc
+? tinylogin_1.4-20030620.2_arm.ipk.upload.html
+? tinylogin_1.4-20030620_arm.ipk
+? tinylogin_1.4-20030620_arm.ipk.asc
+? tinylogin_1.4-20030620_arm.ipk.upload.html
+? tmp
+Index: addgroup.c
+===================================================================
+RCS file: /var/cvs/tinylogin/addgroup.c,v
+retrieving revision 1.23
+diff -u -r1.23 addgroup.c
+--- a/addgroup.c        9 Jan 2003 18:43:29 -0000       1.23
++++ b/addgroup.c        8 Jun 2004 08:56:08 -0000
+@@ -31,6 +31,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <getopt.h>
+ #include "tinylogin.h"
+ 
+ #define GROUP_FILE      "/etc/group"
+@@ -124,6 +125,11 @@
+        return 0;
+ }
+ 
++static struct option long_options[] = {
++  { "system",          0, NULL, 'S' },
++  { 0,                 0, 0, 0 }
++};
++
+ /*
+  * addgroup will take a login_name as its first parameter.
+  *
+@@ -136,14 +142,19 @@
+        int opt;
+        char *group;
+        char *user;
++       int option_index = -1;
+        gid_t gid = 0;
++       int system = 0;
+ 
+        /* get remaining args */
+-       while ((opt = getopt (argc, argv, "g:")) != -1) {
++       while ((opt = getopt_long (argc, argv, "g:S", long_options, &option_index)) != -1) {
+                switch (opt) {
+                        case 'g':
+                                gid = strtol(optarg, NULL, 10);
+                                break;
++                       case 'S':
++                               system = 1;
++                               break;
+                        default:
+                                show_usage();
+                                break;
+Index: adduser.c
+===================================================================
+RCS file: /var/cvs/tinylogin/adduser.c,v
+retrieving revision 1.38
+diff -u -r1.38 adduser.c
+--- a/adduser.c 21 Jun 2003 19:35:42 -0000      1.38
++++ b/adduser.c 8 Jun 2004 08:56:09 -0000
+@@ -66,13 +66,13 @@
+ 
+ /* remix */
+ /* EDR recoded such that the uid may be passed in *p */
+-static int passwd_study(const char *filename, struct passwd *p)
++static int passwd_study(const char *filename, struct passwd *p, int system)
+ {
+        struct passwd *pw;
+        FILE *passwd;
+ 
+-       const int min = 500;
+-       const int max = 65000;
++       const int min = system ? 10 : 500;
++       const int max = system ? 99 : 65000;
+ 
+        passwd = wfopen(filename, "r");
+        if (!passwd)
+@@ -142,7 +142,7 @@
+ }
+ 
+ /* putpwent(3) remix */
+-static int adduser(const char *filename, struct passwd *p, int makehome, int setpass)
++static int adduser(const char *filename, struct passwd *p, int makehome, int setpass, int system)
+ {
+        FILE *passwd;
+        int r;
+@@ -165,7 +165,7 @@
+        fseek(passwd, 0, SEEK_END);
+ 
+        /* if (passwd_study(filename, p) == 0) { */
+-       r = passwd_study(filename, p);
++       r = passwd_study(filename, p, system);
+        if (r) {
+                if (r == 1)
+                        error_msg("%s: login already in use", p->pw_name);
+@@ -357,7 +357,7 @@
+        }
+ 
+        /* grand finale */
+-       return adduser(PASSWD_FILE, &pw, makehome, setpass);
++       return adduser(PASSWD_FILE, &pw, makehome, setpass, system);
+ }
+ 
+ /* $Id: adduser.c,v 1.38 2003/06/21 19:35:42 andersen Exp $ */
diff --git a/meta/recipes-core/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch
new file mode 100644
index 0000000000..737ac423c4
--- /dev/null
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch
@@ -0,0 +1,43 @@
+--- tinylogin-1.4/adduser.c.orig        2004-09-30 18:01:46.000000000 +0200
++++ tinylogin-1.4/adduser.c     2004-09-30 18:07:01.000000000 +0200
+@@ -249,6 +249,7 @@
+ struct option long_options[] = {
+   { "home",            1, NULL, 'h' },
+   { "disabled-password", 0, NULL, 'D' },
++  { "empty-password", 0, NULL, 'E' },
+   { "system",          0, NULL, 'S' },
+   { "ingroup",         1, NULL, 'G' },
+   { "no-create-home",   0, NULL, 'H' },
+@@ -287,7 +288,7 @@
+        shell = default_shell;
+ 
+        /* get args */
+-       while ((opt = getopt_long (argc, argv, "h:g:s:G:DSH", long_options, &option_index)) != -1) {
++       while ((opt = getopt_long (argc, argv, "h:g:s:G:DESH", long_options, &option_index)) != -1) {
+                switch (opt) {
+                        case 'h':
+                                home = optarg;
+@@ -304,6 +305,9 @@
+                        case 'D':
+                                setpass = 0;
+                                break;
++                       case 'E':
++                               setpass = -1;
++                               break;
+                        case 'S':
+                                system = 1;
+                                break;
+@@ -338,7 +342,12 @@
+ 
+        /* create a passwd struct */
+        pw.pw_name = (char *)login;
+-       pw.pw_passwd = (char *)default_passwd;
++       if (setpass != -1)
++               pw.pw_passwd = (char *)default_passwd;
++       else {
++               pw.pw_passwd = (char *)"";
++               setpass = 0;
++       }
+        pw.pw_uid = 0;
+        pw.pw_gid = 0;
+        pw.pw_gecos = (char *)gecos;
diff --git a/meta/recipes-core/tinylogin/tinylogin-1.4/cvs-20040608.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/cvs-20040608.patch
new file mode 100644
index 0000000000..1142329a67
--- /dev/null
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/cvs-20040608.patch
@@ -0,0 +1,821 @@
+Index: Config.h
+===================================================================
+RCS file: /var/cvs/tinylogin/Config.h,v
+retrieving revision 1.10
+retrieving revision 1.12
+diff -u -r1.10 -r1.12
+--- a/Config.h  23 Jun 2002 03:09:07 -0000      1.10
++++ b/Config.h  17 Feb 2003 11:51:55 -0000      1.12
+@@ -27,15 +27,11 @@
+ // Enable checking of /etc/securetty by login
+ #define CONFIG_FEATURE_SECURETTY
+ //
+-// Enable using sha passwords
+-#define CONFIG_FEATURE_SHA1_PASSWORDS
+-//
+ // Enable use of a wheel group
+ #define CONFIG_WHEEL_GROUP
+ //
+-// This compiles out everything but the most 
+-// trivial --help usage information (i.e. reduces binary size)
+-#define CONFIG_FEATURE_TRIVIAL_HELP
++// Show verbose usage messages
++//#define CONFIG_FEATURE_VERBOSE_USAGE
+ //
+ // Enable 'tinylogin --install [-s]' to allow tinylogin
+ // to create links (or symlinks) at runtime for all the 
+@@ -48,10 +44,6 @@
+ // Nothing beyond this point should ever be touched by 
+ // mere mortals so leave this stuff alone.
+ //
+-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+-#define CONFIG_SHA1
+-#endif
+-//
+ #ifdef CONFIG_FEATURE_SHADOWPASSWDS
+ #define CONFIG_SHADOW
+ #endif
+Index: addgroup.c
+===================================================================
+RCS file: /var/cvs/tinylogin/addgroup.c,v
+retrieving revision 1.22
+retrieving revision 1.23
+diff -u -r1.22 -r1.23
+--- a/addgroup.c        12 Dec 2002 08:46:03 -0000      1.22
++++ b/addgroup.c        9 Jan 2003 18:43:29 -0000       1.23
+@@ -133,23 +133,33 @@
+  * ________________________________________________________________________ */
+ int addgroup_main(int argc, char **argv)
+ {
++       int opt;
+        char *group;
+        char *user;
+        gid_t gid = 0;
+ 
+-       if (argc < 2) {
+-               show_usage();
++       /* get remaining args */
++       while ((opt = getopt (argc, argv, "g:")) != -1) {
++               switch (opt) {
++                       case 'g':
++                               gid = strtol(optarg, NULL, 10);
++                               break;
++                       default:
++                               show_usage();
++                               break;
++               }
+        }
+ 
+-       if (strncmp(argv[1], "-g", 2) == 0) {
+-               gid = strtol(argv[2], NULL, 10);
+-               group = argv[2];
++       if (optind < argc) {
++               group = argv[optind];
++               optind++;
+        } else {
+                show_usage();
+        }
+-       
+-       if (argc == 4) {
+-               user = argv[3];
++
++       if (optind < argc) {
++               user = argv[optind];
++               optind++;
+        } else {
+                user = "";
+        }
+@@ -163,4 +173,4 @@
+        return addgroup(GROUP_FILE, group, gid, user);
+ }
+ 
+-/* $Id: addgroup.c,v 1.22 2002/12/12 08:46:03 andersen Exp $ */
++/* $Id: addgroup.c,v 1.23 2003/01/09 18:43:29 andersen Exp $ */
+Index: adduser.c
+===================================================================
+RCS file: /var/cvs/tinylogin/adduser.c,v
+retrieving revision 1.37
+retrieving revision 1.38
+diff -u -r1.37 -r1.38
+--- a/adduser.c 12 Dec 2002 08:46:03 -0000      1.37
++++ b/adduser.c 21 Jun 2003 19:35:42 -0000      1.38
+@@ -21,6 +21,9 @@
+  *
+  */
+ 
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
+@@ -29,6 +32,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <getopt.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+@@ -93,21 +97,23 @@
+                }
+        }
+ 
+-       /* EDR check for an already existing gid */
+-       while (getgrgid(p->pw_uid) != NULL)
+-               p->pw_uid++;
+-
+-       /* EDR also check for an existing group definition */
+-       if (getgrnam(p->pw_name) != NULL)
+-               return 3;
++       if (p->pw_gid == 0) {
++               /* EDR check for an already existing gid */
++               while (getgrgid(p->pw_uid) != NULL)
++                       p->pw_uid++;
++
++               /* EDR also check for an existing group definition */
++               if (getgrnam(p->pw_name) != NULL)
++                       return 3;
++
++               /* EDR create new gid always = uid */
++               p->pw_gid = p->pw_uid;
++       }
+ 
+        /* EDR bounds check */
+        if ((p->pw_uid > max) || (p->pw_uid < min))
+                return 2;
+ 
+-       /* EDR create new gid always = uid */
+-       p->pw_gid = p->pw_uid;
+-
+        /* return 1; */
+        return 0;
+ }
+@@ -136,7 +142,7 @@
+ }
+ 
+ /* putpwent(3) remix */
+-static int adduser(const char *filename, struct passwd *p)
++static int adduser(const char *filename, struct passwd *p, int makehome, int setpass)
+ {
+        FILE *passwd;
+        int r;
+@@ -144,6 +150,11 @@
+        FILE *shadow;
+        struct spwd *sp;
+ #endif
++       int new_group = 1;
++
++       /* if using a pre-existing group, don't create one */
++       if (p->pw_gid != 0)
++               new_group = 0;
+ 
+        /* make sure everything is kosher and setup uid && gid */
+        passwd = wfopen(filename, "a");
+@@ -194,29 +205,36 @@
+        }
+ #endif
+ 
+-       /* add to group */
+-       /* addgroup should be responsible for dealing w/ gshadow */
+-       addgroup_wrapper(p->pw_name, p->pw_gid);
++       if (new_group) {
++               /* add to group */
++               /* addgroup should be responsible for dealing w/ gshadow */
++               addgroup_wrapper(p->pw_name, p->pw_gid);
++       }
+ 
+        /* Clear the umask for this process so it doesn't
+         * * screw up the permissions on the mkdir and chown. */
+        umask(0);
+ 
+-       /* mkdir */
+-       if (mkdir(p->pw_dir, 0755)) {
+-               perror_msg("%s", p->pw_dir);
+-       }
+-       /* Set the owner and group so it is owned by the new user. */
+-       if (chown(p->pw_dir, p->pw_uid, p->pw_gid)) {
+-               perror_msg("%s", p->pw_dir);
+-       }
+-       /* Now fix up the permissions to 2755. Can't do it before now
+-        * since chown will clear the setgid bit */
+-       if (chmod(p->pw_dir, 02755)) {
+-               perror_msg("%s", p->pw_dir);
++       if (makehome) {
++               /* mkdir */
++               if (mkdir(p->pw_dir, 0755)) {
++                       perror_msg("%s", p->pw_dir);
++               }
++               /* Set the owner and group so it is owned by the new user. */
++               if (chown(p->pw_dir, p->pw_uid, p->pw_gid)) {
++                       perror_msg("%s", p->pw_dir);
++               }
++               /* Now fix up the permissions to 2755. Can't do it before now
++                * since chown will clear the setgid bit */
++               if (chmod(p->pw_dir, 02755)) {
++                       perror_msg("%s", p->pw_dir);
++               }
++       }
++
++       if (setpass) {
++               /* interactively set passwd */
++               passwd_wrapper(p->pw_name);
+        }
+-       /* interactively set passwd */
+-       passwd_wrapper(p->pw_name);
+ 
+        return 0;
+ }
+@@ -228,6 +246,15 @@
+        return geteuid();
+ }
+ 
++struct option long_options[] = {
++  { "home",            1, NULL, 'h' },
++  { "disabled-password", 0, NULL, 'D' },
++  { "system",          0, NULL, 'S' },
++  { "ingroup",         1, NULL, 'G' },
++  { "no-create-home",   0, NULL, 'H' },
++  { 0,                 0, 0, 0 }
++};
++
+ /*
+  * adduser will take a login_name as its first parameter.
+  *
+@@ -244,6 +271,11 @@
+        const char *gecos;
+        const char *home = NULL;
+        const char *shell;
++       const char *usegroup = NULL;
++       int option_index = -1;
++       int setpass = 1;
++       int makehome = 1;
++       int system = 0;
+ 
+        struct passwd pw;
+ 
+@@ -255,7 +287,7 @@
+        shell = default_shell;
+ 
+        /* get args */
+-       while ((opt = getopt (argc, argv, "h:g:s:")) != -1) {
++       while ((opt = getopt_long (argc, argv, "h:g:s:G:DSH", long_options, &option_index)) != -1) {
+                switch (opt) {
+                        case 'h':
+                                home = optarg;
+@@ -266,6 +298,18 @@
+                        case 's':
+                                shell = optarg;
+                                break;
++                       case 'H':
++                               makehome = 0;
++                               break;
++                       case 'D':
++                               setpass = 0;
++                               break;
++                       case 'S':
++                               system = 1;
++                               break;
++                       case 'G':
++                               usegroup = optarg;
++                               break;
+                        default:
+                                show_usage ();
+                                break;
+@@ -301,8 +345,19 @@
+        pw.pw_dir = (char *)home;
+        pw.pw_shell = (char *)shell;
+ 
++       if (usegroup) {
++               /* Add user to a group that already exists */
++               struct group *g;
++
++               g = getgrnam(usegroup);
++               if (g == NULL)
++                       error_msg_and_die("group %s does not exist", usegroup);
++
++               pw.pw_gid = g->gr_gid;
++       }
++
+        /* grand finale */
+-       return adduser(PASSWD_FILE, &pw);
++       return adduser(PASSWD_FILE, &pw, makehome, setpass);
+ }
+ 
+-/* $Id: adduser.c,v 1.37 2002/12/12 08:46:03 andersen Exp $ */
++/* $Id: adduser.c,v 1.38 2003/06/21 19:35:42 andersen Exp $ */
+Index: install.sh
+===================================================================
+RCS file: /var/cvs/tinylogin/install.sh,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- a/install.sh        23 Jun 2002 03:09:07 -0000      1.10
++++ b/install.sh        6 Mar 2003 19:29:17 -0000       1.11
+@@ -21,11 +21,11 @@
+ h=`sort tinylogin.links | uniq`
+ 
+ 
+-mkdir -p $prefix/bin || exit 1
++install -d -m 0755 $prefix/bin || exit 1
+ 
+ for i in $h ; do
+        appdir=`dirname $i`
+-       mkdir -p $prefix/$appdir || exit 1
++       install -d -m 0755 $prefix/$appdir || exit 1
+        if [ "$2" = "--hardlinks" ]; then
+            bb_path="$prefix/bin/tinylogin"
+        else
+Index: passwd.c
+===================================================================
+RCS file: /var/cvs/tinylogin/passwd.c,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -r1.19 -r1.20
+--- a/passwd.c  7 Nov 2002 02:34:15 -0000       1.19
++++ b/passwd.c  17 Feb 2003 11:51:55 -0000      1.20
+@@ -25,10 +25,6 @@
+ {
+        int x = 0;                                      /* standart: DES */
+ 
+-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+-       if (strcasecmp(a, "sha1") == 0)
+-               x = 2;
+-#endif
+        if (strcasecmp(a, "md5") == 0)
+                x = 1;
+        return x;
+@@ -394,11 +390,6 @@
+        bzero(cp, strlen(cp));
+        bzero(orig, sizeof(orig));
+ 
+-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+-       if (algo == 2) {
+-               cp = pw_encrypt(pass, "$2$");
+-       } else
+-#endif
+        if (algo == 1) {
+                cp = pw_encrypt(pass, "$1$");
+        } else
+Index: sha1.c
+===================================================================
+RCS file: sha1.c
+diff -N sha1.c
+--- a/sha1.c    20 Dec 2000 21:54:28 -0000      1.2
++++ /dev/null   1 Jan 1970 00:00:00 -0000
+@@ -1,187 +0,0 @@
+-/* vi: set sw=4 ts=4: */
+-/* 
+-   Implements the Secure Hash Algorithm (SHA1)
+-
+-   Copyright (C) 1999 Scott G. Miller
+-
+-   Released under the terms of the GNU General Public License v2
+-   see file COPYING for details
+-
+-   Credits: 
+-      Robert Klep <robert@ilse.nl>  -- Expansion function fix 
+-   ---
+-   FIXME: This source takes int to be a 32 bit integer.  This
+-   may vary from system to system.  I'd use autoconf if I was familiar
+-   with it.  Anyone want to help me out?
+-*/
+-
+-void sha_hash(int *, int *);
+-void sha_init(int *);
+-char *sprint_hash(int *);
+-void do_sha_hash(int *, int *);
+-
+-/*
+-  added 3 functions for sha passowrd stuff (mainly inspired from stuff seen in main.c from shasum-1.3 package)
+-*/
+-#include <stdio.h>
+-#include <string.h>
+-#include <stdlib.h>
+-
+-#include <endian.h>
+-/* On big endian machines, we need to reverse the input to process
+-   the blocks correctly */
+-
+-#define switch_endianness(x) (x<<24 & 0xff000000) | \
+-                             (x<<8  & 0x00ff0000) | \
+-                             (x>>8  & 0x0000ff00) | \
+-                             (x>>24 & 0x000000ff)
+-
+-/* Initial hash values */
+-#define Ai 0x67452301
+-#define Bi 0xefcdab89
+-#define Ci 0x98badcfe
+-#define Di 0x10325476
+-#define Ei 0xc3d2e1f0
+-
+-/* SHA1 round constants */
+-#define K1 0x5a827999
+-#define K2 0x6ed9eba1
+-#define K3 0x8f1bbcdc
+-#define K4 0xca62c1d6
+-
+-/* Round functions.  Note that f2() is used in both rounds 2 and 4 */
+-#define f1(B,C,D) ((B & C) | ((~B) & D))
+-#define f2(B,C,D) (B ^ C ^ D)
+-#define f3(B,C,D) ((B & C) | (B & D) | (C & D))
+-
+-/* left circular shift functions (rotate left) */
+-#define rol1(x) ((x<<1) | ((x>>31) & 1))
+-#define rol5(A) ((A<<5) | ((A>>27) & 0x1f))
+-#define rol30(B) ((B<<30) | ((B>>2) & 0x3fffffff))
+-
+-/*
+-  Hashes 'data', which should be a pointer to 512 bits of data (sixteen
+-  32 bit ints), into the ongoing 160 bit hash value (five 32 bit ints)
+-  'hash'
+-*/
+-void sha_hash(int *data, int *hash)
+-{
+-       int W[80];
+-       unsigned int A = hash[0], B = hash[1], C = hash[2], D = hash[3], E =
+-               hash[4];
+-       unsigned int t, x, TEMP;
+-
+-       for (t = 0; t < 16; t++) {
+-#ifdef BIG_ENDIAN
+-               W[t] = switch_endianness(data[t]);
+-#else
+-               W[t] = data[t];
+-#endif
+-       }
+-
+-
+-       /* SHA1 Data expansion */
+-       for (t = 16; t < 80; t++) {
+-               x = W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16];
+-               W[t] = rol1(x);
+-       }
+-
+-       /* SHA1 main loop (t=0 to 79) 
+-          This is broken down into four subloops in order to use
+-          the correct round function and constant */
+-       for (t = 0; t < 20; t++) {
+-               TEMP = rol5(A) + f1(B, C, D) + E + W[t] + K1;
+-               E = D;
+-               D = C;
+-               C = rol30(B);
+-               B = A;
+-               A = TEMP;
+-       }
+-       for (; t < 40; t++) {
+-               TEMP = rol5(A) + f2(B, C, D) + E + W[t] + K2;
+-               E = D;
+-               D = C;
+-               C = rol30(B);
+-               B = A;
+-               A = TEMP;
+-       }
+-       for (; t < 60; t++) {
+-               TEMP = rol5(A) + f3(B, C, D) + E + W[t] + K3;
+-               E = D;
+-               D = C;
+-               C = rol30(B);
+-               B = A;
+-               A = TEMP;
+-       }
+-       for (; t < 80; t++) {
+-               TEMP = rol5(A) + f2(B, C, D) + E + W[t] + K4;
+-               E = D;
+-               D = C;
+-               C = rol30(B);
+-               B = A;
+-               A = TEMP;
+-       }
+-       hash[0] += A;
+-       hash[1] += B;
+-       hash[2] += C;
+-       hash[3] += D;
+-       hash[4] += E;
+-}
+-
+-/*
+-  Takes a pointer to a 160 bit block of data (five 32 bit ints) and
+-  intializes it to the start constants of the SHA1 algorithm.  This
+-  must be called before using hash in the call to sha_hash
+-*/
+-void sha_init(int *hash)
+-{
+-       hash[0] = Ai;
+-       hash[1] = Bi;
+-       hash[2] = Ci;
+-       hash[3] = Di;
+-       hash[4] = Ei;
+-}
+-
+-
+-/*
+- * write the hash to a string
+- */
+-char *sprint_sha1_hash(int *hashval)
+-{
+-       int x = 0;
+-       char *out = NULL;
+-
+-       if ((out = malloc(43)) == NULL)
+-               return NULL;
+-       memset(out, 0x00, 43);
+-       strcpy(out, "$2$");
+-       for (x = 0; x < 5; x++) {
+-               sprintf(out + (x * 8) + 3, "%08x", hashval[x]);
+-       }
+-       out[43] = 0;
+-       return out;
+-}
+-
+-
+-/*
+- * hash the password
+- */
+-void do_sha_hash(int *hashval, int *pw)
+-{
+-       sha_init(hashval);
+-       sha_hash(pw, hashval);
+-}
+-
+-
+-/*
+- * hash a charakter string and return the 160bit integer in hex as a character string
+- */
+-char *sha1_crypt(const char *pw)
+-{
+-       int hashval[20];
+-
+-       memset(hashval, 0x00, sizeof(hashval));
+-       do_sha_hash(hashval, (int *) ((char *) pw + 3));
+-
+-       return sprint_sha1_hash(hashval);
+-}
+Index: vlock.c
+===================================================================
+RCS file: /var/cvs/tinylogin/vlock.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- a/vlock.c   19 Sep 2002 03:50:31 -0000      1.13
++++ b/vlock.c   17 Feb 2003 11:51:56 -0000      1.14
+@@ -26,7 +26,7 @@
+  * minimalistic vlock.
+  */
+ /* Fixed by Erik Andersen to do passwords the tinylogin way...
+- * It now works with md5, sha1, etc passwords. */
++ * It now works with md5, etc passwords. */
+ 
+ #include "tinylogin.h"
+ #include <stdio.h>
+Index: docs/tinylogin.busybox.net/index.html
+===================================================================
+RCS file: /var/cvs/tinylogin/docs/tinylogin.busybox.net/index.html,v
+retrieving revision 1.23
+retrieving revision 1.25
+diff -u -r1.23 -r1.25
+--- a/docs/tinylogin.busybox.net/index.html     3 Jan 2003 10:56:32 -0000       1.23
++++ b/docs/tinylogin.busybox.net/index.html     3 Jan 2003 11:21:53 -0000       1.25
+@@ -56,6 +56,9 @@
+ Erik Andersen</a>, and licensed under the 
+ <a href="http://www.gnu.org/copyleft/gpl.html">GNU GENERAL PUBLIC LICENSE</a>.
+ 
++<h3>Mailing List Information</h3>
++Here are the Tinylogin <a href="/lists/tinylogin/">mailing list archives</a><br>
++To subscribe, go and visit <a href= "/mailman/listinfo/tinylogin">this page</a>. 
+ 
+ <!-- Begin Download section -->
+ 
+@@ -222,19 +225,19 @@
+ <ul> 
+     <li>  <A HREF="http://freshmeat.net/projects/tinylogin/?highlight=tinylogin">
+     Freshmeat AppIndex record for TinyLogin</A>
++    <p>
+ 
+     <li><a href="http://www.busybox.net/">BusyBox</a>
+     combines tiny versions of many common UNIX utilities into a single small 
+     executable. It provides minimalist replacements for most of the utilities 
+     you usually find on a standard Linux system.
+-
+     <p>
++
+     <li><a href="http://uclibc.org/uClibc.html">uClibc</a>
+        is a C library for embedded systems.  You can actually statically link
+        a "Hello World" application under x86 that only takes 4k (as opposed to
+        200k under GNU libc).  It can do dynamic linking too and works nicely with
+        BusyBox to create very small embedded systems.
+-
+     <p>
+ 
+ </ul>
+Index: include/libbb.h
+===================================================================
+RCS file: /var/cvs/tinylogin/include/libbb.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- a/include/libbb.h   23 Jun 2002 03:09:10 -0000      1.1
++++ b/include/libbb.h   17 Feb 2003 11:51:57 -0000      1.2
+@@ -39,9 +39,6 @@
+ #ifdef CONFIG_FEATURE_SHADOWPASSWDS
+ #include "shadow_.h"
+ #endif
+-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+-# include "sha1.h"
+-#endif
+ 
+ #if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__)
+ /* libc5 doesn't define socklen_t */
+Index: include/sha1.h
+===================================================================
+RCS file: include/sha1.h
+diff -N include/sha1.h
+--- a/include/sha1.h    23 Jun 2002 03:09:10 -0000      1.1
++++ /dev/null   1 Jan 1970 00:00:00 -0000
+@@ -1,3 +0,0 @@
+-/* SHA1.H - header file for SHA1.C */
+-
+-char *sha1_crypt(const char *pw);
+Index: include/usage.h
+===================================================================
+RCS file: /var/cvs/tinylogin/include/usage.h,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- a/include/usage.h   3 Jul 2002 05:57:00 -0000       1.2
++++ b/include/usage.h   17 Feb 2003 11:51:57 -0000      1.3
+@@ -33,11 +33,6 @@
+        "\t-h\tName of the remote host for this login.\n" \
+        "\t-p\tPreserve environment."
+ 
+-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+-  #define PASSWORD_ALG_TYPES(a) a
+-#else
+-  #define PASSWORD_ALG_TYPES(a)
+-#endif
+ #define passwd_trivial_usage \
+        "[OPTION] [name]"
+ #define passwd_full_usage \
+@@ -46,7 +41,6 @@
+        "Options:\n" \
+        "\t-a\tDefine which algorithm shall be used for the password.\n" \
+        "\t\t\t(Choices: des, md5" \
+-       PASSWORD_ALG_TYPES(", sha1") \
+        ")\n\t-d\tDelete the password for the specified user account.\n" \
+        "\t-l\tLocks (disables) the specified user account.\n" \
+        "\t-u\tUnlocks (re-enables) the specified user account."
+Index: libbb/obscure.c
+===================================================================
+RCS file: /var/cvs/tinylogin/libbb/obscure.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- a/libbb/obscure.c   23 Jun 2002 04:05:59 -0000      1.2
++++ b/libbb/obscure.c   30 Jul 2003 08:41:33 -0000      1.3
+@@ -44,7 +44,7 @@
+  * can't be a palindrome - like `R A D A R' or `M A D A M'
+  */
+ 
+-static int palindrome(const char *old, const char *newval)
++static int palindrome(const char *newval)
+ {
+        int i, j;
+ 
+@@ -79,24 +79,25 @@
+  * a nice mix of characters.
+  */
+ 
+-static int simple(const char *old, const char *newval)
++static int simple(const char *newval)
+ {
+        int digits = 0;
+        int uppers = 0;
+        int lowers = 0;
+        int others = 0;
++       int c;
+        int size;
+        int i;
+ 
+-       for (i = 0; newval[i]; i++) {
+-               if (isdigit(newval[i]))
+-                       digits++;
+-               else if (isupper(newval[i]))
+-                       uppers++;
+-               else if (islower(newval[i]))
+-                       lowers++;
++       for (i = 0; (c = *newval++) != 0; i++) {
++               if (isdigit(c))
++                       digits = c;
++               else if (isupper(c))
++                       uppers = c;
++               else if (islower(c))
++                       lowers = c;
+                else
+-                       others++;
++                       others = c;
+        }
+ 
+        /*
+@@ -129,49 +130,53 @@
+        return string;
+ }
+ 
+-static char *password_check(const char *old, const char *newval, const struct passwd *pwdp)
++static const char *
++password_check(const char *old, const char *newval, const struct passwd *pwdp)
+ {
+-       char *msg = NULL;
+-       char *oldmono, *newmono, *wrapped;
++       const char *msg;
++       char *newmono, *wrapped;
++       int lenwrap;
+ 
+        if (strcmp(newval, old) == 0)
+                return "no change";
++       if (simple(newval))
++               return "too simple";
+ 
++       msg = NULL;
+        newmono = str_lower(xstrdup(newval));
+-       oldmono = str_lower(xstrdup(old));
+-       wrapped = (char *) xmalloc(strlen(oldmono) * 2 + 1);
+-       strcpy(wrapped, oldmono);
+-       strcat(wrapped, oldmono);
++       lenwrap = strlen(old) * 2 + 1;
++       wrapped = (char *) xmalloc(lenwrap);
++       str_lower(strcpy(wrapped, old));
+ 
+-       if (palindrome(oldmono, newmono))
++       if (palindrome(newmono))
+                msg = "a palindrome";
+ 
+-       if (!msg && strcmp(oldmono, newmono) == 0)
++       else if (strcmp(wrapped, newmono) == 0)
+                msg = "case changes only";
+ 
+-       if (!msg && similiar(oldmono, newmono))
++       else if (similiar(wrapped, newmono))
+                msg = "too similiar";
+ 
+-       if (!msg && simple(old, newval))
+-               msg = "too simple";
+-
+-       if (!msg && strstr(wrapped, newmono))
+-               msg = "rotated";
++       else {
++               safe_strncpy(wrapped + lenwrap, wrapped, lenwrap + 1);
++               if (strstr(wrapped, newmono))
++                       msg = "rotated";
++       }
+ 
+        bzero(newmono, strlen(newmono));
+-       bzero(oldmono, strlen(oldmono));
+-       bzero(wrapped, strlen(wrapped));
++       bzero(wrapped, lenwrap);
+        free(newmono);
+-       free(oldmono);
+        free(wrapped);
+ 
+        return msg;
+ }
+ 
+-static char *obscure_msg(const char *old, const char *newval, const struct passwd *pwdp)
++static const char *
++obscure_msg(const char *old, const char *newval, const struct passwd *pwdp)
+ {
+        int maxlen, oldlen, newlen;
+-       char *new1, *old1, *msg;
++       char *new1, *old1;
++       const char *msg;
+ 
+        oldlen = strlen(old);
+        newlen = strlen(newval);
+@@ -233,7 +238,7 @@
+ 
+ extern int obscure(const char *old, const char *newval, const struct passwd *pwdp)
+ {
+-       char *msg = obscure_msg(old, newval, pwdp);
++       const char *msg = obscure_msg(old, newval, pwdp);
+ 
+        /*  if (msg) { */
+        if (msg != NULL) {
+Index: libbb/pw_encrypt.c
+===================================================================
+RCS file: /var/cvs/tinylogin/libbb/pw_encrypt.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- a/libbb/pw_encrypt.c        23 Jun 2002 03:09:12 -0000      1.1
++++ b/libbb/pw_encrypt.c        17 Feb 2003 11:51:58 -0000      1.2
+@@ -30,11 +30,6 @@
+        static char cipher[128];
+        char *cp;
+ 
+-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+-       if (strncmp(salt, "$2$", 3) == 0) {
+-               return sha1_crypt(clear);
+-       }
+-#endif
+        cp = (char *) crypt(clear, salt);
+        /* if crypt (a nonstandard crypt) returns a string too large,
+           truncate it so we don't overrun buffers and hope there is
diff --git a/meta/recipes-core/tinylogin/tinylogin-1.4/remove-index.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/remove-index.patch
new file mode 100644
index 0000000000..fc35002bad
--- /dev/null
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/remove-index.patch
@@ -0,0 +1,11 @@
+--- /tmp/deluser.c      2007-05-13 10:38:19.000000000 +0200
++++ tinylogin-1.4/deluser.c     2007-05-13 10:38:50.185251000 +0200
+@@ -60,7 +60,7 @@
+        }
+        start++;
+ 
+-       stop = index(start, '\n');      /* index is a BSD-ism */
++       stop = strchr(start, '\n');     /* index is a BSD-ism, strchr hopefully isn't */
+        b.start = start - buffer;
+        b.stop = stop - buffer;
+        return b;
diff --git a/meta/recipes-core/tinylogin/tinylogin_1.4.bb b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
new file mode 100644
index 0000000000..ad254bff6a
--- /dev/null
+++ b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
@@ -0,0 +1,29 @@
+SECTION = "base"
+DESCRIPTION = "TinyLogin is a suite of tiny UNIX \
+utilities for handling logins, user authentication, \
+changing passwords, and otherwise maintaining users \
+and groups on an embedded system."
+HOMEPAGE = "http://tinylogin.busybox.net/"
+LICENSE = "GPL"
+PR = "r4"
+
+SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
+        file://cvs-20040608.patch;patch=1;pnum=1 \
+        file://add-system.patch;patch=1;pnum=1 \
+        file://adduser-empty_pwd.patch;patch=1 \
+        file://remove-index.patch;patch=1"
+
+EXTRA_OEMAKE = ""
+
+do_compile () {
+        oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+}
+
+do_install () {
+        install -d ${D}${base_bindir}
+        install -m 4755 tinylogin ${D}${base_bindir}/tinylogin
+        for i in `cat tinylogin.links`; do
+                mkdir -p ${D}/`dirname $i`
+                ln -sf /bin/tinylogin ${D}$i
+        done
+}
diff --git a/meta/recipes-core/uclibc/files/armeb-kernel-stat.h.patch b/meta/recipes-core/uclibc/files/armeb-kernel-stat.h.patch
new file mode 100644
index 0000000000..0440718eec
--- /dev/null
+++ b/meta/recipes-core/uclibc/files/armeb-kernel-stat.h.patch
@@ -0,0 +1,125 @@
+# The 2.6 asm/stat.h for ARM has some rather unusual transmogrifications
+# for big-endian running.  This patch adds ARM specific code in xstatconv.c
+# which deals with the 2.4->2.6 ABI change.
+--- uClibc-0.9.27/libc/sysdeps/linux/common/xstatconv.c 2005-01-11 23:59:21.000000000 -0800
++++ uClibc-0.9.27/libc/sysdeps/linux/common/xstatconv.c 2005-06-05 11:03:56.742587966 -0700
+@@ -18,7 +18,14 @@
+    02111-1307 USA. 
+    
+    Modified for uClibc by Erik Andersen <andersen@codepoet.org>
++   Further modified for ARMBE by John Bowler <jbowler@acm.org>
+    */
++/* This is a copy of common/xstatconv.c with a fixup for the ABI
++ * (structure layout) change in ARM Linux 2.6 - this shifts the
++ * st_dev and st_rdev information from the start of the 8 byte
++ * space to the end on big-endian ARM (only).  The code is unchanged
++ * on little endian.
++ */
+ 
+ #define _GNU_SOURCE
+ #define _LARGEFILE64_SOURCE
+@@ -32,6 +39,84 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+ 
++/* Only for ARMEB and LFS. */
++#if defined(__ARMEB__) && defined(__UCLIBC_HAS_LFS__)
++/* stat64 (renamed) from 2.6.11.11.  What happened here is that after
++ * Linux 2.4 the 2.4 unsigned short st_rdev and st_dev fields were
++ * lengthened to unsigned long long - causing the inclusion of at least
++ * some of the 0 padding bytes which followed them.  On little endian
++ * this is fine because 2.4 did zero the pad bytes (I think) and the
++ * position of the data did not change.  On big endian the change
++ * shifted the data to the end of the field.  Someone noticed for the
++ * struct stat, and the armeb (big endian) case preserved the
++ * unsigned short (yuck), but no so for stat64 (maybe this was deliberate,
++ * but there is no evidence in the code of this.)  Consequently a
++ * fixup is necessary for the stat64 case.  The fixup here is to
++ * use the new structure when the change is detected.  See below.
++ */
++struct __kernel_stat64_armeb {
++       /* This definition changes the layout on big-endian from that
++        * used in 2.4.31 - ABI change!  Likewise for st_rdev.
++        */
++       unsigned long long      st_dev;
++       unsigned char   __pad0[4];
++       unsigned long   __st_ino;
++       unsigned int    st_mode;
++       unsigned int    st_nlink;
++       unsigned long   st_uid;
++       unsigned long   st_gid;
++       unsigned long long      st_rdev;
++       unsigned char   __pad3[4];
++       long long       st_size;
++       unsigned long   st_blksize;
++       unsigned long   __pad4;
++       unsigned long   st_blocks;
++       unsigned long   st_atime;
++       unsigned long   st_atime_nsec;
++       unsigned long   st_mtime;
++       unsigned long   st_mtime_nsec;
++       unsigned long   st_ctime;
++       unsigned long   st_ctime_nsec;
++       unsigned long long      st_ino;
++};
++
++/* This fixup only works so long as the old struct stat64 is no
++ * smaller than the new one - the caller of xstatconv uses the
++ * *old* struct, but the kernel writes the new one.  CASSERT
++ * detects this at compile time.
++ */
++#define CASSERT(c) do switch (0) { case 0:; case (c):; } while (0)
++
++void __xstat64_conv_new(struct __kernel_stat64_armeb *kbuf, struct stat64 *buf)
++{
++    CASSERT(sizeof *kbuf <= sizeof (struct kernel_stat64));
++
++    /* Convert from new kernel version of `struct stat64'.  */
++    buf->st_dev = kbuf->st_dev;
++    buf->st_ino = kbuf->st_ino;
++#ifdef _HAVE_STAT64___ST_INO
++    buf->__st_ino = kbuf->__st_ino;
++#endif
++    buf->st_mode = kbuf->st_mode;
++    buf->st_nlink = kbuf->st_nlink;
++    buf->st_uid = kbuf->st_uid;
++    buf->st_gid = kbuf->st_gid;
++    buf->st_rdev = kbuf->st_rdev;
++    buf->st_size = kbuf->st_size;
++    buf->st_blksize = kbuf->st_blksize;
++    buf->st_blocks = kbuf->st_blocks;
++    buf->st_atime = kbuf->st_atime;
++    buf->st_mtime = kbuf->st_mtime;
++    buf->st_ctime = kbuf->st_ctime;
++}
++#define _MAY_HAVE_NEW_STAT64 1
++#else
++#define _MAY_HAVE_NEW_STAT64 0
++#endif
++
++/* The following is taken verbatim from xstatconv.c apart from
++ * the addition of the _MAY_HAVE_NEW_STAT64 code.
++ */
+ void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf)
+ {
+     /* Convert to current kernel version of `struct stat'.  */
+@@ -53,6 +138,19 @@
+ #if defined __UCLIBC_HAS_LFS__
+ void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf)
+ {
++#   if _MAY_HAVE_NEW_STAT64
++       /* This relies on any device (0,0) not being mountable - i.e.
++        * it fails on Linux 2.4 if dev(0,0) is a mountable block file
++        * system and itself contains it's own device.  That doesn't
++        * happen on Linux 2.4 so far as I can see, but even if it
++        * does the API only fails (even then) if 2.4 didn't set all
++        * of the pad bytes to 0 (and it does set them to zero.)
++        */
++       if (kbuf->st_dev == 0 && kbuf->st_rdev == 0) {
++           __xstat64_conv_new((struct __kernel_stat64_armeb*)kbuf, buf);
++           return;
++       }
++#   endif
+     /* Convert to current kernel version of `struct stat64'.  */
+     buf->st_dev = kbuf->st_dev;
+     buf->st_ino = kbuf->st_ino;
diff --git a/meta/recipes-core/uclibc/files/errno_values.h.patch b/meta/recipes-core/uclibc/files/errno_values.h.patch
new file mode 100644
index 0000000000..a1e39c181b
--- /dev/null
+++ b/meta/recipes-core/uclibc/files/errno_values.h.patch
@@ -0,0 +1,21 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h
+===================================================================
+--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2002-08-23 20:48:19.000000000 +0200
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2007-07-01 22:11:53.000000000 +0200
+@@ -134,4 +134,16 @@
+ #define        ENOMEDIUM       123     /* No medium found */
+ #define        EMEDIUMTYPE     124     /* Wrong medium type */
+ 
++/* the following errornumbers are only in 2.6 */
++
++#define ECANCELED       125     /* Operation Canceled */
++#define ENOKEY          126     /* Required key not available */
++#define EKEYEXPIRED     127     /* Key has expired */
++#define EKEYREVOKED     128     /* Key has been revoked */
++#define EKEYREJECTED    129     /* Key was rejected by service */
++
++/* for robust mutexes */
++#define EOWNERDEAD      130     /* Owner died */
++#define ENOTRECOVERABLE 131     /* State not recoverable */
++
+ #endif /* _BITS_ERRNO_VALUES_H */
diff --git a/meta/recipes-core/uclibc/files/kernel-key-t-ipc.h.patch b/meta/recipes-core/uclibc/files/kernel-key-t-ipc.h.patch
new file mode 100644
index 0000000000..4cc4530470
--- /dev/null
+++ b/meta/recipes-core/uclibc/files/kernel-key-t-ipc.h.patch
@@ -0,0 +1,27 @@
+# include/linux/posix_types.h defines __kernel_key_t as int, this file
+# contains an identical definition.  This results in a compiler error
+# if both files are included.  The ipc.h file, however, also includes
+# bits/types.h, which typedefs __key_t to (int), therefore it must
+# be safe to use __key_t in place of __kernel_key_t (given that C
+# regards equivalent numeric typedefs as identical.)
+--- uClibc-0.9.27/libc/sysdeps/linux/common/bits/ipc.h.orig     2005-05-07 13:36:04.448332211 -0700
++++ uClibc-0.9.27/libc/sysdeps/linux/common/bits/ipc.h  2005-05-07 13:37:00.493885708 -0700
+@@ -35,9 +35,6 @@
+ # define IPC_INFO      3               /* See ipcs.  */
+ #endif
+ 
+-/* Type of a SYSV IPC key.  */
+-typedef int __kernel_key_t;
+-
+ /* Special key values.  */
+ #define IPC_PRIVATE    ((__key_t) 0)   /* Private key.  */
+ 
+@@ -45,7 +42,7 @@
+ /* Data structure used to pass permission information to IPC operations.  */
+ struct ipc_perm
+ {
+-    __kernel_key_t     __key;
++    __key_t            __key;
+     __kernel_uid_t     uid;
+     __kernel_gid_t     gid;
+     __kernel_uid_t     cuid;
diff --git a/meta/recipes-core/uclibc/files/nokernelheadercheck.patch b/meta/recipes-core/uclibc/files/nokernelheadercheck.patch
new file mode 100644
index 0000000000..9f09fb2ac9
--- /dev/null
+++ b/meta/recipes-core/uclibc/files/nokernelheadercheck.patch
@@ -0,0 +1,24 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- uClibc/Makefile~nokernelheadercheck
++++ uClibc/Makefile
+@@ -121,11 +121,11 @@
+        @./extra/config/conf -o extra/Configs/Config.in
+ 
+ headers: include/bits/uClibc_config.h
+-ifeq ($(strip $(ARCH_HAS_MMU)),y)
+-       @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
+-else
+-       @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
+-endif
++#ifeq ($(strip $(ARCH_HAS_MMU)),y)
++#      @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
++#else
++#      @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
++#endif
+        @cd include/bits; \
+        set -e; \
+        for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
diff --git a/meta/recipes-core/uclibc/files/termios.h.patch b/meta/recipes-core/uclibc/files/termios.h.patch
new file mode 100644
index 0000000000..f7200ba393
--- /dev/null
+++ b/meta/recipes-core/uclibc/files/termios.h.patch
@@ -0,0 +1,22 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
+===================================================================
+--- uClibc-0.9.29.orig/libc/sysdeps/linux/common/bits/termios.h 2006-02-13 09:41:37.000000000 +0100
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h      2007-07-03 00:41:27.000000000 +0200
+@@ -156,7 +156,6 @@
+ #endif
+ #define  B57600   0010001
+ #define  B115200  0010002
+-#if 0 /* limited on uClibc, keep in sync w/ cfsetspeed.c */
+ #define  B230400  0010003
+ #define  B460800  0010004
+ #define  B500000  0010005
+@@ -171,9 +170,6 @@
+ #define  B3500000 0010016
+ #define  B4000000 0010017
+ #define __MAX_BAUD B4000000
+-#else
+-#define __MAX_BAUD B115200
+-#endif
+ #ifdef __USE_MISC
+ # define CIBAUD          002003600000          /* input baud rate (not used) */
+ # define CMSPAR   010000000000         /* mark or space (stick) parity */
diff --git a/meta/recipes-core/uclibc/files/uClibc.distro b/meta/recipes-core/uclibc/files/uClibc.distro
new file mode 100644
index 0000000000..d87b891b41
--- /dev/null
+++ b/meta/recipes-core/uclibc/files/uClibc.distro
@@ -0,0 +1,3 @@
+# Default per-distro config
+# DO NOT CHANGE THIS
+# Create a new file ${DISTRO}/uClibc.distro
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/Use-__always_inline-instead-of-__inline__.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/Use-__always_inline-instead-of-__inline__.patch
new file mode 100644
index 0000000000..a9c7a4fb10
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/Use-__always_inline-instead-of-__inline__.patch
@@ -0,0 +1,393 @@
+From c190f738e1b0e87658ea5f86c057fb147dc19428 Mon Sep 17 00:00:00 2001
+From: Carmelo Amoroso <carmelo.amoroso@st.com>
+Date: Thu, 5 Mar 2009 13:28:55 +0000
+Subject: [PATCH] Use __always_inline instead of __inline__
+
+---
+ ldso/ldso/arm/dl-sysdep.h     |    8 ++++----
+ ldso/ldso/bfin/dl-sysdep.h    |    2 +-
+ ldso/ldso/cris/dl-sysdep.h    |    6 +++---
+ ldso/ldso/i386/dl-sysdep.h    |   10 +++++-----
+ ldso/ldso/m68k/dl-sysdep.h    |    6 +++---
+ ldso/ldso/mips/dl-sysdep.h    |    8 ++++----
+ ldso/ldso/powerpc/dl-sysdep.h |    8 ++++----
+ ldso/ldso/sh/dl-sysdep.h      |    8 ++++----
+ ldso/ldso/sh64/dl-sysdep.h    |    6 +++---
+ ldso/ldso/sparc/dl-sysdep.h   |    8 ++++----
+ ldso/ldso/xtensa/dl-sysdep.h  |    6 +++---
+ 11 files changed, 38 insertions(+), 38 deletions(-)
+
+diff --git a/ldso/ldso/arm/dl-sysdep.h b/ldso/ldso/arm/dl-sysdep.h
+index eea3b98..5191dd7 100644
+--- a/ldso/ldso/arm/dl-sysdep.h
++++ b/ldso/ldso/arm/dl-sysdep.h
+@@ -15,7 +15,7 @@
+   GOT_BASE[1] = (unsigned long) MODULE; \
+ }
+ 
+-static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
++static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p)
+ {
+        unsigned long i,t,inc;
+        i=p; t=0;
+@@ -67,7 +67,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
+    first element of the GOT.  We used to use the PIC register to do this
+    without a constant pool reference, but GCC 4.2 will use a pseudo-register
+    for the PIC base, so it may not be in r10.  */
+-static __inline__ Elf32_Addr __attribute__ ((unused))
++static __always_inline Elf32_Addr __attribute__ ((unused))
+ elf_machine_dynamic (void)
+ {
+   Elf32_Addr dynamic;
+@@ -99,7 +99,7 @@ elf_machine_dynamic (void)
+ }
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr __attribute__ ((unused))
++static __always_inline Elf32_Addr __attribute__ ((unused))
+ elf_machine_load_address (void)
+ {
+        extern void __dl_start __asm__ ("_dl_start");
+@@ -123,7 +123,7 @@ elf_machine_load_address (void)
+        return pcrel_addr - got_addr;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h
+index 3c88da4..f0c5129 100644
+--- a/ldso/ldso/bfin/dl-sysdep.h
++++ b/ldso/ldso/bfin/dl-sysdep.h
+@@ -210,7 +210,7 @@ while (0)
+ #endif
+ 
+ #include <elf.h>
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/cris/dl-sysdep.h b/ldso/ldso/cris/dl-sysdep.h
+index ffb763a..e454c10 100644
+--- a/ldso/ldso/cris/dl-sysdep.h
++++ b/ldso/ldso/cris/dl-sysdep.h
+@@ -37,7 +37,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entr
+      || ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT)    \
+    | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
+ 
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_dynamic(void)
+ {
+        /* Don't just set this to an asm variable "r0" since that's not logical
+@@ -59,7 +59,7 @@ elf_machine_dynamic(void)
+    there's some other symbol we could use, that we don't *have* to force a
+    GOT entry for.  */
+ 
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_load_address(void)
+ {
+        Elf32_Addr gotaddr_diff;
+@@ -93,7 +93,7 @@ elf_machine_load_address(void)
+        return gotaddr_diff;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h
+index 77fa372..6e84861 100644
+--- a/ldso/ldso/i386/dl-sysdep.h
++++ b/ldso/ldso/i386/dl-sysdep.h
+@@ -37,8 +37,8 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent
+ /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
+    first element of the GOT.  This must be inlined in a function which
+    uses global data.  */
+-static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused;
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr elf_machine_dynamic (void) attribute_unused;
++static __always_inline Elf32_Addr
+ elf_machine_dynamic (void)
+ {
+        register Elf32_Addr *got __asm__ ("%ebx");
+@@ -47,8 +47,8 @@ elf_machine_dynamic (void)
+ 
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr elf_machine_load_address (void) attribute_unused;
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr elf_machine_load_address (void) attribute_unused;
++static __always_inline Elf32_Addr
+ elf_machine_load_address (void)
+ {
+        /* It doesn't matter what variable this is, the reference never makes
+@@ -61,7 +61,7 @@ elf_machine_load_address (void)
+        return addr;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h
+index 8e26e20..259cb84 100644
+--- a/ldso/ldso/m68k/dl-sysdep.h
++++ b/ldso/ldso/m68k/dl-sysdep.h
+@@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
+ /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
+    first element of the GOT.  This must be inlined in a function which
+    uses global data.  */
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_dynamic (void)
+ {
+        register Elf32_Addr *got __asm__ ("%a5");
+@@ -48,7 +48,7 @@ elf_machine_dynamic (void)
+ 
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_load_address (void)
+ {
+        Elf32_Addr addr;
+@@ -58,7 +58,7 @@ elf_machine_load_address (void)
+        return addr;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h
+index cf6b28b..30d84fb 100644
+--- a/ldso/ldso/mips/dl-sysdep.h
++++ b/ldso/ldso/mips/dl-sysdep.h
+@@ -169,7 +169,7 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy)
+ 
+ #define OFFSET_GP_GOT 0x7ff0
+ 
+-static __inline__ ElfW(Addr) *
++static __always_inline ElfW(Addr) *
+ elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
+ {
+        /* FIXME: the offset of gp from GOT may be system-dependent. */
+@@ -179,7 +179,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
+ /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
+    first element of the GOT.  This must be inlined in a function which
+    uses global data.  We assume its $gp points to the primary GOT.  */
+-static __inline__ ElfW(Addr)
++static __always_inline ElfW(Addr)
+ elf_machine_dynamic (void)
+ {
+        register ElfW(Addr) gp __asm__ ("$28");
+@@ -198,7 +198,7 @@ elf_machine_dynamic (void)
+ #endif
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ ElfW(Addr)
++static __always_inline ElfW(Addr)
+ elf_machine_load_address (void)
+ {
+        ElfW(Addr) addr;
+@@ -214,7 +214,7 @@ elf_machine_load_address (void)
+        return addr;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr,
+                      ElfW(Word) relative_count)
+ {
+diff --git a/ldso/ldso/powerpc/dl-sysdep.h b/ldso/ldso/powerpc/dl-sysdep.h
+index fdbf564..f33214c 100644
+--- a/ldso/ldso/powerpc/dl-sysdep.h
++++ b/ldso/ldso/powerpc/dl-sysdep.h
+@@ -85,7 +85,7 @@ void _dl_init_got(unsigned long *lpnt,struct elf_resolve *tpnt);
+ #define ELF_MACHINE_PLTREL_OVERLAP 1
+ 
+ /* Return the value of the GOT pointer.  */
+-static __inline__ Elf32_Addr * __attribute__ ((const))
++static __always_inline Elf32_Addr * __attribute__ ((const))
+ ppc_got (void)
+ {
+        Elf32_Addr *got;
+@@ -104,14 +104,14 @@ ppc_got (void)
+ 
+ /* Return the link-time address of _DYNAMIC, stored as
+    the first value in the GOT. */
+-static __inline__ Elf32_Addr __attribute__ ((const))
++static __always_inline Elf32_Addr __attribute__ ((const))
+ elf_machine_dynamic (void)
+ {
+        return *ppc_got();
+ }
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr __attribute__ ((const))
++static __always_inline Elf32_Addr __attribute__ ((const))
+ elf_machine_load_address (void)
+ {
+   Elf32_Addr *branchaddr;
+@@ -159,7 +159,7 @@ elf_machine_load_address (void)
+   return runtime_dynamic - elf_machine_dynamic ();
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h
+index daedda5..d4fc784 100644
+--- a/ldso/ldso/sh/dl-sysdep.h
++++ b/ldso/ldso/sh/dl-sysdep.h
+@@ -25,7 +25,7 @@
+ struct elf_resolve;
+ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
+ 
+-static __inline__ unsigned int
++static __always_inline unsigned int
+ _dl_urem(unsigned int n, unsigned int base)
+ {
+   int res;
+@@ -95,7 +95,7 @@ _dl_urem(unsigned int n, unsigned int base)
+ /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
+    first element of the GOT.  This must be inlined in a function which
+    uses global data.  */
+-static __inline__ Elf32_Addr __attribute__ ((unused))
++static __always_inline Elf32_Addr __attribute__ ((unused))
+ elf_machine_dynamic (void)
+ {
+        register Elf32_Addr *got;
+@@ -104,7 +104,7 @@ elf_machine_dynamic (void)
+ }
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr __attribute__ ((unused))
++static __always_inline Elf32_Addr __attribute__ ((unused))
+ elf_machine_load_address (void)
+ {
+        Elf32_Addr addr;
+@@ -146,7 +146,7 @@ elf_machine_load_address (void)
+     } \
+   }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/sh64/dl-sysdep.h b/ldso/ldso/sh64/dl-sysdep.h
+index fc67b12..15d9b5e 100644
+--- a/ldso/ldso/sh64/dl-sysdep.h
++++ b/ldso/ldso/sh64/dl-sysdep.h
+@@ -41,7 +41,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent
+ /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
+    first element of the GOT.  This must be inlined in a function which
+    uses global data.  */
+-static __inline__ Elf32_Addr elf_machine_dynamic(void)
++static __always_inline Elf32_Addr elf_machine_dynamic(void)
+ {
+        register Elf32_Addr *got;
+ 
+@@ -69,7 +69,7 @@ static __inline__ Elf32_Addr elf_machine_dynamic(void)
+ }
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr elf_machine_load_address(void)
++static __always_inline Elf32_Addr elf_machine_load_address(void)
+ {
+        Elf32_Addr addr;
+ 
+@@ -122,7 +122,7 @@ static __inline__ Elf32_Addr elf_machine_load_address(void)
+        }                                               \
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                     Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/sparc/dl-sysdep.h b/ldso/ldso/sparc/dl-sysdep.h
+index 7936517..ebfa268 100644
+--- a/ldso/ldso/sparc/dl-sysdep.h
++++ b/ldso/ldso/sparc/dl-sysdep.h
+@@ -52,7 +52,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
+ 
+ #ifndef COMPILE_ASM
+ /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */
+-static __inline__ unsigned long
++static __always_inline unsigned long
+ sparc_mod(unsigned long m, unsigned long p)
+ {
+        unsigned long i, t, inc;
+@@ -118,7 +118,7 @@ do {    register Elf32_Addr pc __asm__("o7"); \
+ /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
+    first element of the GOT.  This must be inlined in a function which
+    uses global data.  */
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_dynamic (void)
+ {
+        register Elf32_Addr *got __asm__ ("%l7");
+@@ -129,7 +129,7 @@ elf_machine_dynamic (void)
+ }
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_load_address (void)
+ {
+        register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7");
+@@ -148,7 +148,7 @@ elf_machine_load_address (void)
+        return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+diff --git a/ldso/ldso/xtensa/dl-sysdep.h b/ldso/ldso/xtensa/dl-sysdep.h
+index daae428..07b9b79 100644
+--- a/ldso/ldso/xtensa/dl-sysdep.h
++++ b/ldso/ldso/xtensa/dl-sysdep.h
+@@ -85,7 +85,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
+   (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
+ 
+ /* Return the link-time address of _DYNAMIC.  */
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_dynamic (void)
+ {
+   /* This function is only used while bootstrapping the runtime linker.
+@@ -95,7 +95,7 @@ elf_machine_dynamic (void)
+ }
+ 
+ /* Return the run-time load address of the shared object.  */
+-static __inline__ Elf32_Addr
++static __always_inline Elf32_Addr
+ elf_machine_load_address (void)
+ {
+   Elf32_Addr addr, tmp;
+@@ -116,7 +116,7 @@ elf_machine_load_address (void)
+   return addr - 3;
+ }
+ 
+-static __inline__ void
++static __always_inline void
+ elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
+                      Elf32_Word relative_count)
+ {
+-- 
+1.6.3.3.444.g4ecbc
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch
new file mode 100644
index 0000000000..e222668a66
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch
@@ -0,0 +1,218 @@
+Index: uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S
+===================================================================
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S  2008-08-28 00:22:06.278340855 +0200
+@@ -0,0 +1,78 @@
++/* Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Philip Blundell <philb@gnu.org>.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <sysdep-cancel.h>
++#define _ERRNO_H       1
++#include <bits/errno.h>
++#include <kernel-features.h>
++
++/* Clone the calling process, but without copying the whole address space.
++   The calling process is suspended until the new process exits or is
++   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
++   and the process ID of the new process to the old process.  */
++
++ENTRY (__vfork)
++
++#ifdef __NR_vfork
++
++#ifdef SHARED
++       ldr     ip, 1f
++       ldr     r0, 2f
++3:     add     ip, pc, ip
++       ldr     r0, [ip, r0]
++#else
++       ldr     r0, 1f
++#endif
++       movs    r0, r0
++       bne     HIDDEN_JUMPTARGET (__fork)
++
++       DO_CALL (vfork, 0)
++       cmn     a1, #4096
++       RETINSTR(cc, lr)
++
++#ifndef __ASSUME_VFORK_SYSCALL
++       /* Check if vfork syscall is known at all.  */
++       cmn     a1, #ENOSYS
++       bne     PLTJMP(C_SYMBOL_NAME(__syscall_error))
++#endif
++
++#endif
++
++#ifndef __ASSUME_VFORK_SYSCALL
++       /* If we don't have vfork, fork is close enough.  */
++       DO_CALL (fork, 0)
++       cmn     a1, #4096
++       RETINSTR(cc, lr)
++#elif !defined __NR_vfork
++# error "__NR_vfork not available and __ASSUME_VFORK_SYSCALL defined"
++#endif
++       b       PLTJMP(C_SYMBOL_NAME(__syscall_error))
++
++#ifdef SHARED
++1:     .word   _GLOBAL_OFFSET_TABLE_ - 3b - 8
++2:     .word   __libc_pthread_functions(GOTOFF)
++#else
++       .weak   pthread_create
++1:     .word   pthread_create
++#endif
++
++PSEUDO_END (__vfork)
++libc_hidden_def (__vfork)
++
++weak_alias (__vfork, vfork)
+Index: uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+===================================================================
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h  2008-08-28 00:28:04.301636993 +0200
+@@ -0,0 +1,130 @@
++/* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Phil Blundell <pb@nexus.co.uk>, 2003.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <tls.h>
++#include <pt-machine.h>
++#ifndef __ASSEMBLER__
++# include <linuxthreads/internals.h>
++#endif
++
++#if !defined NOT_IN_libc || defined IS_IN_libpthread
++
++/* We push lr onto the stack, so we have to use ldmib instead of ldmia
++   to find the saved arguments.  */
++# ifdef PIC
++#  undef DOARGS_5
++#  undef DOARGS_6
++#  undef DOARGS_7
++#  define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8];
++#  define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5};
++#  define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6};
++# endif
++
++# undef PSEUDO_RET
++# define PSEUDO_RET                                                    \
++    ldrcc pc, [sp], $4;                                                        \
++    ldr        lr, [sp], $4;                                                   \
++    b PLTJMP(SYSCALL_ERROR)
++
++# undef PSEUDO
++# define PSEUDO(name, syscall_name, args)                              \
++  .section ".text";                                                    \
++    PSEUDO_PROLOGUE;                                                   \
++  ENTRY (name);                                                                \
++    SINGLE_THREAD_P;                                                   \
++    bne .Lpseudo_cancel;                                               \
++    DO_CALL (syscall_name, args);                                      \
++    cmn r0, $4096;                                                     \
++    RETINSTR(cc, lr);                                                  \
++    b PLTJMP(SYSCALL_ERROR);                                           \
++  .Lpseudo_cancel:                                                     \
++    str lr, [sp, $-4]!;                                                        \
++    DOCARGS_##args;    /* save syscall args around CENABLE.  */        \
++    CENABLE;                                                           \
++    mov ip, r0;                /* put mask in safe place.  */                  \
++    UNDOCARGS_##args;  /* restore syscall args.  */                    \
++    swi SYS_ify (syscall_name);        /* do the call.  */                     \
++    str r0, [sp, $-4]!; /* save syscall return value.  */              \
++    mov r0, ip;                /* get mask back.  */                           \
++    CDISABLE;                                                          \
++    ldr r0, [sp], $4;  /* retrieve return value.  */                   \
++    UNDOC2ARGS_##args; /* fix register damage.  */                     \
++    cmn r0, $4096;
++
++# define DOCARGS_0
++# define UNDOCARGS_0
++# define UNDOC2ARGS_0
++
++# define DOCARGS_1     str r0, [sp, #-4]!;
++# define UNDOCARGS_1   ldr r0, [sp], #4;
++# define UNDOC2ARGS_1
++
++# define DOCARGS_2     str r1, [sp, #-4]!; str r0, [sp, #-4]!;
++# define UNDOCARGS_2   ldr r0, [sp], #4; ldr r1, [sp], #4;
++# define UNDOC2ARGS_2
++
++# define DOCARGS_3     str r2, [sp, #-4]!; str r1, [sp, #-4]!; str r0, [sp, #-4]!;
++# define UNDOCARGS_3   ldr r0, [sp], #4; ldr r1, [sp], #4; ldr r2, [sp], #4
++# define UNDOC2ARGS_3
++
++# define DOCARGS_4     stmfd sp!, {r0-r3}
++# define UNDOCARGS_4   ldmfd sp!, {r0-r3}
++# define UNDOC2ARGS_4
++
++# define DOCARGS_5     stmfd sp!, {r0-r3}
++# define UNDOCARGS_5   ldmfd sp, {r0-r3}; str r4, [sp, #-4]!; ldr r4, [sp, #24]
++# define UNDOC2ARGS_5   ldr r4, [sp], #20
++
++# ifdef IS_IN_libpthread
++#  define CENABLE      bl PLTJMP(__pthread_enable_asynccancel)
++#  define CDISABLE     bl PLTJMP(__pthread_disable_asynccancel)
++#  define __local_multiple_threads __pthread_multiple_threads
++# else
++#  define CENABLE      bl PLTJMP(__libc_enable_asynccancel)
++#  define CDISABLE     bl PLTJMP(__libc_disable_asynccancel)
++#  define __local_multiple_threads __libc_multiple_threads
++# endif
++
++# ifndef __ASSEMBLER__
++extern int __local_multiple_threads attribute_hidden;
++#  define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
++# else
++#  if !defined PIC
++#   define SINGLE_THREAD_P                                             \
++  ldr ip, =__local_multiple_threads;                                   \
++  ldr ip, [ip];                                                                \
++  teq ip, #0;
++#   define PSEUDO_PROLOGUE
++#  else
++#   define SINGLE_THREAD_P                                             \
++  ldr ip, 1b;                                                          \
++2:                                                                     \
++  ldr ip, [pc, ip];                                                    \
++  teq ip, #0;
++#   define PSEUDO_PROLOGUE                                             \
++  1:  .word __local_multiple_threads - 2f - 8;
++#  endif
++# endif
++
++#elif !defined __ASSEMBLER__
++
++/* This code should never be used but we define it anyhow.  */
++# define SINGLE_THREAD_P (1)
++
++#endif
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine
new file mode 100644
index 0000000000..2d9f63e531
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 22:07:03 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_WANTS_BIG_ENDIAN=y
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine
new file mode 100644
index 0000000000..85f70f70c7
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+UCLIBC_HAS_SOFT_FLOAT=n
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine
new file mode 100644
index 0000000000..85f70f70c7
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+UCLIBC_HAS_SOFT_FLOAT=n
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch
new file mode 100644
index 0000000000..b9ff6710bc
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch
@@ -0,0 +1,31 @@
+Index: uClibc-0.9.30.1/extra/scripts/unifdef.c
+===================================================================
+--- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c        2009-08-09 11:55:23.000000000 +0200
++++ uClibc-0.9.30.1/extra/scripts/unifdef.c     2009-08-09 11:55:46.000000000 +0200
+@@ -206,7 +206,7 @@
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
+-static Linetype         getline(void);
++static Linetype         _getline(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);
+ static void             ignoreon(void);
+@@ -512,7 +512,7 @@
+ 
+        for (;;) {
+                linenum++;
+-               lineval = getline();
++               lineval = _getline();
+                trans_table[ifstate[depth]][lineval]();
+                debug("process %s -> %s depth %d",
+                    linetype_name[lineval],
+@@ -526,7 +526,7 @@
+  * help from skipcomment().
+  */
+ static Linetype
+-getline(void)
++_getline(void)
+ {
+        const char *cp;
+        int cursym;
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
new file mode 100644
index 0000000000..cfa68ce52d
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
@@ -0,0 +1,21 @@
+Index: uClibc/ldso/ldso/arm/resolve.S
+===================================================================
+--- uClibc.orig/ldso/ldso/arm/resolve.S 2009-03-20 12:03:32.000000000 -0700
++++ uClibc/ldso/ldso/arm/resolve.S      2009-03-20 12:04:23.000000000 -0700
+@@ -97,7 +97,6 @@
+ 
+  .text
+  .align 4      @ 16 byte boundary and there are 32 bytes below (arm case)
+- #if !defined(__thumb__) || defined(__thumb2__)
+  .arm
+  .globl _dl_linux_resolve
+  .type _dl_linux_resolve,%function
+@@ -129,7 +128,7 @@
+ #else
+        mov pc,ip
+ #endif
+-#else
++#if 0
+        @ In the thumb case _dl_linux_resolver is thumb.  If a bl is used
+        @ from arm code the linker will insert a stub call which, with
+        @ binutils 2.16, is not PIC.  Since this code is accessed by an
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch
new file mode 100644
index 0000000000..f6f32cdd29
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch
@@ -0,0 +1,291 @@
+Index: uClibc/libpthread/linuxthreads/descr.h
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/descr.h 2008-08-27 23:59:46.171809044 +0200
++++ uClibc/libpthread/linuxthreads/descr.h      2008-08-28 00:00:35.435134759 +0200
+@@ -123,9 +123,9 @@
+       union dtv *dtvp;
+       pthread_descr self;      /* Pointer to this structure */
+       int multiple_threads;
+-# ifdef NEED_DL_SYSINFO
+       uintptr_t sysinfo;
+-# endif
++      uintptr_t stack_guard;
++      uintptr_t pointer_guard;
+     } data;
+     void *__padding[16];
+   } p_header;
+@@ -193,6 +193,13 @@
+   size_t p_alloca_cutoff;      /* Maximum size which should be allocated
+                                   using alloca() instead of malloc().  */
+   /* New elements must be added at the end.  */
++
++  /* This member must be last.  */
++  char end_padding[];
++
++#define PTHREAD_STRUCT_END_PADDING \
++  (sizeof (struct _pthread_descr_struct)                             \
++   - offsetof (struct _pthread_descr_struct, end_padding))
+ } __attribute__ ((aligned(32))); /* We need to align the structure so that
+                                    doubles are aligned properly.  This is 8
+                                    bytes on MIPS and 16 bytes on MIPS64.
+Index: uClibc/libpthread/linuxthreads/manager.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/manager.c       2008-08-27 23:59:54.185140485 +0200
++++ uClibc/libpthread/linuxthreads/manager.c    2008-08-28 00:00:35.435134759 +0200
+@@ -679,6 +679,17 @@
+   new_thread->p_inheritsched = attr ? attr->__inheritsched : 0;
+   new_thread->p_alloca_cutoff = stksize / 4 > __MAX_ALLOCA_CUTOFF
+                                 ? __MAX_ALLOCA_CUTOFF : stksize / 4;
++
++  /* Copy the stack guard canary.  */
++#ifdef THREAD_COPY_STACK_GUARD
++  THREAD_COPY_STACK_GUARD (new_thread);
++#endif
++
++  /* Copy the pointer guard value.  */
++#ifdef THREAD_COPY_POINTER_GUARD
++  THREAD_COPY_POINTER_GUARD (new_thread);
++#endif
++
+   /* Initialize the thread handle */
+   __pthread_init_lock(&__pthread_handles[sseg].h_lock);
+   __pthread_handles[sseg].h_descr = new_thread;
+@@ -742,15 +753,15 @@
+          pid = __clone2(pthread_start_thread_event,
+                 (void **)new_thread_bottom,
+                         (char *)stack_addr - new_thread_bottom,
+-                        CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                        CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+                         __pthread_sig_cancel, new_thread);
+ #elif _STACK_GROWS_UP
+          pid = __clone(pthread_start_thread_event, (void *) new_thread_bottom,
+-                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+                        __pthread_sig_cancel, new_thread);
+ #else
+          pid = __clone(pthread_start_thread_event, stack_addr,
+-                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+                        __pthread_sig_cancel, new_thread);
+ #endif
+          saved_errno = errno;
+@@ -783,15 +794,15 @@
+       pid = __clone2(pthread_start_thread,
+                     (void **)new_thread_bottom,
+                      (char *)stack_addr - new_thread_bottom,
+-                    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+                     __pthread_sig_cancel, new_thread);
+ #elif _STACK_GROWS_UP
+       pid = __clone(pthread_start_thread, (void *) new_thread_bottom,
+-                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+                    __pthread_sig_cancel, new_thread);
+ #else
+       pid = __clone(pthread_start_thread, stack_addr,
+-                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+                    __pthread_sig_cancel, new_thread);
+ #endif /* !NEED_SEPARATE_REGISTER_STACK */
+       saved_errno = errno;
+@@ -892,10 +903,11 @@
+ #ifdef _STACK_GROWS_UP
+ # ifdef USE_TLS
+       size_t stacksize = guardaddr - th->p_stackaddr;
++      guardaddr = th->p_stackaddr;
+ # else
+       size_t stacksize = guardaddr - (char *)th;
+-# endif
+       guardaddr = (char *)th;
++# endif
+ #else
+       /* Guardaddr is always set, even if guardsize is 0.  This allows
+         us to compute everything else.  */
+Index: uClibc/libpthread/linuxthreads/pthread.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/pthread.c       2008-08-28 00:00:00.825141935 +0200
++++ uClibc/libpthread/linuxthreads/pthread.c    2008-08-28 00:00:35.438472147 +0200
+@@ -698,6 +698,16 @@
+   mgr = &__pthread_manager_thread;
+ #endif
+ 
++  /* Copy the stack guard canary.  */
++#ifdef THREAD_COPY_STACK_GUARD
++  THREAD_COPY_STACK_GUARD (mgr);
++#endif
++
++  /* Copy the pointer guard value.  */
++#ifdef THREAD_COPY_POINTER_GUARD
++  THREAD_COPY_POINTER_GUARD (mgr);
++#endif
++
+   __pthread_manager_request = manager_pipe[1]; /* writing end */
+   __pthread_manager_reader = manager_pipe[0]; /* reading end */
+ 
+@@ -738,17 +748,17 @@
+          pid = __clone2(__pthread_manager_event,
+                         (void **) __pthread_manager_thread_bos,
+                         THREAD_MANAGER_STACK_SIZE,
+-                        CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
++                        CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM,
+                         mgr);
+ #elif _STACK_GROWS_UP
+          pid = __clone(__pthread_manager_event,
+                        (void **) __pthread_manager_thread_bos,
+-                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
++                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM,
+                        mgr);
+ #else
+          pid = __clone(__pthread_manager_event,
+                        (void **) __pthread_manager_thread_tos,
+-                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
++                       CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM,
+                        mgr);
+ #endif
+ 
+@@ -778,13 +788,13 @@
+ #ifdef NEED_SEPARATE_REGISTER_STACK
+       pid = __clone2(__pthread_manager, (void **) __pthread_manager_thread_bos,
+                     THREAD_MANAGER_STACK_SIZE,
+-                    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr);
++                    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr);
+ #elif _STACK_GROWS_UP
+       pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_bos,
+-                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr);
++                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr);
+ #else
+       pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_tos,
+-                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr);
++                   CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr);
+ #endif
+     }
+   if (__builtin_expect (pid, 0) == -1) {
+@@ -971,6 +981,10 @@
+     struct pthread_request request;
+     pthread_descr self = thread_self();
+ 
++    /* Make sure we come back here after suspend(), in case we entered
++       from a signal handler.  */
++    THREAD_SETMEM(self, p_signal_jmp, NULL);
++
+     request.req_thread = self;
+     request.req_kind = REQ_PROCESS_EXIT;
+     request.req_args.exit.code = retcode;
+@@ -1198,13 +1212,13 @@
+ 
+ void __pthread_restart_old(pthread_descr th)
+ {
+-  if (atomic_increment(&th->p_resume_count) == -1)
++  if (pthread_atomic_increment(&th->p_resume_count) == -1)
+     kill(th->p_pid, __pthread_sig_restart);
+ }
+ 
+ void __pthread_suspend_old(pthread_descr self)
+ {
+-  if (atomic_decrement(&self->p_resume_count) <= 0)
++  if (pthread_atomic_decrement(&self->p_resume_count) <= 0)
+     __pthread_wait_for_restart_signal(self);
+ }
+ 
+@@ -1215,7 +1229,7 @@
+   int was_signalled = 0;
+   sigjmp_buf jmpbuf;
+ 
+-  if (atomic_decrement(&self->p_resume_count) == 0) {
++  if (pthread_atomic_decrement(&self->p_resume_count) == 0) {
+     /* Set up a longjmp handler for the restart signal, unblock
+        the signal and sleep. */
+ 
+@@ -1272,9 +1286,9 @@
+      being delivered. */
+ 
+   if (!was_signalled) {
+-    if (atomic_increment(&self->p_resume_count) != -1) {
++    if (pthread_atomic_increment(&self->p_resume_count) != -1) {
+       __pthread_wait_for_restart_signal(self);
+-      atomic_decrement(&self->p_resume_count); /* should be zero now! */
++      pthread_atomic_decrement(&self->p_resume_count); /* should be zero now! */
+       /* woke spontaneously and consumed restart signal */
+       return 1;
+     }
+Index: uClibc/libpthread/linuxthreads/specific.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/specific.c      2008-08-28 00:00:07.595139286 +0200
++++ uClibc/libpthread/linuxthreads/specific.c   2008-08-28 00:00:35.438472147 +0200
+@@ -104,13 +104,14 @@
+      that if the key is reallocated later by pthread_key_create, its
+      associated values will be NULL in all threads.
+ 
+-     If no threads have been created yet, clear it just in the
+-     current thread.  */
++     If no threads have been created yet, or if we are exiting, clear
++     it just in the current thread.  */
+ 
+   struct pthread_key_delete_helper_args args;
+   args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
+   args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
+-  if (__pthread_manager_request != -1)
++  if (__pthread_manager_request != -1
++      && !(__builtin_expect (__pthread_exit_requested, 0)))
+     {
+       struct pthread_request request;
+ 
+@@ -203,8 +204,9 @@
+   __pthread_lock(THREAD_GETMEM(self, p_lock), self);
+   for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
+     if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) {
+-      free(THREAD_GETMEM_NC(self, p_specific[i]));
++      void *p = THREAD_GETMEM_NC(self, p_specific[i]);
+       THREAD_SETMEM_NC(self, p_specific[i], NULL);
++      free(p);
+     }
+   }
+   __pthread_unlock(THREAD_GETMEM(self, p_lock));
+Index: uClibc/libpthread/linuxthreads/spinlock.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/spinlock.c      2008-08-28 00:00:17.805140454 +0200
++++ uClibc/libpthread/linuxthreads/spinlock.c   2008-08-28 00:00:35.438472147 +0200
+@@ -637,8 +637,20 @@
+ #if defined HAS_COMPARE_AND_SWAP
+        wait_node_dequeue(pp_head, pp_max_prio, p_max_prio);
+ #endif
++
++      /* Release the spinlock before restarting.  */
++#if defined TEST_FOR_COMPARE_AND_SWAP
++      if (!__pthread_has_cas)
++#endif
++#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
++       {
++         __pthread_release(&lock->__spinlock);
++       }
++#endif
++
+       restart(p_max_prio->thr);
+-      break;
++
++      return;
+     }
+   }
+ 
+Index: uClibc/libpthread/linuxthreads/spinlock.h
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/spinlock.h      2008-08-28 00:00:24.768471655 +0200
++++ uClibc/libpthread/linuxthreads/spinlock.h   2008-08-28 00:02:42.971786951 +0200
+@@ -172,7 +172,7 @@
+ 
+ /* Operations on pthread_atomic, which is defined in internals.h */
+ 
+-static __inline__ long atomic_increment(struct pthread_atomic *pa)
++static __inline__ long pthread_atomic_increment(struct pthread_atomic *pa)
+ {
+     long oldval;
+ 
+@@ -184,7 +184,7 @@
+ }
+ 
+ 
+-static __inline__ long atomic_decrement(struct pthread_atomic *pa)
++static __inline__ long pthread_atomic_decrement(struct pthread_atomic *pa)
+ {
+     long oldval;
+ 
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine
new file mode 100644
index 0000000000..5df15f94cb
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Fri Nov 23 15:49:33 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
+UCLIBC_HAS_FENV=y
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/pthread_atfork.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/pthread_atfork.patch
new file mode 100644
index 0000000000..92accc2a1a
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/pthread_atfork.patch
@@ -0,0 +1,42 @@
+Index: uClibc-0.9.30/libpthread/linuxthreads/Makefile.in
+===================================================================
+--- uClibc-0.9.30.orig/libpthread/linuxthreads/Makefile.in      2009-01-11 01:09:27.008515954 +0100
++++ uClibc-0.9.30/libpthread/linuxthreads/Makefile.in   2009-01-11 01:09:35.295181636 +0100
+@@ -45,7 +45,7 @@
+ pthread_SRC := \
+        attr barrier cancel condvar errno events join pthread \
+        lockfile manager mutex pt-machine ptcleanup \
+-       ptclock_gettime ptclock_settime ptfork pthandles \
++       ptclock_gettime ptclock_settime ptfork pthandles pthread_atfork \
+        pthread_setegid pthread_seteuid pthread_setgid pthread_setregid \
+        pthread_setresgid pthread_setresuid pthread_setreuid pthread_setuid \
+        rwlock semaphore sighandler signals specific spinlock
+Index: uClibc-0.9.30/libpthread/linuxthreads/pthread_atfork.c
+===================================================================
+--- uClibc-0.9.30.orig/libpthread/linuxthreads/pthread_atfork.c 2009-01-11 01:09:44.931848926 +0100
++++ uClibc-0.9.30/libpthread/linuxthreads/pthread_atfork.c      2009-01-11 01:12:49.926539743 +0100
+@@ -43,12 +43,8 @@
+ 
+ /* Hide the symbol so that no definition but the one locally in the
+    executable or DSO is used.  */
+-int
+-#ifndef __pthread_atfork
+-/* Don't mark the compatibility function as hidden.  */
+-attribute_hidden
+-#endif
+-__pthread_atfork (prepare, parent, child)
++
++int attribute_hidden __pthread_atfork (prepare, parent, child)
+      void (*prepare) (void);
+      void (*parent) (void);
+      void (*child) (void);
+@@ -56,8 +52,5 @@
+   return __register_atfork (prepare, parent, child,
+                            &__dso_handle == NULL ? NULL : __dso_handle);
+ }
+-#ifndef __pthread_atfork
+-extern int pthread_atfork (void (*prepare) (void), void (*parent) (void),
+-                          void (*child) (void)) attribute_hidden;
++
+ strong_alias (__pthread_atfork, pthread_atfork)
+-#endif
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine
new file mode 100644
index 0000000000..fafdd7584e
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+CONFIG_ARM926T=y
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/bad/path/to/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine
new file mode 100644
index 0000000000..44fec169c8
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine
@@ -0,0 +1,68 @@
+#
+# Automatically generated make config: don't edit
+# Fri Nov 23 15:49:33 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine
new file mode 100644
index 0000000000..44fec169c8
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine
@@ -0,0 +1,68 @@
+#
+# Automatically generated make config: don't edit
+# Fri Nov 23 15:49:33 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.config b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.config
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.distro b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.distro
new file mode 100644
index 0000000000..042ea4c547
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.distro
@@ -0,0 +1,148 @@
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+LDSO_GNU_HASH_SUPPORT=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+# UCLIBC_HAS_STDIO_GETC_MACRO is not set
+# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=n
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
+
+# math stuff for perl
+DO_C99_MATH=y
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm
new file mode 100644
index 0000000000..6e89444a64
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uclibc-c99-ldbl-math.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uclibc-c99-ldbl-math.patch
new file mode 100644
index 0000000000..f3718431ea
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uclibc-c99-ldbl-math.patch
@@ -0,0 +1,474 @@
+Index: uClibc-0.9.30.1/libm/ldouble_wrappers.c
+===================================================================
+--- uClibc-0.9.30.1/libm/ldouble_wrappers.c     (revision 25552)
++++ uClibc-0.9.30.1/libm/ldouble_wrappers.c     (working copy)
+@@ -13,6 +13,16 @@
+ #include "math.h"
+ #include <complex.h>
+ 
++#if defined __NO_LONG_DOUBLE_MATH
++# define int_WRAPPER_C99(func) /* not needed */
++# else
++# define int_WRAPPER_C99(func) \
++int func##l(long double x) \
++{ \
++    return func((double) x); \
++} \
++libm_hidden_def(func##l)
++#endif
+ 
+ /* Implement the following, as defined by SuSv3 */
+ #if 0
+@@ -543,46 +553,28 @@ long double truncl (long double x)
+ #endif
+ 
+ 
+-#ifdef __DO_C99_MATH__
++#if defined __DO_C99_MATH__
+ 
+ #ifdef L_fpclassifyl
+-int __fpclassifyl (long double x)
+-{
+-       return __fpclassify ( (double) x );
+-}
+-libm_hidden_def(__fpclassifyl)
++int_WRAPPER_C99(__fpclassify)
+ #endif
+ 
+ #ifdef L_finitel
+-int __finitel (long double x)
+-{
+-       return __finite ( (double)x );
+-}
+-libm_hidden_def(__finitel)
++int_WRAPPER_C99(__finite)
+ #endif
+ 
+ #ifdef L_signbitl
+-int __signbitl (long double x)
+-{
+-       return __signbitl ( (double)x );
+-}
+-libm_hidden_def(__signbitl)
++int_WRAPPER_C99(__signbit)
+ #endif
+ 
+ #ifdef L_isnanl
+-int __isnanl (long double x)
+-{
+-       return __isnan ( (double)x );
+-}
+-libm_hidden_def(__isnanl)
++int_WRAPPER_C99(__isnan)
+ #endif
+ 
+ #ifdef L_isinfl
+-int __isinfl (long double x)
+-{
+-       return __isinf ( (double)x );
+-}
+-libm_hidden_def(__isinfl)
++int_WRAPPER_C99(__isinf)
+ #endif
+ 
+-#endif
++#endif /* DO_C99_MATH */
++
++#undef int_WRAPPER_C99
+Index: uClibc-0.9.30.1/libm/nan.c
+===================================================================
+--- uClibc-0.9.30.1/libm/nan.c  (revision 25552)
++++ uClibc-0.9.30.1/libm/nan.c  (working copy)
+@@ -45,7 +45,7 @@ float nanf (const char *tagp)
+ }
+ libm_hidden_def(nanf)
+ 
+-#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __NO_LONG_DOUBLE_MATH
+ libm_hidden_proto(nanl)
+ long double nanl (const char *tagp)
+ {
+Index: uClibc-0.9.30.1/include/math.h
+===================================================================
+--- uClibc-0.9.30.1/include/math.h      (revision 25552)
++++ uClibc-0.9.30.1/include/math.h      (working copy)
+@@ -118,7 +118,7 @@ __BEGIN_DECLS
+ # undef        __MATH_PRECNAME
+ 
+ # if (__STDC__ - 0 || __GNUC__ - 0) \
+-     && (defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ || defined __LDBL_COMPAT)
++     && (!defined __NO_LONG_DOUBLE_MATH || defined __LDBL_COMPAT)
+ #  ifdef __LDBL_COMPAT
+ 
+ #   ifdef __USE_ISOC99
+@@ -230,7 +230,7 @@ enum
+   };
+ 
+ /* Return number of classification appropriate for X.  */
+-# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# ifdef __NO_LONG_DOUBLE_MATH
+ #  define fpclassify(x) \
+      (sizeof (x) == sizeof (float) ? __fpclassifyf (x) : __fpclassify (x))
+ # else
+@@ -242,7 +242,7 @@ enum
+ # endif
+ 
+ /* Return nonzero value if sign of X is negative.  */
+-# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# ifdef __NO_LONG_DOUBLE_MATH
+ #  define signbit(x) \
+      (sizeof (x) == sizeof (float) ? __signbitf (x) : __signbit (x))
+ # else
+@@ -254,7 +254,7 @@ enum
+ # endif
+ 
+ /* Return nonzero value if X is not +-Inf or NaN.  */
+-# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# ifdef __NO_LONG_DOUBLE_MATH
+ #  define isfinite(x) \
+      (sizeof (x) == sizeof (float) ? __finitef (x) : __finite (x))
+ # else
+@@ -270,7 +270,7 @@ enum
+ 
+ /* Return nonzero value if X is a NaN.  We could use `fpclassify' but
+    we already have this functions `__isnan' and it is faster.  */
+-# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# ifdef __NO_LONG_DOUBLE_MATH
+ #  define isnan(x) \
+      (sizeof (x) == sizeof (float) ? __isnanf (x) : __isnan (x))
+ # else
+@@ -282,7 +282,7 @@ enum
+ # endif
+ 
+ /* Return nonzero value is X is positive or negative infinity.  */
+-# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# ifdef __NO_LONG_DOUBLE_MATH
+ #  define isinf(x) \
+      (sizeof (x) == sizeof (float) ? __isinff (x) : __isinf (x))
+ # else
+Index: uClibc-0.9.30.1/include/tgmath.h
+===================================================================
+--- uClibc-0.9.30.1/include/tgmath.h    (revision 25552)
++++ uClibc-0.9.30.1/include/tgmath.h    (working copy)
+@@ -36,7 +36,7 @@
+ 
+ #if __GNUC_PREREQ (2, 7)
+ 
+-# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# ifdef __NO_LONG_DOUBLE_MATH
+ #  define __tgml(fct) fct
+ # else
+ #  define __tgml(fct) fct ## l
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/wordsize.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/wordsize.h  (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/wordsize.h  (working copy)
+@@ -7,13 +7,13 @@
+ # define __WORDSIZE    32
+ #endif
+ 
+-#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __LONG_DOUBLE_MATH_OPTIONAL
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
+ 
+ /* Signal the glibc ABI didn't used to have a `long double'.
+    The changes all the `long double' function variants to be redirects
+    to the double functions.  */
+ # define __LONG_DOUBLE_MATH_OPTIONAL   1
+ # ifndef __LONG_DOUBLE_128__
+-#  undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  define __NO_LONG_DOUBLE_MATH        1
+ # endif
+ #endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/mathdef.h   (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/mathdef.h   (working copy)
+@@ -65,11 +65,13 @@ typedef double double_t;
+ 
+ #endif /* ISO C99 */
+ 
+-#ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#ifndef __NO_LONG_DOUBLE_MATH
+ #include <bits/wordsize.h>
+ /* Signal that we do not really have a `long double'.  The disables the
+    declaration of all the `long double' function variants.  */
+ # if __WORDSIZE == 32
+-#  undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  define __NO_LONG_DOUBLE_MATH        1
++# elif !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  define __NO_LONG_DOUBLE_MATH        1
+ # endif  /* __WORDSIZE == 32 */
+-#endif  /* __UCLIBC_HAS_LONG_DOUBLE_MATH__ */
++#endif  /* __NO_LONG_DOUBLE_MATH */
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/mathdef.h       (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/mathdef.h       (working copy)
+@@ -34,3 +34,11 @@ typedef double double_t;     /* `double' exp
+ # define FP_ILOGBNAN   (2147483647)
+ 
+ #endif /* ISO C99 */
++
++#ifndef __NO_LONG_DOUBLE_MATH
++/* Signal that we do not really have a `long double'.  This disables the
++   declaration of all the `long double' function variants.  */
++/* XXX The FPA does support this but the patterns in GCC are currently
++   turned off.  */
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/mathdef.h      (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/mathdef.h      (working copy)
+@@ -36,3 +36,7 @@ typedef long double double_t; /* `double
+ # define FP_ILOGBNAN   (2147483647)
+ 
+ #endif /* ISO C99 */
++
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/wordsize.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/wordsize.h    (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/wordsize.h    (working copy)
+@@ -18,13 +18,13 @@
+ 
+ #define __WORDSIZE     64
+ 
+-#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __LONG_DOUBLE_MATH_OPTIONAL
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
+ 
+ /* Signal that we didn't used to have a `long double'. The changes all
+    the `long double' function variants to be redirects to the double
+    functions.  */
+ # define __LONG_DOUBLE_MATH_OPTIONAL   1
+ # ifndef __LONG_DOUBLE_128__
+-#  undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  define __NO_LONG_DOUBLE_MATH                1
+ # endif
+ #endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/mathdef.h     (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/mathdef.h     (working copy)
+@@ -78,3 +78,7 @@ typedef double double_t;
+ 
+ # endif /* GNUC before 3.4 */
+ #endif /* COMPLEX_H */
++
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/common/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/common/bits/mathdef.h    (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/common/bits/mathdef.h    (working copy)
+@@ -35,3 +35,9 @@ typedef double double_t;      /* `double' exp
+ # define FP_ILOGBNAN   2147483647
+ 
+ #endif /* ISO C99 */
++
++#ifndef __NO_LONG_DOUBLE_MATH
++/* Signal that we do not really have a `long double'.  The disables the
++   declaration of all the `long double' function variants.  */
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/mathdef.h      (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/mathdef.h      (working copy)
+@@ -44,3 +44,7 @@ typedef long double double_t; /* `double
+ # define FP_ILOGBNAN   (-2147483647 - 1)
+ 
+ #endif /* ISO C99 */
++
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/nios2/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/nios2/bits/mathdef.h     (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/nios2/bits/mathdef.h     (working copy)
+@@ -34,3 +34,11 @@ typedef double double_t;     /* `double' exp
+ # define FP_ILOGBNAN   (2147483647)
+ 
+ #endif /* ISO C99 */
++
++#ifndef __NO_LONG_DOUBLE_MATH
++/* Signal that we do not really have a `long double'.  This disables the
++   declaration of all the `long double' function variants.  */
++/* XXX The FPA does support this but the patterns in GCC are currently
++   turned off.  */
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/mathdef.h    (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/mathdef.h    (working copy)
+@@ -46,3 +46,7 @@ typedef long double double_t; /* `double
+ # define FP_ILOGBNAN   (-2147483647 - 1)
+ 
+ #endif /* ISO C99 */
++
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/mathdef.h    (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/mathdef.h    (working copy)
+@@ -36,8 +36,8 @@ typedef double double_t;      /* `double' exp
+ 
+ #endif /* ISO C99 */
+ 
+-#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#ifndef __NO_LONG_DOUBLE_MATH
+ /* Signal that we do not really have a `long double'.  The disables the
+    declaration of all the `long double' function variants.  */
+-# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
+ #endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/mathdef.h      (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/mathdef.h      (working copy)
+@@ -35,3 +35,7 @@ typedef double double_t;      /* `double' exp
+ # define FP_ILOGBNAN   2147483647
+ 
+ #endif /* ISO C99 */
++
++#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/mathdef.h      (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/mathdef.h      (working copy)
+@@ -39,8 +39,10 @@ typedef double double_t;     /* `double' exp
+ 
+ #endif /* ISO C99 */
+ 
+-#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && _MIPS_SIM == _ABIO32
++#if ! defined __NO_LONG_DOUBLE_MATH && _MIPS_SIM == _ABIO32
+ /* Signal that we do not really have a `long double'.  This disables the
+    declaration of all the `long double' function variants.  */
+-# error defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ and _MIPS_SIM == _ABIO32
++# define __NO_LONG_DOUBLE_MATH 1
++#elif !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++# define __NO_LONG_DOUBLE_MATH 1
+ #endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/nios/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/nios/bits/mathdef.h      (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/nios/bits/mathdef.h      (working copy)
+@@ -34,3 +34,11 @@ typedef double double_t;     /* `double' exp
+ # define FP_ILOGBNAN   (2147483647)
+ 
+ #endif /* ISO C99 */
++
++#ifndef __NO_LONG_DOUBLE_MATH
++/* Signal that we do not really have a `long double'.  This disables the
++   declaration of all the `long double' function variants.  */
++/* XXX The FPA does support this but the patterns in GCC are currently
++   turned off.  */
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/wordsize.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/wordsize.h    (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/wordsize.h    (working copy)
+@@ -6,7 +6,7 @@
+ # define __WORDSIZE    32
+ #endif
+ 
+-#if 0 /* uClibc: done in mathdefs.h: defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __LONG_DOUBLE_MATH_OPTIONAL*/
++#if 0 /* uClibc: done in mathdefs.h: !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL*/
+ 
+ # if __WORDSIZE == 32
+ /* Signal that in 32bit ABI we didn't used to have a `long double'.
+@@ -14,7 +14,7 @@
+    to the double functions.  */
+ #  define __LONG_DOUBLE_MATH_OPTIONAL   1
+ #  ifndef __LONG_DOUBLE_128__
+-#   undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#   define __NO_LONG_DOUBLE_MATH        1
+ #  endif
+ # endif
+ #endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathdef.h     (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathdef.h     (working copy)
+@@ -57,13 +57,15 @@ typedef double double_t;
+ 
+ #endif /* ISO C99 */
+ 
+-#ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#ifndef __NO_LONG_DOUBLE_MATH
+ 
+ # if __WORDSIZE == 32
+ /* Signal that in 32bit ABI we do not really have a `long double'.
+    The disables the declaration of all the `long double' function
+    variants.  */
+-#  undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  define __NO_LONG_DOUBLE_MATH        1
++# elif !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  define __NO_LONG_DOUBLE_MATH        1
+ # endif
+ 
+ #endif
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathinline.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathinline.h  (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathinline.h  (working copy)
+@@ -37,7 +37,7 @@
+ 
+ # if __WORDSIZE == 32
+ 
+-#  ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#  ifndef __NO_LONG_DOUBLE_MATH
+ 
+ #   define __unordered_cmp(x, y) \
+   (__extension__                                                             \
+@@ -157,7 +157,7 @@ __NTH (__signbit (double __x))
+   return __u.__i[0] < 0;
+ }
+ 
+-#    ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#    ifndef __NO_LONG_DOUBLE_MATH
+ __MATH_INLINE int
+ __NTH (__signbitl (long double __x))
+ {
+@@ -219,7 +219,7 @@ __NTH (sqrtl (long double __x))
+   _Qp_sqrt (&__r, &__x);
+   return __r;
+ }
+-#   elif defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#   elif !defined __NO_LONG_DOUBLE_MATH
+ __MATH_INLINE long double
+ sqrtl (long double __x) __THROW
+ {
+@@ -257,7 +257,7 @@ __ieee754_sqrtl (long double __x)
+   _Qp_sqrt(&__r, &__x);
+   return __r;
+ }
+-#   elif defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
++#   elif !defined __NO_LONG_DOUBLE_MATH
+ __MATH_INLINE long double
+ __ieee754_sqrtl (long double __x)
+ {
+Index: uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/mathdef.h
+===================================================================
+--- uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/mathdef.h        (revision 25552)
++++ uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/mathdef.h        (working copy)
+@@ -61,3 +61,9 @@ typedef double double_t;
+ # define FP_ILOGBNAN   0x7fffffff
+ 
+ #endif /* ISO C99 */
++
++#ifndef __NO_LONG_DOUBLE_MATH
++/* Signal that we do not really have a `long double'.  The disables the
++   declaration of all the `long double' function variants.  */
++# define __NO_LONG_DOUBLE_MATH 1
++#endif
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/uclibc_ldso_use_O0.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uclibc_ldso_use_O0.patch
new file mode 100644
index 0000000000..7a89e66621
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uclibc_ldso_use_O0.patch
@@ -0,0 +1,13 @@
+Index: uClibc/ldso/ldso/Makefile.in
+===================================================================
+--- uClibc.orig/ldso/ldso/Makefile.in   2009-02-03 17:27:55.000000000 -0800
++++ uClibc/ldso/ldso/Makefile.in        2009-02-03 17:28:11.000000000 -0800
+@@ -8,7 +8,7 @@
+ CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS)
+ 
+ # This stuff will not work with -fomit-frame-pointer
+-CFLAGS-ldso += -fno-omit-frame-pointer
++CFLAGS-ldso += -O0 -fno-omit-frame-pointer
+ 
+ CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso
+ CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\"
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.30.1/x86/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/x86/uClibc.machine
new file mode 100644
index 0000000000..6cd19e851e
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/x86/uClibc.machine
@@ -0,0 +1,72 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.30.1
+# Wed Jul  1 17:04:32 2009
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS="/bla"
+HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-initial_0.9.30.1.bb b/meta/recipes-core/uclibc/uclibc-initial_0.9.30.1.bb
new file mode 100644
index 0000000000..6d21d3a2c5
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-initial_0.9.30.1.bb
@@ -0,0 +1,27 @@
+SECTION = "base"
+require uclibc_${PV}.bb
+
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_install() {
+        # Install initial headers into the cross dir
+        make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+                install_headers
+        #ln -sf include ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/sys-include
+
+        # This conflicts with the c++ version of this header
+        rm -f ${D}${includedir}/bits/atomicity.h
+        install -d ${D}${libdir}/
+        install -m 644 lib/crt[1in].o ${D}${libdir}/
+        install -d ${D}${libdir}/
+        install -m 644 lib/libc.so ${D}${libdir}/
+}
+
+do_compile () {
+        make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+                lib/crt1.o lib/crti.o lib/crtn.o
+        ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+                -o lib/libc.so
+}
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
new file mode 100644
index 0000000000..18392b5c17
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -0,0 +1,183 @@
+DESCRIPTION = "C library for embedded systems"
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "required"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if not uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils \
+           virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers ncurses-native pax-utils-native"
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
+
+# Blackfin needs a wrapper around ld
+#DEPENDS_append_bfin = " elf2flt "
+
+INHIBIT_DEFAULT_DEPS = "1"
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db"
+
+LEAD_SONAME = "libc.so"
+
+# The last line (gdb and lib1) is for uclinux-uclibc builds 
+uclibc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so \
+                   ${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so \
+                   ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so \
+                   ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so \
+                   ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so \
+                   ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \
+                   ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so \
+                   ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so \
+                   ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so \
+                   ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so \
+                   ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so \
+                   ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \
+                   "
+FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
+               ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
+FILES_ldd = "${bindir}/ldd"
+FILES_uclibc-dev += "${libdir}/*.o"
+FILES_uclibc-utils = "${bindir} ${sbindir}"
+FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
+FILES_uclibc-gconv = "${libdir}/gconv"
+FILES_uclibc-thread-db = "/lib/libthread_db*"
+RPROVIDES_uclibc-dev += "libc-dev"
+
+#
+# This locale file gets copied into uClibc-${PV}/extra/locale/ prior to
+# build, it does not need to be unpacked, but we can't inhibit the unpacking
+# in the current build system.
+#
+UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz"
+UCLIBC_LOCALE_FILE_arm = "uClibc-locale-030818.arm.tgz"
+UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
+UCLIBC_LOCALE_URI_arm = "http://wiki.openembedded.net/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
+
+SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
+           file://uClibc.config \
+           http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
+          "
+
+# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
+# the CFLAGS (for when building the utils).
+OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \
+                'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
+EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' \
+                'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}' \
+                ARCH=`grep TARGET_ARCH ${S}/.config|sed -e 's/TARGET_ARCH=//g'`"
+EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
+
+KERNEL_SOURCE = "${STAGING_INCDIR}"
+KERNEL_HEADERS = "${STAGING_INCDIR}"
+
+# Lets munge this via siteinfo.bbclass as well:
+# ARCH_BIG_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN=y
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+
+# How to enable verbose logs:
+#export VERBOSE="1"
+
+configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \
+                s,^KERNEL_HEADERS=.*,KERNEL_HEADERS="${KERNEL_HEADERS}",g; \
+                s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \
+                s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
+                s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
+                s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="/lib",; \
+                s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
+                ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \
+                ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) in ['mips', 'mipsel', 'avr32']]} \
+               '
+
+CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
+
+python () {
+        if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+                bb.data.setVar('configmangle_append', ' s,^HAS_FPU=y,# HAS_FPU is not set,;', d)
+}
+
+uclibcbuild_do_patch() {
+        ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
+        ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
+        
+        ${@['cp %s/%s extra/locale' % (bb.data.getVar('DL_DIR', d, 1) or '', bb.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}
+}
+
+python do_patch () {
+        bb.build.exec_func('base_do_patch', d)
+        bb.build.exec_func('uclibcbuild_do_patch', d)
+}
+
+do_configure() {
+        rm -f ${S}/.config
+
+        # For uClibc 0.9.29, OpenEmbedded splits the uClibc.config in two parts:
+        # uClibc.machine and uClibc.distro. So, if they exist use them, otherwise
+        # use a uClibc.config
+        if [ -f ${WORKDIR}/uClibc.machine -a -f ${WORKDIR}/uClibc.distro ]; then
+                echo "### uClibc.machine ###" >${S}/merged.config
+                cat ${WORKDIR}/uClibc.machine >>${S}/merged.config
+                echo "### uClibc.distro ###" >>${S}/merged.config
+                cat ${WORKDIR}/uClibc.distro >>${S}/merged.config
+        else
+                echo "### uClibc.config ###" >${S}/merged.config
+                cat ${WORKDIR}/uClibc.config >>${S}/merged.config
+        fi
+        cp ${S}/merged.config ${S}/.config      
+
+        # Mangle the resulting .config depending on OE variables
+        perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
+        sed -i -e s:'$(CROSS)strip':true: ${S}/Rules.mak        
+        perl -i -p -e '${configmangle}' ${S}/.config
+
+        sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config
+
+        if [ `echo ${TARGET_ARCH} | grep -e '^arm'` ]; then
+                if [ `echo ${TARGET_OS} | grep -e 'eabi$'` ]; then
+                        echo "CONFIG_ARM_EABI=y"                >> ${S}/.config
+                else
+                        echo "# CONFIG_ARM_EABI is not set"     >> ${S}/.config
+                fi
+        fi
+        yes '' | oe_runmake oldconfig
+}
+
+do_install() {
+        oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+                install_dev install_runtime 
+
+        # Need to overwrite the version from -initial
+        if [ ! -e ${D}${libdir}/libc.so ]; then
+                ln -s ../../lib/libc.so.0 ${D}${libdir}/libc.so
+        fi
+
+        # We don't really need this in ${includedir}
+        rm -f ${D}${prefix}/include/.cvsignore
+
+        # This conflicts with the c++ version of this header
+        rm -f ${D}${prefix}/include/bits/atomicity.h
+
+        oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils
+        oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+                install_utils
+        
+        # oe_runstrip needs +x on files 
+        chmod +x ${D}/${base_libdir}/*
+}
+
diff --git a/meta/recipes-core/uclibc/uclibc_0.9.30.1.bb b/meta/recipes-core/uclibc/uclibc_0.9.30.1.bb
new file mode 100644
index 0000000000..6bdf153a2a
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc_0.9.30.1.bb
@@ -0,0 +1,33 @@
+# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# the config files will typically be correct!)  uclibc-cvs takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
+# try removing it
+#
+# UCLIBC_BASE can be set in a distro file, but whether this works depends
+# on whether the base patches apply to the selected (SRCDATE) svn release.
+#
+UCLIBC_BASE ?= "0.9.30.1"
+
+require uclibc.inc
+PR = "r1"
+
+PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
+
+SRC_URI += "file://uClibc.machine file://uClibc.distro \
+            file://arm-linuxthreads.patch;patch=1 \
+            file://linuxthreads-changes.patch;patch=1 \
+            file://pthread_atfork.patch;patch=1 \
+            file://uclibc_ldso_use_O0.patch;patch=1 \
+            file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
+            file://gcc-4.4-fixlet.patch;patch=1 \
+            file://uclibc-c99-ldbl-math.patch;patch=1 \
+            file://Use-__always_inline-instead-of-__inline__.patch;patch=1 \
+           "
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
+
+S = "${WORKDIR}/uClibc-${UCLIBC_BASE}"
diff --git a/meta/recipes-core/udev/files/50-hostap_cs.rules b/meta/recipes-core/udev/files/50-hostap_cs.rules
new file mode 100644
index 0000000000..efefdc58fc
--- /dev/null
+++ b/meta/recipes-core/udev/files/50-hostap_cs.rules
@@ -0,0 +1,4 @@
+# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards
+#
+ACTION=="add", DEVICE=="hostap_cs", \
+ SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1"
diff --git a/meta/recipes-core/udev/files/akita/mount.blacklist b/meta/recipes-core/udev/files/akita/mount.blacklist
new file mode 100644
index 0000000000..c15b582298
--- /dev/null
+++ b/meta/recipes-core/udev/files/akita/mount.blacklist
@@ -0,0 +1,3 @@
+/dev/mtdblock
+/dev/loop
+/dev/ram
diff --git a/meta/recipes-core/udev/files/c7x0/mount.blacklist b/meta/recipes-core/udev/files/c7x0/mount.blacklist
new file mode 100644
index 0000000000..c15b582298
--- /dev/null
+++ b/meta/recipes-core/udev/files/c7x0/mount.blacklist
@@ -0,0 +1,3 @@
+/dev/mtdblock
+/dev/loop
+/dev/ram
diff --git a/meta/recipes-core/udev/files/devfs-udev.rules b/meta/recipes-core/udev/files/devfs-udev.rules
new file mode 100644
index 0000000000..0ba1ad4e7f
--- /dev/null
+++ b/meta/recipes-core/udev/files/devfs-udev.rules
@@ -0,0 +1,108 @@
+# The use of these rules is not recommended or supported.
+# In a world where devices can come and go at any time, the devfs scheme
+# of simple device enumeration does not help _anything_. Just forget about
+# it. Use custom rules to name your device or look at the persistent device
+# naming scheme, which is implemented for disks and add your subsystem.
+
+# ide block devices
+BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
+
+# md block devices
+KERNEL="md[0-9]*", NAME="md/%n"
+
+# floppy devices
+KERNEL="fd[0-9]*", NAME="floppy/%n"
+
+# tty devices
+KERNEL="tty[0-9]*",    NAME="vc/%n", SYMLINK="%k"
+KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k"
+KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
+
+# vc devices
+KERNEL="vcs",        NAME="vcc/0"
+KERNEL="vcs[0-9]*",  NAME="vcc/%n"
+KERNEL="vcsa",       NAME="vcc/a0"
+KERNEL="vcsa[0-9]*", NAME="vcc/a%n"
+
+# v4l devices
+KERNEL="video[0-9]*", NAME="v4l/video%n"
+KERNEL="radio[0-9]*", NAME="v4l/radio%n"
+KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
+KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
+
+# dm devices (ignore them)
+KERNEL="dm-[0-9]*", NAME=""
+
+# i2c devices
+KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
+
+# loop devices
+KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
+
+# ramdisks
+KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
+
+# framebuffer devices
+KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
+
+# misc
+KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
+KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
+KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
+KERNEL="uinput",  NAME="misc/%k", SYMLINK="%k"
+
+# alsa devices
+KERNEL="controlC[0-9]*", NAME="snd/%k"
+KERNEL="hw[CD0-9]*",     NAME="snd/%k"
+KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
+KERNEL="midi[CD0-9]*",   NAME="snd/%k"
+KERNEL="timer",          NAME="snd/%k"
+KERNEL="seq",            NAME="snd/%k"
+
+# oss devices
+KERNEL="audio*",     NAME="sound/%k", SYMLINK="%k"
+KERNEL="dmmidi",     NAME="sound/%k", SYMLINK="%k"
+KERNEL="dsp*",       NAME="sound/%k", SYMLINK="%k"
+KERNEL="midi*",      NAME="sound/%k", SYMLINK="%k"
+KERNEL="mixer*",     NAME="sound/%k", SYMLINK="%k"
+KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k"
+
+# input devices
+KERNEL="mice",   NAME="input/%k"
+KERNEL="mouse*", NAME="input/%k"
+KERNEL="event*", NAME="input/%k"
+KERNEL="js*",    NAME="input/%k"
+KERNEL="ts*",    NAME="input/%k"
+
+# USB devices
+KERNEL="hiddev*",       NAME="usb/%k"
+KERNEL="auer*",         NAME="usb/%k"
+KERNEL="legousbtower*", NAME="usb/%k"
+KERNEL="dabusb*",       NAME="usb/%k"
+BUS="usb", KERNEL="lp[0-9]*",   NAME="usb/%k"
+
+# netlink devices
+KERNEL="route",         NAME="netlink/%k"
+KERNEL="skip",          NAME="netlink/%k"
+KERNEL="usersock",      NAME="netlink/%k"
+KERNEL="fwmonitor",     NAME="netlink/%k"
+KERNEL="tcpdiag",       NAME="netlink/%k"
+KERNEL="nflog",         NAME="netlink/%k"
+KERNEL="xfrm",          NAME="netlink/%k"
+KERNEL="arpd",          NAME="netlink/%k"
+KERNEL="route6",        NAME="netlink/%k"
+KERNEL="ip6_fw",        NAME="netlink/%k"
+KERNEL="dnrtmsg",       NAME="netlink/%k"
+KERNEL="tap*",          NAME="netlink/%k"
+
+# CAPI devices
+KERNEL="capi",          NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL="capi*",         NAME="capi/%n"
+
+# Network devices
+KERNEL="tun",           NAME="net/%k"
+
+# raw devices
+KERNEL="raw[0-9]*",     NAME="raw/%k" 
diff --git a/meta/recipes-core/udev/files/fix-alignment.patch b/meta/recipes-core/udev/files/fix-alignment.patch
new file mode 100644
index 0000000000..8c7b8b5ac5
--- /dev/null
+++ b/meta/recipes-core/udev/files/fix-alignment.patch
@@ -0,0 +1,24 @@
+diff --git a/udev_rules_parse.c b/udev_rules_parse.c
+--- a/udev_rules_parse.c
++++ b/udev_rules_parse.c
+@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule
+        int valid;
+        char *linepos;
+        char *attr;
++       size_t padding;
+        int retval;
+ 
+        /* get all the keys */
+@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule
+ 
+        /* grow buffer and add rule */
+        rule_size = sizeof(struct udev_rule) + rule->bufsize;
++       padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
++       dbg("add %zi padding bytes", padding);
++       rule_size += padding;
++       rule->bufsize += padding;
++
+        rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
+        if (!rules->buf) {
+                err("realloc failed");
+
diff --git a/meta/recipes-core/udev/files/init b/meta/recipes-core/udev/files/init
new file mode 100755
index 0000000000..8cbab188f0
--- /dev/null
+++ b/meta/recipes-core/udev/files/init
@@ -0,0 +1,212 @@
+#!/bin/sh -e
+
+UDEVSTART=/sbin/udevstart
+
+# defaults
+tmpfs_size="10M"
+udev_root="/dev"
+
+[ -x $UDEVSTART ] || exit 0
+
+. /etc/udev/udev.conf
+
+##############################################################################
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return 0
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  # using ln to test if /dev works, because touch is in /usr/bin/
+  if ln -s test /dev/test-file; then
+    rm /dev/test-file
+  else
+    echo "udev requires tmpfs support, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+# this function is duplicated in preinst, postinst and d-i
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return 0
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return 0
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.12, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevstart has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+case "$1" in
+  start)
+    if [ -e "$udev_root/.udevdb" ]; then
+      if mountpoint -q /dev/; then
+        TMPFS_MOUNTED=1
+      else
+        echo ".udevdb already exists on the old $udev_root!"
+      fi
+    fi
+    warn_if_interactive
+
+    #echo /sbin/udevsend > /proc/sys/kernel/hotplug
+    if [ -e /sys/kernel/uevent_helper ] ; then
+      echo "" > /sys/kernel/uevent_helper
+    else
+      echo "" > /proc/sys/kernel/hotplug
+    fi
+    udevsend
+    if [ "$UDEV_DISABLED" = "yes" ]; then
+      echo "udev disabled on the kernel command line, not started."
+      exit 0
+    fi
+
+    if [ ! "$TMPFS_MOUNTED" ]; then
+      unmount_devpts
+      mount_tmpfs
+      [ -d /proc/1 ] || mount -n /proc
+      # if this directory is not present /dev will not be updated by udev
+      mkdir /dev/.udevdb/
+      echo "Creating initial device nodes..."
+      udevstart
+    fi
+    make_extra_nodes
+    ;;
+  stop)
+    warn_if_interactive
+    start-stop-daemon --stop --exec /sbin/udevd --quiet
+    unmount_devpts
+    if [ -d /dev/.static/dev/ ]; then
+      umount -l /dev/.static/dev/ || true
+    fi
+    echo "Unmounting /dev..."
+    # unmounting with -l should never fail
+    if ! umount -l /dev; then
+      exit 1
+    fi
+    ;;
+  restart|force-reload)
+    start-stop-daemon --stop --exec /sbin/udevd --quiet
+    log_begin_msg "Recreating device nodes..."
+    udevstart
+    make_extra_nodes
+    log_end_msg 0
+    ;;
+  *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/meta/recipes-core/udev/files/links.conf b/meta/recipes-core/udev/files/links.conf
new file mode 100644
index 0000000000..8fff922db6
--- /dev/null
+++ b/meta/recipes-core/udev/files/links.conf
@@ -0,0 +1,21 @@
+# This file does not exist. Please do not ask the debian maintainer about it.
+# You may use it to do strange and wonderful things, at your risk.
+
+L fd            /proc/self/fd
+L stdin         /proc/self/fd/0
+L stdout        /proc/self/fd/1
+L stderr        /proc/self/fd/2
+L core          /proc/kcore
+L sndstat       /proc/asound/oss/sndstat
+L MAKEDEV       /sbin/MAKEDEV
+
+D pts
+D shm
+
+# Hic sunt leones.
+M ppp           c 108 0
+D loop
+M loop/0        b 7 0
+D net
+M net/tun       c 10 200
+
diff --git a/meta/recipes-core/udev/files/local.rules b/meta/recipes-core/udev/files/local.rules
new file mode 100644
index 0000000000..5f2efbeb0c
--- /dev/null
+++ b/meta/recipes-core/udev/files/local.rules
@@ -0,0 +1,22 @@
+# 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"
diff --git a/meta/recipes-core/udev/files/mount.blacklist b/meta/recipes-core/udev/files/mount.blacklist
new file mode 100644
index 0000000000..d3ebb17176
--- /dev/null
+++ b/meta/recipes-core/udev/files/mount.blacklist
@@ -0,0 +1,3 @@
+/dev/loop
+/dev/ram
+/dev/mtdblock
diff --git a/meta/recipes-core/udev/files/mount.sh b/meta/recipes-core/udev/files/mount.sh
new file mode 100644
index 0000000000..53fefa3681
--- /dev/null
+++ b/meta/recipes-core/udev/files/mount.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Called from udev
+#
+# Attempt to mount any added block devices and umount any removed devices
+
+
+MOUNT="/bin/mount"
+PMOUNT="/usr/bin/pmount"
+UMOUNT="/bin/umount"
+
+for line in `cat /etc/udev/mount.blacklist`
+do
+        if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
+        then
+                logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+                exit 0
+        fi
+done
+
+automount() {   
+        name="`basename "$DEVNAME"`"
+
+        ! test -d "/media/$name" && mkdir -p "/media/$name"
+        
+        if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name"
+        then
+                #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
+                rm_dir "/media/$name"
+        else
+                logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
+                touch "/tmp/.automount-$name"
+        fi
+}
+        
+rm_dir() {
+        # We do not want to rm -r populated directories
+        if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
+        then
+                ! test -z "$1" && rm -r "$1"
+        else
+                logger "mount.sh/automount" "Not removing non-empty directory [$1]"
+        fi
+}
+
+if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
+        if [ -x "$PMOUNT" ]; then
+                $PMOUNT $DEVNAME 2> /dev/null
+        elif [ -x $MOUNT ]; then
+                $MOUNT $DEVNAME 2> /dev/null
+        fi
+        
+        # If the device isn't mounted at this point, it isn't configured in fstab
+        grep -q "^$DEVNAME " /proc/mounts || automount
+fi
+
+
+
+if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
+        for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
+        do
+                $UMOUNT $mnt
+        done
+        
+        # Remove empty directories from auto-mounter
+        name="`basename "$DEVNAME"`"
+        test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
+fi
diff --git a/meta/recipes-core/udev/files/network.sh b/meta/recipes-core/udev/files/network.sh
new file mode 100644
index 0000000000..5016328df4
--- /dev/null
+++ b/meta/recipes-core/udev/files/network.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# Do not run when pcmcia-cs is installed
+test -x /sbin/cardctl && exit 0
+
+# We get two "add" events for hostap cards due to wifi0
+echo "$INTERFACE" | grep -q wifi && exit 0
+
+
+# Check if /etc/init.d/network has been run yet to see if we are 
+# called by starting /etc/rcS.d/S03udev and not by hotplugging a device
+#
+# At this stage, network interfaces should not be brought up
+# automatically because:
+# a)    /etc/init.d/network has not been run yet (security issue)
+# b)    /var has not been populated yet so /etc/resolv,conf points to 
+#       oblivion, making the network unusable
+#
+
+spoofp="`grep ^spoofprotect /etc/network/options`"
+if test -z "$spoofp"
+then
+        # This is the default from /etc/init.d/network
+        spoofp_val=yes
+else
+        spoofp_val=${spoofp#spoofprotect=}
+fi
+
+test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0
+
+# I think it is safe to assume that "lo" will always be there ;)
+if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val"
+then
+        echo "$INTERFACE" >> /dev/udev_network_queue    
+        exit 0
+fi
+
+#
+# Code taken from pcmcia-cs:/etc/pcmcia/network
+#
+
+# if this interface has an entry in /etc/network/interfaces, let ifupdown
+# handle it
+if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
+  case $ACTION in
+    add)
+        ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE
+        ;;
+    remove)
+        ifdown $INTERFACE
+        ;;
+  esac
+  
+  exit 0
+fi
diff --git a/meta/recipes-core/udev/files/noasmlinkage.patch b/meta/recipes-core/udev/files/noasmlinkage.patch
new file mode 100644
index 0000000000..0d8e854c0e
--- /dev/null
+++ b/meta/recipes-core/udev/files/noasmlinkage.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- udev-062/udev.c~noasmlinkage.patch
++++ udev-062/udev.c
+@@ -54,7 +54,7 @@
+ }
+ #endif
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGALRM:
+--- udev-062/udevd.c~noasmlinkage.patch
++++ udev-062/udevd.c
+@@ -639,7 +639,7 @@
+        return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        int rc;
+ 
+--- udev-062/udevstart.c~noasmlinkage.patch
++++ udev-062/udevstart.c
+@@ -323,7 +323,7 @@
+        exec_list(&device_list);
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGALRM:
diff --git a/meta/recipes-core/udev/files/permissions.rules b/meta/recipes-core/udev/files/permissions.rules
new file mode 100644
index 0000000000..86d771276b
--- /dev/null
+++ b/meta/recipes-core/udev/files/permissions.rules
@@ -0,0 +1,81 @@
+# default permissions for block devices
+SUBSYSTEM=="block",                             GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",      GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}="1", \
+  PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom*",      GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",                                 GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",                                GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",  GROUP="tape"
+BUS=="scsi", SYSFS{type}=="5",  GROUP="cdrom"
+BUS=="scsi", SYSFS{type}=="6",  GROUP="scanner"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp"
+
+# serial devices
+SUBSYSTEM=="tty",       GROUP="dialout"
+SUBSYSTEM=="capi",      GROUP="dialout"
+SUBSYSTEM=="slamr",     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="0444"
+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=="nvram",        GROUP="nvram"
+KERNEL=="rtc",          MODE="0660", GROUP="audio"
+
+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=="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]*",  MODE="0664"
+KERNEL=="js[0-9]*",     MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",                       MODE="0220", GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err",        MODE="0440"
+
diff --git a/meta/recipes-core/udev/files/slugos/mount.blacklist b/meta/recipes-core/udev/files/slugos/mount.blacklist
new file mode 100644
index 0000000000..210702f837
--- /dev/null
+++ b/meta/recipes-core/udev/files/slugos/mount.blacklist
@@ -0,0 +1,4 @@
+ram[0-9]$
+mtdblock[0-9]$
+hd[a-z]$
+sd[a-z]$
diff --git a/meta/recipes-core/udev/files/spitz/mount.blacklist b/meta/recipes-core/udev/files/spitz/mount.blacklist
new file mode 100644
index 0000000000..aee308f9b8
--- /dev/null
+++ b/meta/recipes-core/udev/files/spitz/mount.blacklist
@@ -0,0 +1,4 @@
+/dev/mtdblock
+/dev/hda
+/dev/loop
+/dev/ram
diff --git a/meta/recipes-core/udev/files/tmpfs.patch b/meta/recipes-core/udev/files/tmpfs.patch
new file mode 100644
index 0000000000..9d0d8b4515
--- /dev/null
+++ b/meta/recipes-core/udev/files/tmpfs.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- udev-031/extras/start_udev~tmpfs    2004-09-10 17:10:03.000000000 -0400
++++ udev-031/extras/start_udev  2004-09-11 15:18:15.560789160 -0400
+@@ -85,7 +85,7 @@
+ fi
+ 
+ echo "mounting... ramfs at $udev_root"
+-mount -n -t ramfs none $udev_root
++mount -n -t ramfs none $udev_root || mount -n -t tmpfs none $udev_root
+ 
+ # propogate /udev from /sys
+ echo "Creating initial udev device nodes:"
diff --git a/meta/recipes-core/udev/files/tosa/mount.blacklist b/meta/recipes-core/udev/files/tosa/mount.blacklist
new file mode 100644
index 0000000000..c15b582298
--- /dev/null
+++ b/meta/recipes-core/udev/files/tosa/mount.blacklist
@@ -0,0 +1,3 @@
+/dev/mtdblock
+/dev/loop
+/dev/ram
diff --git a/meta/recipes-core/udev/files/udev-cache b/meta/recipes-core/udev/files/udev-cache
new file mode 100644
index 0000000000..77bbda6f1b
--- /dev/null
+++ b/meta/recipes-core/udev/files/udev-cache
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+### BEGIN INIT INFO
+# Provides:          udev-cache
+# Required-Start:    mountall
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: cache /dev to speedup the udev next boot
+### END INIT INFO
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x /sbin/udevd ] || exit 1
+
+if [ ! -e /etc/dev.tar ]; then
+        (cd /; tar cf /etc/dev.tar dev)
+fi
+
+exit 0
diff --git a/meta/recipes-core/udev/files/udev.rules b/meta/recipes-core/udev/files/udev.rules
new file mode 100644
index 0000000000..5c566f6cef
--- /dev/null
+++ b/meta/recipes-core/udev/files/udev.rules
@@ -0,0 +1,98 @@
+# 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
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",        NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",          NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",          NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",    NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",         NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+                                        SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+        PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",                 NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",           NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",           NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",            NAME="hwrng"
+KERNEL=="tun",                  NAME="net/%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=="buzzer",               NAME="misc/buzzer"
+
+# 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"
+
+# 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]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/sbin/firmware_helper"
diff --git a/meta/recipes-core/udev/files/udev_network_queue.sh b/meta/recipes-core/udev/files/udev_network_queue.sh
new file mode 100644
index 0000000000..05e08e9d1b
--- /dev/null
+++ b/meta/recipes-core/udev/files/udev_network_queue.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: udev_network_queue.sh
+# Date: 03-May-06
+
+do_start() {
+        if test -e /dev/udev_network_queue
+        then
+                echo "Activating queued NICs..."
+                for NIC in `cat /dev/udev_network_queue`
+                do      
+                        export INTERFACE="$NIC" ; export ACTION=add
+                        /etc/udev/scripts/network.sh
+                done
+                echo ""
+        else
+                echo "No NICs queued"
+        fi
+}
+
+do_stop() {
+        /bin/true
+}
+
+case "$1" in
+start)          do_start;;
+stop)           do_stop;;
+restart)        do_stop
+                do_start;;
+*)      echo "Usage: `basename $0` [ start | stop | restart ]"
+        exit 0;;
+esac
diff --git a/meta/recipes-core/udev/files/udevsynthesize.patch b/meta/recipes-core/udev/files/udevsynthesize.patch
new file mode 100644
index 0000000000..7811188485
--- /dev/null
+++ b/meta/recipes-core/udev/files/udevsynthesize.patch
@@ -0,0 +1,776 @@
+--- udev-081/udevsynthesize.c.orig      2006-01-29 12:22:45.000000000 +0100
++++ udev-081/udevsynthesize.c   2006-01-29 12:22:40.000000000 +0100
+@@ -0,0 +1,763 @@
++/*
++ * udevcoldplug.c
++ *
++ * Copyright (C) 2005 SUSE Linux Products GmbH
++ *
++ * Author:
++ *   Kay Sievers <kay.sievers@vrfy.org>
++ *
++ * Synthesize kernel events from sysfs information and pass them
++ * to the udevd daemon.
++ *
++ *     This program 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 version 2 of the License.
++ * 
++ *     This program is distributed in the hope that it will be useful, but
++ *     WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *     General Public License for more details.
++ * 
++ *     You should have received a copy of the GNU General Public License along
++ *     with this program; if not, write to the Free Software Foundation, Inc.,
++ *     675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#include <stdlib.h>
++#include <stddef.h>
++#include <string.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <errno.h>
++#include <ctype.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <signal.h>
++#include <syslog.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++#include <sys/wait.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++
++#include "udev_libc_wrapper.h"
++#include "udev.h"
++#include "udevd.h"
++#include "udev_version.h"
++#include "logging.h"
++
++#include "list.h"
++
++#ifndef DT_DIR
++#define DT_DIR                 4
++#endif
++
++static const char *udev_log_str;
++static int udevd_sock = -1;
++
++#ifdef USE_LOG
++void log_message(int priority, const char *format, ...)
++{
++       va_list args;
++
++       if (priority > udev_log_priority)
++               return;
++
++       va_start(args, format);
++       vsyslog(priority, format, args);
++       va_end(args);
++}
++#endif
++
++struct device {
++       struct list_head node;
++       struct udevd_msg msg;
++       size_t bufpos;
++       char *path;
++};
++
++static dev_t read_devt(const char *path)
++{
++       char filename[PATH_SIZE];
++       char majorminor[64];
++       unsigned int major, minor;
++       ssize_t count;
++       int fd;
++
++       snprintf(filename, sizeof(filename), "%s/%s", path, "dev");
++       filename[sizeof(filename)-1] = '\0';
++
++       fd = open(filename, O_RDONLY);
++       if (fd < 0)
++               return 0;
++
++       count = read(fd, majorminor, sizeof(majorminor));
++       close(fd);
++       majorminor[count] = '\0';
++       if (sscanf(majorminor, "%u:%u", &major, &minor) != 2)
++               return 0;
++       dbg("found major=%d, minor=%d", major, minor);
++
++       return makedev(major, minor);
++}
++
++static ssize_t read_file(const char *directory, const char *file, char *str, size_t len)
++{
++       char filename[PATH_SIZE];
++       ssize_t count;
++       int fd;
++
++       memset(filename, 0, sizeof(filename));
++       snprintf(filename, sizeof(filename), "%s/%s", directory, file);
++       filename[sizeof(filename)-1] = '\0';
++
++       fd = open(filename, O_RDONLY);
++       if (fd < 0)
++               return -1;
++
++       count = read(fd, str, len-1);
++       close(fd);
++
++       if (count > (ssize_t)len)
++               count = len;
++       str[count-1] = '\0';
++
++       return count;
++}
++
++static ssize_t read_link(const char *directory, const char *file, char *str, size_t size)
++{
++       char filename[PATH_SIZE];
++       char target[PATH_SIZE];
++       int len;
++       char *back;
++       char *strip;
++       int level = 1;
++
++       snprintf(filename, sizeof(filename), "%s/%s", directory, file);
++       filename[sizeof(filename)-1] = '\0';
++
++       len = readlink(filename, target, sizeof(target)-1);
++       if (len < 0)
++               return -1;
++       target[len] = '\0';
++
++       back = target;
++       while (strncmp(back, "../", 3) == 0) {
++               back += 3;
++               level++;
++       }
++       while(level--) {
++               strip = strrchr(filename, '/');
++               if (!strip)
++                       return -1;
++               strip[0] = '\0';
++       }
++
++       snprintf(str, size, "%s/%s", filename, back);
++       str[size-1] = '\0';
++
++       return len;
++}
++
++static char *add_env_key(struct device *device, const char *key, const char *value)
++{
++       size_t pos = device->bufpos;
++       device->bufpos += sprintf(&device->msg.envbuf[device->bufpos], "%s=%s", key, value)+1;
++       return &device->msg.envbuf[pos];
++}
++
++static struct device *device_create(const char *path, const char *subsystem, dev_t devt)
++{
++       struct device *device;
++       const char *devpath = &path[strlen(sysfs_path)];
++       char target[PATH_SIZE];
++
++       device = malloc(sizeof(struct device));
++       if (device == NULL) {
++               dbg("error malloc");
++               return NULL;
++       }
++       memset(device, 0x00, sizeof(struct device));
++
++       device->path = add_env_key(device, "DEVPATH", devpath);
++       device->path += strlen("DEVPATH=");
++       add_env_key(device, "SUBSYSTEM", subsystem);
++       add_env_key(device, "ACTION", "add");
++       add_env_key(device, "UDEV_COLDPLUG", "1");
++
++       if (major(devt)) {
++               char number[32];
++               sprintf(number, "%u", major(devt));
++               add_env_key(device, "MAJOR", number);
++               sprintf(number, "%u", minor(devt));
++               add_env_key(device, "MINOR", number);
++       }
++
++       if (strncmp(devpath, "/block/", strlen("/block/")) == 0 ||
++           strncmp(devpath, "/class/", strlen("/class/")) == 0) {
++               char physpath[PATH_SIZE];
++
++               if (read_link(path, "device", physpath, sizeof(physpath)) > (ssize_t)strlen(sysfs_path)) {
++                       add_env_key(device, "PHYSDEVPATH", &physpath[strlen(sysfs_path)]);
++                       if (read_link(physpath, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++                               char *pos = strrchr(target, '/');
++                               if (pos)
++                                       add_env_key(device, "PHYSDEVDRIVER", &pos[1]);
++                       }
++                       if (read_link(physpath, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++                               char *pos = strrchr(target, '/');
++                               if (pos)
++                                       add_env_key(device, "PHYSDEVBUS", &pos[1]);
++                       }
++               }
++       } else if (strncmp(devpath, "/devices/", strlen("/devices/")) == 0) {
++               if (read_link(path, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++                       char *pos = strrchr(target, '/');
++                       if (pos)
++                               add_env_key(device, "PHYSDEVDRIVER", &pos[1]);
++               }
++               if (read_link(path, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
++                       char *pos = strrchr(target, '/');
++                       if (pos)
++                               add_env_key(device, "PHYSDEVBUS", &pos[1]);
++               }
++       }
++
++       return device;
++}
++
++static int device_list_insert(struct list_head *device_list, struct device *device)
++{
++       struct device *loop_device;
++
++       dbg("insert: '%s'", device->path);
++
++       /* sort files in lexical order */
++       list_for_each_entry(loop_device, device_list, node)
++               if (strcmp(loop_device->path, device->path) > 0)
++                       break;
++
++       list_add_tail(&device->node, &loop_device->node);
++
++       return 0;
++}
++
++static int add_device_udevd(struct device *device)
++{
++       size_t msg_len;
++       struct sockaddr_un saddr;
++       socklen_t addrlen;
++       int retval;
++
++       memset(&saddr, 0x00, sizeof(struct sockaddr_un));
++       saddr.sun_family = AF_LOCAL;
++       /* use abstract namespace for socket path */
++       strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
++       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
++
++       strcpy(device->msg.magic, UDEV_MAGIC);
++       device->msg.type = UDEVD_UEVENT_UDEVSEND;
++
++       msg_len = offsetof(struct udevd_msg, envbuf) + device->bufpos;
++       dbg("msg_len=%i", msg_len);
++
++       retval = sendto(udevd_sock, &device->msg, msg_len, 0, (struct sockaddr *)&saddr, addrlen);
++       if (retval < 0)
++               return -1;
++
++       return 0;
++}
++
++static void exec_list(struct list_head *device_list, const char *first[], const char *last[])
++{
++       struct device *loop_device;
++       struct device *tmp_device;
++       int i;
++
++       /* handle the "first" type devices first */
++       if (first)
++               list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
++                       for (i = 0; first[i] != NULL; i++) {
++                               if (strncmp(loop_device->path, first[i], strlen(first[i])) == 0) {
++                                       add_device_udevd(loop_device);
++                                       list_del(&loop_device->node);
++                                       free(loop_device);
++                                       break;
++                               }
++                       }
++               }
++
++       /* handle the devices we are allowed to, excluding the "last" type devices */
++       if (last)
++               list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
++                       int found = 0;
++                       for (i = 0; last[i] != NULL; i++) {
++                               if (strncmp(loop_device->path, last[i], strlen(last[i])) == 0) {
++                                       found = 1;
++                                       break;
++                               }
++                       }
++                       if (found)
++                               continue;
++
++               add_device_udevd(loop_device);
++               list_del(&loop_device->node);
++               free(loop_device);
++       }
++
++       /* handle the rest of the devices */
++       list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
++               add_device_udevd(loop_device);
++               list_del(&loop_device->node);
++               free(loop_device);
++       }
++}
++
++static int udev_scan_class(void)
++{
++       char base[PATH_SIZE];
++       DIR *dir;
++       struct dirent *dent;
++       LIST_HEAD(device_list);
++
++       /* we want /dev/null and /dev/console first */
++       const char *first[] = {
++               "/class/mem",
++               "/class/tty",
++               NULL,
++       };
++
++       snprintf(base, sizeof(base), "%s/class", sysfs_path);
++       base[sizeof(base)-1] = '\0';
++
++       dir = opendir(base);
++       if (!dir)
++               return -1;
++
++       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++               char dirname[PATH_SIZE];
++               DIR *dir2;
++               struct dirent *dent2;
++
++               if (dent->d_name[0] == '.')
++                       continue;
++
++               snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name);
++               dirname[sizeof(dirname)-1] = '\0';
++
++               dir2 = opendir(dirname);
++               if (!dir2)
++                       continue;
++               for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
++                       char dirname2[PATH_SIZE];
++                       struct device *device;
++                       dev_t devt;
++
++                       if (dent2->d_name[0] == '.')
++                               continue;
++                       if (dent2->d_type != DT_DIR)
++                               continue;
++
++                       snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
++                       dirname2[sizeof(dirname2)-1] = '\0';
++                       devt = read_devt(dirname2);
++                       device = device_create(dirname2, dent->d_name, devt);
++
++                       if (strcmp(dent->d_name, "net") == 0 ||
++                           strcmp(dent->d_name, "bluetooth") == 0) {
++                               add_env_key(device, "INTERFACE", dent2->d_name);
++                       } else if (strcmp(dent->d_name, "pcmcia_socket") == 0 &&
++                                  strlen(dent->d_name) > 14) {
++                               add_env_key(device, "SOCKET_NO",
++                                       dent2->d_name + 14);
++                       }
++
++                       device_list_insert(&device_list, device);
++               }
++               closedir(dir2);
++       }
++       closedir(dir);
++       exec_list(&device_list, first, NULL);
++
++       return 0;
++}
++
++static int udev_scan_block(void)
++{
++       char base[PATH_SIZE];
++       DIR *dir;
++       struct dirent *dent;
++       LIST_HEAD(device_list);
++
++       /* dm wants to have the block devices around before it */
++       const char *last[] = {
++               "/block/dm",
++               NULL,
++       };
++
++       snprintf(base, sizeof(base), "%s/block", sysfs_path);
++       base[sizeof(base)-1] = '\0';
++
++       dir = opendir(base);
++       if (!dir)
++               return -1;
++
++       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++               char dirname[PATH_SIZE];
++               struct device *device;
++               struct dirent *dent2;
++               DIR *dir2;
++               dev_t devt;
++
++               if (dent->d_name[0] == '.')
++                       continue;
++               if (dent->d_type != DT_DIR)
++                       continue;
++
++               snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name);
++               dirname[sizeof(dirname)-1] = '\0';
++               devt = read_devt(dirname);
++               if (major(devt)) {
++                       device = device_create(dirname, "block", devt);
++                       device_list_insert(&device_list, device);
++               }
++
++               /* look for partitions */
++               dir2 = opendir(dirname);
++               if (!dir2)
++                       continue;
++               for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
++                       char dirname2[PATH_SIZE];
++
++                       if (dent2->d_name[0] == '.')
++                               continue;
++                       if (dent2->d_type != DT_DIR)
++                               continue;
++
++                       snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
++                       dirname2[sizeof(dirname2)-1] = '\0';
++                       devt = read_devt(dirname2);
++                       if (major(devt)) {
++                               device = device_create(dirname2, "block", devt);
++                               device_list_insert(&device_list, device);
++                               continue;
++                       }
++               }
++               closedir(dir2);
++       }
++       closedir(dir);
++       exec_list(&device_list, NULL, last);
++
++       return 0;
++}
++
++static int pci_handler(struct device *device)
++{
++       char path[PATH_SIZE];
++       char value[PATH_SIZE];
++       char vendor[PATH_SIZE];
++       char product[PATH_SIZE];
++       const char *name;
++
++       snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++       path[sizeof(path)-1] = '\0';
++
++       if (read_file(path, "modalias", value, sizeof(value)) > 0)
++               add_env_key(device, "MODALIAS", value);
++
++       name = strrchr(device->path, '/');
++       if (name)
++               add_env_key(device, "PCI_SLOT_NAME", &name[1]);
++
++       if (read_file(path, "class", value, sizeof(value)) > 0)
++               add_env_key(device, "PCI_CLASS", &value[2]);
++
++       if (read_file(path, "vendor", vendor, sizeof(vendor)) > 0 &&
++           read_file(path, "device", product, sizeof(product)) > 0) {
++               snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]);
++               path[sizeof(value)-1] = '\0';
++               add_env_key(device, "PCI_ID", value);
++       }
++
++       if (read_file(path, "subsystem_vendor", vendor, sizeof(vendor)) > 0 &&
++           read_file(path, "subsystem_device", product, sizeof(product)) > 0) {
++               snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]);
++               path[sizeof(value)-1] = '\0';
++               add_env_key(device, "PCI_SUBSYS_ID", value);
++       }
++
++       return 0;
++}
++
++static int usb_handler(struct device *device)
++{
++       char path[PATH_SIZE];
++       char value[PATH_SIZE];
++       char str1[PATH_SIZE];
++       char str2[PATH_SIZE];
++       char str3[PATH_SIZE];
++       unsigned int int1;
++       unsigned int int2;
++       unsigned int int3;
++       char *pos;
++
++       snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++       path[sizeof(path)-1] = '\0';
++
++       /* device events have : in their directory name */
++       pos = strrchr(path, '/');
++       if (!strchr(pos, ':'))
++               return 0;       /* and do not have other variables */
++
++       if (read_file(path, "modalias", value, sizeof(value)) > 0)
++               add_env_key(device, "MODALIAS", value);
++
++       if (read_file(path, "bInterfaceClass", str1, sizeof(str1)) > 0 &&
++           read_file(path, "bInterfaceSubClass", str2, sizeof(str2)) > 0 &&
++           read_file(path, "bInterfaceProtocol", str3, sizeof(str3)) > 0) {
++               int1 = (int) strtol(str1, NULL, 16);
++               int2 = (int) strtol(str2, NULL, 16);
++               int3 = (int) strtol(str3, NULL, 16);
++               snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3);
++               path[sizeof(value)-1] = '\0';
++               add_env_key(device, "INTERFACE", value);
++       }
++
++       /* move to the parent directory */
++       pos[0] = '\0';
++
++       if (read_file(path, "idVendor", str1, sizeof(str1)) > 0 &&
++           read_file(path, "idProduct", str2, sizeof(str2)) > 0 &&
++           read_file(path, "bcdDevice", str3, sizeof(str3)) > 0) {
++               int1 = (int) strtol(str1, NULL, 16);
++               int2 = (int) strtol(str2, NULL, 16);
++               int3 = (int) strtol(str3, NULL, 16);
++               snprintf(value, sizeof(value), "%x/%x/%x", int1, int2, int3);
++               path[sizeof(value)-1] = '\0';
++               add_env_key(device, "PRODUCT", value);
++       }
++
++       if (read_file(path, "bDeviceClass", str1, sizeof(str1)) > 0 &&
++           read_file(path, "bDeviceSubClass", str2, sizeof(str2)) > 0 &&
++           read_file(path, "bDeviceProtocol", str3, sizeof(str3)) > 0) {
++               int1 = (int) strtol(str1, NULL, 16);
++               int2 = (int) strtol(str2, NULL, 16);
++               int3 = (int) strtol(str3, NULL, 16);
++               snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3);
++               path[sizeof(value)-1] = '\0';
++               add_env_key(device, "TYPE", value);
++       }
++
++       if (read_file(path, "devnum", str2, sizeof(str2)) > 0) {
++               pos = strrchr(path, 'b');
++               int1 = (int) strtol(pos + 1, NULL, 16);
++               int2 = (int) strtol(str2, NULL, 16);
++               snprintf(value, sizeof(value),
++                       "/proc/bus/usb/%03d/%03d", int1, int2);
++               path[sizeof(value)-1] = '\0';
++               add_env_key(device, "DEVICE", value);
++       }
++
++       return 0;
++}
++
++static int serio_handler(struct device *device)
++{
++       char path[PATH_SIZE];
++       char value[PATH_SIZE];
++
++       snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++       path[sizeof(path)-1] = '\0';
++
++       if (read_file(path, "modalias", value, sizeof(value)) > 0)
++               add_env_key(device, "MODALIAS", value);
++
++       if (read_file(path, "id/type", value, sizeof(value)) > 0)
++               add_env_key(device, "SERIO_TYPE", value);
++
++       if (read_file(path, "id/proto", value, sizeof(value)) > 0)
++               add_env_key(device, "SERIO_PROTO", value);
++
++       if (read_file(path, "id/id", value, sizeof(value)) > 0)
++               add_env_key(device, "SERIO_ID", value);
++
++       if (read_file(path, "id/extra", value, sizeof(value)) > 0)
++               add_env_key(device, "SERIO_EXTRA", value);
++
++       return 0;
++}
++
++static int ccw_handler(struct device *device)
++{
++       char path[PATH_SIZE];
++       char value[PATH_SIZE], *tmp;
++
++       snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++       path[sizeof(path)-1] = '\0';
++
++       if (read_file(path, "modalias", value, sizeof(value)) > 0)
++               add_env_key(device, "MODALIAS", value);
++
++       if (read_file(path, "cutype", value, sizeof(value)) > 0) {
++               value[4] = 0;
++               tmp = &value[5];
++               add_env_key(device, "CU_TYPE", value);
++               add_env_key(device, "CU_MODEL", tmp);
++       }
++
++       if (read_file(path, "devtype", value, sizeof(value)) > 0) {
++               if (value[0] == 'n') {
++                       add_env_key(device, "DEV_TYPE", "0000");
++                       add_env_key(device, "DEV_MODEL", "00");
++               }
++               else {
++                       value[4] = 0;
++                       tmp = &value[5];
++                       add_env_key(device, "DEV_TYPE", value);
++                       add_env_key(device, "DEV_MODEL", tmp);
++               }
++       }
++
++       return 0;
++}
++
++static int modalias_handler(struct device *device)
++{
++       char path[PATH_SIZE];
++       char value[PATH_SIZE];
++
++       snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
++       path[sizeof(path)-1] = '\0';
++
++       if (read_file(path, "modalias", value, sizeof(value)) > 0)
++               add_env_key(device, "MODALIAS", value);
++
++       return 0;
++}
++
++static int udev_scan_bus(const char *bus, int bus_handler(struct device *device))
++{
++       char base[PATH_SIZE];
++       DIR *dir;
++       struct dirent *dent;
++       LIST_HEAD(device_list);
++
++       snprintf(base, sizeof(base), "%s/bus/%s/devices", sysfs_path, bus);
++       base[sizeof(base)-1] = '\0';
++
++       dir = opendir(base);
++       if (!dir)
++               return -1;
++       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++               char devpath[PATH_SIZE];
++               struct device *device;
++
++               if (dent->d_name[0] == '.')
++                       continue;
++
++               if (read_link(base, dent->d_name, devpath, sizeof(devpath)) < 0)
++                       continue;
++
++               device = device_create(devpath, bus, makedev(0, 0));
++               if (bus_handler) {
++                       if (bus_handler(device) < 0) {
++                               dbg("'%s' bus handler skipped event", devpath);
++                               free(device);
++                               continue;
++                       }
++               }
++
++               device_list_insert(&device_list, device);
++       }
++       closedir(dir);
++       exec_list(&device_list, NULL, NULL);
++
++       return 0;
++}
++
++static int udev_scan_devices(void)
++{
++       char base[PATH_SIZE];
++       DIR *dir;
++       struct dirent *dent;
++
++       snprintf(base, sizeof(base), "%s/bus", sysfs_path);
++       base[sizeof(base)-1] = '\0';
++
++       dir = opendir(base);
++       if (!dir)
++               return -1;
++
++       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
++               if (dent->d_name[0] == '.')
++                       continue;
++               if (dent->d_type != DT_DIR)
++                       continue;
++
++               /* add bus specific env values */
++               if (strcmp(dent->d_name, "pci") == 0)
++                       udev_scan_bus("pci", pci_handler);
++               else if (strcmp(dent->d_name, "usb") == 0)
++                       udev_scan_bus("usb", usb_handler);
++               else if (strcmp(dent->d_name, "serio") == 0)
++                       udev_scan_bus("serio", serio_handler);
++               else if (strcmp(dent->d_name, "ccw") == 0)
++                       udev_scan_bus("ccw", ccw_handler);
++               else
++                       udev_scan_bus(dent->d_name, modalias_handler);
++       }
++       closedir(dir);
++
++       return 0;
++}
++
++int main(int argc, char *argv[], char *envp[])
++{
++       LIST_HEAD(device_list);
++       int i;
++
++       logging_init("udevcoldplug");
++       udev_config_init(); sysfs_init();
++       dbg("version %s", UDEV_VERSION);
++
++       udev_log_str = getenv("UDEV_LOG");
++
++       /* disable all logging if not explicitely requested */
++       if (udev_log_str == NULL)
++               udev_log_priority = 0;
++
++       for (i = 1 ; i < argc; i++) {
++               char *arg = argv[i];
++
++               if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
++                       printf("Usage: udevcoldplug \n"
++                               "  --help                   print this help text\n\n");
++                       exit(0);
++               } else {
++                       fprintf(stderr, "unknown option\n\n");
++                       exit(1);
++               }
++       }
++
++       udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
++       if (udevd_sock < 0) {
++               err("error getting socket");
++               return 1;
++       }
++
++       /* create nodes for already available devices */
++       udev_scan_class();
++       udev_scan_block();
++
++       /* synthesize events for bus devices
++        * may load modules or configure the device */
++       udev_scan_devices();
++
++       if (udevd_sock >= 0)
++               close(udevd_sock);
++       logging_close();
++
++       return 0;
++}
+--- udev-081/Makefile
++++ udev-081/Makefile
+@@ -58,6 +58,7 @@ PROGRAMS = \
+        udevmonitor                     \
+        udevinfo                        \
+        udevtest                        \
++       udevsynthesize                  \
+        udevstart
+ 
+ HEADERS = \
diff --git a/meta/recipes-core/udev/files/udevsynthesize.sh b/meta/recipes-core/udev/files/udevsynthesize.sh
new file mode 100644
index 0000000000..d58217c144
--- /dev/null
+++ b/meta/recipes-core/udev/files/udevsynthesize.sh
@@ -0,0 +1,51 @@
+#!/bin/sh -e
+
+load_input_modules() {
+  for module in mousedev evdev joydev; do
+    modprobe -q $module || true
+  done
+}
+
+if [ ! -e /sys/class/mem/null/uevent ]; then # <= 2.6.14
+  /lib/udev/udevsynthesize
+  load_input_modules
+  exit 0
+fi
+
+# replace $IFS with something which is not likely to appear in a sysfs path,
+# because some buggy drivers have spaces in their names
+oldifs="$IFS"
+IFS="|"
+
+for file in /sys/bus/*/devices/*/uevent /sys/class/*/*/uevent \
+                /sys/block/*/uevent /sys/block/*/*/uevent; do
+  case "$file" in
+    */device/uevent) ;;         # skip followed device symlinks
+    */\*/*) ;;
+
+    */class/mem/*)              # for /dev/null
+    first="$first${IFS}$file" ;;
+
+    */block/md[0-9]*)
+    last="$last${IFS}$file" ;;
+
+    *)
+    default="$default${IFS}$file" ;;
+  esac
+done
+
+for file in $first${IFS}$default${IFS}$last; do
+  [ "$file" ] || continue
+  echo 'add' > "$file" || true
+done
+
+IFS="$oldifs"
+
+case "$(uname -r)" in
+  2.6.1[0-5]|2.6.1[0-5][!0-9]*) # <= 2.6.15
+  load_input_modules
+  ;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch b/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch
new file mode 100644
index 0000000000..4bd0d4d9b9
--- /dev/null
+++ b/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch
@@ -0,0 +1,17 @@
+Index: udev-092/udev_libc_wrapper.h
+===================================================================
+--- udev-092.orig/udev_libc_wrapper.h   2006-07-26 21:55:06.000000000 +0100
++++ udev-092/udev_libc_wrapper.h        2006-07-26 21:55:37.000000000 +0100
+@@ -58,9 +58,9 @@
+ # define __NR_inotify_add_watch        152
+ # define __NR_inotify_rm_watch 156
+ #elif defined (__arm__)
+-# define __NR_inotify_init     316
+-# define __NR_inotify_add_watch        317
+-# define __NR_inotify_rm_watch 318
++# define __NR_inotify_init     __NR_SYSCALL_BASE+316
++# define __NR_inotify_add_watch        __NR_SYSCALL_BASE+317
++# define __NR_inotify_rm_watch __NR_SYSCALL_BASE+318
+ #elif defined (__sh__)
+ # define __NR_inotify_init     290
+ # define __NR_inotify_add_watch        291
diff --git a/meta/recipes-core/udev/udev-092/flags.patch b/meta/recipes-core/udev/udev-092/flags.patch
new file mode 100644
index 0000000000..492a39881c
--- /dev/null
+++ b/meta/recipes-core/udev/udev-092/flags.patch
@@ -0,0 +1,51 @@
+--- udev-089/Makefile.orig      2006-04-08 13:32:53.000000000 +0200
++++ udev-089/Makefile   2006-04-08 13:34:27.000000000 +0200
+@@ -117,28 +117,28 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS         = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS                = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS       = -Wstrict-prototypes -Wsign-compare -Wshadow \
+                  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+                  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS         += $(WARNINGS)
++override CFLAGS                += $(WARNINGS)
+ 
+ LDFLAGS = -Wl,-warn-common
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-       CFLAGS += -DUSE_LOG
++       override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-       CFLAGS  += -DDEBUG
++       override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-       CFLAGS += -fprofile-arcs -ftest-coverage
++       override CFLAGS += -fprofile-arcs -ftest-coverage
+        LDFLAGS += -fprofile-arcs
+ endif
+ 
+@@ -151,11 +151,11 @@
+ ifeq ($(strip $(USE_SELINUX)),true)
+        UDEV_OBJS += udev_selinux.o
+        LIB_OBJS += -lselinux -lsepol
+-       CFLAGS += -DUSE_SELINUX
++       override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-       CFLAGS += -DUSE_STATIC
++       override CFLAGS += -DUSE_STATIC
+        LDFLAGS += -static
+ endif
+ 
diff --git a/meta/recipes-core/udev/udev-092/init b/meta/recipes-core/udev/udev-092/init
new file mode 100644
index 0000000000..5a60d52a9a
--- /dev/null
+++ b/meta/recipes-core/udev/udev-092/init
@@ -0,0 +1,227 @@
+#!/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
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp -a /lib/udev/devices/* /dev/
+  fi
+
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+set_hotplug_handler() {
+  case "$(uname -r)" in
+    2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
+  esac
+  echo $HANDLER > /proc/sys/kernel/hotplug
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+PATH="/sbin:/bin:/usr/bin"
+
+[ -x /sbin/udevd ] || exit 0
+
+# defaults
+tmpfs_size="10M"
+udev_root="/dev"
+udevd_timeout=30
+
+. /etc/udev/udev.conf
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.12, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+case "$1" in
+    start)
+    if [ -e "$udev_root/.udev/" ]; then
+        if mountpoint -q /dev/; then
+            TMPFS_MOUNTED=1
+        else
+            echo ".udev/ already exists on the static $udev_root!"
+        fi
+    else
+        warn_if_interactive
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    set_hotplug_handler
+
+    if [ -z "$TMPFS_MOUNTED" ]; then
+        unmount_devpts
+        mount_tmpfs
+        [ -d /proc/1 ] || mount -n /proc
+    fi
+
+    # if this directory is not present /dev will not be updated by udev
+    mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    echo "Synthesizing the initial hotplug events"
+    udevsynthesize
+
+    # wait for the udevd childs to finish
+    echo "Waiting for /dev to be fully populated"
+    while [ -d /dev/.udev/queue/ ]; do
+        sleep 1
+        udevd_timeout=$(($udevd_timeout - 1))
+        if [ $udevd_timeout -eq 0 ]; then
+            # ps axf
+            break
+        fi
+    done
+    if [ $udevd_timeout -eq 0 ]; then
+        echo 'timeout'
+    fi
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+
+    restart|force-reload)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet ; then
+        exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-core/udev/udev-092/local.rules b/meta/recipes-core/udev/udev-092/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/meta/recipes-core/udev/udev-092/local.rules
@@ -0,0 +1,31 @@
+# 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"
+
+# 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"
diff --git a/meta/recipes-core/udev/udev-092/permissions.rules b/meta/recipes-core/udev/udev-092/permissions.rules
new file mode 100644
index 0000000000..8da35c3090
--- /dev/null
+++ b/meta/recipes-core/udev/udev-092/permissions.rules
@@ -0,0 +1,109 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",   WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",                              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{PHYSDEVDRIVER}=="?*",     WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",                             GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",      GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+        IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",                            GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",                 GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",                GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",                  GROUP="tape"
+BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
+BUS=="scsi", SYSFS{type}=="5",                  GROUP="cdrom"
+BUS=="scsi", SYSFS{type}=="6",                  GROUP="scanner"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",                 GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",        MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",                        GROUP="plugdev", \
+        SYSFS{idVendor}=="4102", SYSFS{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=="nvram",                                GROUP="nvram"
+KERNEL=="rtc",                                  GROUP="audio"
+KERNEL=="tpm*",                 MODE="0600",    OWNER="tss", GROUP="tss"
+KERNEL=="fuse",                                 GROUP="fuse"
+
+KERNEL=="cdemu[0-9]*",                          GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",                        GROUP="cdrom"
+KERNEL=="pktcdvd",              MODE="0644"
+
+KERNEL=="uverbs*",                              GROUP="rdma"
+KERNEL=="ucm*",                                 GROUP="rdma"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",                           GROUP="lp"
+SUBSYSTEM=="ppdev",                             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]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+                                MODE="0664",    GROUP="video"
+KERNEL=="js[0-9]*",             MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",               MODE="0220",    GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/meta/recipes-core/udev/udev-092/udev.rules b/meta/recipes-core/udev/udev-092/udev.rules
new file mode 100644
index 0000000000..72be706e84
--- /dev/null
+++ b/meta/recipes-core/udev/udev-092/udev.rules
@@ -0,0 +1,102 @@
+# 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
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",        NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",          NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",          NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",    NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",         NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+                                        SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+        PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",                 NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",           NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",           NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",            NAME="hwrng"
+KERNEL=="tun",                  NAME="net/%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=="buzzer",               NAME="misc/buzzer"
+
+# 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"
+
+# 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]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
diff --git a/meta/recipes-core/udev/udev-115/flags.patch b/meta/recipes-core/udev/udev-115/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile      2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile   2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS         += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS        = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS       = -Wstrict-prototypes -Wsign-compare -Wshadow \
+                  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+                  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS         += $(WARNINGS)
++override CFLAGS        += $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-       CFLAGS += -DUSE_LOG
++       override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-       CFLAGS  += -DDEBUG
++       override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-       CFLAGS += -fprofile-arcs -ftest-coverage
++       override CFLAGS += -fprofile-arcs -ftest-coverage
+        LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+        UDEV_OBJS += udev_selinux.o
+        LIB_OBJS += -lselinux -lsepol
+-       CFLAGS += -DUSE_SELINUX
++       override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-       CFLAGS += -DUSE_STATIC
++       override CFLAGS += -DUSE_STATIC
+        LDFLAGS += -static
+ endif
+ 
diff --git a/meta/recipes-core/udev/udev-115/init b/meta/recipes-core/udev/udev-115/init
new file mode 100644
index 0000000000..c882c75607
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/init
@@ -0,0 +1,48 @@
+export TZ=/etc/localtime
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x /sbin/udevd ] || exit 1
+[ -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 -n "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 0755 /dev/shm
+}
+
+if [ -e /etc/dev.tar ]; then
+        (cd /; tar xf /etc/dev.tar)
+        not_first_boot=1
+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/udevcontrol env STARTUP=1
+                if [ "$not_first_boot" != "" ];then
+                        /sbin/udevtrigger --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/udevsettle --timeout=3; /sbin/udevcontrol env STARTUP=)&
+                else
+                        /sbin/udevtrigger
+                        /sbin/udevsettle
+                fi
+
+echo
+exit 0
diff --git a/meta/recipes-core/udev/udev-115/local.rules b/meta/recipes-core/udev/udev-115/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/local.rules
@@ -0,0 +1,31 @@
+# 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"
+
+# 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"
diff --git a/meta/recipes-core/udev/udev-115/noasmlinkage.patch b/meta/recipes-core/udev/udev-115/noasmlinkage.patch
new file mode 100644
index 0000000000..5824d29590
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/noasmlinkage.patch
@@ -0,0 +1,36 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+---
+ udevd.c     |    2 +-
+ udevstart.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: udev-115/udevd.c
+===================================================================
+--- udev-115.orig/udevd.c       2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevd.c    2007-09-20 17:04:51.000000000 +0200
+@@ -767,7 +767,7 @@
+        return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGINT:
+Index: udev-115/udevstart.c
+===================================================================
+--- udev-115.orig/udevstart.c   2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevstart.c        2007-09-20 17:04:51.000000000 +0200
+@@ -304,7 +304,7 @@
+        }
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGALRM:
diff --git a/meta/recipes-core/udev/udev-115/permissions.rules b/meta/recipes-core/udev/udev-115/permissions.rules
new file mode 100644
index 0000000000..99e03b1036
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/permissions.rules
@@ -0,0 +1,101 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",   WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",                              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{PHYSDEVDRIVER}=="?*",     WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",                             GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",      GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+        IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",                            GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",                 GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",                GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",                  GROUP="tape"
+BUS=="scsi", SYSFS{type}=="5",                  GROUP="cdrom"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",                 GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",        MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",                        GROUP="plugdev", \
+        SYSFS{idVendor}=="4102", SYSFS{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",                                  GROUP="audio"
+
+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=="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]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+                                MODE="0664",    GROUP="video"
+KERNEL=="js[0-9]*",             MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",               MODE="0220",    GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/meta/recipes-core/udev/udev-115/udev.rules b/meta/recipes-core/udev/udev-115/udev.rules
new file mode 100644
index 0000000000..4d29acac0c
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/udev.rules
@@ -0,0 +1,105 @@
+# 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
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",        NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",          NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",          NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",    NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",         NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+                                        SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+        PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",                 NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",           NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",           NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",            NAME="hwrng"
+KERNEL=="tun",                  NAME="net/%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=="buzzer",               NAME="misc/buzzer"
+
+# 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"
+
+# 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]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
+# MXC UARTs
+KERNEL=="ttymxc[0-4]",   NAME="ttymxc%n"
+
diff --git a/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..87cafcaa9d
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,104 @@
+---
+ udevtrigger.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+Index: udev-115/udevtrigger.c
+===================================================================
+--- udev-115.orig/udevtrigger.c 2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevtrigger.c      2007-09-21 18:45:28.000000000 +0200
+@@ -39,6 +39,8 @@
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ 
+@@ -218,6 +220,26 @@
+        return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++       struct name_entry *loop_name;
++
++       /* skip devices matching the prohibited kernel device names */
++       list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++               if (fnmatch(loop_name->name, kernel, 0) == 0)
++                       return 1;
++
++       /* skip devices not matching the listed kernel device names */
++       if (!list_empty(&filter_kernel_match_list)) {
++               list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++                       if (fnmatch(loop_name->name, kernel, 0) == 0)
++                               return 0;
++               return 1;
++       }
++
++       return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+        struct name_entry *loop_name;
+@@ -296,6 +318,9 @@
+                                        if (dent2->d_name[0] == '.')
+                                                continue;
+ 
++                                       if (kernel_filtered(dent2->d_name))
++                                               continue;
++
+                                        strlcpy(dirname2, dirname, sizeof(dirname2));
+                                        strlcat(dirname2, "/", sizeof(dirname2));
+                                        strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -402,6 +427,9 @@
+                                        if (!strcmp(dent2->d_name, "device"))
+                                                continue;
+ 
++                                       if (kernel_filtered(dent2->d_name))
++                                               continue;
++
+                                        strlcpy(dirname2, dirname, sizeof(dirname2));
+                                        strlcat(dirname2, "/", sizeof(dirname2));
+                                        strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -458,6 +486,8 @@
+                { "subsystem-nomatch", 1, NULL, 'S' },
+                { "attr-match", 1, NULL, 'a' },
+                { "attr-nomatch", 1, NULL, 'A' },
++               { "kernel-match", 1, NULL, 'k' },
++               { "kernel-nomatch", 1, NULL, 'K' },
+                {}
+        };
+ 
+@@ -496,6 +526,12 @@
+                case 'A':
+                        name_list_add(&filter_attr_nomatch_list, optarg, 0);
+                        break;
++               case 'k':
++                       name_list_add(&filter_kernel_match_list, optarg, 0);
++                       break;
++               case 'K':
++                       name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++                       break;
+                case 'h':
+                        printf("Usage: udevtrigger OPTIONS\n"
+                               "  --verbose                       print the list of devices while running\n"
+@@ -504,6 +540,8 @@
+                               "                                  marked as failed during a previous run\n"
+                               "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+                               "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++                              "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
++                              "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
+                               "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+                               "                                  attribute\n"
+                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -549,6 +587,8 @@
+ exit:
+        name_list_cleanup(&filter_subsystem_match_list);
+        name_list_cleanup(&filter_subsystem_nomatch_list);
++       name_list_cleanup(&filter_kernel_match_list);
++       name_list_cleanup(&filter_kernel_nomatch_list);
+        name_list_cleanup(&filter_attr_match_list);
+        name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/meta/recipes-core/udev/udev-115/vol_id_ld.patch b/meta/recipes-core/udev/udev-115/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/meta/recipes-core/udev/udev-115/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile     2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile  2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+        $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-       $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++       $(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/meta/recipes-core/udev/udev-124/flags.patch b/meta/recipes-core/udev/udev-124/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile      2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile   2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS         += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS        = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS       = -Wstrict-prototypes -Wsign-compare -Wshadow \
+                  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+                  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS         += $(WARNINGS)
++override CFLAGS        += $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-       CFLAGS += -DUSE_LOG
++       override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-       CFLAGS  += -DDEBUG
++       override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-       CFLAGS += -fprofile-arcs -ftest-coverage
++       override CFLAGS += -fprofile-arcs -ftest-coverage
+        LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+        UDEV_OBJS += udev_selinux.o
+        LIB_OBJS += -lselinux -lsepol
+-       CFLAGS += -DUSE_SELINUX
++       override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-       CFLAGS += -DUSE_STATIC
++       override CFLAGS += -DUSE_STATIC
+        LDFLAGS += -static
+ endif
+ 
diff --git a/meta/recipes-core/udev/udev-124/init b/meta/recipes-core/udev/udev-124/init
new file mode 100644
index 0000000000..32ab370aa9
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/init
@@ -0,0 +1,59 @@
+#!/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/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 -n "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 0755 /dev/shm
+}
+
+if [ -e /etc/dev.tar ]; then
+        (cd /; tar xf /etc/dev.tar)
+        not_first_boot=1
+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=)&
+                else
+                        /sbin/udevadm trigger
+                        /sbin/udevadm settle
+                fi
+
+echo
+exit 0
diff --git a/meta/recipes-core/udev/udev-124/local.rules b/meta/recipes-core/udev/udev-124/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/local.rules
@@ -0,0 +1,31 @@
+# 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"
+
+# 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"
diff --git a/meta/recipes-core/udev/udev-124/noasmlinkage.patch b/meta/recipes-core/udev/udev-124/noasmlinkage.patch
new file mode 100644
index 0000000000..d58a7ea4de
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/noasmlinkage.patch
@@ -0,0 +1,45 @@
+diff -pru udev-124.orig/test-udev.c udev-124/test-udev.c
+--- udev-124.orig/test-udev.c   2008-06-12 06:24:30.000000000 +0100
++++ udev-124/test-udev.c        2008-07-07 14:43:37.000000000 +0100
+@@ -46,7 +46,7 @@ void log_message(int priority, const cha
+ }
+ #endif
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGALRM:
+diff -pru udev-124.orig/udevd.c udev-124/udevd.c
+--- udev-124.orig/udevd.c       2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevd.c    2008-07-07 14:43:58.000000000 +0100
+@@ -87,7 +87,7 @@ void log_message(int priority, const cha
+ 
+ #endif
+ 
+-static void asmlinkage udev_event_sig_handler(int signum)
++static void udev_event_sig_handler(int signum)
+ {
+        if (signum == SIGALRM)
+                exit(1);
+@@ -798,7 +798,7 @@ static struct udevd_uevent_msg *get_netl
+        return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGINT:
+diff -pru udev-124.orig/udevmonitor.c udev-124/udevmonitor.c
+--- udev-124.orig/udevmonitor.c 2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevmonitor.c      2008-07-07 14:44:24.000000000 +0100
+@@ -97,7 +97,7 @@ static int init_uevent_netlink_sock(void
+        return 0;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        if (signum == SIGINT || signum == SIGTERM)
+                udev_exit = 1;
diff --git a/meta/recipes-core/udev/udev-124/permissions.rules b/meta/recipes-core/udev/udev-124/permissions.rules
new file mode 100644
index 0000000000..205b733292
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/permissions.rules
@@ -0,0 +1,131 @@
+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}=="3", ATTRS{vendor}=="HP",      GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="5",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="6",                           GROUP="scanner"
+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=="nvram",                                GROUP="nvram"
+KERNEL=="rtc|rtc[0-9]*",                        GROUP="audio"
+KERNEL=="tpm*",                 MODE="0600",    OWNER="tss", GROUP="tss"
+KERNEL=="fuse",                                 GROUP="fuse"
+KERNEL=="kqemu",                MODE="0666"
+KERNEL=="kvm",                                  GROUP="kvm"
+KERNEL=="tun",                  MODE="0666",
+
+KERNEL=="cdemu[0-9]*",                          GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",                        GROUP="cdrom"
+KERNEL=="pktcdvd",              MODE="0644"
+
+KERNEL=="uverbs*",                              GROUP="rdma"
+KERNEL=="ucm*",                                 GROUP="rdma"
+KERNEL=="rdma_ucm",                             GROUP="rdma"
+
+# 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/meta/recipes-core/udev/udev-124/run.rules b/meta/recipes-core/udev/udev-124/run.rules
new file mode 100644
index 0000000000..75d71375bb
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/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/meta/recipes-core/udev/udev-124/udev.rules b/meta/recipes-core/udev/udev-124/udev.rules
new file mode 100644
index 0000000000..a19d4a0bf6
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/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*",   NAME="%k", 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]*", NAME="%k", 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/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..5182542461
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,99 @@
+diff -pru udev-124.orig/udevtrigger.c udev-124/udevtrigger.c
+--- udev-124.orig/udevtrigger.c 2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevtrigger.c      2008-07-07 15:10:09.000000000 +0100
+@@ -42,6 +42,8 @@ static int dry_run;
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ static int sock = -1;
+@@ -331,6 +333,26 @@ static int attr_match(const char *path, 
+        return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++       struct name_entry *loop_name;
++
++       /* skip devices matching the prohibited kernel device names */
++       list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++               if (fnmatch(loop_name->name, kernel, 0) == 0)
++                       return 1;
++
++       /* skip devices not matching the listed kernel device names */
++       if (!list_empty(&filter_kernel_match_list)) {
++               list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++                       if (fnmatch(loop_name->name, kernel, 0) == 0)
++                               return 0;
++               return 1;
++       }
++
++       return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+        struct name_entry *loop_name;
+@@ -409,6 +431,9 @@ static void scan_subsystem(const char *s
+                                        if (dent2->d_name[0] == '.')
+                                                continue;
+ 
++                                       if (kernel_filtered(dent2->d_name))
++                                               continue;
++
+                                        strlcpy(dirname2, dirname, sizeof(dirname2));
+                                        strlcat(dirname2, "/", sizeof(dirname2));
+                                        strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -465,6 +490,9 @@ static void scan_block(void)
+                                        if (!strcmp(dent2->d_name,"device"))
+                                                continue;
+ 
++                                       if (kernel_filtered(dent2->d_name))
++                                               continue;
++
+                                        strlcpy(dirname2, dirname, sizeof(dirname2));
+                                        strlcat(dirname2, "/", sizeof(dirname2));
+                                        strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -576,6 +604,8 @@ int udevtrigger(int argc, char *argv[], 
+                { "subsystem-nomatch", 1, NULL, 'S' },
+                { "attr-match", 1, NULL, 'a' },
+                { "attr-nomatch", 1, NULL, 'A' },
++               { "kernel-match", 1, NULL, 'k' },
++               { "kernel-nomatch", 1, NULL, 'K' },
+                { "env", 1, NULL, 'e' },
+                {}
+        };
+@@ -622,6 +652,12 @@ int udevtrigger(int argc, char *argv[], 
+                case 'A':
+                        name_list_add(&filter_attr_nomatch_list, optarg, 0);
+                        break;
++               case 'k':
++                       name_list_add(&filter_kernel_match_list, optarg, 0);
++                       break;
++               case 'K':
++                       name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++                       break;
+                case 'h':
+                        printf("Usage: udevadm trigger OPTIONS\n"
+                               "  --verbose                       print the list of devices while running\n"
+@@ -632,6 +668,8 @@ int udevtrigger(int argc, char *argv[], 
+                               "  --env=<KEY>=<value>             pass an additional key (works only with --socket=)\n"
+                               "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+                               "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++                              "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
++                              "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
+                               "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+                               "                                  attribute\n"
+                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -701,6 +739,8 @@ int udevtrigger(int argc, char *argv[], 
+ exit:
+        name_list_cleanup(&filter_subsystem_match_list);
+        name_list_cleanup(&filter_subsystem_nomatch_list);
++       name_list_cleanup(&filter_kernel_match_list);
++       name_list_cleanup(&filter_kernel_nomatch_list);
+        name_list_cleanup(&filter_attr_match_list);
+        name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/meta/recipes-core/udev/udev-124/vol_id_ld.patch b/meta/recipes-core/udev/udev-124/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/meta/recipes-core/udev/udev-124/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile     2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile  2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+        $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-       $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++       $(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/meta/recipes-core/udev/udev-141/igep0020/local.rules b/meta/recipes-core/udev/udev-141/igep0020/local.rules
new file mode 100644
index 0000000000..db976d0419
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/igep0020/local.rules
@@ -0,0 +1,34 @@
+# 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"
diff --git a/meta/recipes-core/udev/udev-141/init b/meta/recipes-core/udev/udev-141/init
new file mode 100644
index 0000000000..eb5e50758b
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/init
@@ -0,0 +1,59 @@
+#!/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/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 -n "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 [ -e /etc/dev.tar ]; then
+        (cd /; tar xf /etc/dev.tar)
+        not_first_boot=1
+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=)&
+                else
+                        /sbin/udevadm trigger
+                        /sbin/udevadm settle
+                fi
+
+echo
+exit 0
diff --git a/meta/recipes-core/udev/udev-141/local.rules b/meta/recipes-core/udev/udev-141/local.rules
new file mode 100644
index 0000000000..dab319b431
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/local.rules
@@ -0,0 +1,33 @@
+# 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"
+
+# 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
+# Need to use ../ so the eventX can find the parent inputX modalias which is a directory above
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+
diff --git a/meta/recipes-core/udev/udev-141/noasmlinkage.patch b/meta/recipes-core/udev/udev-141/noasmlinkage.patch
new file mode 100644
index 0000000000..6f9fe948f2
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/noasmlinkage.patch
@@ -0,0 +1,48 @@
+Index: udev-141/udev/test-udev.c
+===================================================================
+--- udev-141.orig/udev/test-udev.c      2008-10-24 09:07:24.000000000 +0100
++++ udev-141/udev/test-udev.c   2009-04-14 15:34:01.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include "udev.h"
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGALRM:
+Index: udev-141/udev/udevadm-monitor.c
+===================================================================
+--- udev-141.orig/udev/udevadm-monitor.c        2009-03-29 19:07:01.000000000 +0100
++++ udev-141/udev/udevadm-monitor.c     2009-04-14 15:34:01.000000000 +0100
+@@ -35,7 +35,7 @@
+ 
+ static int udev_exit;
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        if (signum == SIGINT || signum == SIGTERM)
+                udev_exit = 1;
+Index: udev-141/udev/udevd.c
+===================================================================
+--- udev-141.orig/udev/udevd.c  2009-03-29 19:07:01.000000000 +0100
++++ udev-141/udev/udevd.c       2009-04-14 15:34:56.000000000 +0100
+@@ -172,7 +172,7 @@
+        udev_event_unref(event);
+ }
+ 
+-static void asmlinkage event_sig_handler(int signum)
++static void event_sig_handler(int signum)
+ {
+        if (signum == SIGALRM)
+                exit(1);
+@@ -583,7 +583,7 @@
+        return 0;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGINT:
diff --git a/meta/recipes-core/udev/udev-141/permissions.rules b/meta/recipes-core/udev/udev-141/permissions.rules
new file mode 100644
index 0000000000..205b733292
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/permissions.rules
@@ -0,0 +1,131 @@
+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}=="3", ATTRS{vendor}=="HP",      GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="5",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="6",                           GROUP="scanner"
+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=="nvram",                                GROUP="nvram"
+KERNEL=="rtc|rtc[0-9]*",                        GROUP="audio"
+KERNEL=="tpm*",                 MODE="0600",    OWNER="tss", GROUP="tss"
+KERNEL=="fuse",                                 GROUP="fuse"
+KERNEL=="kqemu",                MODE="0666"
+KERNEL=="kvm",                                  GROUP="kvm"
+KERNEL=="tun",                  MODE="0666",
+
+KERNEL=="cdemu[0-9]*",                          GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",                        GROUP="cdrom"
+KERNEL=="pktcdvd",              MODE="0644"
+
+KERNEL=="uverbs*",                              GROUP="rdma"
+KERNEL=="ucm*",                                 GROUP="rdma"
+KERNEL=="rdma_ucm",                             GROUP="rdma"
+
+# 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/meta/recipes-core/udev/udev-141/run.rules b/meta/recipes-core/udev/udev-141/run.rules
new file mode 100644
index 0000000000..75d71375bb
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/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/meta/recipes-core/udev/udev-141/udev.rules b/meta/recipes-core/udev/udev-141/udev.rules
new file mode 100644
index 0000000000..a19d4a0bf6
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/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*",   NAME="%k", 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]*", NAME="%k", 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/meta/recipes-core/udev/udev-141/unbreak.patch b/meta/recipes-core/udev/udev-141/unbreak.patch
new file mode 100644
index 0000000000..bb5988dca4
--- /dev/null
+++ b/meta/recipes-core/udev/udev-141/unbreak.patch
@@ -0,0 +1,24 @@
+Index: udev-141/extras/volume_id/lib/Makefile.am
+===================================================================
+--- udev-141.orig/extras/volume_id/lib/Makefile.am      2009-05-17 23:36:16.000000000 +0100
++++ udev-141/extras/volume_id/lib/Makefile.am   2009-05-17 23:36:26.000000000 +0100
+@@ -54,19 +54,6 @@
+        -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \
+        -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols
+ 
+-# move devel files to $(prefix)$(libdir_name) if needed
+-install-data-hook:
+-       rm  $(DESTDIR)$(rootlibdir)/libvolume_id.la
+-       if test "$(prefix)" != "$(exec_prefix)"; then \
+-               mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \
+-               mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \
+-               so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \
+-               rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \
+-               so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+-               ln -sf  $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \
+-                       $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \
+-       fi
+-
+ EXTRA_DIST = \
+        exported_symbols
+ 
diff --git a/meta/recipes-core/udev/udev-145/enable-gudev.patch b/meta/recipes-core/udev/udev-145/enable-gudev.patch
new file mode 100644
index 0000000000..45fd37311c
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/enable-gudev.patch
@@ -0,0 +1,48 @@
+Index: udev-145/configure.ac
+===================================================================
+--- udev-145.orig/configure.ac  2010-01-29 14:41:29.000000000 +0000
++++ udev-145/configure.ac       2010-01-29 14:41:54.000000000 +0000
+@@ -49,16 +49,17 @@
+ AC_ARG_ENABLE([extras],
+        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
+        [], [enable_extras=yes])
++
++       PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
++       AC_SUBST([GLIB_CFLAGS])
++       AC_SUBST([GLIB_LIBS])
++
+ if test "x$enable_extras" = xyes; then
+        AC_PATH_PROG([GPERF], [gperf])
+        if test -z "$GPERF"; then
+                AC_MSG_ERROR([gperf is needed])
+        fi
+ 
+-       PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
+-       AC_SUBST([GLIB_CFLAGS])
+-       AC_SUBST([GLIB_LIBS])
+-
+        AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
+        AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
+ 
+Index: udev-145/extras/Makefile.am
+===================================================================
+--- udev-145.orig/extras/Makefile.am    2010-01-29 14:43:56.000000000 +0000
++++ udev-145/extras/Makefile.am 2010-01-29 14:44:11.000000000 +0000
+@@ -12,7 +12,8 @@
+        rule_generator \
+        scsi_id \
+        usb_id \
+-       v4l_id
++       v4l_id \
++       gudev 
+ 
+ if ENABLE_EXTRAS
+ SUBDIRS += \
+@@ -20,6 +21,5 @@
+        usb-db \
+        hid2hci \
+        keymap \
+-       modem-modeswitch \
+-       gudev
++       modem-modeswitch
+ endif
diff --git a/meta/recipes-core/udev/udev-145/init b/meta/recipes-core/udev/udev-145/init
new file mode 100644
index 0000000000..eb5e50758b
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/init
@@ -0,0 +1,59 @@
+#!/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/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 -n "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 [ -e /etc/dev.tar ]; then
+        (cd /; tar xf /etc/dev.tar)
+        not_first_boot=1
+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=)&
+                else
+                        /sbin/udevadm trigger
+                        /sbin/udevadm settle
+                fi
+
+echo
+exit 0
diff --git a/meta/recipes-core/udev/udev-145/local.rules b/meta/recipes-core/udev/udev-145/local.rules
new file mode 100644
index 0000000000..dab319b431
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/local.rules
@@ -0,0 +1,33 @@
+# 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"
+
+# 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
+# Need to use ../ so the eventX can find the parent inputX modalias which is a directory above
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+
diff --git a/meta/recipes-core/udev/udev-145/noasmlinkage.patch b/meta/recipes-core/udev/udev-145/noasmlinkage.patch
new file mode 100644
index 0000000000..6f9fe948f2
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/noasmlinkage.patch
@@ -0,0 +1,48 @@
+Index: udev-141/udev/test-udev.c
+===================================================================
+--- udev-141.orig/udev/test-udev.c      2008-10-24 09:07:24.000000000 +0100
++++ udev-141/udev/test-udev.c   2009-04-14 15:34:01.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include "udev.h"
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGALRM:
+Index: udev-141/udev/udevadm-monitor.c
+===================================================================
+--- udev-141.orig/udev/udevadm-monitor.c        2009-03-29 19:07:01.000000000 +0100
++++ udev-141/udev/udevadm-monitor.c     2009-04-14 15:34:01.000000000 +0100
+@@ -35,7 +35,7 @@
+ 
+ static int udev_exit;
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        if (signum == SIGINT || signum == SIGTERM)
+                udev_exit = 1;
+Index: udev-141/udev/udevd.c
+===================================================================
+--- udev-141.orig/udev/udevd.c  2009-03-29 19:07:01.000000000 +0100
++++ udev-141/udev/udevd.c       2009-04-14 15:34:56.000000000 +0100
+@@ -172,7 +172,7 @@
+        udev_event_unref(event);
+ }
+ 
+-static void asmlinkage event_sig_handler(int signum)
++static void event_sig_handler(int signum)
+ {
+        if (signum == SIGALRM)
+                exit(1);
+@@ -583,7 +583,7 @@
+        return 0;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+        switch (signum) {
+                case SIGINT:
diff --git a/meta/recipes-core/udev/udev-145/permissions.rules b/meta/recipes-core/udev/udev-145/permissions.rules
new file mode 100644
index 0000000000..205b733292
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/permissions.rules
@@ -0,0 +1,131 @@
+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}=="3", ATTRS{vendor}=="HP",      GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="5",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="6",                           GROUP="scanner"
+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=="nvram",                                GROUP="nvram"
+KERNEL=="rtc|rtc[0-9]*",                        GROUP="audio"
+KERNEL=="tpm*",                 MODE="0600",    OWNER="tss", GROUP="tss"
+KERNEL=="fuse",                                 GROUP="fuse"
+KERNEL=="kqemu",                MODE="0666"
+KERNEL=="kvm",                                  GROUP="kvm"
+KERNEL=="tun",                  MODE="0666",
+
+KERNEL=="cdemu[0-9]*",                          GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",                        GROUP="cdrom"
+KERNEL=="pktcdvd",              MODE="0644"
+
+KERNEL=="uverbs*",                              GROUP="rdma"
+KERNEL=="ucm*",                                 GROUP="rdma"
+KERNEL=="rdma_ucm",                             GROUP="rdma"
+
+# 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/meta/recipes-core/udev/udev-145/run.rules b/meta/recipes-core/udev/udev-145/run.rules
new file mode 100644
index 0000000000..75d71375bb
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/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/meta/recipes-core/udev/udev-145/udev.rules b/meta/recipes-core/udev/udev-145/udev.rules
new file mode 100644
index 0000000000..a19d4a0bf6
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/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*",   NAME="%k", 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]*", NAME="%k", 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/meta/recipes-core/udev/udev-145/unbreak.patch b/meta/recipes-core/udev/udev-145/unbreak.patch
new file mode 100644
index 0000000000..bb5988dca4
--- /dev/null
+++ b/meta/recipes-core/udev/udev-145/unbreak.patch
@@ -0,0 +1,24 @@
+Index: udev-141/extras/volume_id/lib/Makefile.am
+===================================================================
+--- udev-141.orig/extras/volume_id/lib/Makefile.am      2009-05-17 23:36:16.000000000 +0100
++++ udev-141/extras/volume_id/lib/Makefile.am   2009-05-17 23:36:26.000000000 +0100
+@@ -54,19 +54,6 @@
+        -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \
+        -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols
+ 
+-# move devel files to $(prefix)$(libdir_name) if needed
+-install-data-hook:
+-       rm  $(DESTDIR)$(rootlibdir)/libvolume_id.la
+-       if test "$(prefix)" != "$(exec_prefix)"; then \
+-               mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \
+-               mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \
+-               so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \
+-               rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \
+-               so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+-               ln -sf  $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \
+-                       $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \
+-       fi
+-
+ EXTRA_DIST = \
+        exported_symbols
+ 
diff --git a/meta/recipes-core/udev/udev-158/init b/meta/recipes-core/udev/udev-158/init
new file mode 100644
index 0000000000..eb5e50758b
--- /dev/null
+++ b/meta/recipes-core/udev/udev-158/init
@@ -0,0 +1,59 @@
+#!/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/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 -n "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 [ -e /etc/dev.tar ]; then
+        (cd /; tar xf /etc/dev.tar)
+        not_first_boot=1
+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=)&
+                else
+                        /sbin/udevadm trigger
+                        /sbin/udevadm settle
+                fi
+
+echo
+exit 0
diff --git a/meta/recipes-core/udev/udev-158/local.rules b/meta/recipes-core/udev/udev-158/local.rules
new file mode 100644
index 0000000000..dab319b431
--- /dev/null
+++ b/meta/recipes-core/udev/udev-158/local.rules
@@ -0,0 +1,33 @@
+# 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"
+
+# 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
+# Need to use ../ so the eventX can find the parent inputX modalias which is a directory above
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+
diff --git a/meta/recipes-core/udev/udev-158/permissions.rules b/meta/recipes-core/udev/udev-158/permissions.rules
new file mode 100644
index 0000000000..205b733292
--- /dev/null
+++ b/meta/recipes-core/udev/udev-158/permissions.rules
@@ -0,0 +1,131 @@
+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}=="3", ATTRS{vendor}=="HP",      GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",   GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="5",                           GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="6",                           GROUP="scanner"
+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=="nvram",                                GROUP="nvram"
+KERNEL=="rtc|rtc[0-9]*",                        GROUP="audio"
+KERNEL=="tpm*",                 MODE="0600",    OWNER="tss", GROUP="tss"
+KERNEL=="fuse",                                 GROUP="fuse"
+KERNEL=="kqemu",                MODE="0666"
+KERNEL=="kvm",                                  GROUP="kvm"
+KERNEL=="tun",                  MODE="0666",
+
+KERNEL=="cdemu[0-9]*",                          GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",                        GROUP="cdrom"
+KERNEL=="pktcdvd",              MODE="0644"
+
+KERNEL=="uverbs*",                              GROUP="rdma"
+KERNEL=="ucm*",                                 GROUP="rdma"
+KERNEL=="rdma_ucm",                             GROUP="rdma"
+
+# 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/meta/recipes-core/udev/udev-158/run.rules b/meta/recipes-core/udev/udev-158/run.rules
new file mode 100644
index 0000000000..75d71375bb
--- /dev/null
+++ b/meta/recipes-core/udev/udev-158/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/meta/recipes-core/udev/udev-158/udev.rules b/meta/recipes-core/udev/udev-158/udev.rules
new file mode 100644
index 0000000000..a19d4a0bf6
--- /dev/null
+++ b/meta/recipes-core/udev/udev-158/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*",   NAME="%k", 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]*", NAME="%k", 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/meta/recipes-core/udev/udev-extraconf_0.0.bb b/meta/recipes-core/udev/udev-extraconf_0.0.bb
new file mode 100644
index 0000000000..34c8400ddd
--- /dev/null
+++ b/meta/recipes-core/udev/udev-extraconf_0.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Extra machine specific configuration files"
+LICENCE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "file://mount.blacklist"
+
+do_install () {
+        install -d ${D}${sysconfdir}/udev/
+
+        install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+}
diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
new file mode 100644
index 0000000000..87f9633473
--- /dev/null
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -0,0 +1,92 @@
+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."
+HOMEPAGE = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LICENSE_${PN} = "GPLv2+"
+LICENSE_libudev = "LGPLv2.1+"
+LICENSE_libgudev = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+                    file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+DEPENDS = "acl glib-2.0 libusb usbutils pciutils linux-libc-headers gperf-native libxslt-native"
+RPROVIDES_${PN} = "hotplug"
+RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
+RDEPENDS_libudev = "${PN} (= ${EXTENDPV})"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://run.rules \
+           file://udev.rules \
+           file://devfs-udev.rules \
+           file://links.conf \
+           file://permissions.rules \
+           file://mount.sh \
+           file://network.sh \
+           file://local.rules \
+           file://udev-cache \
+           file://init"
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+
+inherit autotools pkgconfig update-rc.d
+
+# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
+sbindir = "${base_sbindir}"
+libexecdir = "${base_libdir}/udev"
+EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
+                --with-pci-ids-path=${datadir}/pci.ids"
+
+PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
+PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
+PACKAGE_ARCH_h2200 = "h2200"
+
+INITSCRIPT_PACKAGES = "udev udev-cache"
+INITSCRIPT_NAME_udev = "udev"
+INITSCRIPT_PARAMS_udev = "start 04 S ."
+INITSCRIPT_NAME_udev-cache = "udev-cache"
+INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
+
+FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
+FILES_${PN}-dbg += "${libexecdir}/.debug"
+FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
+FILES_libudev = "${base_libdir}/libudev.so.*"
+FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
+FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
+                     ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
+FILES_libgudev = "${libdir}/libgudev*.so.*"
+FILES_libgudev-dbg = "${libdir}/.debug/libgudev*.so.*"
+FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
+                     ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
+FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
+
+do_install_append () {
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+        install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        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
+
+        # Remove some default rules that don't work well on embedded devices
+        #rm ${D}${libexecdir}/rules.d/60-persistent-input.rules
+        #rm ${D}${libexecdir}/rules.d/60-persistent-storage.rules
+        #rm ${D}${libexecdir}/rules.d/60-persistent-storage-tape.rules
+
+        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
+}
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
new file mode 100644
index 0000000000..0afd817b8f
--- /dev/null
+++ b/meta/recipes-core/udev/udev.inc
@@ -0,0 +1,71 @@
+DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
+/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
+LICENSE = "GPL"
+
+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://udev-cache \
+           file://init"
+
+UDEV_DEVFS_RULES ?= "0"
+
+PACKAGES =+ "udev-utils libvolume-id udev-cache"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
+
+RRECOMMENDS_${PN} += "udev-extraconf udev-cache"
+
+inherit update-rc.d autotools pkgconfig
+
+INITSCRIPT_PACKAGES = "udev udev-cache"
+INITSCRIPT_NAME_udev = "udev"
+INITSCRIPT_PARAMS_udev = "start 04 S ."
+INITSCRIPT_NAME_udev-cache = "udev-cache"
+INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
+
+export CROSS = "${TARGET_PREFIX}"
+export HOSTCC = "${BUILD_CC}"
+export udevdir ?= "/dev"
+export usrbindir := "${bindir}"
+export usrsbindir := "${sbindir}"
+export etcdir = "${sysconfdir}"
+LD = "${CC}"
+bindir = "/bin"
+sbindir = "/sbin"
+
+UDEV_EXTRAS = "<override me>"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
+FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
+EXTRA_OEMAKE = "-e \
+                'EXTRAS=${UDEV_EXTRAS}' \
+                'STRIP=echo'"
+
+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}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        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}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+        if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+                install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+        fi
+
+        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
+}
diff --git a/meta/recipes-core/udev/udev_092.bb b/meta/recipes-core/udev/udev_092.bb
new file mode 100644
index 0000000000..0e94d1f6c8
--- /dev/null
+++ b/meta/recipes-core/udev/udev_092.bb
@@ -0,0 +1,58 @@
+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."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r17"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://noasmlinkage.patch;patch=1 \
+           file://flags.patch;patch=1 \
+           file://udevsynthesize.patch;patch=1 \
+           file://udevsynthesize.sh \
+           file://arm_inotify_fix.patch;patch=1 \
+           "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+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}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        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}/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
+
+        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
+
+        install -d ${D}${base_libdir}/udev/
+        install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize
+        install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize
+}
+
+do_install_append_h2200() {
+        install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
diff --git a/meta/recipes-core/udev/udev_115.bb b/meta/recipes-core/udev/udev_115.bb
new file mode 100644
index 0000000000..9db8661b61
--- /dev/null
+++ b/meta/recipes-core/udev/udev_115.bb
@@ -0,0 +1,55 @@
+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."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r5"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://noasmlinkage.patch;patch=1 \
+           file://flags.patch;patch=1 \
+           file://vol_id_ld.patch;patch=1 \
+           file://udevtrigger_add_devname_filtering.patch;patch=1 \
+           "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+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}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        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}/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
+
+        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
+
+        install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+        install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
diff --git a/meta/recipes-core/udev/udev_124.bb b/meta/recipes-core/udev/udev_124.bb
new file mode 100644
index 0000000000..ccfbbf7018
--- /dev/null
+++ b/meta/recipes-core/udev/udev_124.bb
@@ -0,0 +1,62 @@
+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."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r10"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://noasmlinkage.patch;patch=1 \
+           file://flags.patch;patch=1 \
+           file://vol_id_ld.patch;patch=1 \
+           file://udevtrigger_add_devname_filtering.patch;patch=1 \
+           file://run.rules \
+           "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+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}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        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
+
+        # Remove some default rules that don't work well on embedded devices
+        rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules
+        rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules
+        rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules
+
+        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
+
+        install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+        install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
diff --git a/meta/recipes-core/udev/udev_141.bb b/meta/recipes-core/udev/udev_141.bb
new file mode 100644
index 0000000000..3893a98a2d
--- /dev/null
+++ b/meta/recipes-core/udev/udev_141.bb
@@ -0,0 +1,65 @@
+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."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r8"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://noasmlinkage.patch;patch=1 \
+           file://unbreak.patch;patch=1 \
+           file://run.rules \
+           "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+require udev.inc
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+#EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+exec_prefix = ""
+
+EXTRA_OECONF = "--with-udev-prefix="
+
+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}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/
+        cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/
+        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
+
+        # Remove some default rules that don't work well on embedded devices
+        #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules
+        #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules
+        #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules
+
+        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
+
+        install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+        install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
diff --git a/meta/recipes-core/udev/udev_145.bb b/meta/recipes-core/udev/udev_145.bb
new file mode 100644
index 0000000000..91d8ce3734
--- /dev/null
+++ b/meta/recipes-core/udev/udev_145.bb
@@ -0,0 +1,65 @@
+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."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r9"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://enable-gudev.patch;patch=1 \
+           file://run.rules \
+           "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+
+EXTRA_OECONF = "--with-udev-prefix= --disable-extras --disable-introspection"
+
+DEPENDS += "glib-2.0"
+
+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}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+
+        install -d ${D}${sysconfdir}/udev/rules.d/
+
+        cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/
+        cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/
+        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
+
+        # Remove some default rules that don't work well on embedded devices
+        #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules
+        #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules
+        #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules
+
+        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
+
+        install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+        install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
diff --git a/meta/recipes-core/udev/udev_158.bb b/meta/recipes-core/udev/udev_158.bb
new file mode 100644
index 0000000000..daf8d37e5f
--- /dev/null
+++ b/meta/recipes-core/udev/udev_158.bb
@@ -0,0 +1,3 @@
+include udev-new.inc
+
+PR = "r2"
diff --git a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch b/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
new file mode 100644
index 0000000000..0f068308f6
--- /dev/null
+++ b/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
@@ -0,0 +1,47 @@
+--- update-rc.d/update-rc.d.org 2005-01-03 00:30:47.000000000 +0200
++++ update-rc.d/update-rc.d     2007-12-01 19:41:08.000000000 +0200
+@@ -19,6 +19,7 @@
+ notreally=0
+ force=0
+ dostart=0
++verbose=0
+ 
+ usage()
+ {
+@@ -28,6 +29,7 @@
+        update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
+                -n: not really
+                -f: force
++               -v: verbose
+                -r: alternate root path (default is /)
+                -s: invoke start methods if appropriate to current runlevel
+ EOF
+@@ -69,7 +71,7 @@
+        lev=`echo $2 | cut -d/ -f1`
+        nn=`echo $2 | cut -d/ -f2`
+        fn="${etcd}${lev}.d/${startstop}${nn}${bn}"
+-       echo "  $fn -> ../init.d/$bn"
++       [ $verbose -eq 1 ] && echo "  $fn -> ../init.d/$bn"
+        if [ $notreally -eq 0 ]; then
+                mkdir -p `dirname $fn`
+                ln -s ../init.d/$bn $fn
+@@ -89,7 +91,7 @@
+                exit 0
+        fi
+ 
+-       echo " Adding system startup for $initd/$bn ..."
++       echo " Adding system startup for $initd/$bn."
+ 
+        for i in $startlinks; do
+                dolink S $i
+@@ -105,6 +107,10 @@
+                        shift
+                        continue
+                        ;;
++               -v)     verbose=1
++                       shift
++                       continue
++                       ;;
+                -f)     force=1
+                        shift
+                        continue
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
new file mode 100644
index 0000000000..03ac5c1a29
--- /dev/null
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "manage symlinks in /etc/rcN.d."
+SECTION = "base"
+PRIORITY = "standard"
+PACKAGE_ARCH = "all"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=148a48321b10eb37c1fa3ee02b940a75"
+
+PR = "r3"
+
+SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7 \
+           file://add-verbose.patch;apply=yes"
+
+S = "${WORKDIR}/update-rc.d"
+
+
+do_compile() {
+}
+
+do_install() {
+        install -d ${D}${sbindir}
+        install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d
+}
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/zlib/files/Makefile.am b/meta/recipes-core/zlib/files/Makefile.am
new file mode 100644
index 0000000000..b66d299d8f
--- /dev/null
+++ b/meta/recipes-core/zlib/files/Makefile.am
@@ -0,0 +1,9 @@
+lib_LTLIBRARIES = libz.la
+
+libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c gzclose.c gzread.c \
+                  gzwrite.c uncompr.c deflate.c trees.c zutil.c inflate.c \
+                  infback.c inftrees.c inffast.c
+
+libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
+
+include_HEADERS = zconf.h zlib.h zlibdefs.h
diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac
new file mode 100644
index 0000000000..4761b7ef28
--- /dev/null
+++ b/meta/recipes-core/zlib/files/configure.ac
@@ -0,0 +1,48 @@
+AC_INIT(zlib,1.2.5)
+AC_CONFIG_SRCDIR(adler32.c)
+AM_INIT_AUTOMAKE(zlibs,1.2.5)
+
+AC_PREREQ([2.59])
+
+AC_PROG_CC([gcc])
+AC_PROG_LIBTOOL
+
+AC_HEADER_STDC
+
+zlib_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+AC_CHECK_TYPES(off64_t)
+CPPFLAGS=$zlib_save_CPPFLAGS
+
+AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [
+    zlib_cv_use_lfs64=no
+    if test "$ac_cv_type_off64_t" = "yes"; then
+        zlib_cv_use_lfs64=yes
+    fi
+])
+
+if test "$zlib_cv_use_lfs64" = "yes"; then
+    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+
+    #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
+fi
+
+cat > zlibdefs.h << EOF
+/* zlibdefs.h -- compile-time definitions for the zlib compression library
+ * Copyright (C) 1995-2006 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include <sys/types.h>  /* for off_t */
+#include <unistd.h>     /* for SEEK_* and off_t */
+#ifdef VMS
+#  include <unixio.h>   /* for off_t */
+#endif
+#ifndef z_off_t
+#  define z_off_t off_t
+#endif
+EOF
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb
new file mode 100644
index 0000000000..e6db69e3a6
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib_1.2.5.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zlib Compression Library"
+HOMEPAGE = "http://zlib.net/"
+SECTION = "libs"
+PRIORITY = "required"
+LICENSE = "zlib"
+LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
+
+DEPENDS = "libtool-cross"
+PR = "r0"
+
+SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
+           file://configure.ac \
+           file://Makefile.am"
+
+inherit autotools
+
+do_configure_prepend () {
+        cp ${WORKDIR}/configure.ac ${S}/
+        cp ${WORKDIR}/Makefile.am ${S}/
+}
+
+BBCLASSEXTEND = "native nativesdk"