2525 files changed, 4210 insertions, 15906 deletions

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index c0298f528..7e0beba95 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -3,7 +3,7 @@ BBPATH ?= ""
 BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
+BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "normal"
 BBFILE_PATTERN_normal := "^${LAYERDIR}/"
diff --git a/meta/packages/cx3110x/cx3110x_1.1.bb b/meta/packages/cx3110x/cx3110x_1.1.bb
deleted file mode 100644
index 95bbc3508..000000000
--- a/meta/packages/cx3110x/cx3110x_1.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "cx3110x wifi support as found in the Nokia 770/800"
-SECTION = "kernel/modules"
-LICENSE = "GPL"
-PR = "r1"
-PACKAGES = "${PN}"
-
-COMPATIBLE_MACHINE = "(nokia770|nokia800)"
-
-export KERNEL_SRC_DIR = ${STAGING_KERNEL_DIR}
-export LDFLAGS = ""
-
-SRC_URI = "https://garage.maemo.org/frs/download.php/939/cx3110x-1.1.tar.gz"
-
-S = "${WORKDIR}/cx3110x-${PV}"
-
-inherit module
-
-do_compile() {
-	oe_runmake modules 
-}
-
diff --git a/meta/packages/cx3110x/cx3110x_2.0.15.bb b/meta/packages/cx3110x/cx3110x_2.0.15.bb
deleted file mode 100644
index c952b2a94..000000000
--- a/meta/packages/cx3110x/cx3110x_2.0.15.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "cx3110x wifi support as found in the Nokia 770/N800/N810"
-SECTION = "kernel/modules"
-LICENSE = "GPL"
-PACKAGES = "${PN}"
-PR = "r1"
-
-COMPATIBLE_MACHINE = "(nokia800)"
-
-export KERNEL_SRC_DIR = ${STAGING_KERNEL_DIR}
-export LDFLAGS = ""
-
-DEFAULT_PREFERENCE_nokia770 = "-1"
-
-SRC_URI = "http://repository.maemo.org/pool/os2008/free/source/c/cx3110x-module-src/cx3110x-module-src_2.0.15-1.tar.gz \
-           file://no-linux-config.patch;patch=1"
-
-S = "${WORKDIR}/cx3110x-module-src-${PV}"
-
-inherit module
-
-do_compile() {
-	oe_runmake modules 
-}
diff --git a/meta/packages/cx3110x/files/no-linux-config.patch b/meta/packages/cx3110x/files/no-linux-config.patch
deleted file mode 100644
index e6ab31724..000000000
--- a/meta/packages/cx3110x/files/no-linux-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: cx3110x-module-src-2.0.15/src/sm_drv_spi.c
-===================================================================
---- cx3110x-module-src-2.0.15.orig/src/sm_drv_spi.c	2008-02-08 13:52:28.000000000 +0100
-+++ cx3110x-module-src-2.0.15/src/sm_drv_spi.c	2008-02-08 13:52:40.000000000 +0100
-@@ -36,7 +36,6 @@
- #include <linux/platform_device.h>
- #include <linux/string.h>
- #include <linux/firmware.h>
--#include <linux/config.h>
- #if !defined(CONFIG_FW_LOADER) && !defined(CONFIG_FW_LOADER_MODULE)
- #error No Firmware Loading configured in the kernel !
- #endif
diff --git a/meta/packages/helix/helix-libs.bb b/meta/packages/helix/helix-libs.bb
deleted file mode 100644
index 9fcbd4b67..000000000
--- a/meta/packages/helix/helix-libs.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "Helix Client Libraries"
-SECTION = "base"
-DEPENDS = "ribosome gtk+ libxv"
-HOMEPAGE = "http://helixcommunity.org"
-LICENSE = "RPSL"
-
-_SNAPSHOT = "atlas310_11212008"
-_TARBALL_SERVER = "http://git.moblin.org/repos/users/rusty"
-
-PV="r0"
-
-SRC_URI = "${_TARBALL_SERVER}/helix-libs_${_SNAPSHOT}.tar.bz2 \
-           file://helix-libs/helix-player.pc \
-           file://helix-libs/add-clutter.patch;patch=1"
-S = "${WORKDIR}/helix-libs_${_SNAPSHOT}"
-
-export BUILD_ROOT=${STAGING_DIR_HOST}${libdir}/ribosome
-export BUILDRC=${BUILD_ROOT}/buildrc
-export SYSTEM_ID=linux-2.2-libc6-gcc32-i586
-export BUILD=$BUILD_ROOT/bin/build.py
-
-COMPATIBLE_HOST = '(i.86.*-linux)'
-
-do_compile() {
-	${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
-}
-
-do_install() {
-	mkdir -p ${D}/opt/helix/lib
-	mkdir -p ${D}/opt/helix/include
-	mkdir -p ${D}${libdir}/pkgconfig
-
-	install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/
-	install -m 0644 ../helix-libs/helix-player.pc ${D}${libdir}/pkgconfig
-
-	install -m 0644 release/*.so ${D}/opt/helix/lib
-
-	install -d ${D}${libdir}
-	install -m 0644 release/libhelix-player.so ${D}${libdir}
-}
-
-sysroot_stage_all_append() {
-	sysroot_stage_dir ${D}/opt/helix ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/helix
-}
-
-FILES_${PN} = "/usr/lib/libhelix-player.so"
-FILES_${PN} += "/opt/helix/lib"
-FILES_${PN}-dev = "/usr/lib/pkgconfig"
-FILES_${PN}-dev += "/opt/helix/include"
diff --git a/meta/packages/helix/helix-libs/add-clutter.patch b/meta/packages/helix/helix-libs/add-clutter.patch
deleted file mode 100644
index eb545ff73..000000000
--- a/meta/packages/helix/helix-libs/add-clutter.patch
+++ /dev/null
@@ -1,12668 +0,0 @@
-Index: helix-libs/clientapps/clutter/LICENSE.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/LICENSE.txt	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,30 @@
-+ Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.  
-+        
-+ The contents of this directory, and (except where otherwise
-+ indicated) the directories included within this directory, are
-+ subject to the current version of the RealNetworks Public Source
-+ License (the "RPSL") available at RPSL.txt in this directory, unless
-+ you have licensed the directory under the current version of the
-+ RealNetworks Community Source License (the "RCSL") available at
-+ RCSL.txt in this directory, in which case the RCSL will apply. You
-+ may also obtain the license terms directly from RealNetworks.  You
-+ may not use the files in this directory except in compliance with the
-+ RPSL or, if you have a valid RCSL with RealNetworks applicable to
-+ this directory, the RCSL.  Please see the applicable RPSL or RCSL for
-+ the rights, obligations and limitations governing use of the contents
-+ of the directory.
-+ 
-+ This directory is part of the Helix DNA Technology. RealNetworks is
-+ the developer of the Original Code and owns the copyrights in the
-+ portions it created.
-+   
-+ This directory, and the directories included with this directory, are
-+ distributed and made available on an 'AS IS' basis, WITHOUT WARRANTY
-+ OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY
-+ DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY
-+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-+ QUIET ENJOYMENT OR NON-INFRINGEMENT.
-+  
-+ Technology Compatibility Kit Test Suite(s) Location:  
-+    http://www.helixcommunity.org/content/tck  
-+
-Index: helix-libs/clientapps/clutter/RCSL.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/RCSL.txt	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,948 @@
-+The RCSL is made up of a base agreement and a few Attachments.
-+
-+For Research and Development use, you agree to the terms of the
-+RCSL R&D License (base RCSL and Attachments A, B, and C) 
-+
-+For Commercial Use (either distribution or internal commercial
-+deployment) of the Helix DNA with or without support for RealNetworks'
-+RealAudio and RealVideo Add-on Technology, you agree to the
-+terms of the same RCSL R&D license
-+and execute one or more additional Commercial Use License attachments
-+<see http://www.helixcommunity.org/content/rcsl-attachments>.
-+
-+------------------------------------------------------------------------
-+
-+
-+    REALNETWORKS COMMUNITY SOURCE LICENSE
-+
-+Version 1.2 (Rev. Date: January 22, 2003).
-+
-+
-+  RECITALS
-+
-+Original Contributor has developed Specifications, Source Code
-+implementations and Executables of certain Technology; and
-+
-+Original Contributor desires to license the Technology to a large
-+community to facilitate research, innovation and product development
-+while maintaining compatibility of such products with the Technology as
-+delivered by Original Contributor; and
-+
-+Original Contributor desires to license certain Trademarks for the
-+purpose of branding products that are compatible with the relevant
-+Technology delivered by Original Contributor; and
-+
-+You desire to license the Technology and possibly certain Trademarks
-+from Original Contributor on the terms and conditions specified in this
-+License.
-+
-+In consideration for the mutual covenants contained herein, You and
-+Original Contributor agree as follows:
-+
-+
-+  AGREEMENT
-+
-+*1. Introduction.*
-+
-+The RealNetworks Community Source License ("RCSL") and effective
-+attachments ("License") may include five distinct licenses:
-+
-+i) Research Use license -- License plus Attachments A, B and C only.
-+
-+ii) Commercial Use and Trademark License, which may be for Internal
-+Deployment Use or external distribution, or both -- License plus
-+Attachments A, B, C, and D.
-+
-+iii) Technology Compatibility Kit (TCK) license -- Attachment C.
-+
-+iv) Add-On Technology License (Executable) Commercial Use License
-+-Attachment F.
-+
-+v) Add-On Technology Source Code Porting and Optimization
-+License-Attachment G.
-+
-+The Research Use license is effective when You click and accept this
-+License. The TCK is effective when You click and accept this License,
-+unless otherwise specified in the TCK attachments. The Commercial Use
-+and Trademark, Add-On Technology License, and the Add-On Technology
-+Source Code Porting and Optimization licenses must each be signed by You
-+and Original Contributor to become effective. Once effective, these
-+licenses and the associated requirements and responsibilities are
-+cumulative. Capitalized terms used in this License are defined in the
-+Glossary.
-+
-+*2. License Grants.*
-+
-+2.1 Original Contributor Grant.
-+
-+Subject to Your compliance with Sections 3, 8.10 and Attachment A of
-+this License, Original Contributor grants to You a worldwide,
-+royalty-free, non-exclusive license, to the extent of Original
-+Contributor's Intellectual Property Rights covering the Original Code,
-+Upgraded Code and Specifications, to do the following:
-+
-+(a) Research Use License:
-+
-+(i) use, reproduce and modify the Original Code, Upgraded Code and
-+Specifications to create Modifications and Reformatted Specifications
-+for Research Use by You;
-+
-+(ii) publish and display Original Code, Upgraded Code and Specifications
-+with, or as part of Modifications, as permitted under Section 3.1(b) below;
-+
-+(iii) reproduce and distribute copies of Original Code and Upgraded Code
-+to Licensees and students for Research Use by You;
-+
-+(iv) compile, reproduce and distribute Original Code and Upgraded Code
-+in Executable form, and Reformatted Specifications to anyone for
-+Research Use by You.
-+
-+(b) Other than the licenses expressly granted in this License, Original
-+Contributor retains all right, title, and interest in Original Code and
-+Upgraded Code and Specifications.
-+
-+2.2 Your Grants.
-+
-+(a) To Other Licensees. You hereby grant to each Licensee a license to
-+Your Error Corrections and Shared Modifications, of the same scope and
-+extent as Original Contributor's licenses under Section 2.1 a) above
-+relative to Research Use and Attachment D relative to Commercial Use.
-+
-+(b) To Original Contributor. You hereby grant to Original Contributor a
-+worldwide, royalty-free, non-exclusive, perpetual and irrevocable
-+license, to the extent of Your Intellectual Property Rights covering
-+Your Error Corrections, Shared Modifications and Reformatted
-+Specifications, to use, reproduce, modify, display and distribute Your
-+Error Corrections, Shared Modifications and Reformatted Specifications,
-+in any form, including the right to sublicense such rights through
-+multiple tiers of distribution.
-+
-+(c) Other than the licenses expressly granted in Sections 2.2(a) and (b)
-+above, and the restrictions set forth in Section 3.1(d)(iv) below, You
-+retain all right, title, and interest in Your Error Corrections, Shared
-+Modifications and Reformatted Specifications.
-+
-+2.3 Contributor Modifications.
-+
-+You may use, reproduce, modify, display and distribute Contributor Error
-+Corrections, Shared Modifications and Reformatted Specifications,
-+obtained by You under this License, to the same scope and extent as with
-+Original Code, Upgraded Code and Specifications.
-+
-+2.4 Subcontracting.
-+
-+You may deliver the Source Code of Covered Code to other Licensees
-+having at least a Research Use license, for the sole purpose of
-+furnishing development services to You in connection with Your rights
-+granted in this License. All such Licensees must execute appropriate
-+documents with respect to such work consistent with the terms of this
-+License, and acknowledging their work-made-for-hire status or assigning
-+exclusive right to the work product and associated Intellectual Property
-+Rights to You.
-+
-+*3. Requirements and Responsibilities*.
-+
-+3.1 Research Use License.
-+
-+As a condition of exercising the rights granted under Section 2.1(a)
-+above, You agree to comply with the following:
-+
-+(a) Your Contribution to the Community. All Error Corrections and Shared
-+Modifications which You create or contribute to are automatically
-+subject to the licenses granted under Section 2.2 above. You are
-+encouraged to license all of Your other Modifications under Section 2.2
-+as Shared Modifications, but are not required to do so. You agree to
-+notify Original Contributor of any errors in the Specification.
-+
-+(b) Source Code Availability. You agree to provide all Your Error
-+Corrections to Original Contributor as soon as reasonably practicable
-+and, in any event, prior to Internal Deployment Use or Commercial Use,
-+if applicable. Original Contributor may, at its discretion, post Source
-+Code for Your Error Corrections and Shared Modifications on the
-+Community Webserver. You may also post Error Corrections and Shared
-+Modifications on a web-server of Your choice; provided, that You must
-+take reasonable precautions to ensure that only Licensees have access to
-+such Error Corrections and Shared Modifications. Such precautions shall
-+include, without limitation, a password protection scheme limited to
-+Licensees and a click-on, download certification of Licensee status
-+required of those attempting to download from the server. An example of
-+an acceptable certification is attached as Attachment A-2.
-+
-+(c) Notices. All Error Corrections and Shared Modifications You create
-+or contribute to must include a file documenting the additions and
-+changes You made and the date of such additions and changes. You must
-+also include the notice set forth in Attachment A-1 in the file header.
-+If it is not possible to put the notice in a particular Source Code file
-+due to its structure, then You must include the notice in a location
-+(such as a relevant directory file), where a recipient would be most
-+likely to look for such a notice.
-+
-+(d) Redistribution.
-+
-+(i) Source. Covered Code may be distributed in Source Code form only to
-+another Licensee (except for students as provided below). You may not
-+offer or impose any terms on any Covered Code that alter the rights,
-+requirements, or responsibilities of such Licensee. You may distribute
-+Covered Code to students for use in connection with their course work
-+and research projects undertaken at accredited educational institutions.
-+Such students need not be Licensees, but must be given a copy of the
-+notice set forth in Attachment A-3 and such notice must also be included
-+in a file header or prominent location in the Source Code made available
-+to such students.
-+
-+(ii) Executable. You may distribute Executable version(s) of Covered
-+Code to Licensees and other third parties only for the purpose of
-+evaluation and comment in connection with Research Use by You and under
-+a license of Your choice, but which limits use of such Executable
-+version(s) of Covered Code only to that purpose.
-+
-+(iii) Modified Class, Interface and Package Naming. In connection with
-+Research Use by You only, You may use Original Contributor's class,
-+Interface and package names only to accurately reference or invoke the
-+Source Code files You modify. Original Contributor grants to You a
-+limited license to the extent necessary for such purposes.
-+
-+(iv) You expressly agree that any distribution, in whole or in part, of
-+Modifications developed by You shall only be done pursuant to the terms
-+and conditions of this License.
-+
-+(e) Extensions.
-+
-+(i) Covered Code. You may not include any Source Code of Community Code
-+in any Extensions. You may include the compiled Header Files of
-+Community Code in an Extension provided that Your use of the Covered
-+Code, including Heading Files, complies with the Commercial Use License,
-+the TCK and all other terms of this License.
-+
-+(ii) Publication. No later than the date on which You first distribute
-+such Extension for Commercial Use, You must publish to the industry, on
-+a non-confidential basis and free of all copyright restrictions with
-+respect to reproduction and use, an accurate and current specification
-+for any Extension. In addition, You must make available an appropriate
-+test suite, pursuant to the same rights as the specification,
-+sufficiently detailed to allow any third party reasonably skilled in the
-+technology to produce implementations of the Extension compatible with
-+the specification. Such test suites must be made available as soon as
-+reasonably practicable but, in no event, later than ninety (90) days
-+after Your first Commercial Use of the Extension. You must use
-+reasonable efforts to promptly clarify and correct the specification and
-+the test suite upon written request by Original Contributor.
-+
-+(iii) Open. You agree to refrain from enforcing any Intellectual
-+Property Rights You may have covering any interface(s) of Your
-+Extension, which would prevent the implementation of such interface(s)
-+by Original Contributor or any Licensee. This obligation does not
-+prevent You from enforcing any Intellectual Property Right You have that
-+would otherwise be infringed by an implementation of Your Extension.
-+
-+(iv) Interface Modifications and Naming. You may not modify or add to
-+the GUID space * * "xxxxxxxx-0901-11d1-8B06-00A024406D59" or any other
-+GUID space designated by Original Contributor. You may not modify any
-+Interface prefix provided with the Covered Code or any other prefix
-+designated by Original Contributor.* *
-+
-+* *
-+
-+(f) You agree that any Specifications provided to You by Original
-+Contributor are confidential and proprietary information of Original
-+Contributor. You must maintain the confidentiality of the Specifications
-+and may not disclose them to any third party without Original
-+Contributor's prior written consent. You may only use the Specifications
-+under the terms of this License and only for the purpose of implementing
-+the terms of this License with respect to Covered Code. You agree not
-+use, copy or distribute any such Specifications except as provided in
-+writing by Original Contributor.
-+
-+3.2 Commercial Use License.
-+
-+You may not make Commercial Use of any Covered Code unless You and
-+Original Contributor have executed a copy of the Commercial Use and
-+Trademark License attached as Attachment D.
-+
-+*4. Versions of the License.*
-+
-+4.1 License Versions.
-+
-+Original Contributor may publish revised versions of the License from
-+time to time. Each version will be given a distinguishing version number.
-+
-+4.2 Effect.
-+
-+Once a particular version of Covered Code has been provided under a
-+version of the License, You may always continue to use such Covered Code
-+under the terms of that version of the License. You may also choose to
-+use such Covered Code under the terms of any subsequent version of the
-+License. No one other than Original Contributor has the right to
-+promulgate License versions.
-+
-+4.3 Multiple-Licensed Code.
-+
-+Original Contributor may designate portions of the Covered Code as
-+"Multiple-Licensed." "Multiple-Licensed" means that the Original
-+Contributor permits You to utilize those designated portions of the
-+Covered Code under Your choice of this License or the alternative
-+license(s), if any, specified by the Original Contributor in an
-+Attachment to this License.
-+
-+*5. Disclaimer of Warranty.*
-+
-+5.1 COVERED CODE PROVIDED AS IS.
-+
-+COVERED CODE IS PROVIDED UNDER THIS LICENSE "AS IS," WITHOUT WARRANTY OF
-+ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
-+WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT
-+FOR A PARTICULAR PURPOSE OR NON-INFRINGING. YOU AGREE TO BEAR THE ENTIRE
-+RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF COVERED CODE UNDER
-+THIS LICENSE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART
-+OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER
-+EXCEPT SUBJECT TO THIS DISCLAIMER.
-+
-+5.2 Not Designed for High Risk Activities.
-+
-+You acknowledge that Original Code, Upgraded Code and Specifications are
-+not designed or intended for use in high risk activities including, but
-+not limited to: (i) on-line control of aircraft, air traffic, aircraft
-+navigation or aircraft communications; or (ii) in the design,
-+construction, operation or maintenance of any nuclear facility. Original
-+Contributor disclaims any express or implied warranty of fitness for
-+such uses.
-+
-+*6. Termination.*
-+
-+6.1 By You.
-+
-+You may terminate this Research Use license at anytime by providing
-+written notice to Original Contributor.
-+
-+6.2 By Original Contributor.
-+
-+This License and the rights granted hereunder will terminate:
-+
-+(i) automatically if You fail to comply with the terms of this License
-+and fail to cure such breach within 30 days of receipt of written notice
-+of the breach;
-+
-+(ii) immediately in the event of circumstances specified in Sections 7.1
-+and 8.4; or
-+
-+(iii) at Original Contributor's discretion upon any action initiated by
-+You (including by cross-claim or counter claim) alleging that use or
-+distribution by Original Contributor or any Licensee, of Original Code,
-+Upgraded Code, Error Corrections, Shared Modifications or Specifications
-+infringe a patent owned or controlled by You.
-+
-+6.3 Effective of Termination.
-+
-+Upon termination, You agree to discontinue use of and destroy all copies
-+of Covered Code in Your possession. All sublicenses to the Covered Code
-+which You have properly granted shall survive any termination of this
-+License. Provisions that, by their nature, should remain in effect
-+beyond the termination of this License shall survive including, without
-+limitation, Sections 2.2, 3, 5, 7 and 8.
-+
-+6.4 No Compensation.
-+
-+Each party waives and releases the other from any claim to compensation
-+or indemnity for permitted or lawful termination of the business
-+relationship established by this License.
-+
-+*7. Liability.*
-+
-+7.1 Infringement. Should any of the Original Code, Upgraded Code, TCK or
-+Specifications ("Materials") become the subject of a claim of
-+infringement, Original Contributor may, at its sole option, (i) attempt
-+to procure the rights necessary for You to continue using the Materials,
-+(ii) modify the Materials so that they are no longer infringing, or
-+(iii) terminate Your right to use the Materials, immediately upon
-+written notice, and refund to You the amount, if any, having then
-+actually been paid by You to Original Contributor for the Original Code,
-+Upgraded Code and TCK, depreciated on a straight line, five year basis.
-+
-+7.2 LIMITATION OF LIABILITY. TO THE FULL EXTENT ALLOWED BY APPLICABLE
-+LAW, ORIGINAL CONTRIBUTOR'S LIABILITY TO YOU FOR CLAIMS RELATING TO THIS
-+LICENSE, WHETHER FOR BREACH OR IN TORT, SHALL BE LIMITED TO ONE HUNDRED
-+PERCENT (100%) OF THE AMOUNT HAVING THEN ACTUALLY BEEN PAID BY YOU TO
-+ORIGINAL CONTRIBUTOR FOR ALL COPIES LICENSED HEREUNDER OF THE PARTICULAR
-+ITEMS GIVING RISE TO SUCH CLAIM, IF ANY, DURING THE TWELVE MONTHS
-+PRECEDING THE CLAIMED BREACH. IN NO EVENT WILL YOU (RELATIVE TO YOUR
-+SHARED MODIFICATIONS OR ERROR CORRECTIONS) OR ORIGINAL CONTRIBUTOR BE
-+LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-+DAMAGES IN CONNECTION WITH OR RISING OUT OF THIS LICENSE (INCLUDING,
-+WITHOUT LIMITATION, LOSS OF PROFITS, USE, DATA, OR OTHER ECONOMIC
-+ADVANTAGE), HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+AN ACTION FOR CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE)
-+OR OTHERWISE, WHETHER OR NOT YOU OR ORIGINAL CONTRIBUTOR HAS BEEN
-+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE AND NOTWITHSTANDING THE
-+FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.
-+
-+*8. Miscellaneous.*
-+
-+8.1 Trademark.
-+
-+You shall not use any Trademark unless You and Original Contributor
-+execute a copy of the Commercial Use and Trademark License Agreement
-+attached hereto as Attachment D. Except as expressly provided in the
-+License, You are granted no right, title or license to, or interest in,
-+any Trademarks. Whether or not You and Original Contributor enter into
-+the Trademark License, You agree not to (i) challenge Original
-+Contributor's ownership or use of Trademarks; (ii) attempt to register
-+any Trademarks, or any mark or logo substantially similar thereto; or
-+(iii) incorporate any Trademarks into Your own trademarks, product
-+names, service marks, company names, or domain names.
-+
-+8.2 Integration.
-+
-+This License represents the complete agreement concerning the subject
-+matter hereof.
-+
-+8.3 Assignment.
-+
-+Original Contributor may assign this License, and its rights and
-+obligations hereunder, in its sole discretion. You may assign the
-+Research Use portions of this License and the TCK license to a third
-+party upon prior written notice to Original Contributor (which may be
-+provided electronically via the Community Web-Server). You may not
-+assign the Commercial Use and Trademark license, the Add-On Technology
-+License, or the Add-On Technology Source Code Porting License, including
-+by way of merger (regardless of whether You are the surviving entity) or
-+acquisition, without Original Contributor's prior written consent.
-+
-+8.4 Severability.
-+
-+If any provision of this License is held to be unenforceable, such
-+provision shall be reformed only to the extent necessary to make it
-+enforceable. Notwithstanding the foregoing, if You are prohibited by law
-+from fully and specifically complying with Sections 2.2 or 3, this
-+License will immediately terminate and You must immediately discontinue
-+any use of Covered Code.
-+
-+8.5 Governing Law.
-+
-+This License shall be governed by the laws of the United States and the
-+State of Washington, as applied to contracts entered into and to be
-+performed in Washington between Washington residents. The application of
-+the United Nations Convention on Contracts for the International Sale of
-+Goods is expressly excluded. You agree that the state and federal courts
-+located in Seattle, Washington have exclusive jurisdiction over any
-+claim relating to the License, including contract and tort claims.
-+
-+8.6 Dispute Resolution.
-+
-+a) Arbitration. Any dispute arising out of or relating to this License
-+shall be finally settled by arbitration as set out herein, except that
-+either party may bring any action, in a court of competent jurisdiction
-+(which jurisdiction shall be exclusive), with respect to any dispute
-+relating to such party's Intellectual Property Rights or with respect to
-+Your compliance with the TCK license. Arbitration shall be administered:
-+(i) by the American Arbitration Association (AAA), (ii) in accordance
-+with the rules of the United Nations Commission on International Trade
-+Law (UNCITRAL) (the "Rules") in effect at the time of arbitration as
-+modified herein; and (iii) the arbitrator will apply the substantive
-+laws of Washington and the United States. Judgment upon the award
-+rendered by the arbitrator may be entered in any court having
-+jurisdiction to enforce such award.
-+
-+b) Arbitration language, venue and damages. All arbitration proceedings
-+shall be conducted in English by a single arbitrator selected in
-+accordance with the Rules, who must be fluent in English and be either a
-+retired judge or practicing attorney having at least ten (10) years
-+litigation experience and be reasonably familiar with the technology
-+matters relative to the dispute. Unless otherwise agreed, arbitration
-+venue shall be in Seattle, Washington. The arbitrator may award monetary
-+damages only and nothing shall preclude either party from seeking
-+provisional or emergency relief from a court of competent jurisdiction.
-+The arbitrator shall have no authority to award damages in excess of
-+those permitted in this License and any such award in excess is void.
-+All awards will be payable in U.S. dollars and may include, for the
-+prevailing party (i) pre-judgment award interest, (ii) reasonable
-+attorneys' fees incurred in connection with the arbitration, and (iii)
-+reasonable costs and expenses incurred in enforcing the award. The
-+arbitrator will order each party to produce identified documents and
-+respond to no more than twenty-five single question interrogatories.
-+
-+8.7 Construction.
-+
-+Any law or regulation, which provides that the language of a contract
-+shall be construed against the drafter, shall not apply to this License.
-+
-+8.8 U.S. Government End Users.
-+
-+The Covered Code is a "commercial item," as that term is defined in 48
-+C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software"
-+and "commercial computer software documentation," as such terms are used
-+in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
-+48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
-+End Users acquire Covered Code with only those rights set forth herein.
-+You agree to pass this notice to our licensees.
-+
-+8.9 Marketing Activities.
-+
-+Licensee hereby grants Original Contributor a non-exclusive,
-+non-transferable, limited license to use the Licensee's company name and
-+logo ("Licensee Marks") in any presentations, press releases, or
-+marketing materials solely for the purpose of identifying Licensee as a
-+member of the Helix Community. Licensee shall provide samples of
-+Licensee Marks to Original Contributor upon request by Original
-+Contributor. Original Contributor acknowledges that the Licensee Marks
-+are the trademarks of Licensee. Original Contributor shall not use the
-+Licensee Marks in a way that may imply that Original Contributor is an
-+agency or branch of Licensee. Original Contributor understands and
-+agrees that the use of any Licensee Marks in connection with this
-+Agreement shall not create any right, title or interest, in, or to the
-+Licensee Marks or any Licensee trademarks and that all such use and
-+goodwill associated with any such trademarks will inure to the benefit
-+of Licensee. Further the Original Contributor will stop usage of the
-+Licensee Marks upon Licensee's request.
-+
-+8.10 Press Announcements.
-+
-+You may make press announcements or other public statements regarding
-+this License without the prior written consent of the Original
-+Contributor, if Your statement is limited to announcing the licensing of
-+the Covered Code or the availability of Your Product and its
-+compatibility with the Covered Code. All other public announcements
-+regarding this license require the prior written consent of the Original
-+Contributor. Consent requests are welcome at press@helixcommunity.org.
-+
-+8.11 International Use.
-+
-+a) Export/Import laws. Covered Code is subject to U.S. export control
-+laws and may be subject to export or import regulations in other
-+countries. Each party agrees to comply strictly with all such laws and
-+regulations and acknowledges their responsibility to obtain such
-+licenses to export, re-export, or import as may be required. You agree
-+to pass these obligations to Your licensees.
-+
-+b) Intellectual Property Protection. Due to limited intellectual
-+property protection and enforcement in certain countries, You agree not
-+to redistribute the Original Code, Upgraded Code, TCK and Specifications
-+to any country on the list of restricted countries on the Community Web
-+Server.
-+
-+8.12 Language.
-+
-+This License is in the English language only, which language shall be
-+controlling in all respects, and all versions of this License in any
-+other language shall be for accommodation only and shall not be binding
-+on the parties to this License. All communications and notices made or
-+given pursuant to this License, and all documentation and support to be
-+provided, unless otherwise noted, shall be in the English language.
-+
-+PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY CLICKING ON THE
-+"ACCEPT" BUTTON BELOW YOU ARE ACCEPTING AND AGREEING TO THE TERMS AND
-+CONDITIONS OF THIS LICENSE WITH REALNETWORKS, INC. IF YOU ARE AGREEING
-+TO THIS LICENSE ON BEHALF OF A COMPANY, YOU REPRESENT THAT YOU ARE
-+AUTHORIZED TO BIND THE COMPANY TO SUCH A LICENSE. WHETHER YOU ARE ACTING
-+ON YOUR OWN BEHALF, OR REPRESENTING A COMPANY, YOU MUST BE OF MAJORITY
-+AGE AND BE OTHERWISE COMPETENT TO ENTER INTO CONTRACTS. IF YOU DO NOT
-+MEET THIS CRITERIA OR YOU DO NOT AGREE TO ANY OF THE TERMS AND
-+CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON TO EXIT.
-+
-+
-+    GLOSSARY
-+
-+1. *"Added Value"* means code which:
-+
-+(i) has a principal purpose which is substantially different from that
-+of the stand-alone Technology;
-+
-+(ii) represents a significant functional and value enhancement to the
-+Technology;
-+
-+(iii) operates in conjunction with the Technology; and
-+
-+(iv) is not marketed as a technology which replaces or substitutes for
-+the Technology
-+
-+2. "*Applicable Patent Rights*" mean: (a) in the case where Original
-+Contributor is the grantor of rights, claims of patents that (i) are now
-+or hereafter acquired, owned by or assigned to Original Contributor and
-+(ii) are necessarily infringed by using or making the Original Code or
-+Upgraded Code, including Modifications provided by Original Contributor,
-+alone and not in combination with other software or hardware; and (b) in
-+the case where Licensee is the grantor of rights, claims of patents that
-+(i) are now or hereafter acquired, owned by or assigned to Licensee and
-+(ii) are infringed (directly or indirectly) by using or making
-+Licensee's Modifications or Error Corrections, taken alone or in
-+combination with Covered Code.
-+
-+3. "*Application Programming Interfaces (APIs)"* means the interfaces,
-+associated header files, service provider interfaces, and protocols that
-+enable a device, application, Operating System, or other program to
-+obtain services from or make requests of (or provide services in
-+response to requests from) other programs, and to use, benefit from, or
-+rely on the resources, facilities, and capabilities of the relevant
-+programs using the APIs. APIs includes the technical documentation
-+describing the APIs, the Source Code constituting the API, and any
-+Header Files used with the APIs.
-+
-+4. "*Commercial Use*" means any use (internal or external), copying,
-+sublicensing or distribution (internal or external), directly or
-+indirectly of Covered Code by You other than Your Research Use of
-+Covered Code within Your business or organization or in conjunction with
-+other Licensees with equivalent Research Use rights. Commercial Use
-+includes any use of the Covered Code for direct or indirect commercial
-+or strategic gain, advantage or other business purpose. Any Commercial
-+Use requires execution of Attachment D by You and Original Contributor.
-+
-+5. "*Community Code*" means the Original Code, Upgraded Code, Error
-+Corrections, Shared Modifications, or any combination thereof.
-+
-+6. "*Community Webserver(s)"* means the webservers designated by
-+Original Contributor for access to the Original Code, Upgraded Code, TCK
-+and Specifications and for posting Error Corrections and Shared
-+Modifications.
-+
-+7. "*Compliant Covered Code*" means Covered Code that complies with the
-+requirements of the TCK.
-+
-+8. "*Contributor*" means each Licensee that creates or contributes to
-+the creation of any Error Correction or Shared Modification.
-+
-+9. "*Covered Code*" means the Original Code, Upgraded Code,
-+Modifications, or any combination thereof.
-+
-+10. "*Error Correction*" means any change made to Community Code which
-+conforms to the Specification and corrects the adverse effect of a
-+failure of Community Code to perform any function set forth in or
-+required by the Specifications.
-+
-+11. "*Executable*" means Covered Code that has been converted from
-+Source Code to the preferred form for execution by a computer or digital
-+processor (e.g. binary form).
-+
-+12. "*Extension(s)"* means any additional Interfaces developed by or for
-+You which: (i) are designed for use with the Technology; (ii) constitute
-+an API for a library of computing functions or services; and (iii) are
-+disclosed or otherwise made available to third party software developers
-+for the purpose of developing software which invokes such additional
-+Interfaces. The foregoing shall not apply to software developed by Your
-+subcontractors to be exclusively used by You.
-+
-+13. "*Header File(s)"* means that portion of the Source Code that
-+provides the names and types of member functions, data members, class
-+definitions, and interface definitions necessary to implement the APIs
-+for the Covered Code. Header Files include, files specifically
-+designated by Original Contributor as Header Files. Header Files do not
-+include the code necessary to implement the functionality underlying the
-+Interface.
-+
-+14. *"Helix DNA Server Technology"* means the program(s) that implement
-+the Helix Universal Server streaming engine for the Technology as
-+defined in the Specification.
-+
-+15. *"Helix DNA Client Technology"* means the Covered Code that
-+implements the RealOne Player engine as defined in the Specification.
-+
-+16. *"Helix DNA Producer Technology"* means the Covered Code that
-+implements the Helix Producer engine as defined in the Specification.
-+
-+17. *"Helix DNA Technology"* means the Helix DNA Server Technology, the
-+Helix DNA Client Technology, the Helix DNA Producer Technology and other
-+Helix technologies designated by Original Contributor.
-+
-+18. "*Intellectual Property Rights*" means worldwide statutory and
-+common law rights associated solely with (i) Applicable Patent Rights;
-+(ii) works of authorship including copyrights, copyright applications,
-+copyright registrations and "moral rights"; (iii) the protection of
-+trade and industrial secrets and confidential information; and (iv)
-+divisions, continuations, renewals, and re-issuances of the foregoing
-+now existing or acquired in the future.
-+
-+19. *"Interface*" means interfaces, functions, properties, class
-+definitions, APIs, Header Files, GUIDs, V-Tables, and/or protocols
-+allowing one piece of software, firmware or hardware to communicate or
-+interoperate with another piece of software, firmware or hardware.
-+
-+20. "*Internal Deployment Use*" means use of Compliant Covered Code
-+(excluding Research Use) within Your business or organization only by
-+Your employees and/or agents on behalf of Your business or organization,
-+but not to provide services, including content distribution, to third
-+parties, subject to execution of Attachment D by You and Original
-+Contributor, if required.
-+
-+21. "*Licensee*" means any party that has entered into and has in effect
-+a version of this License with Original Contributor.
-+
-+22. "*MIME type*" means a description of what type of media or other
-+content is in a file, including by way of example but not limited to
-+'audio/x-pn-realaudio-plugin.'
-+
-+23. "*Modification(s)"* means (i) any addition to, deletion from and/or
-+change to the substance and/or structure of the Covered Code, including
-+Interfaces; (ii) the combination of any Covered Code and any previous
-+Modifications; (iii) any new file or other representation of computer
-+program statements that contains any portion of Covered Code; and/or
-+(iv) any new Source Code implementing any portion of the Specifications.
-+
-+24. "*MP3 Patents*" means any patents necessary to make, use or sell
-+technology implementing any portion of the specification developed by
-+the Moving Picture Experts Group known as MPEG-1 Audio Layer-3 or MP3,
-+including but not limited to all past and future versions, profiles,
-+extensions, parts and amendments relating to the MP3 specification.
-+
-+25. "*MPEG-4 Patents*" means any patents necessary to make, use or sell
-+technology implementing any portion of the specification developed by
-+the Moving Pictures Experts Group known as MPEG-4, including but not
-+limited to all past and future versions, profiles, extensions, parts and
-+amendments relating to the MPEG-4 specification.
-+
-+26. "*Original Code*" means the initial Source Code for the Technology
-+as described on the Community Web Server.
-+
-+27. "*Original Contributor*" means RealNetworks, Inc., its affiliates
-+and its successors and assigns.
-+
-+28. "*Original Contributor MIME Type*" means the MIME registry, browser
-+preferences, or local file/protocol associations invoking any Helix DNA
-+Client-based application, including the RealOne Player, for playback of
-+RealAudio, RealVideo, other RealMedia MIME types or datatypes (e.g.,
-+.ram, .rnx, .rpm, .ra, .rm, .rp, .rt, .rf, .prx, .mpe, .rmp, .rmj, .rav,
-+.rjs, .rmx, .rjt, .rms), and any other Original Contributor-specific or
-+proprietary MIME types that Original Contributor may introduce in the
-+future.
-+
-+29. "*Personal Use*" means use of Covered Code by an individual solely
-+for his or her personal, private and non-commercial purposes. An
-+individual's use of Covered Code in his or her capacity as an officer,
-+employee, member, independent contractor or agent of a corporation,
-+business or organization (commercial or non-commercial) does not qualify
-+as Personal Use.
-+
-+30. "*RealMedia File Format*" means the file format designed and
-+developed by RealNetworks for storing multimedia data and used to store
-+RealAudio and RealVideo encoded streams. Valid RealMedia File Format
-+extensions include: .rm, .rmj, .rmc, .rmvb, .rms.
-+
-+31. "*RCSL Webpage*" means the RealNetworks Community Source License
-+webpage located at https://www.helixcommunity.org/content/rcsl or such
-+other URL that Original Contributor may designate from time to time.
-+
-+32. "*Reformatted Specifications*" means any revision to the
-+Specifications which translates or reformats the Specifications (as for
-+example in connection with Your documentation) but which does not alter,
-+subset or superset * *the functional or operational aspects of the
-+Specifications.
-+
-+33. "*Research Use*" means use and distribution of Covered Code only for
-+Your Personal Use, research or development use and expressly excludes
-+Internal Deployment Use and Commercial Use. Research Use also includes
-+use of Covered Code to teach individuals how to use Covered Code.
-+
-+34. "*Shared Modifications*" means Modifications that You distribute or
-+use for a Commercial Use, in addition to any Modifications provided by
-+You, at Your option, pursuant to Section 2.2, or received by You from a
-+Contributor pursuant to Section 2.3.
-+
-+35. "*Source Code*" means the preferred form of the Covered Code for
-+making modifications to it, including all modules it contains, plus any
-+associated interface definition files, scripts used to control
-+compilation and installation of an Executable, or source code
-+differential comparisons against either the Original Code or another
-+well known, available Covered Code of the Contributor's choice. The
-+Source Code can be in a compressed or archival form, provided the
-+appropriate decompression or de-archiving software is widely available
-+for no charge.
-+
-+36. "*Specifications*" means the specifications for the Technology and
-+other documentation, as designated on the Community Web Server, as may
-+be revised by Original Contributor from time to time.
-+
-+37. "*Trademarks*" means Original Contributor's trademarks and logos,
-+including, but not limited to, RealNetworks, RealAudio, RealVideo,
-+RealOne, RealSystem, SureStream, Helix, Helix DNA and other trademarks
-+whether now used or adopted in the future.
-+
-+38. "*Technology*" means the technology described in Attachment B, and
-+Upgrades.
-+
-+39. "*Technology Compatibility Kit"* or *"TCK*" means the test programs,
-+procedures, acceptance criteria and/or other requirements, designated by
-+Original Contributor for use in verifying compliance of Covered Code
-+with the Specifications, in conjunction with the Original Code and
-+Upgraded Code. Original Contributor may, in its sole discretion and from
-+time to time, revise a TCK to correct errors and/or omissions and in
-+connection with Upgrades.
-+
-+40. "*Upgrade(s)"* means new versions of Technology designated
-+exclusively by Original Contributor as an "Upgrade" and released by
-+Original Contributor from time to time under the terms of the License.
-+
-+41. "*Upgraded Code*" means the Source Code and/or Executables for
-+Upgrades, possibly including Modifications made by Contributors.
-+
-+42. *"User's Guide"* means the users guide for the TCK which Original
-+Contributor makes available to You to provide direction in how to run
-+the TCK and properly interpret the results, as may be revised by
-+Original Contributor from time to time.
-+
-+43. "*You(r)*" means an individual, or a legal entity acting by and
-+through an individual or individuals, exercising rights either under
-+this License or under a future version of this License issued pursuant
-+to Section 4.1. For legal entities, "You(r)" includes any entity that by
-+majority voting interest controls, is controlled by, or is under common
-+control with You.
-+
-+44. "*Your Products*" means any (i) hardware products You distribute
-+integrating the Covered Code; (ii) any software products You distribute
-+with the Covered Code that utilize the APIs of the Covered Code; or
-+(iii) any services You provide using the Covered Code.
-+
-+
-+  ATTACHMENT A
-+
-+REQUIRED NOTICES
-+
-+
-+    ATTACHMENT A-1
-+
-+REQUIRED IN ALL CASES
-+
-+Notice to be included in header file of all Error Corrections and Shared
-+Modifications:
-+
-+Portions Copyright 1994-2003 © RealNetworks, Inc. All rights reserved.
-+
-+The contents of this file, and the files included with this file, are
-+subject to the current version of RealNetworks Community Source License
-+Version 1.1 (the "License"). You may not use this file except in
-+compliance with the License executed by both You and RealNetworks. You
-+may obtain a copy of the License at *
-+https://www.helixcommunity.org/content/rcsl.* You may also obtain a copy
-+of the License by contacting RealNetworks directly. Please see the
-+License for the rights, obligations and limitations governing use of the
-+contents of the file.
-+
-+This file is part of the Helix DNA technology. RealNetworks, Inc., is
-+the developer of the Original code and owns the copyrights in the
-+portions it created.
-+
-+This file, and the files included with this file, are distributed on an
-+'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-+AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT
-+LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-+PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-+
-+Contributor(s):
-+
-+_______________________________________________
-+
-+Technology Compatibility Kit Test Suite(s) Location:
-+
-+________________________________
-+
-+
-+    ATTACHMENT A-2
-+
-+SAMPLE LICENSEE CERTIFICATION
-+
-+"By clicking the `Agree' button below, You certify that You are a
-+Licensee in good standing under the RealNetworks Community Source
-+License, ("License") and that Your access, use and distribution of code
-+and information You may obtain at this site is subject to the License.
-+If You are not a Licensee under the RealNetworks Community Source
-+License You agree not to download, copy or use the Helix DNA technology.
-+
-+
-+    ATTACHMENT A-3
-+
-+REQUIRED STUDENT NOTIFICATION
-+
-+"This software and related documentation has been obtained by Your
-+educational institution subject to the RealNetworks Community Source
-+License. You have been provided access to the software and related
-+documentation for use only in connection with your course work and
-+research activities as a matriculated student of Your educational
-+institution. Any other use is expressly prohibited.
-+
-+THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIAL OF
-+REALNETWORKS, INC, WHICH ARE PROTECTED BY VARIOUS INTELLECTUAL PROPERTY
-+RIGHTS.
-+
-+You may not use this file except in compliance with the License. You may
-+obtain a copy of the License on the web at
-+https://www.helixcommunity.org/content/rcsl.
-+
-+*
-+*
-+
-+
-+  ATTACHMENT B
-+
-+Description of Technology
-+
-+Helix DNA, which consists of Helix DNA Client, Helix DNA Server and
-+Helix DNA Producer.
-+
-+Description of "Technology"
-+
-+Helix DNA Technology v1.0 as described on the Community Web Server.
-+
-+
-+  ATTACHMENT C
-+
-+TECHNOLOGY COMPATIBILITY KIT LICENSE
-+
-+The following license is effective for the *Helix DNA* Technology
-+Compatibility Kit - as described on the Community Web Server. The
-+Technology Compatibility Kit(s) for the Technology specified in
-+Attachment B may be accessed at the Community Web Server.
-+
-+1. TCK License.
-+
-+1.1 Grants to use TCK
-+
-+Subject to the terms and restrictions set forth below and the
-+RealNetworks Community Source License, and the Research Use license,
-+Original Contributor grants to You a worldwide, non-exclusive,
-+non-transferable license, to the extent of Original Contributor's
-+Intellectual Property Rights in the TCK (without the right to
-+sublicense), to use the TCK to develop and test Covered Code.
-+
-+1.2 TCK Use Restrictions.
-+
-+You are not authorized to create derivative works of the TCK or use the
-+TCK to test any implementation of the Specification that is not Covered
-+Code. You may not publish Your test results or make claims of
-+comparative compatibility with respect to other implementations of the
-+Specification. In consideration for the license grant in Section 1.1
-+above You agree not to develop Your own tests that are intended to
-+validate conformation with the Specification.
-+
-+2. Test Results.
-+
-+You agree to provide to Original Contributor or the third party test
-+facility if applicable, Your test results that demonstrate that Covered
-+Code is Compliant Covered Code and that Original Contributor may publish
-+or otherwise distribute such test results.
-+
-+PLEASE READ THE TERMS OF THIS LICENSE CAREFULLY. BY CLICKING ON THE
-+"ACCEPT" BUTTON BELOW YOU ARE ACCEPTING AND AGREEING TO THE TERMS AND
-+CONDITIONS OF THIS LICENSE WITH THE ORIGINAL CONTRIBUTOR, REALNETWORKS,
-+INC. IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF A COMPANY, YOU
-+REPRESENT THAT YOU ARE AUTHORIZED TO BIND THE COMPANY TO SUCH A LICENSE.
-+WHETHER YOU ARE ACTING ON YOUR OWN BEHALF, OR REPRESENTING A COMPANY,
-+YOU MUST BE OF MAJORITY AGE AND BE OTHERWISE COMPETENT TO ENTER INTO
-+CONTRACTS. IF YOU DO NOT MEET THIS CRITERIA OR YOU DO NOT AGREE TO ANY
-+OF THE TERMS AND CONDITIONS OF THIS LICENSE, CLICK ON THE REJECT BUTTON
-+TO EXIT.
-+
-+*ACCEPT / REJECT
-+*
-+
-+*
-+*
-+
-+*To agree to the R&D/academic terms of this license, please register
-+<https://www.helixcommunity.org/2002/intro/why-register> on the site --
-+you will then be given a chance to agree to the clickwrap RCSL
-+<https://reguseronly.helixcommunity.org/2002/clickwrap/rcsl-clickwrap>
-+R&D License
-+<https://reguseronly.helixcommunity.org/2002/clickwrap/rcsl-clickwrap>
-+and gain access to the RCSL-licensed source code.  To build or deploy
-+commercial applications based on the RCSL, you will need to agree to the
-+Commercial Use license attachments
-+<https://www.helixcommunity.org/content/rcsl-attachments>*
-+
-+
-+
-Index: helix-libs/clientapps/clutter/RPSL.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/RPSL.txt	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,518 @@
-+RealNetworks Public Source License Version 1.0
-+(Rev. Date October 28, 2002)
-+
-+1. General Definitions. This License applies to any program or other work which
-+RealNetworks, Inc., or any other entity that elects to use this license,
-+("Licensor") makes publicly available and which contains a notice placed by
-+Licensor identifying such program or work as "Original Code" and stating that it
-+is subject to the terms of this RealNetworks Public Source License version 1.0
-+(or subsequent version thereof) ("License"). You are not required to accept this
-+License. However, nothing else grants You permission to use, copy, modify or
-+distribute the software or its derivative works. These actions are prohibited by
-+law if You do not accept this License. Therefore, by modifying, copying or
-+distributing the software (or any work based on the software), You indicate your
-+acceptance of this License to do so, and all its terms and conditions. In
-+addition, you agree to the terms of this License by clicking the Accept button
-+or downloading the software. As used in this License:
-+
-+1.1 "Applicable Patent Rights" mean: (a) in the case where Licensor is the
-+grantor of rights, claims of patents that (i) are now or hereafter acquired,
-+owned by or assigned to Licensor and (ii) are necessarily infringed by using or
-+making the Original Code alone and not in combination with other software or
-+hardware; and (b) in the case where You are the grantor of rights, claims of
-+patents that (i) are now or hereafter acquired, owned by or assigned to You and
-+(ii) are infringed (directly or indirectly) by using or making Your
-+Modifications, taken alone or in combination with Original Code.
-+
-+1.2 "Compatible Source License" means any one of the licenses listed on Exhibit
-+B or at https://www.helixcommunity.org/content/complicense or other licenses
-+specifically identified by Licensor in writing. Notwithstanding any term to the
-+contrary in any Compatible Source License, any code covered by any Compatible
-+Source License that is used with Covered Code must be made readily available in
-+Source Code format for royalty-free use under the terms of the Compatible Source
-+License or this License.
-+
-+1.3 "Contributor" means any person or entity that creates or contributes to the
-+creation of Modifications.
-+
-+1.4 "Covered Code" means the Original Code, Modifications, the combination of
-+Original Code and any Modifications, and/or any respective portions thereof.
-+
-+1.5 "Deploy" means to use, sublicense or distribute Covered Code other than for
-+Your internal research and development (R&D) and/or Personal Use, and includes
-+without limitation, any and all internal use or distribution of Covered Code
-+within Your business or organization except for R&D use and/or Personal Use, as
-+well as direct or indirect sublicensing or distribution of Covered Code by You
-+to any third party in any form or manner.
-+
-+1.6 "Derivative Work" means either the Covered Code or any derivative work under
-+United States copyright law, and including any work containing or including any
-+portion of the Covered Code or Modifications, either verbatim or with
-+modifications and/or translated into another language. Derivative Work also
-+includes any work which combines any portion of Covered Code or Modifications
-+with code not otherwise governed by the terms of this License.
-+
-+1.7 "Externally Deploy" means to Deploy the Covered Code in any way that may be
-+accessed or used by anyone other than You, used to provide any services to
-+anyone other than You, or used in any way to deliver any content to anyone other
-+than You, whether the Covered Code is distributed to those parties, made
-+available as an application intended for use over a computer network, or used to
-+provide services or otherwise deliver content to anyone other than You.
-+
-+1.8. "Interface" means interfaces, functions, properties, class definitions,
-+APIs, header files, GUIDs, V-Tables, and/or protocols allowing one piece of
-+software, firmware or hardware to communicate or interoperate with another piece
-+of software, firmware or hardware.
-+
-+1.9 "Modifications" mean any addition to, deletion from, and/or change to, the
-+substance and/or structure of the Original Code, any previous Modifications, the
-+combination of Original Code and any previous Modifications, and/or any
-+respective portions thereof. When code is released as a series of files, a
-+Modification is: (a) any addition to or deletion from the contents of a file
-+containing Covered Code; and/or (b) any new file or other representation of
-+computer program statements that contains any part of Covered Code.
-+
-+1.10 "Original Code" means (a) the Source Code of a program or other work as
-+originally made available by Licensor under this License, including the Source
-+Code of any updates or upgrades to such programs or works made available by
-+Licensor under this License, and that has been expressly identified by Licensor
-+as such in the header file(s) of such work; and (b) the object code compiled
-+from such Source Code and originally made available by Licensor under this
-+License.
-+
-+1.11 "Personal Use" means use of Covered Code by an individual solely for his or
-+her personal, private and non-commercial purposes. An individual's use of
-+Covered Code in his or her capacity as an officer, employee, member, independent
-+contractor or agent of a corporation, business or organization (commercial or
-+non-commercial) does not qualify as Personal Use.
-+
-+1.12 "Source Code" means the human readable form of a program or other work that
-+is suitable for making modifications to it, including all modules it contains,
-+plus any associated interface definition files, scripts used to control
-+compilation and installation of an executable (object code).
-+
-+1.13 "You" or "Your" means an individual or a legal entity exercising rights
-+under this License. For legal entities, "You" or "Your" includes any entity
-+which controls, is controlled by, or is under common control with, You, where
-+"control" means (a) the power, direct or indirect, to cause the direction or
-+management of such entity, whether by contract or otherwise, or (b) ownership of
-+fifty percent (50%) or more of the outstanding shares or beneficial ownership of
-+such entity.
-+
-+2. Permitted Uses; Conditions & Restrictions. Subject to the terms and
-+conditions of this License, Licensor hereby grants You, effective on the date
-+You accept this License (via downloading or using Covered Code or otherwise
-+indicating your acceptance of this License), a worldwide, royalty-free,
-+non-exclusive copyright license, to the extent of Licensor's copyrights cover
-+the Original Code, to do the following:
-+
-+2.1 You may reproduce, display, perform, modify and Deploy Covered Code,
-+provided that in each instance:
-+
-+(a) You must retain and reproduce in all copies of Original Code the copyright
-+and other proprietary notices and disclaimers of Licensor as they appear in the
-+Original Code, and keep intact all notices in the Original Code that refer to
-+this License;
-+
-+(b) You must include a copy of this License with every copy of Source Code of
-+Covered Code and documentation You distribute, and You may not offer or impose
-+any terms on such Source Code that alter or restrict this License or the
-+recipients' rights hereunder, except as permitted under Section 6;
-+
-+(c) You must duplicate, to the extent it does not already exist, the notice in
-+Exhibit A in each file of the Source Code of all Your Modifications, and cause
-+the modified files to carry prominent notices stating that You changed the files
-+and the date of any change;
-+
-+(d) You must make Source Code of all Your Externally Deployed Modifications
-+publicly available under the terms of this License, including the license grants
-+set forth in Section 3 below, for as long as you Deploy the Covered Code or
-+twelve (12) months from the date of initial Deployment, whichever is longer. You
-+should preferably distribute the Source Code of Your Deployed Modifications
-+electronically (e.g. download from a web site); and
-+
-+(e) if You Deploy Covered Code in object code, executable form only, You must
-+include a prominent notice, in the code itself as well as in related
-+documentation, stating that Source Code of the Covered Code is available under
-+the terms of this License with information on how and where to obtain such
-+Source Code. You must also include the Object Code Notice set forth in Exhibit A
-+in the "about" box or other appropriate place where other copyright notices are
-+placed, including any packaging materials.
-+
-+2.2 You expressly acknowledge and agree that although Licensor and each
-+Contributor grants the licenses to their respective portions of the Covered Code
-+set forth herein, no assurances are provided by Licensor or any Contributor that
-+the Covered Code does not infringe the patent or other intellectual property
-+rights of any other entity. Licensor and each Contributor disclaim any liability
-+to You for claims brought by any other entity based on infringement of
-+intellectual property rights or otherwise. As a condition to exercising the
-+rights and licenses granted hereunder, You hereby assume sole responsibility to
-+secure any other intellectual property rights needed, if any. For example, if a
-+third party patent license is required to allow You to make, use, sell, import
-+or offer for sale the Covered Code, it is Your responsibility to acquire such
-+license(s).
-+
-+2.3 Subject to the terms and conditions of this License, Licensor hereby grants
-+You, effective on the date You accept this License (via downloading or using
-+Covered Code or otherwise indicating your acceptance of this License), a
-+worldwide, royalty-free, perpetual, non-exclusive patent license under
-+Licensor's Applicable Patent Rights to make, use, sell, offer for sale and
-+import the Covered Code, provided that in each instance you comply with the
-+terms of this License.
-+
-+3. Your Grants. In consideration of, and as a condition to, the licenses granted
-+to You under this License:
-+
-+(a) You grant to Licensor and all third parties a non-exclusive, perpetual,
-+irrevocable, royalty free license under Your Applicable Patent Rights and other
-+intellectual property rights owned or controlled by You, to make, sell, offer
-+for sale, use, import, reproduce, display, perform, modify, distribute and
-+Deploy Your Modifications of the same scope and extent as Licensor's licenses
-+under Sections 2.1 and 2.2; and
-+
-+(b) You grant to Licensor and its subsidiaries a non-exclusive, worldwide,
-+royalty-free, perpetual and irrevocable license, under Your Applicable Patent
-+Rights and other intellectual property rights owned or controlled by You, to
-+make, use, sell, offer for sale, import, reproduce, display, perform,
-+distribute, modify or have modified (for Licensor and/or its subsidiaries),
-+sublicense and distribute Your Modifications, in any form and for any purpose,
-+through multiple tiers of distribution.
-+
-+(c) You agree not use any information derived from Your use and review of the
-+Covered Code, including but not limited to any algorithms or inventions that may
-+be contained in the Covered Code, for the purpose of asserting any of Your
-+patent rights, or assisting a third party to assert any of its patent rights,
-+against Licensor or any Contributor.
-+
-+4. Derivative Works. You may create a Derivative Work by combining Covered Code
-+with other code not otherwise governed by the terms of this License and
-+distribute the Derivative Work as an integrated product. In each such instance,
-+You must make sure the requirements of this License are fulfilled for the
-+Covered Code or any portion thereof, including all Modifications.
-+
-+4.1 You must cause any Derivative Work that you distribute, publish or
-+Externally Deploy, that in whole or in part contains or is derived from the
-+Covered Code or any part thereof, to be licensed as a whole at no charge to all
-+third parties under the terms of this License and no other license except as
-+provided in Section 4.2. You also must make Source Code available for the
-+Derivative Work under the same terms as Modifications, described in Sections 2
-+and 3, above.
-+
-+4.2 Compatible Source Licenses. Software modules that have been independently
-+developed without any use of Covered Code and which contain no portion of the
-+Covered Code, Modifications or other Derivative Works, but are used or combined
-+in any way wtih the Covered Code or any Derivative Work to form a larger
-+Derivative Work, are exempt from the conditions described in Section 4.1 but
-+only to the extent that: the software module, including any software that is
-+linked to, integrated with, or part of the same applications as, the software
-+module by any method must be wholly subject to one of the Compatible Source
-+Licenses. Notwithstanding the foregoing, all Covered Code must be subject to the
-+terms of this License. Thus, the entire Derivative Work must be licensed under a
-+combination of the RPSL (for Covered Code) and a Compatible Source License for
-+any independently developed software modules within the Derivative Work. The
-+foregoing requirement applies even if the Compatible Source License would
-+ordinarily allow the software module to link with, or form larger works with,
-+other software that is not subject to the Compatible Source License. For
-+example, although the Mozilla Public License v1.1 allows Mozilla code to be
-+combined with proprietary software that is not subject to the MPL, if
-+MPL-licensed code is used with Covered Code the MPL-licensed code could not be
-+combined or linked with any code not governed by the MPL. The general intent of
-+this section 4.2 is to enable use of Covered Code with applications that are
-+wholly subject to an acceptable open source license. You are responsible for
-+determining whether your use of software with Covered Code is allowed under Your
-+license to such software.
-+
-+4.3 Mere aggregation of another work not based on the Covered Code with the
-+Covered Code (or with a work based on the Covered Code) on a volume of a storage
-+or distribution medium does not bring the other work under the scope of this
-+License. If You deliver the Covered Code for combination and/or integration with
-+an application previously provided by You (for example, via automatic updating
-+technology), such combination and/or integration constitutes a Derivative Work
-+subject to the terms of this License.
-+
-+5. Exclusions From License Grant. Nothing in this License shall be deemed to
-+grant any rights to trademarks, copyrights, patents, trade secrets or any other
-+intellectual property of Licensor or any Contributor except as expressly stated
-+herein. No right is granted to the trademarks of Licensor or any Contributor
-+even if such marks are included in the Covered Code. Nothing in this License
-+shall be interpreted to prohibit Licensor from licensing under different terms
-+from this License any code that Licensor otherwise would have a right to
-+license. Modifications, Derivative Works and/or any use or combination of
-+Covered Code with other technology provided by Licensor or third parties may
-+require additional patent licenses from Licensor which Licensor may grant in its
-+sole discretion. No patent license is granted separate from the Original Code or
-+combinations of the Original Code with other software or hardware.
-+
-+5.1. Trademarks. This License does not grant any rights to use the trademarks or
-+trade names owned by Licensor ("Licensor Marks" defined in Exhibit C) or to any
-+trademark or trade name belonging to any Contributor. No Licensor Marks may be
-+used to endorse or promote products derived from the Original Code other than as
-+permitted by the Licensor Trademark Policy defined in Exhibit C.
-+
-+6. Additional Terms. You may choose to offer, and to charge a fee for, warranty,
-+support, indemnity or liability obligations and/or other rights consistent with
-+the scope of the license granted herein ("Additional Terms") to one or more
-+recipients of Covered Code. However, You may do so only on Your own behalf and
-+as Your sole responsibility, and not on behalf of Licensor or any Contributor.
-+You must obtain the recipient's agreement that any such Additional Terms are
-+offered by You alone, and You hereby agree to indemnify, defend and hold
-+Licensor and every Contributor harmless for any liability incurred by or claims
-+asserted against Licensor or such Contributor by reason of any such Additional
-+Terms.
-+
-+7. Versions of the License. Licensor may publish revised and/or new versions of
-+this License from time to time. Each version will be given a distinguishing
-+version number. Once Original Code has been published under a particular version
-+of this License, You may continue to use it under the terms of that version. You
-+may also choose to use such Original Code under the terms of any subsequent
-+version of this License published by Licensor. No one other than Licensor has
-+the right to modify the terms applicable to Covered Code created under this
-+License.
-+
-+8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in part
-+pre-release, untested, or not fully tested works. The Covered Code may contain
-+errors that could cause failures or loss of data, and may be incomplete or
-+contain inaccuracies. You expressly acknowledge and agree that use of the
-+Covered Code, or any portion thereof, is at Your sole and entire risk. THE
-+COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR SUPPORT OF
-+ANY KIND AND LICENSOR AND LICENSOR'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS
-+"LICENSOR" FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY
-+DISCLAIM ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT
-+NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF
-+SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF QUIET
-+ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. LICENSOR AND EACH
-+CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE
-+COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR
-+REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR
-+ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO ORAL OR
-+WRITTEN DOCUMENTATION, INFORMATION OR ADVICE GIVEN BY LICENSOR, A LICENSOR
-+AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY. You
-+acknowledge that the Covered Code is not intended for use in high risk
-+activities, including, but not limited to, the design, construction, operation
-+or maintenance of nuclear facilities, aircraft navigation, aircraft
-+communication systems, or air traffic control machines in which case the failure
-+of the Covered Code could lead to death, personal injury, or severe physical or
-+environmental damage. Licensor disclaims any express or implied warranty of
-+fitness for such uses.
-+
-+9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT
-+SHALL LICENSOR OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, SPECIAL,
-+INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO THIS LICENSE OR
-+YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ANY PORTION THEREOF, WHETHER
-+UNDER A THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE OR STRICT
-+LIABILITY), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF LICENSOR OR SUCH
-+CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND
-+NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY. SOME
-+JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF INCIDENTAL OR
-+CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY TO YOU. In no event
-+shall Licensor's total liability to You for all damages (other than as may be
-+required by applicable law) under this License exceed the amount of ten dollars
-+($10.00).
-+
-+10. Ownership. Subject to the licenses granted under this License, each
-+Contributor retains all rights, title and interest in and to any Modifications
-+made by such Contributor. Licensor retains all rights, title and interest in and
-+to the Original Code and any Modifications made by or on behalf of Licensor
-+("Licensor Modifications"), and such Licensor Modifications will not be
-+automatically subject to this License. Licensor may, at its sole discretion,
-+choose to license such Licensor Modifications under this License, or on
-+different terms from those contained in this License or may choose not to
-+license them at all.
-+
-+11. Termination. 
-+
-+11.1 Term and Termination. The term of this License is perpetual unless
-+terminated as provided below. This License and the rights granted hereunder will
-+terminate:
-+
-+(a) automatically without notice from Licensor if You fail to comply with any
-+term(s) of this License and fail to cure such breach within 30 days of becoming
-+aware of such breach;
-+
-+(b) immediately in the event of the circumstances described in Section 12.5(b);
-+or
-+
-+(c) automatically without notice from Licensor if You, at any time during the
-+term of this License, commence an action for patent infringement against
-+Licensor (including by cross-claim or counter claim in a lawsuit);
-+
-+(d) upon written notice from Licensor if You, at any time during the term of
-+this License, commence an action for patent infringement against any third party
-+alleging that the Covered Code itself (excluding combinations with other
-+software or hardware) infringes any patent (including by cross-claim or counter
-+claim in a lawsuit).
-+
-+11.2 Effect of Termination. Upon termination, You agree to immediately stop any
-+further use, reproduction, modification, sublicensing and distribution of the
-+Covered Code and to destroy all copies of the Covered Code that are in your
-+possession or control. All sublicenses to the Covered Code which have been
-+properly granted prior to termination shall survive any termination of this
-+License. Provisions which, by their nature, should remain in effect beyond the
-+termination of this License shall survive, including but not limited to Sections
-+3, 5, 8, 9, 10, 11, 12.2 and 13. No party will be liable to any other for
-+compensation, indemnity or damages of any sort solely as a result of terminating
-+this License in accordance with its terms, and termination of this License will
-+be without prejudice to any other right or remedy of any party.
-+
-+12. Miscellaneous.
-+
-+12.1 Government End Users. The Covered Code is a "commercial item" as defined in
-+FAR 2.101. Government software and technical data rights in the Covered Code
-+include only those rights customarily provided to the public as defined in this
-+License. This customary commercial license in technical data and software is
-+provided in accordance with FAR 12.211 (Technical Data) and 12.212 (Computer
-+Software) and, for Department of Defense purchases, DFAR 252.227-7015 (Technical
-+Data -- Commercial Items) and 227.7202-3 (Rights in Commercial Computer Software
-+or Computer Software Documentation). Accordingly, all U.S. Government End Users
-+acquire Covered Code with only those rights set forth herein.
-+
-+12.2 Relationship of Parties. This License will not be construed as creating an
-+agency, partnership, joint venture or any other form of legal association
-+between or among You, Licensor or any Contributor, and You will not represent to
-+the contrary, whether expressly, by implication, appearance or otherwise.
-+
-+12.3 Independent Development. Nothing in this License will impair Licensor's
-+right to acquire, license, develop, have others develop for it, market and/or
-+distribute technology or products that perform the same or similar functions as,
-+or otherwise compete with, Modifications, Derivative Works, technology or
-+products that You may develop, produce, market or distribute.
-+
-+12.4 Waiver; Construction. Failure by Licensor or any Contributor to enforce any
-+provision of this License will not be deemed a waiver of future enforcement of
-+that or any other provision. Any law or regulation which provides that the
-+language of a contract shall be construed against the drafter will not apply to
-+this License.
-+
-+12.5 Severability. (a) If for any reason a court of competent jurisdiction finds
-+any provision of this License, or portion thereof, to be unenforceable, that
-+provision of the License will be enforced to the maximum extent permissible so
-+as to effect the economic benefits and intent of the parties, and the remainder
-+of this License will continue in full force and effect. (b) Notwithstanding the
-+foregoing, if applicable law prohibits or restricts You from fully and/or
-+specifically complying with Sections 2 and/or 3 or prevents the enforceability
-+of either of those Sections, this License will immediately terminate and You
-+must immediately discontinue any use of the Covered Code and destroy all copies
-+of it that are in your possession or control.
-+
-+12.6 Dispute Resolution. Any litigation or other dispute resolution between You
-+and Licensor relating to this License shall take place in the Seattle,
-+Washington, and You and Licensor hereby consent to the personal jurisdiction of,
-+and venue in, the state and federal courts within that District with respect to
-+this License. The application of the United Nations Convention on Contracts for
-+the International Sale of Goods is expressly excluded.
-+
-+12.7 Export/Import Laws. This software is subject to all export and import laws
-+and restrictions and regulations of the country in which you receive the Covered
-+Code and You are solely responsible for ensuring that You do not export,
-+re-export or import the Covered Code or any direct product thereof in violation
-+of any such restrictions, laws or regulations, or without all necessary
-+authorizations.
-+
-+12.8 Entire Agreement; Governing Law. This License constitutes the entire
-+agreement between the parties with respect to the subject matter hereof. This
-+License shall be governed by the laws of the United States and the State of
-+Washington.
-+
-+Where You are located in the province of Quebec, Canada, the following clause
-+applies: The parties hereby confirm that they have requested that this License
-+and all related documents be drafted in English. Les parties ont exig&eacute;
-+que le pr&eacute;sent contrat et tous les documents connexes soient
-+r&eacute;dig&eacute;s en anglais.
-+
-+								EXHIBIT A.  
-+
-+"Copyright &copy; 1995-2002
-+RealNetworks, Inc. and/or its licensors. All Rights Reserved.
-+
-+The contents of this file, and the files included with this file, are subject to
-+the current version of the RealNetworks Public Source License Version 1.0 (the
-+"RPSL") available at https://www.helixcommunity.org/content/rpsl unless you have
-+licensed the file under the RealNetworks Community Source License Version 1.0
-+(the "RCSL") available at https://www.helixcommunity.org/content/rcsl, in which
-+case the RCSL will apply. You may also obtain the license terms directly from
-+RealNetworks. You may not use this file except in compliance with the RPSL or,
-+if you have a valid RCSL with RealNetworks applicable to this file, the RCSL.
-+Please see the applicable RPSL or RCSL for the rights, obligations and
-+limitations governing use of the contents of the file.
-+
-+This file is part of the Helix DNA Technology. RealNetworks is the developer of
-+the Original code and owns the copyrights in the portions it created.
-+
-+This file, and the files included with this file, is distributed and made
-+available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR
-+IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING
-+WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-+PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-+
-+Contributor(s): ____________________________________ 
-+
-+Technology Compatibility Kit Test
-+Suite(s) Location (if licensed under the RCSL): ______________________________ 
-+
-+Object Code Notice: Helix DNA Client technology included. Copyright (c)
-+RealNetworks, Inc., 1995-2002. All rights reserved.
-+
-+
-+								EXHIBIT B 
-+
-+Compatible Source Licenses for the RealNetworks Public Source License. The
-+following list applies to the most recent version of the license as of October
-+25, 2002, unless otherwise indicated.
-+
-+* Academic Free License
-+* Apache Software License
-+* Apple Public Source License
-+* Artistic license
-+* Attribution Assurance Licenses
-+* BSD license
-+* Common Public License (1)
-+* Eiffel Forum License
-+* GNU General Public License (GPL) (1)
-+* GNU Library or "Lesser" General Public License (LGPL) (1)
-+* IBM Public License
-+* Intel Open Source License
-+* Jabber Open Source License
-+* MIT license
-+* MITRE Collaborative Virtual Workspace License (CVW License)
-+* Motosoto License
-+* Mozilla Public License 1.0 (MPL)
-+* Mozilla Public License 1.1 (MPL)
-+* Nokia Open Source License
-+* Open Group Test Suite License
-+* Python Software Foundation License
-+* Ricoh Source Code Public License
-+* Sun Industry Standards Source License (SISSL)
-+* Sun Public License
-+* University of Illinois/NCSA Open Source License
-+* Vovida Software License v. 1.0
-+* W3C License
-+* X.Net License
-+* Zope Public License
-+* zlib/libpng license
-+
-+(1) Note: because this license contains certain reciprocal licensing terms that
-+purport to extend to independently developed code, You may be prohibited under
-+the terms of this otherwise compatible license from using code licensed under
-+its terms with Covered Code because Covered Code may only be licensed under the
-+RealNetworks Public Source License. Any attempt to apply non RPSL license terms,
-+including without limitation the GPL, to Covered Code is expressly forbidden.
-+You are responsible for ensuring that Your use of Compatible Source Licensed
-+code does not violate either the RPSL or the Compatible Source License.
-+
-+The latest version of this list can be found at:
-+https://www.helixcommunity.org/content/complicense
-+
-+								EXHIBIT C 
-+
-+RealNetworks' Trademark policy.  
-+
-+RealNetworks defines the following trademarks collectively as "Licensor
-+Trademarks": "RealNetworks", "RealPlayer", "RealJukebox", "RealSystem",
-+"RealAudio", "RealVideo", "RealOne Player", "RealMedia", "Helix" or any other
-+trademarks or trade names belonging to RealNetworks.
-+
-+RealNetworks "Licensor Trademark Policy" forbids any use of Licensor Trademarks
-+except as permitted by and in strict compliance at all times with RealNetworks'
-+third party trademark usage guidelines which are posted at
-+http://www.realnetworks.com/info/helixlogo.html.
-+
-Index: helix-libs/clientapps/clutter/Umakefil
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/Umakefil	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,325 @@
-+# 
-+# ***** BEGIN LICENSE BLOCK ***** 
-+# Version: RCSL 1.0/RPSL 1.0 
-+#  
-+# Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+#      
-+# The contents of this file, and the files included with this file, are 
-+# subject to the current version of the RealNetworks Public Source License 
-+# Version 1.0 (the "RPSL") available at 
-+# http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+# the file under the RealNetworks Community Source License Version 1.0 
-+# (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+# in which case the RCSL will apply. You may also obtain the license terms 
-+# directly from RealNetworks.  You may not use this file except in 
-+# compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+# applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+# RCSL for the rights, obligations and limitations governing use of the 
-+# contents of the file.  
-+#  
-+# This file is part of the Helix DNA Technology. RealNetworks is the 
-+# developer of the Original Code and owns the copyrights in the portions 
-+# it created. 
-+#  
-+# This file, and the files included with this file, is distributed and made 
-+# available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+# EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+# FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+# 
-+# Technology Compatibility Kit Test Suite(s) Location: 
-+#    http://www.helixcommunity.org/content/tck 
-+# 
-+# Contributor(s): 
-+#  
-+# ***** END LICENSE BLOCK ***** 
-+# 
-+
-+UmakefileVersion(2,2)
-+
-+project.AddModuleIncludes("common/include",
-+                          "common/runtime/pub",
-+                          "client/include",
-+                          "client/common/system/pub",
-+                          "client/common/container/pub",
-+                          "client/audiosvc/pub",
-+                          "common/container/pub",
-+			  "video/sitelib/pub",
-+			  "video/colconverter/pub",
-+			  "video/sitelib/pub/platform/unix",
-+			  "video/sitelib",
-+                          "datatype/rm/include",
-+                          "client/core")
-+
-+project.AddSources("player.cpp",
-+                   "excontxt.cpp",
-+                   "exsite.cpp",
-+                   "exroot.cpp",
-+                   "exadvsnk.cpp",
-+                   "exerror.cpp",
-+                   "iids.cpp",
-+                   "exstateadvsnk.cpp",
-+                   "excallback.cpp",
-+		   "print.cpp")
-+
-+project.AddModuleLibraries(
-+                           "common/runtime[runtlib]",
-+                           "common/system[syslib]",
-+                           "common/container[contlib]",
-+                           "common/runtime[runtlib]",
-+                           "client/common/system[sysclntlib]",
-+                           "common/dbgtool[debuglib]",
-+                           "common/util[utillib]",
-+                           "video/sitelib[sitelib]",
-+                           "video/sitelib[sitecreatelib]",
-+                           "common/log/logutil[logutillib]",
-+                           "video/vidutil[vidutillib]"
-+                           )
-+project.AddSystemLibraries('Xv', 'Xext')
-+
-+if project.IsDefined("HELIX_FEATURE_PREFERENCES"):
-+    project.AddSources("preflist.cpp")
-+
-+if project.IsDefined("HELIX_FEATURE_AUTHENTICATION"):
-+    project.AddSources("exaumgr.cpp")
-+
-+if project.IsDefined("HELIX_FEATURE_VIDEO"):
-+	project.AddSources("exsitsup.cpp",
-+                           "fivemmap.cpp")
-+	project.AddModuleIncludes('video/include')
-+	if project.IsDefined("HELIX_FEATURE_PNG"):
-+		project.AddModuleIncludes('datatype/image/png/common/pub')
-+		project.AddModuleLibraries("common/import/zlib[zlib]",
-+					   "datatype/image/png/import/libpng[libpng]",
-+					   "datatype/image/png/common[pngcomlib]")
-+
-+if project.IsDefined("HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS"):
-+	project.AddSources("exprdnld.cpp")
-+
-+if project.BuildOption("nodll"):
-+        ## Client core
-+	static_plugin_list = ["clntcore"]
-+        project.AddModuleLibraries("common/runtime[runtlib]",
-+                                   "common/fileio[fileiolib]",
-+                                   "client/common/system[sysclntlib]",
-+                                   "client/common/container[contclntlib]",
-+                                   "client/core[clntcorelib]")
-+        if not project.IsDefined("HELIX_FEATURE_LOGLEVEL_NONE"):
-+            project.AddModuleLibraries("common/log/logutil[logutillib]")
-+        if not project.IsDefined("HELIX_CONFIG_MINIMIZE_SIZE"):
-+            project.AddModuleLibraries("client/common/util[utlclntlib]")
-+        ## Client core libraries
-+        if project.IsDefined("HELIX_FEATURE_AUDIO"):
-+        	project.AddModuleLibraries("audio/device[auddevlib]",
-+	        			   "client/audiosvc[audsvclib]")
-+	if ('HELIX_FEATURE_VOLUME' in project.defines):
-+		project.AddModuleLibraries("audio/gaintool[audgainlib]" )
-+	if ('HELIX_FEATURE_VOLUME' in project.defines):
-+		project.AddModuleLibraries("audio/crossfade[audxfadelib]")
-+        if project.IsDefined("HELIX_FEATURE_MIXER"):
-+        	project.AddModuleLibraries("audio/mixer[audmixlib]")
-+        if project.IsDefined("HELIX_FEATURE_RESAMPLER"):
-+        	project.AddModuleLibraries("audio/resampler[audresamplib]")
-+        if project.IsDefined("HELIX_FEATURE_LIMITER"):
-+        	project.AddModuleLibraries("audio/limiter[audlimiter]")
-+
-+        if project.IsDefined("HELIX_FEATURE_VIDEO"):
-+        	project.AddModuleLibraries("client/videosvc[vidsvclib]",
-+                                           "protocol/sdp[sdplib]")
-+        if project.IsDefined("HELIX_FEATURE_PLAYBACK_NET"):
-+        	project.AddModuleLibraries("client/netwksvc[netsvclib]",
-+                                           "common/netio[netiolib]",
-+        				   "client/common/netio[netioclntlib]",
-+        				   "protocol/transport/common/system[systranlib]",
-+        				   "protocol/transport/rtp[rtptranlib]",
-+        				   "protocol/common/util[protutillib]",
-+        				   "protocol/rtsp[rtsplib]")
-+        if project.IsDefined("HELIX_FEATURE_RDT"):
-+		project.AddLibraries(GetSDKPath("prtclrdt_lib"))
-+            	project.AddModuleLibraries("protocol/transport/rdt[rdttranlib]")
-+        if project.IsDefined("HELIX_FEATURE_PNA"):
-+		project.AddLibraries(GetSDKPath("prtclpna_lib"))
-+        if project.IsDefined("HELIX_FEATURE_XMLPARSER"):
-+        	project.AddModuleLibraries("common/lang/xml[xmllib]")
-+        ## Add RAM file format and renderer
-+	if project.IsDefined("HELIX_FEATURE_META"):
-+		static_plugin_list[-1:-1] = ["ramfformat", "ramrender"]
-+                project.AddModuleLibraries("datatype/ram/renderer[ramrendrlib]")
-+        ## Add local file system
-+	if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL"):
-+		static_plugin_list[-1:-1] = ["smplfsys"]
-+                project.AddModuleLibraries("common/fileio[fileiolib]")
-+        ## Add http file system
-+	if project.IsDefined("HELIX_FEATURE_PLAYBACK_NET"):
-+		static_plugin_list[-1:-1] = ["hxsdp", "httpfsys"]
-+                project.AddModuleLibraries("protocol/http[httplib]",
-+                                           "protocol/common/util[protutillib]",
-+                                           "protocol/sdp[sdplib]",
-+                                           "filesystem/data[datafsys]",
-+                                           "common/fileio[fileiolib]",
-+                                           "common/import/zlib[zlib]")
-+        ## Add realmedia file format
-+	if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL") and \
-+	    (project.IsDefined("HELIX_FEATURE_AUDIO_REAL") or    \
-+             project.IsDefined("HELIX_FEATURE_VIDEO_REAL")):
-+		static_plugin_list[-1:-1] = ["rmfformat"]
-+                project.AddModuleLibraries("datatype/common/util[dtutillib]",
-+                                           "datatype/common/container[dtcomcontlib]")
-+		project.AddLibraries(GetSDKPath("rmcom_lib"),
-+                                     GetSDKPath("rmacom_lib"),
-+                                     GetSDKPath("rmff_lib"),
-+			             GetSDKPath("rmvidpyld_lib"))
-+
-+        ## Add realmedia renderer
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_REAL"):
-+		static_plugin_list[-1:-1] = ["rarender"]
-+                project.AddModuleLibraries("datatype/rm/audio/payload[rapayld]")
-+                project.AddLibraries(GetSDKPath("rmarend_lib"),
-+                                     GetSDKPath("rmacom_lib"))
-+        ## Add mp3 file format and renderer
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_MPA_LAYER3") or \
-+           project.IsDefined("HELIX_FEATURE_AUDIO_MPA_LAYER2") or \
-+           project.IsDefined("HELIX_FEATURE_AUDIO_MPA_LAYER1"):
-+		static_plugin_list[-1:-1] = ["mp3render"]
-+                project.AddModuleLibraries("datatype/mp3/codec/fltpt[mp3codecfltpt]",
-+                                           "datatype/mp3/common[mp3lib]",
-+                                           "datatype/mp3/payload[mp3payld]",
-+                                           "datatype/common/util[dtutillib]")
-+		if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL"):
-+			static_plugin_list[-1:-1] = ["mp3fformat"]
-+                        project.AddModuleLibraries("datatype/mp3/common[mp3lib]")
-+        ## Add gecko realmedia codec
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_CODEC_GECKO"):
-+		static_plugin_list[-1:-1] = ["cook"]
-+		if not project.IsDefined("HELIX_CONFIG_FIXEDPOINT"):
-+			project.AddLibraries(GetSDKPath("ra8lbrdec_flt_lib"))
-+		else:
-+			project.AddLibraries(GetSDKPath("ra8lbrdec_fix_lib"))
-+                project.AddModuleLibraries("datatype/rm/audio/codec/common[racompat]")
-+        ## Add RAAC codec
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_CODEC_RAAC"):
-+		static_plugin_list[-1:-1] = ["raac"]
-+		project.AddModuleLibraries("datatype/mp4/common[mp4comlib]",
-+                                           "datatype/aac/codec/fixpt/decoder/hxwrap[aacdeclib]")
-+        ## Add sipro realmedia codec
-+        ## (Right now this only works for floating-point platforms)
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_CODEC_SIPRO"):
-+		static_plugin_list[-1:-1] = ["sipr"]
-+		project.AddLibraries(GetSDKPath("sipro_flt_backend_lib"))
-+        ## Add tokyo realmedia codec
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_CODEC_TOKYO"):
-+		static_plugin_list[-1:-1] = ["atrc"]
-+		project.AddLibraries(GetSDKPath("ra8hbr_lib"))
-+        ##
-+	if project.IsDefined("HELIX_FEATURE_VIDEO"):
-+		static_plugin_list[-1:-1] = ["vidsite"]
-+		static_plugin_list[-1:-1] = ["hxltcolor"]
-+                project.AddModuleLibraries("datatype/common/vidrend[vidrend]",
-+                                           "video/sitelib[sitelib]",
-+                                           "video/site[vidsite]",
-+                                           "video/colconverter[hxltcolor]",
-+                                           "datatype/rm/common[rmcomlib]",
-+                                           "video/vidutil[vidutillib]")
-+
-+		if (project.IsDefined('HELIX_FEATURE_ALTERNATE_SITE_CREATE_LIB')):
-+                    project.AddLibraries(GetSDKPath("sitecreate_lib"))
-+                else:
-+                    project.AddModuleLibraries('video/sitelib[sitecreatelib]')
-+                
-+        ## Add realvideo renderer
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_REAL"):
-+		project.AddModuleLibraries("datatype/rm/video/renderer[rvxrendlib]")
-+		project.AddLibraries(GetSDKPath("rmvidcom_lib"),
-+                                     GetSDKPath("rmvidpyld_lib"),
-+                                     GetSDKPath("rvcodcom_lib"))
-+                project.AddModuleLibraries("datatype/common/util[dtutillib]")
-+		static_plugin_list[-1:-1] = ["rvrender"]
-+                
-+        ## Add mpeg4 file format
-+	if project.IsDefined("HELIX_FEATURE_PLAYBACK_LOCAL")and \
-+	   (project.IsDefined("HELIX_FEATURE_VIDEO_H263") or    \
-+            project.IsDefined("HELIX_FEATURE_VIDEO_MPEG4") or   \
-+            project.IsDefined("HELIX_FEATURE_AUDIO_MPEG4")):
-+		static_plugin_list[-1:-1] = ["mp4fformat"]
-+                project.AddModuleLibraries("datatype/common/util[dtutillib]",
-+                                           "datatype/common/audrend",
-+                                           "datatype/mp4/common[mp4comlib]",
-+                                           "datatype/mp4/payload[mp4pyldlib]",
-+                                           "datatype/mp4/fileformat[mp4fformatlib]")
-+                if not project.IsDefined("HELIX_FEATURE_MP4_FILEFORMAT_M4A_ONLY"):
-+                    project.AddModuleLibraries("protocol/sdp[sdplib]",
-+                                               "protocol/rtsp[rtsplib]",
-+                                               "protocol/common/util[protutillib]",
-+                                               "datatype/rm/common[rmcomlib]",
-+                                               "datatype/amr/common[amrcomlib]")
-+        ## Add h.263 renderer
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_H263"):
-+		project.AddModuleLibraries("datatype/h263/payload[h263pyldlib]")
-+		static_plugin_list[-1:-1] = ["h263render"]
-+        ## Add MPEG4 renderer
-+#	if project.IsDefined("HELIX_FEATURE_VIDEO_MPEG4"):
-+#		static_plugin_list[-1:-1] = ["mp4xrender"]
-+        ## Add mpeg 4 audio renderer
-+	if project.IsDefined("HELIX_FEATURE_AUDIO_MPEG4"):
-+		static_plugin_list[-1:-1] = ["mp4arender"]
-+		project.AddModuleLibraries("datatype/mp4/audio/renderer[mp4arenderlib]")
-+                if not project.IsDefined("HELIX_FEATURE_MP4_FILEFORMAT_M4A_ONLY"):
-+                    project.AddModuleLibraries("datatype/amr/common[amrcomlib]")
-+        ## Add RV10 codec
-+        if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV10"):
-+            project.AddLibraries(GetSDKPath("rv1dec_libs")+"[rv10lib]",
-+                                 GetSDKPath("rv1dec_libs")+"[drv1lib]")
-+            static_plugin_list[-1:-1] = ["rv10", "drv1"]
-+        ## Add RV20 codec
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV20"):
-+		project.AddLibraries(GetSDKPath("rvg2dec_libs")+"[rv20lib]",
-+                                     GetSDKPath("rvg2dec_libs")+"[drv2lib]")
-+		static_plugin_list[-1:-1] = ["rv20", "drv2"]
-+
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV30") or \
-+	   project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV40"):
-+		static_plugin_list[-1:-1] = ["drvc"]
-+		if project.IsDefined("HELIX_FEATURE_ANSIC_RV89COMBO"):
-+			project.AddLibraries(GetSDKPath("rv89combo_c_libs")+"[drvc]")
-+		else:
-+			project.AddLibraries(GetSDKPath("rv89combo_libs")+"[drvclib]")
-+
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV30"):
-+		static_plugin_list[-1:-1] = ["rv30"]
-+		project.AddLibraries(GetSDKPath("rv89combo_libs")+"[rv3xlib]")
-+                project.AddModuleLibraries("datatype/rm/video/codec/rv89combo[rv30]")
-+
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV40"):
-+		static_plugin_list[-1:-1] = ["rv40"]
-+		project.AddLibraries(GetSDKPath("rv89combo_libs")+"[rv4xlib]")
-+                project.AddModuleLibraries("datatype/rm/video/codec/rv89combo[rv40]")
-+
-+#	if project.IsDefined("HELIX_FEATURE_AUDIO_CODEC_AAC"):
-+#		static_plugin_list[-1:-1] = ["aac4"]
-+
-+	CreateStaticPluginTable(static_plugin_list)
-+
-+project.ExportFunction("init_main", "void")
-+project.ExportFunction("deinit_main", "void")
-+project.ExportFunction("get_player", "void **ppPlayer",
-+                    "on_buffering_cb_t on_buffering_cb",
-+                    "on_pos_length_cb_t on_pos_length_cb")
-+project.ExportFunction("player_openurl", "void *pPlayerHandle",
-+                    "char *pszRawURL")
-+project.ExportFunction("put_player", "void *pPlayerHandle")
-+project.ExportFunction("player_geturl", "void *pPlayerHandle", "char **pszURL")
-+project.ExportFunction("player_begin", "void *pPlayerHandle")
-+project.ExportFunction("player_stop", "void *pPlayerHandle")
-+project.ExportFunction("player_pause", "void *pPlayerHandle")
-+project.ExportFunction("player_seek", "void *pPlayerHandle", "int pos")
-+project.ExportFunction("get_curr_playtime", "void *pPlayerHandle")
-+project.ExportFunction("player_getvolume", "void *pPlayerHandle")
-+project.ExportFunction("player_canseek", "void *pPlayerHandle")
-+project.ExportFunction("player_setvolume", "void *pPlayerHandle", "unsigned short volumn")
-+
-+
-+
-+DLLTarget('libhelix-player')
-+
-+DependTarget()
-+
-Index: helix-libs/clientapps/clutter/exabd.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exabd.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,245 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include <stdio.h>
-+
-+#include "hxtypes.h"
-+
-+#include "hxcom.h"
-+#include "hxcomm.h"
-+#include "hxmon.h"
-+#include "hxcore.h"
-+#include "hxengin.h"
-+#include "chxpckts.h"
-+#include "hxclsnk.h"
-+#include "hxstrutl.h"
-+#include "exabd.h"
-+
-+#include "print.h"
-+
-+#include "globals.h"
-+
-+struct _stGlobals*& GetGlobal(); //in main.cpp
-+
-+ExampleABD::ExampleABD(IUnknown* pUnknown)
-+           : m_lRefCount (0)
-+           , m_pUnknown (NULL)
-+           , m_ulABDStartTime(0)
-+           , m_ulABDResult(0)
-+           , m_bABDDone(FALSE)
-+{
-+    if (pUnknown)
-+    {
-+	m_pUnknown = pUnknown;
-+	m_pUnknown->AddRef();
-+    }
-+}
-+
-+ExampleABD::~ExampleABD(void)
-+{
-+    HX_RELEASE(m_pUnknown);
-+}
-+
-+
-+// *** IUnknown methods ***
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::QueryInterface
-+//  Purpose:
-+//	Implement this to export the interfaces supported by your 
-+//	object.
-+//
-+STDMETHODIMP ExampleABD::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+	AddRef();
-+	*ppvObj = (IUnknown*)(IHXAutoBWCalibrationAdviseSink*)this;
-+	return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXAutoBWCalibrationAdviseSink))
-+    {
-+	AddRef();
-+	*ppvObj = (IHXAutoBWCalibrationAdviseSink*)this;
-+	return HXR_OK;
-+    }
-+
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::AddRef
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleABD::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::Release
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleABD::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+/*
-+ *	IHXAutoBWCalibrationAdviseSink methods
-+ */
-+STDMETHODIMP
-+ExampleABD::AutoBWCalibrationStarted (const char* pszServer)
-+{
-+    if (pszServer)
-+    {
-+        STDOUT("ABD: contacting %s\n", pszServer);        
-+    }
-+
-+    return HXR_OK;
-+}
-+
-+STDMETHODIMP
-+ExampleABD::AutoBWCalibrationDone(HX_RESULT  status,
-+                                  UINT32     ulBW)
-+{
-+    m_bABDDone = TRUE;
-+
-+    if (HXR_OK == status)
-+    {
-+        m_ulABDResult = ulBW;
-+        STDOUT("ABD: %lu(Kbps) %lu(ms)\n", ulBW, GetTickCount() - m_ulABDStartTime);        
-+    }
-+    else
-+    {
-+        STDOUT("ABD failed: %lu\n", status);        
-+    }
-+
-+    return HXR_OK;
-+}
-+
-+HX_RESULT
-+ExampleABD::DoABD(const char*   pszServer,
-+                  UINT32        mode,
-+                  UINT32        packetSize,
-+                  UINT32        packetNum)
-+{
-+    HX_RESULT               rc = HXR_OK;
-+    UINT32                  length = 0;
-+    IHXAutoBWCalibration*   pABD = NULL;
-+    IHXValues*              pValues = NULL;
-+    IHXBuffer*              pBuffer = NULL;
-+
-+    m_ulABDStartTime = GetTickCount();
-+    m_ulABDResult = 0;
-+    m_bABDDone = FALSE;
-+
-+    if (m_pUnknown &&
-+        HXR_OK == m_pUnknown->QueryInterface(IID_IHXAutoBWCalibration, (void**)&pABD))
-+    {
-+        pValues = (IHXValues*) new CHXHeader();
-+        pValues->AddRef();
-+
-+	pBuffer = (IHXBuffer*) new CHXBuffer();
-+	pBuffer->AddRef();
-+
-+	pBuffer->Set((UCHAR*)pszServer, strlen(pszServer)+1);        
-+        pValues->SetPropertyCString("ABDServers", pBuffer);
-+
-+        pValues->SetPropertyULONG32("AutoBWDetectionMode", mode);
-+        pValues->SetPropertyULONG32("AutoBWDetectionPacketSize", packetSize);
-+        pValues->SetPropertyULONG32("AutoBWDetectionPackets", packetNum);       
-+
-+        pABD->AddAutoBWCalibrationSink((IHXAutoBWCalibrationAdviseSink*)this);
-+        pABD->InitAutoBWCalibration(pValues);
-+
-+        pABD->StartAutoBWCalibration();
-+
-+        while (!m_bABDDone)
-+        {
-+            MSG msg;
-+            DWORD starttime, endtime, i;
-+            BOOL sleep = TRUE;
-+            static const int checkinterval = 10;
-+
-+            starttime = GetTickCount();
-+            endtime = starttime + (20);
-+            i = 0;
-+            while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-+            {
-+                DispatchMessage(&msg);
-+                if ((i % checkinterval) == 0)
-+                {
-+                    if (GetTickCount() > endtime)
-+                        break;
-+                    ++i;
-+                }
-+                sleep = FALSE;
-+            }
-+
-+            if (sleep)
-+                Sleep(10);
-+        }
-+    }
-+
-+cleanup:
-+
-+    if (pABD)
-+    {
-+        pABD->RemoveAutoBWCalibrationSink((IHXAutoBWCalibrationAdviseSink*)this);
-+    }
-+
-+    HX_RELEASE(pBuffer);
-+    HX_RELEASE(pValues);
-+    HX_RELEASE(pABD);
-+
-+    return rc;
-+}
-+
-+
-Index: helix-libs/clientapps/clutter/exabd.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exabd.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,85 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXAMPLEABD_
-+#define _EXAMPLEABD_
-+
-+struct IHXAutoBWCalibrationAdviseSink;
-+struct IUnknown;
-+
-+class ExampleABD : public IHXAutoBWCalibrationAdviseSink
-+{
-+  private:
-+    LONG32          m_lRefCount;    
-+    IUnknown*       m_pUnknown;    
-+    UINT32          m_ulABDStartTime;
-+    UINT32          m_ulABDResult;
-+    BOOL            m_bABDDone;
-+    
-+    ~ExampleABD();
-+
-+  public:
-+
-+    ExampleABD(IUnknown* /*IN*/ pUnknown);
-+
-+    /*
-+     *  IUnknown methods
-+     */
-+    STDMETHOD(QueryInterface) (THIS_
-+                               REFIID riid,
-+                               void** ppvObj);
-+    
-+    STDMETHOD_(ULONG32,AddRef) (THIS);
-+
-+    STDMETHOD_(ULONG32,Release) (THIS);
-+
-+    /*
-+     *	IHXAutoBWCalibrationAdviseSink methods
-+     */
-+    STDMETHOD(AutoBWCalibrationStarted) (THIS_
-+                                         const char* pszServer);
-+    STDMETHOD(AutoBWCalibrationDone)	(THIS_
-+                                         HX_RESULT  status,
-+                                         UINT32     ulBW);
-+
-+    HX_RESULT   DoABD(const char*   pszServer,
-+                      UINT32        mode,
-+                      UINT32        packetSize,
-+                      UINT32        packetNum);
-+
-+    UINT32      GetABD(void) { return m_ulABDResult; };
-+};
-+
-+#endif /* _EXAMPLEABDSNK_ */
-Index: helix-libs/clientapps/clutter/exadvsnk.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exadvsnk.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,1116 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include <stdio.h>
-+
-+#include "hxtypes.h"
-+
-+#include "hxcom.h"
-+#include "hxcomm.h"
-+#include "hxmon.h"
-+#include "hxcore.h"
-+#include "hxengin.h"
-+#include "hxclsnk.h"
-+#include "hxgroup.h"
-+#include "hxstrutl.h"
-+#include "exadvsnk.h"
-+#include "hxstring.h"
-+#include "hxprefs.h"
-+#include "excontxt.h"
-+
-+#include "print.h"
-+
-+#include "globals.h"
-+#include "player.h"
-+
-+struct _stGlobals*& GetGlobal(); //in main.cpp
-+
-+#ifdef __TCS__
-+extern unsigned long   gStreamTime;
-+ 
-+static int		iOpened = 0;
-+
-+
-+#if	defined(__cplusplus)
-+extern	"C"	{
-+#endif	/* defined(__cplusplus) */
-+
-+typedef enum hookBuffering {
-+	eContacting = 0,
-+	eConnecting = 1,
-+	eBuffering = 2,
-+	ePlaying = 3
-+}hookBuffering;
-+
-+void hookRealAudio_Buffering(hookBuffering connectState, int pct);
-+
-+void hookRealAudio_PlayPosition(unsigned long current,unsigned long duration);
-+
-+typedef enum hookState {
-+	ePlay = 0,
-+	ePause = 1,
-+	eStop = 2,
-+	eResume = 3,
-+	eComplete				// Clip is done playing
-+}hookState;
-+void hookRealAudio_State(hookState newState);
-+
-+
-+#if	defined(__cplusplus)
-+}
-+#endif	/* defined(__cplusplus) */
-+
-+#endif // __TCS__
-+
-+void PrintBuffer(const char* pszName,const unsigned char* pbBuf, unsigned int dwBytes);
-+
-+ExampleClientAdviceSink::ExampleClientAdviceSink(IUnknown* pUnknown, LONG32 lClientIndex, on_buffering_cb_t on_buffering_cb, on_pos_length_cb_t on_pos_length_cb, void *context)
-+    : m_lRefCount (0)
-+    , m_lClientIndex (lClientIndex)
-+    , m_pUnknown (NULL)
-+    , m_pRegistry (NULL)
-+    , m_pScheduler (NULL)
-+    , m_lCurrentBandwidth(0)
-+    , m_lAverageBandwidth(0)
-+    , m_bOnStop(0)
-+	, m_pPlayer(0)
-+    , m_bWaitForTrackStart(0)
-+    , m_on_buffering_cb(on_buffering_cb)
-+    , m_on_pos_length_cb(on_pos_length_cb)
-+    , m_context(context)
-+{
-+    if (pUnknown)
-+    {
-+	m_pUnknown = pUnknown;
-+	m_pUnknown->AddRef();
-+
-+	if (HXR_OK != m_pUnknown->QueryInterface(IID_IHXRegistry, (void**)&m_pRegistry))
-+	{
-+	    m_pRegistry = NULL;
-+	}
-+
-+	if (HXR_OK != m_pUnknown->QueryInterface(IID_IHXScheduler, (void**)&m_pScheduler))
-+	{
-+	    m_pScheduler = NULL;
-+	}
-+
-+	IHXPlayer* pPlayer;
-+	if(HXR_OK == m_pUnknown->QueryInterface(IID_IHXPlayer,
-+						(void**)&pPlayer))
-+	{
-+		m_pPlayer = pPlayer;
-+
-+            IHXGroupManager* pGroupMgr = NULL;
-+            if(HXR_OK == m_pPlayer->QueryInterface(IID_IHXGroupManager,
-+                                                   (void**)&pGroupMgr))
-+            {
-+                pGroupMgr->AddSink((IHXGroupSink*)this);
-+                pGroupMgr->Release();
-+            }
-+
-+	    pPlayer->AddAdviseSink(this);
-+
-+	}
-+    }
-+
-+#ifdef __TCS__
-+    bEnableAdviceSink = TRUE;
-+    iOpened = 0;
-+#endif 
-+}
-+
-+ExampleClientAdviceSink::~ExampleClientAdviceSink(void)
-+{
-+    if (m_pScheduler)
-+    {
-+        m_pScheduler->Release();
-+        m_pScheduler = NULL;
-+    }
-+
-+    if (m_pRegistry)
-+    {
-+	m_pRegistry->Release();
-+	m_pRegistry = NULL;
-+    }
-+
-+    if (m_pPlayer)
-+    {
-+	m_pPlayer->Release();
-+	m_pPlayer = NULL;
-+    }
-+    if (m_pUnknown)
-+    {
-+	m_pUnknown->Release();
-+	m_pUnknown = NULL;
-+    }
-+}
-+
-+
-+// *** IUnknown methods ***
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::QueryInterface
-+//  Purpose:
-+//	Implement this to export the interfaces supported by your 
-+//	object.
-+//
-+STDMETHODIMP ExampleClientAdviceSink::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+	AddRef();
-+	*ppvObj = (IUnknown*)(IHXClientAdviseSink*)this;
-+	return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXClientAdviseSink))
-+    {
-+	AddRef();
-+	*ppvObj = (IHXClientAdviseSink*)this;
-+	return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXGroupSink))
-+    {
-+	AddRef();
-+	*ppvObj = (IHXGroupSink*)this;
-+	return HXR_OK;
-+    }
-+
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::AddRef
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleClientAdviceSink::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::Release
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleClientAdviceSink::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+/*
-+ *	IHXClientAdviseSink methods
-+ */
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnPosLength
-+ *	Purpose:
-+ *	    Called to advise the client that the position or length of the
-+ *	    current playback context has changed.
-+ */
-+
-+#ifdef __TCS__
-+static long	lastPosition = -1;
-+#endif
-+
-+STDMETHODIMP
-+ExampleClientAdviceSink::OnPosLength(UINT32	  ulPosition,
-+				   UINT32	  ulLength)
-+{
-+    // Are we doing a multi-seek?
-+    if (GetGlobal()->g_bMultiSeek)
-+    {
-+        // Have we run out of seek times?
-+        if (GetGlobal()->g_ulMultiSeekIndex < GetGlobal()->g_ulNumMultiSeeks)
-+        {
-+            STDOUT("Multi-seeking the first player to %lu\n",
-+                   GetGlobal()->g_ulMultiSeekTime[GetGlobal()->g_ulMultiSeekIndex]);
-+            GetGlobal()->g_Players[0]->Seek(GetGlobal()->g_ulMultiSeekTime[GetGlobal()->g_ulMultiSeekIndex++]);
-+        }
-+        else
-+        {
-+            // We've run out - stop the multi-seek
-+            GetGlobal()->g_bMultiSeek       = FALSE;
-+            GetGlobal()->g_ulNumMultiSeeks  = 0;
-+            GetGlobal()->g_ulMultiSeekIndex = 0;
-+        }
-+    }
-+
-+    if (m_on_pos_length_cb)
-+        m_on_pos_length_cb(ulPosition, ulLength, m_context);
-+
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnPresentationOpened
-+ *	Purpose:
-+ *	    Called to advise the client a presentation has been opened.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnPresentationOpened()
-+{
-+#ifdef __TCS__
-+    iOpened = 1;
-+    lastPosition = -1;
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnPresentationOpened()\n");
-+    }
-+#if defined(HELIX_FEATURE_PLAYBACK_VELOCITY)
-+    // Try to get the IHXPlaybackVelocity interface
-+    // from the first player
-+    if (GetGlobal()->g_nPlayers > 0 && GetGlobal()->g_Players[0])
-+    {
-+        IHXPlaybackVelocity* pVel = NULL;
-+        HX_RESULT rv = GetGlobal()->g_Players[0]->QueryInterface(IID_IHXPlaybackVelocity, (void**) &pVel);
-+        if (SUCCEEDED(rv))
-+        {
-+            // Get the capabilities object from the player
-+            rv = pVel->QueryVelocityCaps(GetGlobal()->g_pVelocityCaps);
-+            if (SUCCEEDED(rv) && GetGlobal()->bEnableAdviceSink)
-+            {
-+                STDOUT("Available Velocity Ranges:");
-+                UINT32 ulNumRanges = GetGlobal()->g_pVelocityCaps->GetNumRanges();
-+                for (UINT32 i = 0; i < ulNumRanges && SUCCEEDED(rv); i++)
-+                {
-+                    INT32 lMin = 0;
-+                    INT32 lMax = 0;
-+                    rv = GetGlobal()->g_pVelocityCaps->GetRange(i, lMin, lMax);
-+                    if (SUCCEEDED(rv))
-+                    {
-+                        STDOUT(" [%ld,%ld]", lMin, lMax);
-+                    }
-+                }
-+                STDOUT("\n");
-+            }
-+        }
-+        HX_RELEASE(pVel);
-+    }
-+#endif /* #if defined(HELIX_FEATURE_PLAYBACK_VELOCITY) */
-+#endif
-+
-+    UINT32 sourceCount = m_pPlayer->GetSourceCount();	
-+    for (UINT32 sourceID = 0; sourceID < sourceCount; sourceID ++)
-+    {
-+	// get HXSource
-+        IUnknown* pUnkSource = NULL;
-+        IHXStreamSource* pStreamSrc = NULL;
-+
-+        if (HXR_OK != m_pPlayer->GetSource (sourceID, pUnkSource))
-+        {
-+            continue;
-+        }
-+
-+        pUnkSource->QueryInterface(IID_IHXStreamSource, (void **)&pStreamSrc);
-+
-+        HX_RELEASE(pUnkSource);
-+
-+        if (!pStreamSrc)
-+        {
-+            continue;
-+        }
-+
-+        UINT32 num_streams = pStreamSrc->GetStreamCount();
-+
-+        // get information from Streams
-+        for (UINT32 streamID = 0; streamID < num_streams ; streamID++)
-+        {
-+            IUnknown* pUnkStream = NULL;
-+
-+            if (HXR_OK == pStreamSrc->GetStream(streamID, pUnkStream))
-+            {
-+                IHXStream* pStream = NULL;
-+
-+                if (HXR_OK == pUnkStream->QueryInterface(IID_IHXStream,
-+                                                         (void**)&pStream))
-+                {
-+                    const char* pMimeType = pStream->GetStreamType();
-+                    if( 0 == strcmp(pMimeType, "application/ram"))
-+                    {
-+		        m_bWaitForTrackStart = TRUE;
-+                    }
-+                    else
-+               	    {
-+                        m_bWaitForTrackStart = FALSE;
-+                    }
-+                }
-+                HX_RELEASE(pStream);
-+            }
-+            HX_RELEASE(pUnkStream);
-+            if (!m_bWaitForTrackStart)
-+            {
-+                break;
-+            }
-+        }
-+
-+        if (!m_bWaitForTrackStart)
-+        {
-+            break;
-+        }
-+        HX_RELEASE(pStreamSrc);
-+    }
-+
-+    if (!m_bWaitForTrackStart)
-+    {
-+	STDOUT("----------------clip info--------------------\n");
-+	if(m_pScheduler)	{
-+		m_hCallback = m_pScheduler->RelativeEnter(this,50);
-+	}
-+    }
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnPresentationClosed
-+ *	Purpose:
-+ *	    Called to advise the client a presentation has been closed.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnPresentationClosed()
-+{
-+#ifdef __TCS__
-+    iOpened = 0;
-+    lastPosition = -1;
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnPresentationClosed()\n");
-+    }
-+#endif
-+
-+    return HXR_OK;
-+}
-+
-+void ExampleClientAdviceSink::GetStatistics (char* pszRegistryKey)
-+{
-+    char    szRegistryValue[MAX_DISPLAY_NAME] = {0}; /* Flawfinder: ignore */
-+    INT32   lValue = 0;
-+    INT32   i = 0;
-+    INT32   lStatistics = 8;
-+    UINT32 *plValue;
-+    
-+#ifdef __TCS__    
-+    return;	  // DISABLED FOR NOW
-+#endif
-+
-+    // collect statistic
-+    for (i = 0; i < lStatistics; i++)
-+    {
-+	plValue = NULL;
-+	switch (i)
-+	{
-+	case 0:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.Normal", pszRegistryKey);
-+	    break;
-+	case 1:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.Recovered", pszRegistryKey);
-+	    break;
-+	case 2:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.Received", pszRegistryKey);
-+	    break;
-+	case 3:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.Lost", pszRegistryKey);
-+	    break;
-+	case 4:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.Late", pszRegistryKey);
-+	    break;
-+	case 5:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.ClipBandwidth", pszRegistryKey);
-+	    break;
-+	case 6:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.AverageBandwidth", pszRegistryKey);
-+	    plValue = &m_lAverageBandwidth;
-+	    break;
-+	case 7:
-+	    SafeSprintf(szRegistryValue, MAX_DISPLAY_NAME, "%s.CurrentBandwidth", pszRegistryKey);
-+	    plValue = &m_lCurrentBandwidth;
-+	    break;
-+	default:
-+	    break;
-+	}
-+
-+	m_pRegistry->GetIntByName(szRegistryValue, lValue);
-+	if (plValue)
-+	{
-+	    if (m_bOnStop || lValue == 0)
-+	    {
-+		lValue = *plValue;
-+	    }
-+	    else
-+	    {
-+		*plValue = lValue;
-+	    }
-+	}
-+	if (GetGlobal()->bEnableAdviceSink || (GetGlobal()->bEnableVerboseMode && m_bOnStop))
-+	{
-+	    STDOUT("%s = %ld\n", szRegistryValue, lValue);
-+	}
-+    }
-+}
-+
-+void ExampleClientAdviceSink::GetAllStatistics(void)
-+{
-+    UINT32  unPlayerIndex = 0;
-+    UINT32  unSourceIndex = 0;
-+    UINT32  unStreamIndex = 0;
-+
-+    char*   pszRegistryPrefix = "Statistics";
-+    char    szRegistryName[MAX_DISPLAY_NAME] = {0}; /* Flawfinder: ignore */
-+
-+#ifdef __TCS__    
-+    return;	  // DISABLED FOR NOW
-+#endif
-+    
-+    // display the content of whole statistic registry
-+    if (m_pRegistry)
-+    {
-+	// ok, let's start from the top (player)
-+	SafeSprintf(szRegistryName, MAX_DISPLAY_NAME, "%s.Player%ld", pszRegistryPrefix, m_lClientIndex);
-+	if (PT_COMPOSITE == m_pRegistry->GetTypeByName(szRegistryName))
-+	{
-+	    // display player statistic
-+	    GetStatistics(szRegistryName);
-+
-+	    SafeSprintf(szRegistryName, MAX_DISPLAY_NAME, "%s.Source%ld", szRegistryName, unSourceIndex);
-+	    while (PT_COMPOSITE == m_pRegistry->GetTypeByName(szRegistryName))
-+	    {
-+		// display source statistic
-+		GetStatistics(szRegistryName);
-+
-+		SafeSprintf(szRegistryName, MAX_DISPLAY_NAME, "%s.Stream%ld", szRegistryName, unStreamIndex);
-+		while (PT_COMPOSITE == m_pRegistry->GetTypeByName(szRegistryName))
-+		{
-+		    // display stream statistic
-+		    GetStatistics(szRegistryName);
-+
-+		    unStreamIndex++;
-+
-+		    SafeSprintf(szRegistryName, MAX_DISPLAY_NAME, "%s.Player%ld.Source%ld.Stream%ld", 
-+			pszRegistryPrefix, unPlayerIndex, unSourceIndex, unStreamIndex);
-+		}
-+
-+		unSourceIndex++;
-+
-+		SafeSprintf(szRegistryName, MAX_DISPLAY_NAME, "%s.Player%ld.Source%ld",
-+		    pszRegistryPrefix, unPlayerIndex, unSourceIndex);
-+	    }
-+
-+	    unPlayerIndex++;
-+
-+	    SafeSprintf(szRegistryName, MAX_DISPLAY_NAME, "%s.Player%ld", pszRegistryPrefix, unPlayerIndex);
-+	}
-+    }
-+}
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnStatisticsChanged
-+ *	Purpose:
-+ *	    Called to advise the client that the presentation statistics
-+ *	    have changed. 
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnStatisticsChanged(void)
-+{
-+    char        szBuff[1024]; /* Flawfinder: ignore */
-+    HX_RESULT   res     = HXR_OK;
-+    UINT16      uPlayer = 0;
-+
-+#ifdef __TCS__    
-+    return HXR_OK;	  // DISABLED FOR NOW
-+#endif
-+
-+    if(GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnStatisticsChanged():\n");
-+
-+        SafeSprintf(szBuff, 1024, "Statistics");        
-+        res = DumpRegTree( szBuff );
-+    }
-+
-+    return HXR_OK;
-+}
-+
-+HX_RESULT ExampleClientAdviceSink::DumpRegTree(const char* pszTreeName )
-+{
-+    const char* pszName = NULL;
-+    ULONG32     ulRegID   = 0;
-+    HX_RESULT   res     = HXR_OK;
-+    INT32       nVal    = 0;
-+    IHXBuffer* pBuff   = NULL;
-+    IHXValues* pValues = NULL;
-+
-+    //See if the name exists in the reg tree.
-+    res = m_pRegistry->GetPropListByName( pszTreeName, pValues);
-+    if( HXR_OK!=res || !pValues )
-+        return HXR_FAIL;
-+
-+    //make sure this is a PT_COMPOSITE type reg entry.
-+    if( PT_COMPOSITE != m_pRegistry->GetTypeByName(pszTreeName))
-+        return HXR_FAIL;
-+
-+    //Print out the value of each member of this tree.
-+    res = pValues->GetFirstPropertyULONG32( pszName, ulRegID );
-+    while( HXR_OK == res )
-+    {
-+        //We have at least one entry. See what type it is.
-+        HXPropType pt = m_pRegistry->GetTypeById(ulRegID);
-+        switch(pt)
-+        {
-+           case PT_COMPOSITE:
-+               DumpRegTree(pszName);
-+               break;
-+           case PT_INTEGER :
-+               nVal = 0;
-+               m_pRegistry->GetIntById( ulRegID, nVal );
-+               STDOUT("%s : %d\n", pszName, nVal ); 
-+               break;
-+           case PT_INTREF :
-+               nVal = 0;
-+               m_pRegistry->GetIntById( ulRegID, nVal );
-+               STDOUT("%s : %d\n", pszName, nVal ); 
-+               break;
-+           case PT_STRING :
-+               pBuff = NULL;
-+               m_pRegistry->GetStrById( ulRegID, pBuff );
-+               STDOUT("%s : \"", pszName ); 
-+               if( pBuff )
-+                   STDOUT("%s", (const char *)(pBuff->GetBuffer()) );
-+               STDOUT("\"\n" ); 
-+               HX_RELEASE(pBuff);
-+               break;
-+           case PT_BUFFER :
-+               STDOUT("%s : BUFFER TYPE NOT SHOWN\n",
-+                        pszName, nVal ); 
-+               break;
-+           case PT_UNKNOWN:
-+               STDOUT("%s Unkown registry type entry\n", pszName );
-+               break;
-+           default:
-+               STDOUT("%s Unkown registry type entry\n", pszName );
-+               break;
-+        }
-+        res = pValues->GetNextPropertyULONG32( pszName, ulRegID);
-+    }
-+
-+    HX_RELEASE( pValues );
-+    
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnPreSeek
-+ *	Purpose:
-+ *	    Called by client engine to inform the client that a seek is
-+ *	    about to occur. The render is informed the last time for the 
-+ *	    stream's time line before the seek, as well as the first new
-+ *	    time for the stream's time line after the seek will be completed.
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnPreSeek(	ULONG32	ulOldTime,
-+						ULONG32	ulNewTime)
-+{
-+#if !defined(__TCS__)
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnPreSeek(%ld, %ld)\n", ulOldTime, ulNewTime);
-+    }
-+#endif
-+
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnPostSeek
-+ *	Purpose:
-+ *	    Called by client engine to inform the client that a seek has
-+ *	    just occured. The render is informed the last time for the 
-+ *	    stream's time line before the seek, as well as the first new
-+ *	    time for the stream's time line after the seek.
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnPostSeek(	ULONG32	ulOldTime,
-+						ULONG32	ulNewTime)
-+{
-+#ifdef __TCS__
-+    lastPosition = -1;
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnPostSeek(%ld, %ld)\n", ulOldTime, ulNewTime);
-+    }
-+#endif
-+
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnStop
-+ *	Purpose:
-+ *	    Called by client engine to inform the client that a stop has
-+ *	    just occured. 
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnStop(void)
-+{
-+    HXTimeval now;
-+
-+#ifdef __TCS__
-+    hookRealAudio_State(eStop);
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnStop()\n");
-+    }
-+
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("Player %ld stopped.\n", m_lClientIndex);
-+        m_bOnStop = TRUE;
-+	GetAllStatistics();
-+    }
-+#endif
-+
-+    // Find out the current time and subtract the beginning time to
-+    // figure out how many seconds we played
-+    now = m_pScheduler->GetCurrentSchedulerTime();
-+    m_ulStopTime = now.tv_sec;
-+
-+    GetGlobal()->g_ulNumSecondsPlayed = m_ulStopTime - m_ulStartTime;
-+
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnPause
-+ *	Purpose:
-+ *	    Called by client engine to inform the client that a pause has
-+ *	    just occured. The render is informed the last time for the 
-+ *	    stream's time line before the pause.
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnPause(ULONG32 ulTime)
-+{
-+#ifdef __TCS__
-+    hookRealAudio_State(ePause);
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnPause(%ld)\n", ulTime);
-+    }
-+#endif 
-+
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnBegin
-+ *	Purpose:
-+ *	    Called by client engine to inform the client that a begin or
-+ *	    resume has just occured. The render is informed the first time 
-+ *	    for the stream's time line after the resume.
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnBegin(ULONG32 ulTime)
-+{
-+    HXTimeval now;
-+
-+#if !defined(__TCS__)
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnBegin(%ld)\n", ulTime);
-+    }
-+
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("Player %ld beginning playback...\n", m_lClientIndex);
-+    }
-+#endif
-+
-+    GetGlobal()->g_bOnBeginOccurred = TRUE;
-+
-+    // Record the current time, so we can figure out many seconds we played
-+    now = m_pScheduler->GetCurrentSchedulerTime();
-+    m_ulStartTime = now.tv_sec;
-+
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnBuffering
-+ *	Purpose:
-+ *	    Called by client engine to inform the client that buffering
-+ *	    of data is occuring. The render is informed of the reason for
-+ *	    the buffering (start-up of stream, seek has occured, network
-+ *	    congestion, etc.), as well as percentage complete of the 
-+ *	    buffering process.
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnBuffering(ULONG32	ulFlags,
-+						UINT16	unPercentComplete)
-+{
-+#ifdef __TCS__
-+static UINT16	lastPct = 0;
-+    if (unPercentComplete > 0)
-+    {
-+	UINT16	nextPct = lastPct + 10;
-+	if (unPercentComplete < lastPct)
-+	{
-+	    lastPct = 0;
-+	    nextPct = lastPct + 10;
-+	}
-+	if (unPercentComplete >= nextPct)
-+	{
-+	    lastPct = (unPercentComplete / 10) * 10;
-+	    nextPct = lastPct + 10;
-+	    hookRealAudio_Buffering(eBuffering,lastPct);
-+	}
-+    }
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnBuffering(%ld, %d)\n", ulFlags, unPercentComplete);
-+    }
-+#endif
-+    if (m_on_buffering_cb)
-+        m_on_buffering_cb(ulFlags, unPercentComplete, m_context);
-+
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *	Method:
-+ *	    IHXClientAdviseSink::OnContacting
-+ *	Purpose:
-+ *	    Called by client engine to inform the client is contacting
-+ *	    hosts(s).
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::OnContacting(const char* pHostName)
-+{
-+#ifdef __TCS__
-+    printf("Contacting\n");
-+    hookRealAudio_Buffering(eContacting,0);
-+#else
-+    if (GetGlobal()->bEnableAdviceSink)
-+    {
-+        STDOUT("OnContacting(\"%s\")\n", pHostName);
-+    }
-+#endif
-+
-+    return HXR_OK;
-+}
-+
-+void ExampleClientAdviceSink::PrintPropName( IHXValues* pHeader )
-+{
-+    if ( pHeader == NULL )
-+    {
-+        return ;
-+    }
-+
-+    const char *pChar;
-+    ULONG32 pValue;
-+    if(HXR_OK == pHeader->GetFirstPropertyULONG32(pChar, pValue))
-+    {
-+        do
-+        {
-+            STDOUT("%s %d\n", pChar, pValue);
-+        }
-+        while(HXR_OK == pHeader->GetNextPropertyULONG32(pChar, pValue));
-+    }
-+
-+    IHXBuffer *pBuffer;
-+
-+    if(HXR_OK == pHeader->GetFirstPropertyBuffer(pChar, pBuffer))
-+    {
-+        do
-+        {
-+            STDOUT("%s %s\n", pChar, (const char *) ( pBuffer->GetBuffer() ));
-+		PrintBuffer(pChar, pBuffer->GetBuffer() ,pBuffer->GetSize());
-+            HX_RELEASE(pBuffer);
-+        } while(HXR_OK == pHeader->GetNextPropertyBuffer(pChar, pBuffer ));
-+    }
-+    
-+	if(HXR_OK == pHeader->GetFirstPropertyCString(pChar, pBuffer))
-+    {
-+        do
-+        {
-+            STDERR("%s %s\n", pChar, (const char *) ( pBuffer->GetBuffer() ));
-+            HX_RELEASE(pBuffer);
-+        } while(HXR_OK == pHeader->GetNextPropertyCString(pChar, pBuffer ));
-+    }
-+    
-+    fflush(stdout);
-+}
-+
-+
-+void ExampleClientAdviceSink::SetClipInfo( IHXPlayer* m_pRMAPlayer)
-+{
-+    bool bSendOnClipInfo = false;
-+
-+    // Get HXSource and try to get clip infor. 
-+    UINT32 sourceCount = m_pRMAPlayer->GetSourceCount();	
-+    for (UINT32 sourceID = 0; sourceID < sourceCount; sourceID ++)
-+    {
-+	// get HXSource
-+        STDOUT("========Source %d========\n",sourceID);
-+        IUnknown* pUnkSource = NULL;
-+        IHXStreamSource* pStreamSrc = NULL;
-+
-+        if (HXR_OK != m_pRMAPlayer->GetSource (sourceID, pUnkSource))
-+        {
-+            continue;
-+        }
-+
-+        pUnkSource->QueryInterface(IID_IHXStreamSource, (void **)&pStreamSrc);
-+
-+        HX_RELEASE(pUnkSource);
-+
-+        if (!pStreamSrc)
-+        {
-+            continue;
-+        }
-+
-+	UINT32 num_streams = pStreamSrc->GetStreamCount();
-+	
-+	STDOUT("====File Header====\n");
-+
-+        IHXValues* pFileHdr = NULL;
-+        pStreamSrc->QueryInterface(IID_IHXValues, (void**)&pFileHdr);
-+
-+        if ( pFileHdr)
-+        {
-+	    PrintPropName(pFileHdr);
-+        }
-+        HX_RELEASE(pFileHdr);
-+
-+        // get information from Streams
-+        for (UINT32 streamID = 0; streamID < num_streams ; streamID++)
-+        {
-+            STDOUT("====Stream %d====\n",streamID);
-+            IUnknown* pUnkStream = NULL;
-+
-+            if (HXR_OK == pStreamSrc->GetStream(streamID, pUnkStream))
-+            {
-+                IHXStream* pStream = NULL;
-+
-+                if (HXR_OK == pUnkStream->QueryInterface(IID_IHXStream,
-+                                                         (void**)&pStream))
-+                {
-+                    IHXValues* pStreamHdr = pStream->GetHeader();
-+                    if (pStreamHdr)
-+                    {
-+                        PrintPropName(pStreamHdr);
-+                    }
-+                    HX_RELEASE(pStreamHdr);
-+                }
-+                HX_RELEASE(pStream);
-+            }
-+            HX_RELEASE(pUnkStream);
-+        }
-+        STDOUT("---------------------------------------------\n");
-+
-+        HX_RELEASE(pStreamSrc);
-+    }
-+}
-+
-+
-+STDMETHODIMP ExampleClientAdviceSink::Func()
-+{
-+    m_hCallback = 0;
-+
-+    // set clip info
-+	if(m_pPlayer)
-+	    SetClipInfo(m_pPlayer);
-+
-+    return HXR_OK;
-+}
-+
-+void PrintBuffer(const char* pszName,const unsigned char* pbBuf, unsigned int dwBytes)
-+{
-+	if(pszName == NULL || pbBuf == NULL)
-+		return;
-+
-+	STDOUT("    ");
-+	for(unsigned int i= 0; i<dwBytes; i++)	{
-+		STDOUT("0x%02x  ",*pbBuf++);
-+		if(i % 15 == 0 && i!=0)
-+			STDOUT("\n    ");
-+	}
-+	STDOUT("\n");
-+	return;
-+}
-+
-+/*
-+ *  IHXGroupSink methods
-+ */
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::GroupAdded
-+ *  Purpose:
-+ *		Notification of a new group being added to the presentation.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::GroupAdded( UINT16 /*IN*/ uGroupIndex,
-+			    IHXGroup* /*IN*/ pGroup)
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::GroupRemoved
-+ *  Purpose:
-+ *		Notification of a group being removed from the presentation.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::GroupRemoved( UINT16 /*IN*/ uGroupIndex,
-+				IHXGroup*  /*IN*/ pGroup)
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::AllGroupsRemoved
-+ *  Purpose:
-+ *		Notification that all groups have been removed from the 
-+ *		current presentation.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::AllGroupsRemoved()
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::TrackAdded
-+ *  Purpose:
-+ *		Notification of a new track being added to a group.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::TrackAdded( UINT16 /*IN*/ uGroupIndex,
-+			    UINT16     /*IN*/ uTrackIndex,
-+			    IHXValues* /*IN*/ pTrack)
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::TrackRemoved
-+ *  Purpose:
-+ *		Notification of a track being removed from a group.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::TrackRemoved( UINT16 /*IN*/ uGroupIndex,
-+				UINT16     /*IN*/ uTrackIndex,
-+				IHXValues* /*IN*/ pTrack)
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::TrackStarted
-+ *  Purpose:
-+ *		Notification of a track being started (to get duration, for
-+ *		instance...)
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::TrackStarted( UINT16 /*IN*/ uGroupIndex,
-+				UINT16     /*IN*/ uTrackIndex,
-+				IHXValues* /*IN*/ pTrack)
-+{
-+    if ( m_bWaitForTrackStart )
-+    {
-+        STDOUT("----------------clip info--------------------\n");
-+        if(m_pScheduler)
-+        {
-+            m_hCallback = m_pScheduler->RelativeEnter(this,50);
-+        }
-+	m_bWaitForTrackStart = FALSE;
-+    }
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::TrackStopped
-+ *  Purpose:
-+ *		Notification of a track being stopped
-+ *
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::TrackStopped( UINT16 /*IN*/ uGroupIndex,
-+				UINT16     /*IN*/ uTrackIndex,
-+				IHXValues* /*IN*/ pTrack)
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXGroupSink::CurrentGroupSet
-+ *  Purpose:
-+ *		This group is being currently played in the presentation.
-+ */
-+STDMETHODIMP ExampleClientAdviceSink::CurrentGroupSet( UINT16 /*IN*/ uGroupIndex,
-+				IHXGroup* /*IN*/ pGroup)
-+{
-+    return HXR_OK;
-+}
-+
-Index: helix-libs/clientapps/clutter/exadvsnk.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exadvsnk.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,324 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXAMPLECLSNK_
-+#define _EXAMPLECLSNK_
-+
-+#include "player.h"
-+
-+struct IHXClientAdviseSink;
-+struct IHXGroupSink;
-+struct IUnknown;
-+struct IHXRegistry;
-+struct IHXScheduler;
-+struct IHXCallback;
-+struct IHXPlayer;
-+struct IHXGroup;
-+
-+class ExampleClientAdviceSink : public IHXClientAdviseSink,
-+                                public IHXGroupSink,
-+                                public IHXCallback
-+{
-+  private:
-+    LONG32          m_lRefCount;
-+    LONG32          m_lClientIndex;
-+    
-+    IUnknown*       m_pUnknown;
-+    IHXRegistry*    m_pRegistry;
-+    IHXScheduler*   m_pScheduler;
-+    
-+    UINT32          m_ulStartTime;
-+    UINT32          m_ulStopTime;
-+    
-+    UINT32    m_lCurrentBandwidth;
-+    UINT32    m_lAverageBandwidth;
-+    HXBOOL      m_bOnStop;
-+  
-+    HXBOOL      m_bWaitForTrackStart;
-+   
-+    on_buffering_cb_t m_on_buffering_cb;
-+    on_pos_length_cb_t m_on_pos_length_cb; 
-+    void *m_context;    /* a argument passed by texture-helix lib */
-+
-+    // IHXCallback
-+	IHXPlayer*		m_pPlayer;
-+    ULONG32         m_hCallback;
-+    ~ExampleClientAdviceSink();
-+    HX_RESULT DumpRegTree(const char* pszTreeName );
-+
-+
-+        void GetStatistics (char* /*IN*/ pszRegistryKey);
-+    void GetAllStatistics (void);
-+	void SetClipInfo( IHXPlayer* m_pRMAPlayer);
-+	void PrintPropName( IHXValues* pHeader );
-+
-+  public:
-+
-+    ExampleClientAdviceSink(IUnknown* /*IN*/ pUnknown, LONG32 /*IN*/ lClientIndex, on_buffering_cb_t on_buffer_cb, on_pos_length_cb_t on_pos_length_cb, void *context);
-+
-+    /*
-+     *  IUnknown methods
-+     */
-+    STDMETHOD(QueryInterface) (THIS_
-+                               REFIID riid,
-+                               void** ppvObj);
-+    
-+    STDMETHOD_(ULONG32,AddRef) (THIS);
-+
-+    STDMETHOD_(ULONG32,Release) (THIS);
-+
-+    /*
-+     *  IHXClientAdviseSink methods
-+     */
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnPosLength
-+     *  Purpose:
-+     *      Called to advise the client that the position or length of the
-+     *      current playback context has changed.
-+     */
-+    STDMETHOD(OnPosLength) (THIS_
-+                            UINT32    ulPosition,
-+                            UINT32    ulLength);
-+    
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnPresentationOpened
-+     *  Purpose:
-+     *      Called to advise the client a presentation has been opened.
-+     */
-+    STDMETHOD(OnPresentationOpened) (THIS);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnPresentationClosed
-+     *  Purpose:
-+     *      Called to advise the client a presentation has been closed.
-+     */
-+    STDMETHOD(OnPresentationClosed) (THIS);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnStatisticsChanged
-+     *  Purpose:
-+     *      Called to advise the client that the presentation statistics
-+     *      have changed. 
-+     */
-+    STDMETHOD(OnStatisticsChanged) (THIS);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnPreSeek
-+     *  Purpose:
-+     *      Called by client engine to inform the client that a seek is
-+     *      about to occur. The render is informed the last time for the 
-+     *      stream's time line before the seek, as well as the first new
-+     *      time for the stream's time line after the seek will be completed.
-+     *
-+     */
-+    STDMETHOD (OnPreSeek) (THIS_
-+                           ULONG32 ulOldTime,
-+                           ULONG32  ulNewTime);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnPostSeek
-+     *  Purpose:
-+     *      Called by client engine to inform the client that a seek has
-+     *      just occured. The render is informed the last time for the 
-+     *      stream's time line before the seek, as well as the first new
-+     *      time for the stream's time line after the seek.
-+     *
-+     */
-+    STDMETHOD (OnPostSeek) (THIS_
-+                            ULONG32 ulOldTime,
-+                            ULONG32 ulNewTime);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnStop
-+     *  Purpose:
-+     *      Called by client engine to inform the client that a stop has
-+     *      just occured. 
-+     *
-+     */
-+    STDMETHOD (OnStop) (THIS);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnPause
-+     *  Purpose:
-+     *      Called by client engine to inform the client that a pause has
-+     *      just occured. The render is informed the last time for the 
-+     *      stream's time line before the pause.
-+     *
-+     */
-+    STDMETHOD (OnPause) (THIS_
-+                         ULONG32 ulTime);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnBegin
-+     *  Purpose:
-+     *      Called by client engine to inform the client that a begin or
-+     *      resume has just occured. The render is informed the first time 
-+     *      for the stream's time line after the resume.
-+     *
-+     */
-+    STDMETHOD (OnBegin) (THIS_
-+                         ULONG32 ulTime);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnBuffering
-+     *  Purpose:
-+     *      Called by client engine to inform the client that buffering
-+     *      of data is occuring. The render is informed of the reason for
-+     *      the buffering (start-up of stream, seek has occured, network
-+     *      congestion, etc.), as well as percentage complete of the 
-+     *      buffering process.
-+     *
-+     */
-+    STDMETHOD (OnBuffering) (THIS_
-+                             ULONG32 ulFlags,
-+                             UINT16 unPercentComplete);
-+
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXClientAdviseSink::OnContacting
-+     *  Purpose:
-+     *      Called by client engine to inform the client is contacting
-+     *      hosts(s).
-+     *
-+     */
-+    STDMETHOD (OnContacting) (THIS_
-+                              const char* pHostName);
-+
-+    // IHXCallback
-+    STDMETHOD(Func)            (THIS);
-+
-+    /*
-+     *  IHXGroupSink methods
-+     */
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::GroupAdded
-+    *  Purpose:
-+    *		Notification of a new group being added to the presentation.
-+    */
-+    STDMETHOD(GroupAdded)    (THIS_
-+			    UINT16 	    /*IN*/ uGroupIndex,
-+			    IHXGroup*	    /*IN*/ pGroup);
-+
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::GroupRemoved
-+    *  Purpose:
-+    *		Notification of a group being removed from the presentation.
-+    */
-+    STDMETHOD(GroupRemoved)    (THIS_
-+				UINT16 	    /*IN*/ uGroupIndex,
-+				IHXGroup*  /*IN*/ pGroup);
-+
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::AllGroupsRemoved
-+    *  Purpose:
-+    *		Notification that all groups have been removed from the 
-+    *		current presentation.
-+    */
-+    STDMETHOD(AllGroupsRemoved)  (THIS);
-+
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::TrackAdded
-+    *  Purpose:
-+    *		Notification of a new track being added to a group.
-+    */
-+    STDMETHOD(TrackAdded)  (THIS_
-+			    UINT16 	    /*IN*/ uGroupIndex,
-+			    UINT16 	    /*IN*/ uTrackIndex,
-+			    IHXValues*	    /*IN*/ pTrack);
-+
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::TrackRemoved
-+    *  Purpose:
-+    *		Notification of a track being removed from a group.
-+    */
-+    STDMETHOD(TrackRemoved)    (THIS_
-+				UINT16 		/*IN*/ uGroupIndex,
-+				UINT16 		/*IN*/ uTrackIndex,
-+				IHXValues*	/*IN*/ pTrack);
-+
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::TrackStarted
-+    *  Purpose:
-+    *		Notification of a track being started (to get duration, for
-+    *		instance...)
-+    */
-+    STDMETHOD (TrackStarted)	(THIS_
-+				UINT16	    /*IN*/ uGroupIndex,
-+				UINT16	    /*IN*/ uTrackIndex,
-+				IHXValues* /*IN*/ pTrack) ;
-+    
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::TrackStopped
-+    *  Purpose:
-+    *		Notification of a track being stopped
-+    *
-+    */
-+    STDMETHOD(TrackStopped)	(THIS_
-+				UINT16	    /*IN*/ uGroupIndex,
-+				UINT16	    /*IN*/ uTrackIndex,
-+				IHXValues* /*IN*/ pTrack);
-+
-+    /************************************************************************
-+    *  Method:
-+    *      IHXGroupSink::CurrentGroupSet
-+    *  Purpose:
-+    *		This group is being currently played in the presentation.
-+    */
-+    STDMETHOD(CurrentGroupSet)	(THIS_
-+				UINT16 	    /*IN*/ uGroupIndex,
-+				IHXGroup*  /*IN*/ pGroup);
-+
-+};
-+
-+#endif /* _EXAMPLECLSNK_ */
-Index: helix-libs/clientapps/clutter/exaumgr.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exaumgr.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,137 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include <stdio.h>
-+#include "hxtypes.h"
-+#include "hxcom.h"
-+#include "hxauth.h"
-+#include "hxstrutl.h"
-+#include "exaumgr.h"
-+#include <ctype.h>
-+#include "print.h"
-+
-+
-+#include "globals.h"
-+struct _stGlobals*& GetGlobal(); //in main.cpp
-+
-+
-+
-+ExampleAuthenticationManager::ExampleAuthenticationManager() :
-+    m_lRefCount(0),
-+    m_bSentPassword(FALSE)
-+{
-+}
-+
-+ExampleAuthenticationManager::~ExampleAuthenticationManager()
-+{
-+}
-+
-+STDMETHODIMP
-+ExampleAuthenticationManager::QueryInterface(REFIID riid, void**ppvObj)
-+{
-+    if(IsEqualIID(riid, IID_IUnknown))
-+    {
-+        AddRef();
-+        *ppvObj = (IUnknown*)(IHXAuthenticationManager*)this;
-+        return HXR_OK;
-+    }
-+    else if(IsEqualIID(riid, IID_IHXAuthenticationManager))
-+    {
-+        AddRef();
-+        *ppvObj = (IHXAuthenticationManager*)this;
-+        return HXR_OK;
-+    }
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+STDMETHODIMP_(UINT32)
-+ExampleAuthenticationManager::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+STDMETHODIMP_(UINT32)
-+ExampleAuthenticationManager::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+STDMETHODIMP
-+ExampleAuthenticationManager::HandleAuthenticationRequest(IHXAuthenticationManagerResponse* pResponse)
-+{
-+    char      username[1024] = ""; /* Flawfinder: ignore */
-+    char      password[1024] = ""; /* Flawfinder: ignore */
-+    HX_RESULT res = HXR_FAIL;
-+    
-+    if( !m_bSentPassword )
-+    {
-+        res = HXR_OK;
-+        if (GetGlobal()->bEnableVerboseMode)
-+            STDOUT("\nSending Username and Password...\n");
-+
-+        SafeStrCpy(username,  GetGlobal()->g_pszUsername, 1024);
-+        SafeStrCpy(password,  GetGlobal()->g_pszPassword, 1024);
-+
-+        //strip trailing whitespace
-+        char* c;
-+        for(c = username + strlen(username) - 1; 
-+            c > username && isspace(*c);
-+            c--)
-+            ;
-+        *(c+1) = 0;
-+    
-+        for(c = password + strlen(password) - 1; 
-+            c > password && isspace(*c);
-+            c--)
-+            ;
-+        *(c+1) = 0;
-+        
-+        m_bSentPassword = TRUE;
-+    }
-+
-+    if (GetGlobal()->bEnableVerboseMode && FAILED(res) )
-+        STDOUT("\nInvalid Username and/or Password.\n");
-+    
-+    pResponse->AuthenticationRequestDone(res, username, password);
-+    return res;
-+}
-+
-Index: helix-libs/clientapps/clutter/exaumgr.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exaumgr.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,56 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXAUMGR_H_
-+#define _EXAUMGR_H_
-+
-+#include "hxauth.h"
-+
-+class ExampleAuthenticationManager : public IHXAuthenticationManager
-+{
-+private:
-+    INT32 m_lRefCount;
-+    HXBOOL  m_bSentPassword;
-+    ~ExampleAuthenticationManager();
-+
-+public:
-+    ExampleAuthenticationManager();
-+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj);
-+    STDMETHOD_(UINT32,AddRef) (THIS);
-+    STDMETHOD_(UINT32,Release) (THIS);
-+
-+    STDMETHOD(HandleAuthenticationRequest) (IHXAuthenticationManagerResponse* pResponse);
-+};
-+#endif
-Index: helix-libs/clientapps/clutter/excallback.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/excallback.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,38 @@
-+#include "excallback.h"
-+
-+STDMETHODIMP ExCallback::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+	if (IsEqualIID(riid, IID_IHXCallback))
-+	{
-+		AddRef();
-+		*ppvObj = (IHXCallback*)this;
-+		return HXR_OK;
-+	}
-+	else if (IsEqualIID(riid, IID_IUnknown))
-+	{
-+		AddRef();
-+		*ppvObj = this;
-+		return HXR_OK;
-+	}
-+
-+	*ppvObj = NULL;
-+	return HXR_NOINTERFACE;
-+}
-+
-+STDMETHODIMP_(ULONG32) ExCallback::AddRef()
-+{
-+	return HXR_OK;
-+}
-+
-+STDMETHODIMP_(ULONG32) ExCallback::Release()
-+{
-+	return HXR_OK;
-+}
-+
-+STDMETHODIMP ExCallback::Func(void)
-+{
-+	UINT32 sleepTime = 0;
-+	m_pKicker->Kick(HXGetCurrentThreadID, &sleepTime);
-+	printf("Get called, sleeptime:%d\n", sleepTime);
-+	m_pScheduler->RelativeEnter(this, sleepTime/1000);
-+}
-Index: helix-libs/clientapps/clutter/excallback.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/excallback.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,32 @@
-+#ifndef _EX_CALLBACK_H_
-+#define _EX_CALLBACK_H_
-+
-+#include "hxcom.h"
-+#include "hxengin.h"
-+#include "ihxmedpltfm.h"
-+#include "thrdutil.h"
-+
-+class ExCallback : public IHXCallback
-+{
-+	public:
-+		ExCallback(IHXScheduler *pIHXScheduler, IHXMediaPlatformKicker *pKicker) : m_pScheduler(pIHXScheduler), m_pKicker(pKicker){};
-+
-+		/*
-+		 *      *  IUnknown methods
-+		 *           */
-+		STDMETHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj);
-+		STDMETHOD_(ULONG32,AddRef) (THIS);
-+		STDMETHOD_(ULONG32,Release) (THIS);
-+
-+		/*
-+		 *      *  IHXCallback methods
-+		 *           */
-+		STDMETHOD(Func) (THIS);
-+	private:
-+		IHXScheduler *m_pScheduler;
-+		IHXMediaPlatformKicker* m_pKicker;
-+
-+};
-+
-+
-+#endif 
-Index: helix-libs/clientapps/clutter/excontxt.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/excontxt.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,315 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include "hxtypes.h"
-+
-+#include "hxwintyp.h"
-+#include "hxcom.h"
-+#include "hxcomm.h"
-+#include "hxwin.h"
-+#include "fivemmap.h"
-+
-+#include "hxbuffer.h"
-+#include "hxmangle.h"
-+
-+#include "hxclsnk.h"
-+#include "hxgroup.h"
-+#include "hxerror.h"
-+#include "hxprefs.h"
-+#include "hxstrutl.h"
-+
-+#include "exadvsnk.h"
-+#include "exstateadvsnk.h"
-+#include "exerror.h"
-+#include "exsitsup.h"
-+#include "exaumgr.h"
-+#include "hxprdnld.h"
-+#include "exprdnld.h"
-+
-+#include "excontxt.h"
-+
-+extern HXBOOL bEnableAdviceSink;
-+
-+
-+ExampleClientContext::ExampleClientContext(LONG32 lClientIndex)
-+    : m_lRefCount(0)
-+    , m_lClientIndex(lClientIndex)
-+    , m_pClientSink(NULL)
-+    , m_pClientStateSink(NULL)
-+    , m_pErrorSink(NULL)
-+    , m_pAuthMgr(NULL)
-+    , m_pSiteSupplier(NULL)
-+    , m_pDefaultPrefs(NULL)
-+#if defined(HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS)
-+    , m_pPrgDnldStatusObserver(NULL)
-+#endif // /HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS.
-+{
-+}
-+
-+
-+ExampleClientContext::~ExampleClientContext()
-+{
-+    Close();
-+};
-+
-+void ExampleClientContext::Init(IUnknown*	 /*IN*/ pUnknown,
-+				IHXPreferences* /*IN*/ pPreferences,
-+				char*		 /*IN*/ pszGUID,
-+                on_buffering_cb_t   on_buffering_cb,
-+                on_pos_length_cb_t on_pos_length_cb,
-+                on_state_change_cb_t on_state_change_cb,
-+                on_new_frame_cb_t   on_new_frame_cb,
-+                void *context)
-+{
-+    char* pszCipher = NULL;
-+
-+	
-+    m_pClientSink	= new ExampleClientAdviceSink(pUnknown, m_lClientIndex, on_buffering_cb, on_pos_length_cb, context);
-+
-+    m_pClientStateSink	= new ExampleClientStateAdviceSink(pUnknown, m_lClientIndex, on_state_change_cb, context);
-+    m_pErrorSink	= new ExampleErrorSink(pUnknown);
-+#if defined(HELIX_FEATURE_AUTHENTICATION)
-+    m_pAuthMgr          = new ExampleAuthenticationManager();
-+    if(m_pAuthMgr)
-+    {
-+	m_pAuthMgr->AddRef();
-+    }
-+
-+#endif /* #if defined(HELIX_FEATURE_AUTHENTICATION) */
-+#if defined(HELIX_FEATURE_VIDEO)
-+    m_pSiteSupplier	= new ExampleSiteSupplier(pUnknown, on_new_frame_cb, context);
-+#endif 
-+
-+#if defined(HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS)
-+    m_pPrgDnldStatusObserver = new ExamplePDStatusObserver(pUnknown);
-+#endif // /HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS.
-+
-+    if (m_pClientSink)
-+    {
-+	m_pClientSink->AddRef();
-+    }
-+    
-+    if (m_pErrorSink)
-+    {
-+	m_pErrorSink->AddRef();
-+    }
-+
-+    if (m_pClientStateSink)
-+        m_pClientStateSink->AddRef();
-+
-+    if(m_pSiteSupplier)
-+    {
-+	m_pSiteSupplier->AddRef();
-+    }
-+
-+    if (pPreferences)
-+    {
-+	m_pDefaultPrefs = pPreferences;
-+	m_pDefaultPrefs->AddRef();
-+    }
-+
-+    if (pszGUID && *pszGUID)
-+    {
-+	// Encode GUID
-+	pszCipher = Cipher(pszGUID);
-+	SafeStrCpy(m_pszGUID,  pszCipher, 256);
-+    }
-+    else
-+    {
-+	m_pszGUID[0] = '\0';
-+    }
-+}
-+
-+void ExampleClientContext::Close()
-+{
-+    HX_RELEASE(m_pClientSink);
-+    HX_RELEASE(m_pClientStateSink);
-+    HX_RELEASE(m_pErrorSink);
-+#if defined(HELIX_FEATURE_AUTHENTICATION)
-+    HX_RELEASE(m_pAuthMgr);
-+#endif /* #if defined(HELIX_FEATURE_AUTHENTICATION) */
-+    HX_RELEASE(m_pSiteSupplier);
-+    HX_RELEASE(m_pDefaultPrefs);
-+#if defined(HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS)
-+    HX_RELEASE(m_pPrgDnldStatusObserver);
-+#endif // /HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS.
-+}
-+
-+
-+
-+// *** IUnknown methods ***
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::QueryInterface
-+//  Purpose:
-+//	Implement this to export the interfaces supported by your 
-+//	object.
-+//
-+STDMETHODIMP ExampleClientContext::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+	AddRef();
-+	*ppvObj = this;
-+	return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXPreferences))
-+    {
-+	AddRef();
-+	*ppvObj = (IHXPreferences*)this;
-+	return HXR_OK;
-+    }
-+    else if (m_pClientSink && 
-+	     m_pClientSink->QueryInterface(riid, ppvObj) == HXR_OK)
-+    {
-+	return HXR_OK;
-+    }
-+    else if (m_pErrorSink && 
-+	     m_pErrorSink->QueryInterface(riid, ppvObj) == HXR_OK)
-+    {
-+	return HXR_OK;
-+    }
-+    else if (m_pClientStateSink &&
-+            m_pClientStateSink->QueryInterface(riid, ppvObj) == HXR_OK)
-+    {
-+        return HXR_OK;
-+    }
-+#if defined(HELIX_FEATURE_AUTHENTICATION)
-+    else if(m_pAuthMgr &&
-+	    m_pAuthMgr->QueryInterface(riid, ppvObj) == HXR_OK)
-+    {
-+	return HXR_OK;
-+    }
-+#endif /* #if defined(HELIX_FEATURE_AUTHENTICATION) */
-+    else if(m_pSiteSupplier &&
-+	    m_pSiteSupplier->QueryInterface(riid, ppvObj) == HXR_OK)
-+    {
-+	return HXR_OK;
-+    }
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::AddRef
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleClientContext::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::Release
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleClientContext::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+
-+// *** IUnknown methods ***
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IHXPreferences::ReadPref
-+//  Purpose:
-+//	Read a Preference from the registry.
-+//
-+STDMETHODIMP
-+ExampleClientContext::ReadPref(const char* pref_key, IHXBuffer*& buffer)
-+{
-+    HX_RESULT hResult	= HXR_OK;
-+    char*     pszCipher = NULL;
-+    
-+    if ((stricmp(pref_key, CLIENT_GUID_REGNAME) == 0) &&
-+	(*m_pszGUID))
-+    {
-+	// Create a Buffer 
-+	buffer = new CHXBuffer();
-+	buffer->AddRef();
-+
-+	// Copy the encoded GUID into the buffer
-+	buffer->Set((UCHAR*)m_pszGUID, strlen(m_pszGUID) + 1);
-+    }
-+    else if (m_pDefaultPrefs)
-+    {
-+	hResult = m_pDefaultPrefs->ReadPref(pref_key, buffer);
-+    }
-+    else
-+    {
-+	hResult = HXR_NOTIMPL;
-+    }
-+
-+    return hResult;
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IHXPreferences::WritePref
-+//  Purpose:
-+//	Write a Preference to the registry.
-+//
-+STDMETHODIMP
-+ExampleClientContext::WritePref(const char* pref_key, IHXBuffer* buffer)
-+{
-+    if (m_pDefaultPrefs)
-+    {
-+	return m_pDefaultPrefs->WritePref(pref_key, buffer);
-+    }
-+    else	
-+    {
-+	return HXR_OK;
-+    }
-+}
-+
-+EHXClientState ExampleClientContext::GetState()
-+{
-+    return m_pClientStateSink->GetState();
-+};
-Index: helix-libs/clientapps/clutter/excontxt.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/excontxt.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,106 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+#ifndef _EXCONTXT_H_
-+#define _EXCONTXT_H_
-+
-+#include "exerror.h"
-+#include "exsitsup.h"
-+#include "hxprefs.h"
-+#include "player.h"
-+#include "hxclsnk.h"
-+
-+struct IUnknown;
-+struct IHXPreferences;
-+class ExampleClientAdviceSink;
-+class ExampleClientStateAdviceSink;
-+class ExampleErrorMessages;
-+class ExampleAuthenticationManager;
-+class ExamplePDStatusObserver;
-+
-+
-+class ExampleClientContext : public IHXPreferences
-+{
-+private:
-+    LONG32			    m_lRefCount;
-+    LONG32                          m_lClientIndex;
-+
-+    ExampleClientAdviceSink*	    m_pClientSink;
-+    ExampleClientStateAdviceSink*    m_pClientStateSink;
-+    ExampleErrorSink*		    m_pErrorSink;
-+    ExampleAuthenticationManager*   m_pAuthMgr;
-+
-+    ExampleSiteSupplier*	    m_pSiteSupplier;
-+    ExamplePDStatusObserver*        m_pPrgDnldStatusObserver;
-+    IHXPreferences*		    m_pDefaultPrefs;
-+    char			    m_pszGUID[256]; /* Flawfinder: ignore */
-+
-+
-+public:
-+
-+    ExampleClientContext(LONG32 /*IN*/ lClientIndex);
-+    ~ExampleClientContext();
-+
-+    void Init(IUnknown*	       /*IN*/ pUnknown,
-+	      IHXPreferences* /*IN*/ pPreferences,
-+	      char*	       /*IN*/ pszGUID,
-+          on_buffering_cb_t on_buffering_cb = NULL,
-+          on_pos_length_cb_t on_pos_length_cb = NULL,
-+          on_state_change_cb_t on_state_change_cb = NULL,
-+          on_new_frame_cb_t on_new_frame_cb = NULL,
-+          void *context = NULL);
-+    void Close();
-+
-+    EHXClientState GetState(); 
-+
-+    /*
-+     * IUnknown methods
-+     */
-+    STDMETHOD(QueryInterface)	(THIS_
-+				REFIID riid,
-+				void** ppvObj);
-+
-+    STDMETHOD_(ULONG32,AddRef)	(THIS);
-+    STDMETHOD_(ULONG32,Release)	(THIS);
-+
-+    /*
-+     * IHXPreferences methods
-+     */
-+    STDMETHOD(ReadPref)		(THIS_ const char* pref_key, 
-+				 IHXBuffer*& buffer);
-+    STDMETHOD(WritePref)	(THIS_ const char* pref_key,
-+				 IHXBuffer* buffer);
-+};
-+
-+#endif
-Index: helix-libs/clientapps/clutter/exerror.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exerror.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,230 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include "hxtypes.h"
-+
-+#include "hxcom.h"
-+#include "hxcomm.h"
-+#include "hxerror.h"
-+#include "hxstrutl.h"
-+#include "hxcore.h"
-+#include "hxassert.h"
-+#include "hxbuffer.h"
-+
-+#ifdef __TCS__
-+#include "hxresult.h"
-+#endif
-+
-+#if !defined(HELIX_CONFIG_MINIMIZE_SIZE)
-+#include "HXErrorCodeStrings.h"
-+#endif
-+
-+#include "exerror.h"
-+
-+#include <stdio.h>
-+#include "print.h"
-+
-+#include "globals.h"
-+struct _stGlobals*& GetGlobal(); //in main.cpp
-+
-+#ifdef __TCS__
-+#if defined(__cplusplus)
-+extern "C" {
-+#endif
-+
-+void hookRealAudio_ReportError(int err, long errVal);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+ExampleErrorSink::ExampleErrorSink(IUnknown* pUnknown) 
-+    : m_lRefCount(0),
-+      m_pPlayer(NULL)
-+{
-+    IHXClientEngine* pEngine = NULL;
-+    pUnknown->QueryInterface(IID_IHXClientEngine, (void**)&pEngine );
-+    if( pEngine )
-+    {
-+        IUnknown* pTmp = NULL;
-+        pEngine->GetPlayer(0, pTmp);
-+        m_pPlayer = (IHXPlayer*)pTmp;
-+    }
-+    
-+    HX_RELEASE( pEngine );
-+    HX_ASSERT(m_pPlayer);
-+}
-+
-+ExampleErrorSink::~ExampleErrorSink()
-+{
-+    HX_RELEASE(m_pPlayer);
-+}
-+
-+// *** IUnknown methods ***
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//  IUnknown::QueryInterface
-+//  Purpose:
-+//  Implement this to export the interfaces supported by your 
-+//  object.
-+//
-+STDMETHODIMP ExampleErrorSink::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+        AddRef();
-+        *ppvObj = (IUnknown*)(IHXErrorSink*)this;
-+        return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXErrorSink))
-+    {
-+        AddRef();
-+        *ppvObj = (IHXErrorSink*) this;
-+        return HXR_OK;
-+    }
-+
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//  IUnknown::AddRef
-+//  Purpose:
-+//  Everyone usually implements this the same... feel free to use
-+//  this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleErrorSink::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//  IUnknown::Release
-+//  Purpose:
-+//  Everyone usually implements this the same... feel free to use
-+//  this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleErrorSink::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+/*
-+ *  IHXErrorSink methods
-+ */
-+
-+STDMETHODIMP 
-+ExampleErrorSink::ErrorOccurred(const UINT8 unSeverity,  
-+                                const ULONG32   ulHXCode,
-+                                const ULONG32   ulUserCode,
-+                                const char* pUserString,
-+                                const char* pMoreInfoURL
-+                                )
-+{
-+    char HXDefine[256]; /* Flawfinder: ignore */
-+
-+    // Store the code, so we can return it from main()
-+    GetGlobal()->g_Error = ulHXCode;
-+
-+    ConvertErrorToString(ulHXCode, HXDefine, 256);
-+
-+#ifdef __TCS__
-+    hookRealAudio_ReportError(ulHXCode,ulUserCode);
-+#else
-+    STDOUT("Report(%d, %ld, \"%s\", %ld, \"%s\", \"%s\")\n",
-+           unSeverity,
-+           ulHXCode,
-+           (pUserString && *pUserString) ? pUserString : "(NULL)",
-+           ulUserCode,
-+           (pMoreInfoURL && *pMoreInfoURL) ? pMoreInfoURL : "(NULL)",
-+           HXDefine);
-+#endif
-+
-+    return HXR_OK;
-+}
-+
-+void
-+ExampleErrorSink::ConvertErrorToString(const ULONG32 ulHXCode, char* pszBuffer, UINT32 ulBufLen)
-+{
-+    IHXErrorMessages* pErrMsg = NULL;
-+
-+    if( !pszBuffer)
-+        return;
-+    
-+    pszBuffer[0]='\0';
-+
-+    HX_ASSERT(m_pPlayer);
-+    if( m_pPlayer)
-+    {
-+        m_pPlayer->QueryInterface(IID_IHXErrorMessages, (void**)&pErrMsg);
-+        if( pErrMsg )
-+        {
-+            IHXBuffer* pMessage = pErrMsg->GetErrorText(ulHXCode);
-+            if( pMessage )
-+            {
-+                SafeStrCpy( pszBuffer, (const char*)pMessage->GetBuffer(), ulBufLen);
-+                pMessage->Release();
-+            }
-+        }
-+        HX_RELEASE(pErrMsg);
-+    }
-+ 
-+    if( strlen(pszBuffer)==0 )
-+    {
-+#if !defined(HELIX_CONFIG_MINIMIZE_SIZE)        
-+	const char* pszHXCodeString = HXErrorCodeToString(ulHXCode);
-+        if (pszHXCodeString)
-+        {   
-+            SafeSprintf( pszBuffer, ulBufLen, "%s", pszHXCodeString);
-+        }
-+        else
-+#endif        
-+        {
-+            HX_ASSERT(FALSE);
-+            SafeSprintf( pszBuffer, ulBufLen, "Can't convert error code %p - make sure it's defined in common/util/HXErrorCodeStrings.c", ulHXCode );
-+        }
-+    }
-+}
-+
-Index: helix-libs/clientapps/clutter/exerror.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exerror.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,92 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXAMPLEERRORMESSAGES_
-+#define _EXAMPLEERRORMESSAGES_
-+
-+#include "hxerror.h"
-+
-+struct IUnknown;
-+struct IHXErrorMessages;
-+struct IHXPlayer;
-+
-+class ExampleErrorSink : public IHXErrorSink
-+{
-+public:
-+
-+    ExampleErrorSink(IUnknown* pUnknown);
-+    ~ExampleErrorSink();
-+
-+    /*
-+     *  IUnknown methods
-+     */
-+    STDMETHOD(QueryInterface)	(THIS_
-+				REFIID riid,
-+				void** ppvObj);
-+
-+    STDMETHOD_(ULONG32,AddRef)	(THIS);
-+
-+    STDMETHOD_(ULONG32,Release)	(THIS);
-+
-+    /*
-+     *  IHXErrorSink methods
-+     */
-+
-+    /************************************************************************
-+     *	Method:
-+     *	    IHXErrorSink::ErrorOccurred
-+     *	Purpose:
-+     *	    After you have registered your error sink with an IHXErrorSinkControl 
-+     *	    (either in the server or player core) this method will be called to 
-+     *	    report an error, event, or status message.
-+     *
-+     *	    The meaning of the arguments is exactly as described in
-+     *	    hxerror.h
-+     */
-+    STDMETHOD(ErrorOccurred)	(THIS_
-+				const UINT8	unSeverity,  
-+				const ULONG32	ulHXCode,
-+				const ULONG32	ulUserCode,
-+				const char*	pUserString,
-+				const char*	pMoreInfoURL
-+				);
-+
-+protected:
-+    LONG32 m_lRefCount;
-+    IHXPlayer* m_pPlayer;
-+
-+    void   ConvertErrorToString (const ULONG32 ulHXCode, char* pszBuffer, UINT32 ulBufLen);
-+};
-+#endif /*_EXAMPLEERRORMESSAGES_*/
-Index: helix-libs/clientapps/clutter/exprdnld.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exprdnld.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,468 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include "hxcom.h"
-+#include "hxtypes.h"
-+#include "hxcore.h"
-+#include "hxprdnld.h"
-+#include "exprdnld.h"
-+#include "print.h"
-+
-+#include "globals.h"
-+struct _stGlobals*& GetGlobal();
-+
-+UINT32 GetTime(); // /In main.cpp.
-+
-+// /#if defined(HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS)
-+/************************************************************************
-+ *  Method:
-+ *    Constructor
-+ */
-+ExamplePDStatusObserver::ExamplePDStatusObserver(IUnknown* pUnkPlayer)
-+    : m_lRefCount(0)
-+    , m_pPrgDnldStatusMgr(NULL)
-+    , m_pUnkPlayer(pUnkPlayer)
-+    , m_pHXPlayer(NULL)
-+    , m_bPlayerIsPausedByThis(FALSE)
-+    , m_bFirstPDStatusMessage(TRUE)
-+    , m_ulTotalDurReported(HX_PROGDOWNLD_UNKNOWN_DURATION)
-+    , m_ulDurSoFar(HX_PROGDOWNLD_UNKNOWN_DURATION)
-+    , m_ulCurStatusUpdateGranularity(
-+            HX_PROGDOWNLD_DEFAULT_STATUSREPORT_INTERVAL_MSEC)
-+    , m_bInitialPrerollUpateGranularitySet(FALSE)
-+    , m_bDownloadIsComplete(FALSE)
-+{
-+    if (m_pUnkPlayer)
-+    {
-+	m_pUnkPlayer->QueryInterface(IID_IHXPlayer,
-+			(void**)&m_pHXPlayer);
-+
-+	m_pUnkPlayer->QueryInterface(IID_IHXPDStatusMgr,
-+			(void**)&m_pPrgDnldStatusMgr);
-+
-+        if (m_pPrgDnldStatusMgr)
-+        {
-+            // /Add ourselves as an observer of progressive download playback:
-+            m_pPrgDnldStatusMgr->AddObserver(this);
-+            // /Set granularity of status reports to 10 per second until we
-+            // know enough about the situation to go back to getting reports
-+            // at the default interval (every 5 seconds).  Do that as soon
-+            // as we receive the first progress report:
-+            m_ulCurStatusUpdateGranularity = 100;
-+        }
-+
-+	m_pUnkPlayer->AddRef();
-+    }
-+};
-+
-+/************************************************************************
-+ *  Method:
-+ *    Destructor
-+ */
-+ExamplePDStatusObserver::~ExamplePDStatusObserver()
-+{
-+    if (m_pPrgDnldStatusMgr)
-+    {
-+        m_pPrgDnldStatusMgr->RemoveObserver(this);
-+    }
-+    HX_RELEASE(m_pPrgDnldStatusMgr);
-+    HX_RELEASE(m_pHXPlayer);
-+    HX_RELEASE(m_pUnkPlayer);
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IUnknown::QueryInterface
-+ */
-+STDMETHODIMP 
-+ExamplePDStatusObserver::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+	AddRef();
-+	*ppvObj = (IUnknown*)(IHXPDStatusObserver*)this;
-+	return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXPDStatusObserver))
-+    {
-+	AddRef();
-+	*ppvObj = (IHXPDStatusObserver*)this;
-+	return HXR_OK;
-+    }
-+
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IUnknown::AddRef
-+ */
-+STDMETHODIMP_(ULONG32) 
-+ExamplePDStatusObserver::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IUnknown::Release
-+ */
-+STDMETHODIMP_(ULONG32) 
-+ExamplePDStatusObserver::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+
-+/*
-+ *  IHXPDStatusObserver methods
-+ */
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXPDStatusObserver::OnDownloadProgress
-+ *
-+ *  Purpose:
-+ *      Notification from IHXPDStatusMgr of download progress when
-+ *      file size changes.
-+ *
-+ *      lTimeSurplus:
-+ *      - When negative, the absolute value of it is the estimated number
-+ *      of milliseconds of wall-clock time that need to pass while
-+ *      downloading continues before reaching the point at which playback
-+ *      can resume and play the remainder of the stream without having to
-+ *      buffer, assuming that playback is paused and remains so during
-+ *      that period.
-+ *      - When positive, it is the estimated number of milliseconds of
-+ *      wall-clock time between when the download should complete and when
-+ *      the natural content play-out duration will be reached, assuming
-+ *      playback is currently progressing and that no pause will occur.
-+ *
-+ *      Note: ulNewDurSoFar can be HX_PROGDOWNLD_UNKNOWN_DURATION if the
-+ *      IHXMediaBytesToMediaDur was not available to, or was unable to
-+ *      convert the bytes to a duration for the IHXPDStatusMgr calling this:
-+ */
-+STDMETHODIMP
-+ExamplePDStatusObserver::OnDownloadProgress(
-+              IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource,
-+              UINT32 /*IN*/ ulNewDurSoFar,
-+              UINT32 /*IN*/ ulNewBytesSoFar,
-+              INT32  /*IN*/ lTimeSurplus)
-+{
-+    m_ulDurSoFar = ulNewDurSoFar;
-+
-+    if (m_ulCurStatusUpdateGranularity <
-+            HX_PROGDOWNLD_DEFAULT_STATUSREPORT_INTERVAL_MSEC)
-+    {
-+        if (m_bInitialPrerollUpateGranularitySet)
-+        {
-+            if (HX_PROGDOWNLD_UNKNOWN_DURATION != ulNewDurSoFar  &&
-+                    // /Preroll is done, so reset update interval back to default:
-+                    GetGlobal()->g_bOnBeginOccurred)
-+            {
-+                m_ulCurStatusUpdateGranularity =
-+                        HX_PROGDOWNLD_DEFAULT_STATUSREPORT_INTERVAL_MSEC;
-+                m_pPrgDnldStatusMgr->SetStatusUpdateGranularityMsec(
-+                        m_ulCurStatusUpdateGranularity);
-+            }
-+        }
-+        else if (!GetGlobal()->g_bOnBeginOccurred)
-+        {
-+            if (HXR_OK == m_pPrgDnldStatusMgr->SetStatusUpdateGranularityMsec(
-+                    m_ulCurStatusUpdateGranularity))
-+            {
-+                m_bInitialPrerollUpateGranularitySet = TRUE;
-+            }
-+        }
-+    }
-+
-+    UINT32 ulCurPlayTime = 0;
-+
-+    HXBOOL bPauseWasAttempted = FALSE;
-+    HXBOOL bPauseOccurred     = FALSE;
-+    HXBOOL bResumeWasAttempted = FALSE;
-+    HXBOOL bResumeOccurred = FALSE;
-+
-+    
-+    if (m_pHXPlayer)
-+    {
-+        ulCurPlayTime = m_pHXPlayer->GetCurrentPlayTime();
-+
-+        if (GetGlobal()->g_bEnableSlowStart  &&
-+                lTimeSurplus != HX_PROGDOWNLD_UNKNOWN_TIME_SURPLUS)
-+        {
-+            // /"slow start" is enabled so if we have run dry of data,
-+            // pause and wait for more data:
-+            if (!m_bPlayerIsPausedByThis)
-+            {
-+                if (!m_bDownloadIsComplete  &&  lTimeSurplus<0)
-+                {
-+                    // /Use a 1000-millisecond allowance for variation:
-+                    if (lTimeSurplus < -1000)
-+                    {
-+                        bPauseWasAttempted = TRUE;
-+                        bPauseOccurred = m_bPlayerIsPausedByThis =
-+                                (HXR_OK == m_pHXPlayer->Pause());
-+                    }
-+                }
-+            }
-+            else // /paused; see if we can resume yet:
-+            {
-+                if (lTimeSurplus > 0)
-+                {
-+                    // /Use a 1000-millisecond allowance for variation:
-+                    if (lTimeSurplus > 1000)
-+                    {
-+                        bResumeWasAttempted = TRUE;
-+                        bResumeOccurred = (HXR_OK == m_pHXPlayer->Begin());
-+                        m_bPlayerIsPausedByThis = !bResumeOccurred;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-+    if (GetGlobal()->bEnableVerboseMode  &&  !m_bDownloadIsComplete)
-+    {
-+        STDOUT("\nDownload progress: (play time=%lu,",
-+                ulCurPlayTime);
-+        if (HX_PROGDOWNLD_UNKNOWN_TIME_SURPLUS == lTimeSurplus)
-+        {
-+            STDOUT(" UNKNOWN surplus|deficit)");
-+        }
-+        else if (HX_PROGDOWNLD_MIN_TIME_SURPLUS == lTimeSurplus)
-+        {
-+            STDOUT(" deficit exceeds maximum");
-+        }
-+        else if (HX_PROGDOWNLD_MAX_TIME_SURPLUS == lTimeSurplus)
-+        {
-+            STDOUT(" surplus exceeds maximum)");
-+        }
-+        else
-+        {
-+            STDOUT(" surplus=%ld milliseconds)", lTimeSurplus);
-+        }
-+        if (HX_PROGDOWNLD_UNKNOWN_DURATION == ulNewDurSoFar)
-+        {
-+            STDOUT("\n\thave UNKNOWN");
-+        }
-+        else
-+        {
-+            STDOUT("\n\thave %lu", ulNewDurSoFar);
-+        }
-+        
-+        if (HX_PROGDOWNLD_UNKNOWN_DURATION != m_ulTotalDurReported)
-+        {
-+            STDOUT(" of %lu msec", m_ulTotalDurReported);
-+        }
-+        else
-+        {
-+            STDOUT(" of UNKNOWN msec of media");
-+        }
-+        if (HX_PROGDOWNLD_UNKNOWN_FILE_SIZE != ulNewBytesSoFar)
-+        {
-+            STDOUT(" (%lu", ulNewBytesSoFar);
-+        }
-+        else
-+        {
-+            STDOUT(" (UNKNOWN");
-+        }
-+        STDOUT(" bytes downloaded so far)\n", ulNewBytesSoFar);
-+
-+        if (bPauseOccurred  ||  bPauseWasAttempted)
-+        {
-+            STDOUT("# Waiting for more data: %splayback.\n "
-+                    "    Should take %ld milliseconds before playback resumes.\n",
-+                    bPauseOccurred? "Pausing " :
-+                        (bPauseWasAttempted? "Failed attempting to pause "
-+                                              : " "), -lTimeSurplus);
-+        }
-+        if (bResumeOccurred  ||  bResumeWasAttempted)
-+        {
-+            STDOUT("# Data available: %splayback\n "
-+                    "    Time surplus is now %ld",
-+                    bResumeOccurred? "Resuming " :
-+                        (bResumeWasAttempted? "Failed attempting to resume "
-+                                              : " "), lTimeSurplus);
-+        }
-+    }
-+
-+    m_bFirstPDStatusMessage = FALSE;
-+
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXPDStatusObserver::OnTotalDurChanged
-+ *  Purpose:
-+ *      This is a notification if the total file duration becomes known
-+ *      or becomes better-known during download/playback
-+ *      
-+ *      Note: pStreamSource can be NULL.  This will be true when
-+ *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+ *      object.
-+ */
-+STDMETHODIMP
-+ExamplePDStatusObserver::OnTotalDurChanged(
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource,
-+            UINT32 ulNewTotalDur)
-+{
-+    m_ulTotalDurReported = ulNewTotalDur;
-+
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("\nOnTotalDurChanged(): to %lu milliseconds\n", ulNewTotalDur);
-+    }
-+
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXPDStatusObserver::OnDownloadComplete
-+ *
-+ *  Purpose:
-+ *      Notification that the entire file has been downloaded.
-+ *
-+ *      Note: pStreamSource can be NULL.  This will be true when
-+ *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+ *      object.
-+ *      
-+ */
-+STDMETHODIMP
-+ExamplePDStatusObserver::OnDownloadComplete(
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource)
-+{
-+    m_bDownloadIsComplete = TRUE;
-+
-+    HXBOOL bResumeWasAttempted = FALSE;
-+    HXBOOL bResumeOccurred = FALSE;
-+
-+    // /In case we're paused, resume now that there is no more data to get:
-+    if (m_pHXPlayer  &&  m_bPlayerIsPausedByThis)
-+    {
-+        bResumeWasAttempted = TRUE;
-+        bResumeOccurred = (HXR_OK == m_pHXPlayer->Begin());
-+        m_bPlayerIsPausedByThis = !bResumeOccurred;
-+    }
-+    
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("\nOnDownloadComplete()\n");
-+        if (bResumeOccurred  ||  bResumeWasAttempted)
-+        {
-+            STDOUT("\n%splayback now that bytes are available for "
-+                    "uninterrupted playback\n",
-+                    bResumeOccurred? "Resuming " :
-+                        (bResumeWasAttempted? "Failed attempting to resume "
-+                                              : " "));
-+        }
-+    }
-+
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXPDStatusObserver::SrcClaimsSeekSupport         ref: hxprdnld.h
-+ *  Purpose:
-+ *      Passes along notification from file sys that seek support
-+ *      is or is not claimed to be available (although sometimes HTTP
-+ *      server claims this when it doesn't actually support it).
-+ */
-+STDMETHODIMP
-+ExamplePDStatusObserver::SrcClaimsSeekSupport(IHXStreamSource* pStreamSource,
-+                                              HXBOOL bClaimsSupport)
-+{
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("\nSrcClaimsSeekSupport(%sE)\n", bClaimsSupport?"TRU":"FALS");
-+    }
-+    return HXR_OK;
-+}
-+
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXPDStatusObserver::OnDownloadPause
-+ *  Purpose:
-+ *      Notification that the file-download process has purposefully
-+ *      and temporarily halted downloading of the file
-+ *      
-+ *      Note: pStreamSource can be NULL.  This will be true when
-+ *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+ *      object.
-+ */
-+STDMETHODIMP
-+ExamplePDStatusObserver::OnDownloadPause(
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource)
-+{
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("\nOnDownloadPause()\n");
-+    }
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *      IHXPDStatusObserver::OnDownloadResume
-+ *  Purpose:
-+ *      Notification that the file-download process has resumed
-+ *      the process of downloading the remainder of the file
-+ *      
-+ *      Note: pStreamSource can be NULL.  This will be true when
-+ *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+ *      object.
-+ */
-+STDMETHODIMP
-+ExamplePDStatusObserver::OnDownloadResume(
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource)
-+{
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("\nOnDownloadResume()\n");
-+    }
-+    return HXR_OK;
-+}
-+// /#endif // /HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS.
-Index: helix-libs/clientapps/clutter/exprdnld.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exprdnld.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,196 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXPRDNLD_H_
-+#define _EXPRDNLD_H_
-+
-+// /#if defined(HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS)
-+
-+/****************************************************************************
-+ * 
-+ *  Class:
-+ *
-+ *	ExamplePDStatusObserver
-+ *
-+ *  Purpose:
-+ *
-+ *	Implementation for IHXPDStatusObserver which receives progressive-
-+ *      download status reports:
-+ *
-+ */
-+class ExamplePDStatusObserver : 
-+	public IHXPDStatusObserver
-+{
-+private:
-+    INT32		    m_lRefCount;
-+    IHXPDStatusMgr*         m_pPrgDnldStatusMgr;
-+    IUnknown*		    m_pUnkPlayer;
-+    IHXPlayer*              m_pHXPlayer;
-+    HXBOOL                  m_bPlayerIsPausedByThis;
-+    HXBOOL                  m_bFirstPDStatusMessage;
-+    UINT32                  m_ulTotalDurReported;
-+    UINT32                  m_ulDurSoFar;
-+    UINT32                  m_ulCurStatusUpdateGranularity;
-+    HXBOOL                  m_bInitialPrerollUpateGranularitySet;
-+    HXBOOL                  m_bDownloadIsComplete;
-+
-+    ExamplePDStatusObserver();
-+    ~ExamplePDStatusObserver();
-+
-+public:
-+    ExamplePDStatusObserver(IUnknown* pUnkPlayer);
-+    
-+    /*
-+     * IUnknown methods
-+     */
-+    STDMETHOD(QueryInterface)	(THIS_
-+				REFIID riid,
-+				void** ppvObj);
-+
-+    STDMETHOD_(ULONG32,AddRef)	(THIS);
-+
-+    STDMETHOD_(ULONG32,Release)	(THIS);
-+
-+    /*
-+     *  IHXPDStatusObserver methods
-+     */
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXPDStatusObserver::OnDownloadProgress
-+     *
-+     *  Purpose:
-+     *      Notification from IHXPDStatusMgr of download progress when
-+     *      file size changes.
-+     *
-+     *      lTimeSurplus:
-+     *      - When negative, the absolute value of it is the estimated number
-+     *      of milliseconds of wall-clock time that need to pass while
-+     *      downloading continues before reaching the point at which playback
-+     *      can resume and play the remainder of the stream without having to
-+     *      buffer, assuming that playback is paused and remains so during
-+     *      that period.
-+     *      - When positive, it is the estimated number of milliseconds of
-+     *      wall-clock time between when the download should complete and when
-+     *      the natural content play-out duration will be reached, assuming
-+     *      playback is currently progressing and that no pause will occur.
-+     *
-+     *      Note: ulNewDurSoFar can be HX_PROGDOWNLD_UNKNOWN_DURATION if the
-+     *      IHXMediaBytesToMediaDurConverter was not available to, or was
-+     *      unable to convert the bytes to a duration for the IHXPDStatusMgr
-+     *      calling this:
-+     */
-+    STDMETHOD(OnDownloadProgress) (THIS_
-+            IHXStreamSource* /*IN*/  /*NULL is valid value*/ pStreamSource,
-+            UINT32 /*IN*/ ulNewDurSoFar,
-+            UINT32 /*IN*/ ulNewBytesSoFar,
-+            INT32  /*IN*/ lTimeSurplus);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXPDStatusObserver::OnTotalDurChanged
-+     *  Purpose:
-+     *      This is a notification if the total file duration becomes known
-+     *      or becomes better-known during download/playback
-+     *      
-+     *      Note: pStreamSource can be NULL.  This will be true when
-+     *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+     *      object.
-+     */
-+    STDMETHOD(OnTotalDurChanged)  (THIS_
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource,
-+            UINT32 /*IN*/ ulNewDur);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXPDStatusObserver::OnDownloadComplete
-+     *
-+     *  Purpose:
-+     *      Notification that the entire file has been downloaded.
-+     *
-+     *      Note: pStreamSource can be NULL.  This will be true when
-+     *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+     *      object.
-+     *      
-+     */
-+    STDMETHOD(OnDownloadComplete)    (THIS_
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXPDStatusObserver::SrcClaimsSeekSupport
-+     *
-+     *  Purpose:
-+     *      Passes along notification from file sys that seek support
-+     *      is claimed to be available (although sometimes HTTP server
-+     *      claims this when it doesn't actually support it).
-+     *
-+     */
-+    STDMETHOD(SrcClaimsSeekSupport)    (THIS_
-+            IHXStreamSource* pStreamSource,
-+            HXBOOL /*IN*/ bSrcClaimsSeekSupport);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXPDStatusObserver::OnDownloadPause
-+     *  Purpose:
-+     *      Notification that the file-download process has purposefully
-+     *      and temporarily halted downloading of the file
-+     *      
-+     *      Note: pStreamSource can be NULL.  This will be true when
-+     *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+     *      object.
-+     */
-+    STDMETHOD(OnDownloadPause)    (THIS_
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource);
-+
-+    /************************************************************************
-+     *  Method:
-+     *      IHXPDStatusObserver::OnDownloadResume
-+     *  Purpose:
-+     *      Notification that the file-download process has resumed
-+     *      the process of downloading the remainder of the file
-+     *      
-+     *      Note: pStreamSource can be NULL.  This will be true when
-+     *      IHXPDStatusMgr calling this is upstream of the IHXStreamSource
-+     *      object.
-+     */
-+    STDMETHOD(OnDownloadResume)    (THIS_
-+            IHXStreamSource* /*IN*/ /*NULL is valid value*/ pStreamSource);
-+};
-+// /#endif // /HELIX_FEATURE_PROGRESSIVE_DOWNLD_STATUS.
-+
-+#endif // _EXPRDNLD_H_
-+
-Index: helix-libs/clientapps/clutter/exroot.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exroot.cpp	2008-10-13 06:54:08.000000000 -0700
-@@ -0,0 +1,672 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: unixroot.cpp,v 1.9 2007/07/06 20:54:01 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// for shared memory
-+#include <sys/types.h>
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <sys/utsname.h>
-+
-+#include "hxcom.h"
-+#include "hxwintyp.h"
-+#include "hxvsurf.h"
-+#include "hxslist.h"
-+#include "colormap.h"
-+#include "hxprefs.h"
-+#include "hxtick.h"
-+#include "hxthread.h"
-+#include "basesite.h"
-+#include "exroot.h"
-+#include "exsite.h"
-+#include "unixcmap.h"
-+#include "shmhelp.h"
-+
-+//  #ifdef _DEBUG
-+//  #include <X11/extensions/xf86vmode.h> //for debug video sync rates..
-+//  #endif
-+
-+//Work around AIX problem.
-+#ifdef _AIX
-+#  define MAX_SHARED_REGIONS ((UINT32)1)
-+#else
-+#  define MAX_SHARED_REGIONS ((UINT32)9999)
-+#endif
-+
-+CExRootSurf::CExRootSurf(IUnknown* pContext, CHXBaseSite* pSite, on_new_frame_cb_t on_new_frame_cb, void *context )
-+   : CBaseRootSurface(pContext, pSite)
-+   , m_bUseShm(FALSE)
-+   , m_nShmId(0)
-+   , m_pDisplay(NULL)
-+   , m_GC(0)
-+   , m_nScreenNumber(0)
-+   , m_pXImage(NULL)
-+   , m_pVisual(NULL)
-+   , m_unDepth(0)
-+   , m_pScreen(NULL)
-+   , m_pYUVScratchBits(NULL)
-+   , m_nYUVScratchPitch(0)
-+   , m_pScratchBits(NULL)
-+   , m_nScratchPitch(0)
-+   , m_nBitsPerPixel(0)
-+   , m_nCompositionSize(0)
-+   , m_on_new_frame_cb(on_new_frame_cb)
-+   , m_context(context)
-+{
-+}
-+
-+HX_RESULT CExRootSurf::Init()
-+{
-+   //get window and display from main Site.
-+   HXxWindow* pWindow = m_pSite->GetWindow();
-+   HX_ASSERT(pWindow);
-+
-+   m_pDisplay = (Display*)pWindow->display;
-+   m_window   = (Window)pWindow->window;
-+
-+   HX_ASSERT( m_pDisplay );
-+   HX_ASSERT( m_window );
-+
-+   //
-+   // Now see if our X11 server supports the Shared Memory extension.
-+   //
-+  // ShmHelp::Init(m_pDisplay);
-+  // m_bUseShm = ShmHelp::ShmAvailable();
-+
-+   //Create the graphics context
-+   XGCValues values;
-+
-+   XLockDisplay(m_pDisplay);
-+   m_GC = XCreateGC(m_pDisplay, m_window, 0, &values);
-+
-+    //Get X window attributes & visual
-+   XWindowAttributes attr;
-+   XGetWindowAttributes(m_pDisplay, m_window, &attr);
-+   XUnlockDisplay(m_pDisplay);
-+   m_pVisual = attr.visual;
-+
-+   // get visual info & depth
-+   int nv=0;
-+   XVisualInfo visInfo;
-+   memset(&visInfo, 0, sizeof(XVisualInfo));
-+   XLockDisplay(m_pDisplay);
-+   visInfo.visualid = XVisualIDFromVisual(m_pVisual);
-+   XVisualInfo* pVisualInfo = XGetVisualInfo (m_pDisplay, VisualIDMask, &visInfo, &nv);
-+//   m_unDepth       = pVisualInfo->depth;
-+   m_unDepth       = 24;
-+   m_nScreenNumber = DefaultScreen(m_pDisplay);
-+   m_pScreen       = XScreenOfDisplay(m_pDisplay, m_nScreenNumber);
-+   XUnlockDisplay(m_pDisplay);
-+   m_colormap      = HXGetXColormap(m_pDisplay, m_window);
-+
-+   // get pixmap (blt) information for the best depth we can display
-+   int i=0;
-+   int nNum=0;
-+   XLockDisplay(m_pDisplay);
-+   XPixmapFormatValues *pixmap_formats = XListPixmapFormats(m_pDisplay, &nNum);
-+   XUnlockDisplay(m_pDisplay);
-+   if(pixmap_formats)
-+   {
-+      for (i=0 ; i<nNum; i++)
-+      {
-+         if (pixmap_formats[i].depth == m_unDepth)
-+         {
-+            m_nBitsPerPixel = pixmap_formats[i].bits_per_pixel;
-+         }
-+      }
-+      XFree(pixmap_formats);
-+      pixmap_formats = NULL;
-+   }
-+
-+   memset(&m_bmiSave, 0, sizeof(HXBitmapInfo));
-+#if 0
-+   m_bmiSave.bmiHeader.biBitCount    = m_nBitsPerPixel;
-+   m_bmiSave.bmiHeader.biCompression = (m_unDepth==8 ? BI_RGB : BI_BITFIELDS);
-+   m_bmiSave.un.dwBitMask[0]         = pVisualInfo->red_mask;
-+   m_bmiSave.un.dwBitMask[1]         = pVisualInfo->green_mask;
-+   m_bmiSave.un.dwBitMask[2]         = pVisualInfo->blue_mask;
-+#else
-+   /* Fake a RGB24 */
-+   m_nBitsPerPixel = 24;
-+   m_bmiSave.bmiHeader.biBitCount    = m_nBitsPerPixel;
-+   m_bmiSave.bmiHeader.biCompression = BI_RGB;
-+#endif
-+   //Set primary surface CID.
-+   m_nCompositionSurfaceCID = GetBitmapColor(&m_bmiSave);
-+   XFree( pVisualInfo );
-+
-+//  #ifdef _DEBUG
-+//     //Lets find out what Hsync and Vsync rates we have for this display.
-+//     //Ripped from xvidtune.c
-+//     XF86VidModeModeLine mode_line;
-+//     int    scrn=0;
-+//     int    dot_clock;
-+//     double vsync_hz, HSyncRate,HTotal, VTotal, PixelClock;
-+//     if(XF86VidModeGetModeLine(m_pDisplay, scrn, &dot_clock, &mode_line))
-+//     {
-+//        PixelClock=dot_clock;
-+//        HTotal = mode_line.htotal;
-+//        VTotal = mode_line.vtotal;
-+//        HSyncRate = PixelClock*1000.0/HTotal;
-+//        vsync_hz = HSyncRate/VTotal;
-+//        fprintf( stderr, "This Display's Hsync rate is: %f and Vsync: %f\n",
-+//                 HSyncRate, vsync_hz );
-+//     }
-+
-+//  #endif
-+
-+   return HXR_OK;
-+}
-+
-+CExRootSurf::~CExRootSurf()
-+{
-+   _DestroyCompositionSurface();
-+
-+   if( m_GC )
-+   {
-+      XLockDisplay(m_pDisplay);
-+      XFreeGC( m_pDisplay, m_GC );
-+      XUnlockDisplay(m_pDisplay);
-+      m_GC=0;
-+   }
-+   if (m_pVisual)
-+   {
-+      /* PJG: don't have to free visuals */
-+      m_pVisual = NULL;
-+   }
-+
-+   if(m_bUseShm)
-+   {
-+      if( m_pCompositionSurface != NULL )
-+         ShmHelp::DetachSharedRegion(&m_pCompositionSurface, &m_shmInfo);
-+   }
-+   else
-+   {
-+      HX_DELETE(m_pCompositionSurface);
-+      m_nCompositionSize=0;
-+      m_bCompositionSurfaceCreated=FALSE;
-+   }
-+
-+   //XXXgfw any more clean up for these two?
-+   HX_VECTOR_DELETE( m_pScratchBits );
-+   HX_VECTOR_DELETE( m_pYUVScratchBits );
-+
-+}
-+
-+HX_RESULT CExRootSurf::_ResizeVideoBuffer( INT32 nSize)
-+{
-+   HX_RESULT retVal=HXR_OK;
-+
-+   if(nSize <= m_nCompositionSize)
-+      return retVal;
-+
-+   if(m_bUseShm)
-+   {
-+      if( m_pCompositionSurface != NULL )
-+         retVal = ShmHelp::DetachSharedRegion(&m_pCompositionSurface, &m_shmInfo);
-+      if( retVal==HXR_OK )
-+      {
-+         retVal = ShmHelp::CreateSharedRegion( nSize,
-+                                               &m_pCompositionSurface,
-+                                               &m_nShmId,
-+                                               &m_shmInfo
-+                                               );
-+
-+      }
-+      if( retVal != HXR_OK )
-+      {
-+         m_bCompositionSurfaceCreated = FALSE;
-+         m_nCompositionSize           = 0;
-+         m_bUseShm = FALSE;
-+      }
-+      else
-+      {
-+         //It all worked
-+         m_nCompositionSize           = nSize;
-+         m_bCompositionSurfaceCreated = TRUE;
-+         return retVal;
-+      }
-+
-+   }
-+
-+   //We need to fall through here so that if the shared memory stuff
-+   //above fails we can create it the old fashioned way.
-+   if(m_pCompositionSurface == NULL)
-+   {
-+      m_pCompositionSurface = (UCHAR*) malloc(nSize);
-+   }
-+   else
-+   {
-+      m_pCompositionSurface = (UCHAR*) realloc(m_pCompositionSurface, nSize);
-+   }
-+   if( m_pCompositionSurface )
-+   {
-+      m_nCompositionSize = nSize;
-+   }
-+   else
-+   {
-+      HX_ASSERT("We can't alloc the composition surface." == NULL );
-+      m_nCompositionSize = 0;
-+   }
-+
-+   return retVal;
-+}
-+
-+HX_RESULT CExRootSurf::_DebugBlt( UCHAR* pImageData, HXBitmapInfoHeader* pBitmapInfo,
-+                     HXxRect& rDestRect, HXxRect& rSrcRect)
-+{
-+   HX_ASSERT( m_window );
-+   HX_ASSERT( m_pDisplay );
-+   HX_ASSERT( m_GC );
-+   XLockDisplay(m_pDisplay);
-+   XSetForeground( m_pDisplay, m_GC, WhitePixel(m_pDisplay, 0 ));
-+   XSetBackground( m_pDisplay, m_GC, BlackPixel(m_pDisplay, 0 ));
-+   XSetLineAttributes(m_pDisplay, m_GC, 5, LineSolid, CapRound, JoinRound );
-+   XSetForeground( m_pDisplay, m_GC, WhitePixel(m_pDisplay, 0) );
-+   XFillRectangle( m_pDisplay, m_window, m_GC,
-+                   rDestRect.left, rDestRect.top,
-+                   rDestRect.right-rDestRect.left,
-+                   rDestRect.bottom-rDestRect.top
-+                   );
-+   XDrawRectangle( m_pDisplay, m_window, m_GC,
-+                   rDestRect.left, rDestRect.top,
-+                   rDestRect.right-rDestRect.left,
-+                   rDestRect.bottom-rDestRect.top
-+                   );
-+   XUnlockDisplay(m_pDisplay);
-+   return HXR_OK;
-+}
-+
-+void CExRootSurf::_GetYUVScratchWidthHeight(UINT32* pWidth, UINT32* pHeight)
-+{
-+   *pWidth     = m_bmiYUVScratch.bmiHeader.biWidth;
-+   *pHeight    = m_bmiYUVScratch.bmiHeader.biHeight;
-+}
-+
-+XImage* CExRootSurf::_GetCompositionSurfaceDrawable()
-+{
-+   return m_pXImage;
-+}
-+
-+
-+
-+//Not used except for XING.....
-+void CExRootSurf::_CreateYUVScratchSurface(UINT32 width, UINT32 height)
-+{
-+   //Remove old bits....
-+   HX_DELETE(m_pYUVScratchBits);
-+
-+   //Clear BitmapInfo struct....
-+   memset(&m_bmiYUVScratch, 0, sizeof(HXBitmapInfo));
-+   int nResult = MakeBitmap( &m_bmiYUVScratch,
-+                             sizeof(m_bmiYUVScratch),
-+                             CID_YUY2,
-+                             width,
-+                             height,
-+                             NULL,
-+                             0);
-+   if( nResult )
-+   {
-+      m_pYUVScratchBits  = new UCHAR[m_bmiYUVScratch.bmiHeader.biSizeImage];
-+      m_nYUVScratchPitch = GetBitmapPitch(&m_bmiYUVScratch);
-+   }
-+}
-+
-+
-+void CExRootSurf::_GetYUVScratchSurfacePointer(UCHAR** pYUVBits, INT32* YUVPitch)
-+{
-+   *pYUVBits = m_pYUVScratchBits;
-+   *YUVPitch = m_nYUVScratchPitch;
-+}
-+
-+HX_RESULT CExRootSurf::CreateScratchSurface( int nCompositionSurfaceCID, HXxSize* pSize)
-+{
-+   //Remove old bits....
-+   HX_DELETE(m_pScratchBits);
-+
-+   //Clear BitmapInfo struct....
-+   memset(&m_bmiScratch, 0, sizeof(HXBitmapInfo));
-+   int nResult = MakeBitmap( &m_bmiScratch,
-+                             sizeof(m_bmiScratch),
-+                             nCompositionSurfaceCID,
-+                             pSize->cx,
-+                             pSize->cy,
-+                             NULL,
-+                             0);
-+   if( nResult )
-+   {
-+      m_pScratchBits  = new UCHAR[m_bmiScratch.bmiHeader.biSizeImage];
-+      m_nScratchPitch = GetBitmapPitch(&m_bmiScratch);
-+   }
-+
-+   return nResult? HXR_OK : HXR_FAIL;
-+}
-+
-+HX_RESULT CExRootSurf::ScratchLock(UCHAR** pBits, INT32* pPitch)
-+{
-+   *pBits  = m_pScratchBits;
-+   *pPitch = m_nScratchPitch;
-+   return HXR_OK;
-+}
-+
-+HX_RESULT CExRootSurf::ScratchUnlock(UCHAR* pBits)
-+{
-+   return HXR_OK;
-+}
-+
-+HX_RESULT CExRootSurf::_MinimalUnlock(HXxWindow* pWindow)
-+{
-+//     Window win = m_window;
-+//     HX_ASSERT(win);
-+//     HXxSize hxxSize;
-+//     m_pSite->GetSize(hxxSize);
-+
-+//     if (m_bUseShm)
-+//     {
-+//        XShmPutImage(m_pDisplay,
-+//                     win,
-+//                     m_GC,
-+//                     m_pXImage,
-+//                     0,
-+//                     0,
-+//                     0,
-+//                     0,
-+//                     hxxSize.cx,
-+//                     hxxSize.cy,
-+//                     False
-+//                     );
-+//     }
-+//     else
-+//     {
-+//        XPutImage(m_pDisplay,
-+//                  win,
-+//                  m_GC,
-+//                  m_pXImage,
-+//                  0,
-+//                  0,
-+//                  0,
-+//                  0,
-+//                  hxxSize.cx,
-+//                  hxxSize.cy
-+//                  );
-+//     }
-+     return HXR_OK;
-+}
-+
-+HX_RESULT CExRootSurf::_LockComposition(UCHAR** pBits, INT32* pPitch)
-+{
-+   HX_RESULT retVal = HXR_OK;
-+   if( !m_bCompositionSurfaceCreated || m_pCompositionSurface==NULL )
-+   {
-+      retVal = _CreateCompositionSurface();
-+   }
-+   HX_ASSERT( m_pCompositionSurface );
-+   *pBits  = m_pCompositionSurface;
-+   *pPitch = m_nCompositionPitch;
-+   return HXR_OK;
-+}
-+
-+
-+void CExRootSurf::_BltFromScratchToComposition( HXxRect& rDestRect, HXxRect& rSrcRect)
-+{
-+   HX_ASSERT( "Not implemented on unix yet...."==NULL );
-+}
-+
-+HX_RESULT CExRootSurf::_CreateCompositionSurface()
-+{
-+   HX_RESULT retVal = HXR_FAIL;
-+
-+   if(m_bCompositionSurfaceCreated)
-+   {
-+      return HXR_OK;
-+   }
-+
-+   HX_ASSERT( !m_bCompositionSurfaceCreated );
-+   HX_ASSERT( m_pSite );
-+
-+   //Create a BMI to describe the composition surface
-+   HXxSize hxxSize;
-+   m_pSite->GetSize(hxxSize);
-+   memcpy(&m_compositionSize, &hxxSize, sizeof(HXxSize)); /* Flawfinder: ignore */
-+
-+   // find out how big we want to allocate.
-+   if (m_pSite->IsFullScreen())
-+   {
-+      UINT16 unDummy=0;
-+      UINT16 unHorzRes=0;
-+      UINT16 unVertRes=0;
-+      m_pSite->_GetDeviceCaps(NULL, unDummy, unHorzRes, unVertRes );
-+      m_allocatedCompositionSize.cx = unHorzRes;
-+      m_allocatedCompositionSize.cy = unVertRes;
-+   }
-+   else
-+   {
-+        // we use root surface for BASIC_BLT and it assumes the offset(position) 
-+        // of the root site it cooresponding to is (0, 0).
-+        //
-+        // this is not true for "windowless" mode where the root site can be given
-+        // an offset, as a result, we fail to blt the video.
-+        //
-+        // to fix this, we'll take the m_positionOrg into consideration when
-+        // creating the composition surface, this may not be optimal but good enough
-+        // for now.
-+        //
-+        // similar logic is also added for other platforms, we need to move this
-+        // common code to the base class when we have chance to clean it up
-+        if (m_compositionSize.cx && m_compositionSize.cy)
-+        {
-+            m_compositionSize.cx += m_pSite->m_positionOrig.x;
-+            m_compositionSize.cy += m_pSite->m_positionOrig.y;
-+        }
-+
-+        m_allocatedCompositionSize.cx = m_compositionSize.cx;
-+        m_allocatedCompositionSize.cy = m_compositionSize.cy;
-+   }
-+
-+   //XXXgfw uhhhh, OK.
-+   if( m_compositionSize.cx > m_allocatedCompositionSize.cx ||
-+       m_compositionSize.cy > m_allocatedCompositionSize.cy )
-+   {
-+      m_allocatedCompositionSize.cx = m_compositionSize.cx;
-+      m_allocatedCompositionSize.cy = m_compositionSize.cy;
-+   }
-+
-+   //Make the bitmap header struct.
-+   m_bmiComposition.bmiHeader.biBitCount    = m_bmiSave.bmiHeader.biBitCount;
-+   m_bmiComposition.bmiHeader.biCompression = m_bmiSave.bmiHeader.biCompression;
-+   m_bmiComposition.un.dwBitMask[0]         = m_bmiSave.un.dwBitMask[0];
-+   m_bmiComposition.un.dwBitMask[1]         = m_bmiSave.un.dwBitMask[1];
-+   m_bmiComposition.un.dwBitMask[2]         = m_bmiSave.un.dwBitMask[2];
-+   int nResult = MakeBitmap( &m_bmiComposition,
-+                             sizeof(m_bmiComposition),
-+                             m_nCompositionSurfaceCID,
-+                             m_allocatedCompositionSize.cx,
-+                             m_allocatedCompositionSize.cy,
-+                             NULL,
-+                             0
-+                             );
-+   m_bmiComposition.bmiHeader.biBitCount    = m_bmiSave.bmiHeader.biBitCount;
-+   m_bmiComposition.bmiHeader.biCompression = m_bmiSave.bmiHeader.biCompression;
-+   m_bmiComposition.un.dwBitMask[0]         = m_bmiSave.un.dwBitMask[0];
-+   m_bmiComposition.un.dwBitMask[1]         = m_bmiSave.un.dwBitMask[1];
-+   m_bmiComposition.un.dwBitMask[2]         = m_bmiSave.un.dwBitMask[2];
-+
-+   //Now create the bits....
-+   _ResizeVideoBuffer( m_bmiComposition.bmiHeader.biSizeImage );
-+   m_nCompositionPitch = GetBitmapPitch( &m_bmiComposition );
-+
-+   if( m_pXImage )
-+   {
-+      XFree( m_pXImage );
-+   }
-+    
-+   if( m_bUseShm )
-+   {
-+      XLockDisplay(m_pDisplay);
-+      m_pXImage  = XShmCreateImage( m_pDisplay,
-+                                    m_pVisual,
-+                                    m_unDepth,
-+                                    ZPixmap,
-+                                    (char*)m_pCompositionSurface,
-+                                    &m_shmInfo,
-+                                    m_allocatedCompositionSize.cx,
-+                                    m_allocatedCompositionSize.cy
-+                                    );
-+      XUnlockDisplay(m_pDisplay);
-+   }
-+   else
-+   {
-+      XLockDisplay(m_pDisplay);
-+      m_pXImage  = XCreateImage( m_pDisplay,
-+                                 m_pVisual,
-+                                 m_unDepth,
-+                                 ZPixmap,
-+                                 0,
-+                                 (char*)m_pCompositionSurface,
-+                                 m_allocatedCompositionSize.cx,
-+                                 m_allocatedCompositionSize.cy,
-+                                 32,
-+                                 0);
-+      XUnlockDisplay(m_pDisplay);
-+   }
-+
-+   if( m_pXImage )
-+   {
-+      m_bCompositionSurfaceCreated = TRUE;
-+#ifdef _BIG_ENDIAN
-+      m_pXImage->byte_order = MSBFirst;
-+#else
-+      m_pXImage->byte_order = LSBFirst;
-+#endif
-+      retVal = HXR_OK;
-+   }
-+   return retVal;
-+}
-+
-+void CExRootSurf::_MinimalBlt(HXxRect& destRect)
-+{
-+    if (m_on_new_frame_cb) 
-+    {
-+	PlayerImgInfo Info;
-+	Info.Rect.left = destRect.left;
-+	Info.Rect.right = destRect.right;
-+	Info.Rect.top = destRect.top;
-+	Info.Rect.bottom = destRect.bottom;
-+	Info.cx = m_allocatedCompositionSize.cx;
-+	Info.cy = m_allocatedCompositionSize.cy; 
-+	m_on_new_frame_cb(m_pCompositionSurface, 
-+			  m_bmiComposition.bmiHeader.biSizeImage, 
-+			  &Info, 
-+			  m_context);
-+    }
-+}
-+
-+HX_RESULT CExRootSurf::_DestroyCompositionSurface()
-+{
-+   HX_RESULT retVal = HXR_OK;
-+   if( m_bCompositionSurfaceCreated )
-+   {
-+      if( m_pXImage )
-+      {
-+         XFree(m_pXImage);
-+         m_pXImage = NULL;
-+      }
-+      m_bCompositionSurfaceCreated = FALSE;
-+   }
-+
-+   return retVal;
-+}
-+
-+
-+
-+HX_RESULT CExRootSurf::BeginOptimizedBlt(HXBitmapInfoHeader* pBitmapInfo)
-+{
-+#ifdef _DEBUG
-+   fprintf(stderr, "CExRootSurf::BeginOptimizedBlt Needs to be written\n" );
-+#endif
-+   return HXR_NOTIMPL;
-+}
-+
-+HX_RESULT CExRootSurf::OptimizedBlt( UCHAR*   pImageBits,
-+                                       HXxRect& rDestRect,
-+                                       HXxRect& rSrcRect)
-+{
-+#ifdef _DEBUG
-+   fprintf(stderr, "CExRootSurf::OptimizedBlt Needs to be written\n" );
-+#endif
-+   return HXR_NOTIMPL;
-+}
-+
-+HX_RESULT CExRootSurf::EndOptimizedBlt(void)
-+{
-+#ifdef _DEBUG
-+   fprintf(stderr, "CExRootSurf::EndOptimizedBlt Needs to be written\n" );
-+#endif
-+   return HXR_NOTIMPL;
-+}
-+
-+HX_RESULT CExRootSurf::GetOptimizedFormat(HX_COMPRESSION_TYPE& ulType)
-+{
-+#ifdef _DEBUG
-+   fprintf(stderr, "CExRootSurf::GetOptimizedFormat Needs to be written\n" );
-+#endif
-+   return HXR_NOTIMPL;
-+}
-+
-+HX_RESULT CExRootSurf::GetPreferredFormat(HX_COMPRESSION_TYPE& ulType)
-+{
-+#ifdef _DEBUG
-+   fprintf(stderr, "CExRootSurf::GetPreferredFormat Needs to be written\n" );
-+#endif
-+   return HXR_NOTIMPL;
-+}
-+
-+GC CExRootSurf::GetGC()
-+{
-+   return m_GC;
-+}
-Index: helix-libs/clientapps/clutter/exroot.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exroot.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,155 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: unixroot.h,v 1.8 2007/07/06 20:54:05 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef _UNIXROOT_H
-+#define _UNIXROOT_H
-+
-+#include "baseroot.h"
-+#if defined(USE_XWINDOWS)
-+#include <X11/Xatom.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xos.h>
-+#include <X11/Intrinsic.h>
-+#include <X11/extensions/XShm.h>
-+#endif
-+
-+#include "player.h"
-+
-+class CExRootSurf : public CBaseRootSurface
-+{
-+public:
-+   CExRootSurf(IUnknown* pContext, CHXBaseSite* pSite, on_new_frame_cb_t on_new_frame_cb = NULL, void *context = NULL);
-+
-+   //Helpers....
-+   HX_RESULT Init();
-+   GC        GetGC();
-+
-+   //public inherited stuff
-+   virtual HX_RESULT CreateScratchSurface(int nCompositionSurfaceCID, 
-+                                          HXxSize* pSize);
-+   virtual HX_RESULT ScratchLock(UCHAR** pBits, INT32* pPitch);
-+   virtual HX_RESULT ScratchUnlock(UCHAR* pBits);
-+
-+   virtual HX_RESULT BeginOptimizedBlt(HXBitmapInfoHeader* pBitmapInfo);
-+   virtual HX_RESULT OptimizedBlt( UCHAR*   pImageBits,
-+                                   HXxRect& rDestRect,
-+                                   HXxRect& rSrcRect);
-+   virtual HX_RESULT EndOptimizedBlt(void);
-+   virtual HX_RESULT GetOptimizedFormat(HX_COMPRESSION_TYPE& ulType);
-+   virtual HX_RESULT GetPreferredFormat(HX_COMPRESSION_TYPE& ulType);
-+
-+   XImage* _GetCompositionSurfaceDrawable();
-+
-+   //Shared Memory helper func for the basesurf to use.
-+//     HX_RESULT _DetachSharedRegion();
-+//     HX_RESULT _CreateSharedRegion(INT32 nSize);
-+   
-+protected:
-+
-+   //Smartly handle resizing of shm buffer.
-+   HX_RESULT _ResizeVideoBuffer(INT32 nSize);
-+
-+   //Inherited from CBaseRootSurface....
-+   virtual void _BltFromScratchToComposition(HXxRect& rDestRect,
-+                                             HXxRect& rSrcRect);
-+   virtual HX_RESULT _DebugBlt( UCHAR*               pImageData,
-+                                HXBitmapInfoHeader* pBitmapInfo,
-+                                HXxRect&             rDestRect,
-+                                HXxRect&             rSrcRect);
-+   virtual void _GetYUVScratchWidthHeight(UINT32* pWidth, UINT32* pHeight);
-+   virtual void _CreateYUVScratchSurface(UINT32 width, UINT32 height);
-+   virtual void _GetYUVScratchSurfacePointer(UCHAR** pYUVBits, INT32* YUVPitch);
-+   virtual HX_RESULT _MinimalUnlock(HXxWindow* pWindow);
-+   virtual HX_RESULT _LockComposition(UCHAR** pBits, INT32* pPitch);
-+   virtual HX_RESULT _CreateCompositionSurface();
-+   virtual HX_RESULT _DestroyCompositionSurface();
-+   virtual void      _MinimalBlt(HXxRect& dest);
-+
-+   
-+private:
-+
-+   virtual ~CExRootSurf();
-+   
-+   //Protect unintentional copy and default ctors.
-+   CExRootSurf();
-+   CExRootSurf( const CExRootSurf& );
-+   CExRootSurf& operator=( const CExRootSurf& it );
-+
-+   //Shared memory members.
-+   HXBOOL            m_bUseShm;
-+   XShmSegmentInfo m_shmInfo;
-+   int             m_nShmId;
-+
-+   //General display and GC stuff.
-+   Display*     m_pDisplay;
-+   GC           m_GC;
-+   int          m_nScreenNumber;
-+   XImage*      m_pXImage;
-+   Window       m_window;
-+   Visual*      m_pVisual;
-+   unsigned int m_unDepth;
-+   Screen*      m_pScreen;
-+   Colormap     m_colormap;
-+   int          m_nBitsPerPixel;
-+
-+   //Bitmap stuff.
-+   UCHAR*         m_pYUVScratchBits;
-+   HXBitmapInfo  m_bmiYUVScratch;
-+   int            m_nYUVScratchPitch;
-+   UCHAR*         m_pScratchBits;
-+   HXBitmapInfo  m_bmiScratch;
-+   int            m_nScratchPitch;
-+   HXBitmapInfo  m_bmiSave;
-+   ULONG32        m_nCompositionSize;
-+   on_new_frame_cb_t m_on_new_frame_cb;
-+   void *   m_context;
-+};
-+
-+#endif
-Index: helix-libs/clientapps/clutter/exsite.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exsite.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,2915 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: unixsite.cpp,v 1.18.2.6 2008/06/05 14:24:30 lovish Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ *                 Phil Dibowitz
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef _UNIX
-+#error This is the UNIX platform specific implementation.
-+#endif
-+
-+//
-+// System includes...
-+//
-+#include <stdio.h>
-+#include "hlxclib/string.h"
-+#if defined(USE_XWINDOWS)
-+#include <X11/Intrinsic.h>
-+#include <X11/Shell.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/keysym.h>
-+#include <X11/Xos.h>
-+#include <X11/cursorfont.h>
-+#include <X11/extensions/XShm.h>
-+#endif
-+
-+
-+//
-+// RMA includes...
-+//
-+#include "hxcom.h"
-+#include "hxcore.h"
-+#include "hxevent.h"
-+#include "hxwintyp.h"
-+#include "hxwin.h"
-+#include "hxsite2.h"
-+#include "hxtypes.h"
-+#include "exsite.h"
-+#include "unixcmap.h"
-+#include "visuals.h"
-+#include "region.h"
-+#include "basesurf.h"
-+#include "exroot.h"
-+#include "hxthread.h"
-+#include "hxtick.h"
-+#include "sitetext.h"
-+
-+#include "unixsurf.h"
-+
-+#include "hxprefs.h"
-+
-+//
-+// Global & Static global/member data....
-+//
-+Display *CHXExSite::zm_display = NULL;
-+static CHXMapPtrToPtr z_mapSiteToWindow;
-+
-+//
-+// Scroll bar support
-+//
-+#define SCROLL_BAR_WIDTH 13        //Width of scroll bar.
-+//#define _ARROWS_SIDE_BY_SIDE 1   //Regular or side by side arrows?
-+
-+
-+
-+
-+//
-+// CHXExSite only Methods...
-+//
-+CHXExSite::CHXExSite( IUnknown* pContext, IUnknown* pUnkOuter, INT32 lInitialZorder, on_new_frame_cb_t on_new_frame_cb, void *context)
-+    : CHXBaseSite( pContext, pUnkOuter, lInitialZorder )
-+    , m_pUnixEventHandler(NULL)
-+    , m_ScrollHorizButtonL(0)
-+    , m_ScrollHorizButtonR(0)
-+    , m_ScrollVertButtonT(0)
-+    , m_ScrollVertButtonB(0)
-+    , m_winFullScreenWindow(0)
-+    , m_winOldParent(0)
-+    , m_bScrollingInProgress(FALSE)
-+    , m_nScrollDir(0)
-+    , m_bLastPointInSite(FALSE)
-+    , m_bDamaged(FALSE)
-+    , m_bIgnoreFocusOutInFS(FALSE)
-+    , m_bReparent(FALSE)
-+    , m_on_new_frame_cb(on_new_frame_cb)
-+    , m_context(context)
-+#if defined(HELIX_CONFIG_MOBLIN)
-+    , m_pAttachWindowCallback(NULL)
-+    , m_pForceRedrawCallback(NULL)
-+#endif    
-+{
-+    m_ptScrollVertPosT.x   = m_ptScrollVertPosT.y   = 0;
-+    m_ptScrollVertPosB.x   = m_ptScrollVertPosB.y   = 0;
-+    m_ptScrollHorizPosR.x  = m_ptScrollHorizPosR.y  = 0;
-+    m_ptScrollHorizPosL.x  = m_ptScrollHorizPosL.y  = 0;
-+    m_ptFullScreenOffset.x = m_ptFullScreenOffset.y = 0;
-+    memset( &m_PreFullScreenSize, 0, sizeof( m_PreFullScreenSize ) );
-+
-+    HX_ASSERT( m_pContext );
-+
-+    /* Replace m_pVideoSurface with my own */
-+/*    HX_RELEASE(m_pVideoSurface);
-+    m_pVideoSurface = new CUnixSurf(m_pContext, this);
-+    HX_ASSERT( m_pVideoSurface );
-+    m_pVideoSurface->InitSurface(m_pContext);
-+    m_pVideoSurface->AddRef();
-+*/
-+    IHXPreferences* pPreferences = NULL;
-+    if( m_pContext && HXR_OK == m_pContext->QueryInterface( IID_IHXPreferences, (void **) &pPreferences))
-+    {
-+        IHXBuffer *pBuffer = NULL;
-+        pPreferences->ReadPref("IgnoreFocusOutInFS", pBuffer);
-+        if(pBuffer)
-+        {
-+            m_bIgnoreFocusOutInFS = (::atoi((const char*)pBuffer->GetBuffer()) == 1);
-+            HX_RELEASE(pBuffer);
-+        }
-+    }
-+}
-+
-+CHXExSite::~CHXExSite()
-+{
-+#if defined(HELIX_CONFIG_MOBLIN)
-+    RemovePendingCallback(m_pAttachWindowCallback);
-+    HX_RELEASE(m_pAttachWindowCallback);
-+	
-+    RemovePendingCallback(m_pForceRedrawCallback);
-+    HX_RELEASE(m_pForceRedrawCallback);	
-+#endif	
-+    void* pDummy;
-+    if (z_mapSiteToWindow.Lookup((void*)this, pDummy))
-+    {
-+        z_mapSiteToWindow.RemoveKey((void*)this);
-+    }
-+
-+    if( m_pUnixEventHandler )
-+    {
-+        m_pUnixEventHandler->CancelCallback();
-+        HX_RELEASE(m_pUnixEventHandler);
-+    }
-+}
-+
-+HX_RESULT CHXExSite::_OpenXDisplay(char* pszDisplayString)
-+{
-+    HX_RESULT retVal = HXR_OK;
-+
-+    //Is the connection open already?
-+    if( NULL==zm_display )
-+    {
-+        zm_display = XOpenDisplay(pszDisplayString);
-+
-+        //If you can't open the display your done.
-+        if(NULL == zm_display )
-+        {
-+            HX_ASSERT("Can't open X Display..."==NULL);
-+            retVal = HXR_FAIL;
-+        }
-+        else
-+        {
-+            HX_ASSERT(m_pScheduler);
-+            if( m_pScheduler )
-+            {
-+                //UnixEventHandler scheduls itself for init callback
-+                //in the ctor.
-+                m_pUnixEventHandler = new UnixEventHandler(this);
-+                m_pUnixEventHandler->AddRef();
-+            }
-+        }
-+    }
-+    return retVal;
-+}
-+
-+Window CHXExSite::CreateXWindow( Window win )
-+{
-+    Window     parentWindow;
-+    HXxWindow* pWindow = NULL;
-+    //If parentWin is NULL then we belong to the root window.
-+    if( win )
-+    {
-+        parentWindow = win;
-+    }
-+    else
-+    {
-+        HX_ASSERT(zm_display);
-+        XLockDisplay(zm_display);
-+        parentWindow = RootWindow(zm_display, DefaultScreen(zm_display));
-+        XUnlockDisplay(zm_display);
-+    }
-+
-+    //Find the best visual to use on this display.
-+    Visual* visual = GetBestVisual(zm_display);
-+
-+    //Get the visual info.
-+    int         nNotUsed=0;
-+    XVisualInfo stVisInfo;
-+
-+    memset(&stVisInfo, 0, sizeof(XVisualInfo));
-+    stVisInfo.visualid = XVisualIDFromVisual(visual);
-+    XLockDisplay(zm_display);
-+    XVisualInfo* pVisual = XGetVisualInfo( zm_display,
-+                                           VisualIDMask,
-+                                           &stVisInfo,
-+                                           &nNotUsed );
-+    XUnlockDisplay(zm_display);
-+
-+    // Set up attributes of the window.
-+    int                  attrMask = CWBackPixel | CWBorderPixel;
-+    XSetWindowAttributes attr;
-+
-+    memset(&attr, 0, sizeof(XSetWindowAttributes));
-+    XLockDisplay(zm_display);
-+    attr.background_pixel = BlackPixel(zm_display, DefaultScreen(zm_display));
-+    attr.border_pixel     = BlackPixel(zm_display, DefaultScreen(zm_display));
-+    XUnlockDisplay(zm_display);
-+
-+    //See if the default visaul of hte screen is the same one we Want
-+    //to use. If not, create a new one and install it.
-+    Colormap cmap;
-+    XLockDisplay(zm_display);
-+    Visual*  defVisual = DefaultVisual(zm_display, DefaultScreen(zm_display));
-+    XUnlockDisplay(zm_display);
-+    if( defVisual->visualid != stVisInfo.visualid )
-+    {
-+        //XXXgfw Are we leaking this colormap????
-+        XLockDisplay(zm_display);
-+        cmap = XCreateColormap(zm_display, parentWindow, visual, AllocNone);
-+        XUnlockDisplay(zm_display);
-+        attr.colormap = cmap;
-+        attrMask |= CWColormap;
-+    }
-+
-+    // Set the size/position of the window before creating.
-+    XSizeHints size_hints;
-+
-+    size_hints.flags  = PPosition | PSize;
-+    size_hints.x      = m_position.x;
-+    size_hints.y      = m_position.y;
-+    size_hints.width  = 1;
-+    size_hints.height = 1;
-+
-+    //Create it.
-+    XLockDisplay(zm_display);
-+    Window window = XCreateWindow(zm_display,
-+                                  parentWindow,
-+                                  size_hints.x,
-+                                  size_hints.y,
-+                                  size_hints.width,
-+                                  size_hints.height,
-+                                  0,
-+                                  pVisual->depth,
-+                                  InputOutput,
-+                                  visual,
-+                                  attrMask,
-+                                  &attr);
-+    XUnlockDisplay(zm_display);
-+    XFree(pVisual);
-+
-+    //Tell the WM about this window.
-+#if 0
-+    XSetStandardProperties( zm_display,
-+                            window,
-+                            "CHXExSite",
-+                            "CHXExSite",
-+                            None,
-+                            NULL, 0,
-+                            &size_hints
-+                            );
-+#endif
-+
-+    //Select all input events on the window since the other platforms
-+    //we work with have no concept of event masks
-+    XLockDisplay(zm_display);
-+#if 0
-+    int result = XSelectInput( zm_display, window,
-+                               ButtonPressMask   | ButtonReleaseMask | KeyPressMask    |
-+                               KeyReleaseMask    | EnterWindowMask   | LeaveWindowMask |
-+                               PointerMotionMask | ButtonMotionMask  | KeymapStateMask |
-+                               ExposureMask      | StructureNotifyMask | FocusChangeMask
-+                               );
-+#else
-+    int result = XSelectInput( zm_display, window, 0 );
-+
-+
-+#endif
-+    XUnlockDisplay(zm_display);
-+    if( BadWindow == result )
-+    {
-+#ifdef _DEBUG
-+        fprintf( stderr, "Can select events.\n" );
-+#endif
-+    }
-+
-+    //Map the window.
-+    XLockDisplay(zm_display);
-+ /*   XMapWindow(zm_display, window);   */
-+
-+    //Flush event queue.
-+    XFlush(zm_display);
-+    XUnlockDisplay(zm_display);
-+
-+
-+    return window;
-+}
-+
-+void CHXExSite::_MapHorzScroll()
-+{
-+#if 0
-+    if( GetWindow() && GetWindow()->display && m_ScrollHorizButtonL)
-+    {
-+        Display* pDis = (Display*)GetWindow()->display;
-+        XLockDisplay(pDis);
-+        XMapWindow( pDis, m_ScrollHorizButtonL );
-+        XMapWindow( pDis, m_ScrollHorizButtonR );
-+        XUnlockDisplay(pDis);
-+    }
-+    _DrawArrows();
-+#endif
-+}
-+
-+void CHXExSite::_MapVertScroll()
-+{
-+#if 0
-+    if( GetWindow() && GetWindow()->display && m_ScrollVertButtonT)
-+    {
-+        Display* pDis = (Display*)GetWindow()->display;
-+        XLockDisplay(pDis);
-+        XMapWindow( pDis, m_ScrollVertButtonT );
-+        XMapWindow( pDis, m_ScrollVertButtonB );
-+        XUnlockDisplay(pDis);
-+    }
-+    _DrawArrows();
-+#endif
-+}
-+
-+void CHXExSite::_MapScrollButtons()
-+{
-+#if 0
-+    _MapHorzScroll();
-+    _MapVertScroll();
-+#endif
-+}
-+
-+void CHXExSite::_UnmapHorzScroll()
-+{
-+#if 0
-+    HX_ASSERT( GetWindow() );
-+    if( m_ScrollHorizButtonL && GetWindow()->display )
-+    {
-+        Display* pDis = (Display*)GetWindow()->display;
-+        XLockDisplay(pDis);
-+        XUnmapWindow( pDis, m_ScrollHorizButtonL );
-+        XUnmapWindow( pDis, m_ScrollHorizButtonR );
-+        XUnlockDisplay(pDis);
-+    }
-+#endif
-+}
-+void CHXExSite::_UnmapVertScroll()
-+{
-+#if 0
-+    HX_ASSERT( GetWindow() );
-+    if( m_ScrollVertButtonT && GetWindow()->display )
-+    {
-+        Display* pDis = (Display*)GetWindow()->display;
-+        XLockDisplay(pDis);
-+        XUnmapWindow( pDis, m_ScrollVertButtonT );
-+        XUnmapWindow( pDis, m_ScrollVertButtonB );
-+        XUnlockDisplay(pDis);
-+    }
-+#endif
-+}
-+
-+void CHXExSite::_UnmapScrollButtons()
-+{
-+#if 0
-+    if( GetWindow() )
-+    {
-+        _UnmapVertScroll();
-+        _UnmapHorzScroll();
-+    }
-+#endif
-+}
-+
-+void CHXExSite::_DestroyScrollButtons()
-+{
-+    HXxWindow* pWin = GetWindow();
-+    Display*   pDis = (Display*)(pWin?pWin->display:NULL);
-+
-+    if( m_ScrollHorizButtonL && pDis )
-+    {
-+        XLockDisplay(pDis);
-+        XDestroyWindow( pDis, m_ScrollHorizButtonL );
-+        m_ScrollHorizButtonL = 0;
-+        XDestroyWindow( pDis, m_ScrollHorizButtonR );
-+        XUnlockDisplay(pDis);
-+        m_ScrollHorizButtonR = 0;
-+    }
-+
-+    if( m_ScrollVertButtonT && pDis)
-+    {
-+        XLockDisplay(pDis);
-+        XDestroyWindow( pDis, m_ScrollVertButtonT );
-+        m_ScrollVertButtonT = 0;
-+        XDestroyWindow( pDis, m_ScrollVertButtonB );
-+        XUnlockDisplay(pDis);
-+        m_ScrollVertButtonB = 0;
-+    }
-+    m_ptScrollVertPosT.x = m_ptScrollVertPosT.y = 0;
-+    m_ptScrollVertPosB.x = m_ptScrollVertPosB.y = 0;
-+    m_ptScrollHorizPosR.x = m_ptScrollHorizPosR.y = 0;
-+    m_ptScrollHorizPosL.x = m_ptScrollHorizPosL.y = 0;
-+}
-+
-+void CHXExSite::_DrawArrows()
-+{
-+#if 0 //Paul Debug
-+    //only do the work if our site is visible.
-+    if( !IsSiteVisible() )
-+        return;
-+
-+    //Draw an arrow on this window.
-+    XPoint points[4];
-+    int offset = SCROLL_BAR_WIDTH/10;
-+    GC tmpGC;
-+    XGCValues values;
-+    Display* dis = (Display*)GetWindow()->display;
-+
-+    if( m_ScrollVertButtonB )
-+    {
-+        XLockDisplay(dis);
-+        tmpGC = XCreateGC( dis, m_ScrollVertButtonB, 0, &values );
-+        XUnlockDisplay(dis);
-+    }
-+    else if( m_ScrollHorizButtonL )
-+    {
-+        XLockDisplay(dis);
-+        tmpGC = XCreateGC( dis, m_ScrollHorizButtonL, 0, &values );
-+        XUnlockDisplay(dis);
-+    }
-+    else
-+    {
-+        //We don't have any scroll bars to draw....
-+        return;
-+    }
-+
-+
-+    XLockDisplay(dis);
-+    XSetForeground( dis, tmpGC, WhitePixel(dis, 0 ));
-+    XSetBackground( dis, tmpGC, BlackPixel(dis, 0 ));
-+    XUnlockDisplay(dis);
-+    Colormap cmap = HXGetXColormap((Display*)GetWindow()->display,
-+                                   (Window)GetWindow()->window);
-+    XColor color;
-+
-+    memset(&color, 0, sizeof(XColor));
-+    XLockDisplay(dis);
-+    XParseColor(dis, cmap, "blue", &color);
-+    XUnlockDisplay(dis);
-+    HXFindBestXColor(dis, cmap, &color);
-+    XLockDisplay(dis);
-+    XSetForeground( dis, tmpGC, color.pixel);
-+    XSetLineAttributes(dis, tmpGC, 1, LineSolid, CapRound, JoinRound );
-+    XUnlockDisplay(dis);
-+
-+
-+    //Draw up Vertical arrow.
-+    if( m_ScrollVertButtonT )
-+    {
-+        points[0].x = offset;
-+        points[0].y = SCROLL_BAR_WIDTH-offset;
-+        points[1].x = SCROLL_BAR_WIDTH/2;
-+        points[1].y = offset;
-+        points[2].x = SCROLL_BAR_WIDTH-offset;
-+        points[2].y = SCROLL_BAR_WIDTH-offset;
-+        points[3].x = points[0].x;
-+        points[3].y = points[0].y;
-+        XLockDisplay(dis);
-+        XFillPolygon( dis, m_ScrollVertButtonT, tmpGC, points, 4, Convex, CoordModeOrigin);
-+        XUnlockDisplay(dis);
-+    }
-+
-+    //Draw down Vertical arrow.
-+    if( m_ScrollVertButtonB )
-+    {
-+        points[0].x = offset;
-+        points[0].y = offset;
-+        points[1].x = SCROLL_BAR_WIDTH-offset;
-+        points[1].y = offset;
-+        points[2].x = SCROLL_BAR_WIDTH/2;
-+        points[2].y = SCROLL_BAR_WIDTH-offset;
-+        points[3].x = points[0].x;
-+        points[3].y = points[0].y;
-+        XLockDisplay(dis);
-+        XFillPolygon( dis, m_ScrollVertButtonB, tmpGC, points, 4, Convex, CoordModeOrigin);
-+        XUnlockDisplay(dis);
-+    }
-+
-+    //Draw Left Horizontal arrow.
-+    if( m_ScrollHorizButtonL )
-+    {
-+        points[0].x = SCROLL_BAR_WIDTH-offset;
-+        points[0].y = offset;
-+        points[1].x = SCROLL_BAR_WIDTH-offset;
-+        points[1].y = SCROLL_BAR_WIDTH-offset;
-+        points[2].x = offset;
-+        points[2].y = SCROLL_BAR_WIDTH/2;
-+        points[3].x = points[0].x;
-+        points[3].y = points[0].y;
-+        XLockDisplay(dis);
-+        XFillPolygon( dis, m_ScrollHorizButtonL, tmpGC, points, 4, Convex, CoordModeOrigin);
-+        XUnlockDisplay(dis);
-+    }
-+
-+    //Draw Right Horizontal arrow.
-+    if( m_ScrollHorizButtonR )
-+    {
-+        points[0].x = offset;
-+        points[0].y = SCROLL_BAR_WIDTH-offset;
-+        points[1].x = offset;
-+        points[1].y = offset;
-+        points[2].x = SCROLL_BAR_WIDTH-offset;
-+        points[2].y = SCROLL_BAR_WIDTH/2;
-+        points[3].x = points[0].x;
-+        points[3].y = points[0].y;
-+        XLockDisplay(dis);
-+        XFillPolygon( dis, m_ScrollHorizButtonR, tmpGC, points, 4, Convex, CoordModeOrigin);
-+        XUnlockDisplay(dis);
-+    }
-+
-+    //Free the GC and go.
-+    XLockDisplay(dis);
-+    XFreeGC( dis, tmpGC );
-+    XUnlockDisplay(dis);
-+#endif
-+}
-+
-+HXBOOL CHXExSite::_InButton( HXxPoint& pt, int x, int y )
-+{
-+    HXBOOL retVal =FALSE;
-+    if( x>= pt.x && x< pt.x+SCROLL_BAR_WIDTH && y>=pt.y && y<pt.y+SCROLL_BAR_WIDTH )
-+        retVal=TRUE;
-+    else
-+        retVal=FALSE;
-+
-+    return retVal;
-+}
-+
-+void CHXExSite::_CreateHorizScrollBar()
-+{
-+    HX_ASSERT( m_ScrollHorizButtonL == 0 );
-+    HX_ASSERT( m_ScrollHorizButtonR == 0 );
-+
-+    HXxSize  mySize;
-+
-+    HXxWindow* pParentWindow = NULL;
-+    if(GetParentSite())
-+    {
-+        pParentWindow = GetParentSite()->GetWindow();
-+    }
-+    if(pParentWindow)
-+    {
-+        GetParentSite()->GetSize(mySize);
-+    }
-+
-+    HX_ASSERT( pParentWindow );
-+    HX_ASSERT( pParentWindow->window != 0 );
-+
-+    if( m_ScrollVertButtonB )
-+    {
-+        // if the other bar already exists, don't overlap it!
-+        mySize.cx -= SCROLL_BAR_WIDTH;
-+    }
-+
-+    m_ptScrollHorizPosL.x = m_topleft.x;
-+    m_ptScrollHorizPosL.y = m_topleft.y+mySize.cy-SCROLL_BAR_WIDTH;
-+
-+#ifndef _ARROWS_SIDE_BY_SIDE
-+    m_ptScrollHorizPosR.x = m_topleft.x+mySize.cx-SCROLL_BAR_WIDTH;
-+#else
-+    m_ptScrollHorizPosR.x = m_topleft.x+SCROLL_BAR_WIDTH;
-+#endif
-+    m_ptScrollHorizPosR.y = m_topleft.y+mySize.cy-SCROLL_BAR_WIDTH;
-+
-+    Display* dis     = (Display*)GetWindow()->display;
-+    XLockDisplay(dis);
-+    Pixel blackPixel = BlackPixel( dis, DefaultScreen(dis) );
-+    XUnlockDisplay(dis);
-+    Pixel greyPixel  = blackPixel;
-+
-+    Colormap cmap = HXGetXColormap(dis, (Window)GetWindow()->window);
-+    XColor color;
-+
-+    XLockDisplay(dis);
-+    XParseColor(dis, cmap, "gray", &color);
-+    XUnlockDisplay(dis);
-+    HXFindBestXColor(dis, cmap, &color);
-+    greyPixel = color.pixel;
-+
-+    XLockDisplay(dis);
-+    m_ScrollHorizButtonL = XCreateSimpleWindow( dis,
-+                                                (Window)pParentWindow->window,
-+                                                m_ptScrollHorizPosL.x, m_ptScrollHorizPosL.y,
-+                                                SCROLL_BAR_WIDTH, SCROLL_BAR_WIDTH,
-+                                                1,
-+                                                blackPixel,
-+                                                greyPixel
-+                                                );
-+    m_ScrollHorizButtonR = XCreateSimpleWindow( dis,
-+                                                (Window)pParentWindow->window,
-+                                                m_ptScrollHorizPosR.x, m_ptScrollHorizPosR.y,
-+                                                SCROLL_BAR_WIDTH, SCROLL_BAR_WIDTH,
-+                                                1,
-+                                                blackPixel,
-+                                                greyPixel
-+                                                );
-+    XUnlockDisplay(dis);
-+    HX_ASSERT( m_ScrollHorizButtonR && m_ScrollHorizButtonL );
-+
-+}
-+
-+void CHXExSite::_CreateVertScrollBar()
-+{
-+    HX_ASSERT( m_ScrollVertButtonB == 0 );
-+    HX_ASSERT( m_ScrollVertButtonT == 0 );
-+
-+    HXxSize  mySize;
-+
-+    HXxWindow* pParentWindow = NULL;
-+    if(GetParentSite())
-+    {
-+        pParentWindow = GetParentSite()->GetWindow();
-+    }
-+    if(pParentWindow)
-+    {
-+        GetParentSite()->GetSize(mySize);
-+    }
-+
-+    HX_ASSERT( pParentWindow );
-+    HX_ASSERT( pParentWindow->window != 0 );
-+
-+    if( m_ScrollHorizButtonR )
-+    {
-+        // if the other bar already exists, don't overlap it!
-+        mySize.cy -= SCROLL_BAR_WIDTH;
-+    }
-+
-+
-+    m_ptScrollVertPosT.x = m_topleft.x+mySize.cx-SCROLL_BAR_WIDTH;
-+    m_ptScrollVertPosT.y = m_topleft.y;
-+
-+    m_ptScrollVertPosB.x = m_topleft.x+mySize.cx-SCROLL_BAR_WIDTH;
-+#ifndef _ARROWS_SIDE_BY_SIDE
-+    m_ptScrollVertPosB.y = m_topleft.y+mySize.cy-SCROLL_BAR_WIDTH;
-+#else
-+    m_ptScrollVertPosB.y = m_topleft.y+SCROLL_BAR_WIDTH;
-+#endif
-+
-+    Display* dis     = (Display*)GetWindow()->display;
-+    XLockDisplay(dis);
-+    Pixel blackPixel = BlackPixel( dis, DefaultScreen(dis) );
-+    XUnlockDisplay(dis);
-+    Pixel greyPixel  = blackPixel;
-+    Colormap cmap = HXGetXColormap((Display*)GetWindow()->display,
-+                                   (Window)GetWindow()->window);
-+    XColor color;
-+    XLockDisplay(dis);
-+    XParseColor(dis, cmap, "gray", &color);
-+    XUnlockDisplay(dis);
-+    HXFindBestXColor(dis, cmap, &color);
-+    greyPixel = color.pixel;
-+
-+    HX_ASSERT( GetWindow() );
-+    XLockDisplay(dis);
-+    m_ScrollVertButtonT = XCreateSimpleWindow( dis,
-+                                               (Window)pParentWindow->window,
-+                                               m_ptScrollVertPosT.x, m_ptScrollVertPosT.y,
-+                                               SCROLL_BAR_WIDTH, SCROLL_BAR_WIDTH,
-+                                               1,
-+                                               blackPixel,
-+                                               greyPixel
-+                                               );
-+    m_ScrollVertButtonB = XCreateSimpleWindow( dis,
-+                                               (Window)pParentWindow->window,
-+                                               m_ptScrollVertPosB.x, m_ptScrollVertPosB.y,
-+                                               SCROLL_BAR_WIDTH, SCROLL_BAR_WIDTH,
-+                                               1,
-+                                               blackPixel,
-+                                               greyPixel
-+                                               );
-+    XUnlockDisplay(dis);
-+
-+    HX_ASSERT( m_ScrollVertButtonB && m_ScrollVertButtonT );
-+
-+}
-+
-+//
-+// Inherited CHXBaseSite methods.
-+//
-+void CHXExSite::_NeedWindowedSite()
-+{
-+#ifdef _DEBUG
-+    fprintf( stderr, "CHXExSite::_NeedWindowedSite do something here....\n" );
-+#endif
-+    //Nothing to do on unix....
-+}
-+
-+void CHXExSite::_AttachWindow()
-+{
-+#if 1
-+    void* pDummy=NULL;
-+
-+    if (m_pRootSurface)
-+    {	/* Replace CUnixRootSurf with my own CExRootSurf */
-+	    HX_RELEASE(m_pRootSurface);
-+	    m_pRootSurface = new CExRootSurf(m_pContext, this, m_on_new_frame_cb, m_context);
-+	    m_pRootSurface->AddRef();
-+    }
-+
-+    if(!z_mapSiteToWindow.Lookup((void*)this, pDummy))
-+    {
-+        z_mapSiteToWindow.SetAt((void*)this, (void*)m_pWindow);
-+    }
-+
-+    //Set the display variable.
-+    if( m_pWindow->display == NULL )
-+    {
-+        HX_ASSERT(zm_display);
-+        m_pWindow->display = zm_display;
-+    }
-+
-+    //Now that we have a window be sure to init the CExRootSurf.
-+    //this lets it set up the display, colormap, etc.
-+    ((CExRootSurf*)m_pRootSurface)->Init();
-+#endif
-+}
-+
-+void CHXExSite::_DetachWindow()
-+{
-+#if 1
-+    void* pDummy;
-+
-+    if (z_mapSiteToWindow.Lookup((void*)this, pDummy))
-+    {
-+        z_mapSiteToWindow.RemoveKey((void*)this);
-+    }
-+#endif
-+}
-+
-+void* CHXExSite::_Create(void* pParentWindow, UINT32 style)
-+{
-+    HRESULT result = HXR_OK;
-+    if( m_pWindow && m_pWindow->window )
-+    {
-+        HX_ASSERT( "We already have created a window"==NULL);
-+        return NULL;
-+    }
-+
-+    if (pParentWindow==NULL || style)
-+    {
-+        m_bIsChildWindow = FALSE;
-+    }
-+    else
-+    {
-+        m_bIsChildWindow = TRUE;
-+    }
-+
-+    if( _OpenXDisplay(NULL) != HXR_OK )
-+    {
-+        return NULL;
-+    }
-+    return (void*)CreateXWindow((Window)pParentWindow);
-+}
-+
-+
-+void CHXExSite::_Destroy(HXxWindow* pWindow)
-+{
-+    _DestroySliders();
-+    HXxWindow* pWin = GetWindow();
-+    Display*   pDis = (Display*)(pWin?pWin->display:NULL);
-+    if( pDis )
-+    {
-+        XLockDisplay(pDis);
-+        XDestroyWindow( pDis, (Window)pWindow->window );
-+        XUnlockDisplay(pDis);
-+    }
-+}
-+
-+void CHXExSite::_SetSize(HXxSize size)
-+{
-+    HX_ASSERT( m_pWindow && m_pWindow->display && m_pWindow->window);
-+    //The scroll bars get resized also...
-+    _DestroySliders();
-+    Display* pDis = (Display*)GetWindow()->display;
-+    XLockDisplay(pDis);
-+    XResizeWindow(pDis,
-+                  (Window) m_pWindow->window,
-+                  size.cx,
-+                  size.cy);
-+    XUnlockDisplay(pDis);
-+}
-+
-+void CHXExSite::_SetPosition(HXxPoint position)
-+{
-+    HX_ASSERT( m_pWindow && m_pWindow->display && m_pWindow->window);
-+    _DestroyScrollButtons();
-+    XLockDisplay((Display*) m_pWindow->display);
-+    XMoveWindow((Display*)m_pWindow->display,
-+                (Window)m_pWindow->window,
-+                position.x,
-+                position.y);
-+    XUnlockDisplay((Display*) m_pWindow->display);
-+}
-+
-+void CHXExSite::_DamageRect(HXxRect rect)
-+{
-+    if(GetWindow())
-+    {
-+        m_bDamaged = TRUE;
-+    }
-+    return;
-+}
-+
-+void CHXExSite::_DamageRegion(HXxRegion rect)
-+{
-+    if(GetWindow())
-+    {
-+        m_bDamaged = TRUE;
-+    }
-+    return;
-+}
-+
-+void CHXExSite::_SendOSUpdateMessage()
-+{
-+    //We need to redraw our window here, m_pWindow.
-+}
-+
-+void CHXExSite::_ShowSite(HXBOOL bShow)
-+{
-+    if( bShow )
-+    {
-+        _MapScrollButtons();
-+    }
-+    else
-+    {
-+        _UnmapScrollButtons();
-+    }
-+    //do nothing....
-+}
-+
-+HXBOOL CHXExSite::_AtSystemTime()
-+{
-+    return TRUE;
-+}
-+
-+void CHXExSite::_GetDeviceCaps( void* hdc,
-+                                  UINT16& uBitsPerPixel,
-+                                  UINT16& uHorzRes,
-+                                  UINT16& uVertRes )
-+{
-+    Screen* pScreen = NULL;
-+    HXxWindow* pWin = GetWindow();
-+    HX_ASSERT( pWin );
-+    if( pWin )
-+    {
-+        Display* dis = (Display*)pWin->display;
-+        HX_ASSERT( dis );
-+        if( dis )
-+        {
-+            Display* pDisp = (Display*)GetWindow()->display;
-+            XLockDisplay(pDisp);
-+            pScreen = DefaultScreenOfDisplay(pDisp);
-+            XUnlockDisplay(pDisp);
-+
-+            uBitsPerPixel = pScreen->root_depth;
-+            uHorzRes      = pScreen->width;
-+            uVertRes      = pScreen->height;
-+        }
-+    }
-+}
-+
-+void CHXExSite::_GetWindowRect(HXxRect* destRect)
-+{
-+    HX_ASSERT( "Doesn't seem to be used anywhere"==NULL );
-+}
-+
-+void CHXExSite::_DestroySliders()
-+{
-+    _DestroyScrollButtons();
-+}
-+
-+void CHXExSite::_ForwardUpdateEvent(HXxEvent* pEvent)
-+{
-+    GC gc = NULL;
-+    AddRef();
-+
-+    HX_ASSERT(GetWindow()->window);
-+    HX_ASSERT(m_pUser);
-+    if(m_bIsChildWindow)
-+    {
-+        //Create a clip region that excludes our higher z-order
-+        //siblings and is clipped to our parent.
-+        if( !m_bRegionIsValid )
-+        {
-+            RecomputeClip();
-+        }
-+
-+        // The problem is that regions are locked to the origin so we
-+        // will need to reverse shift the region before we set the
-+        // origin of the graph port! get the GC from the video surface
-+        gc = ((CExRootSurf*)m_pRootSurface)->GetGC();
-+        HX_ASSERT( gc );
-+
-+        //Actually setup our clip region
-+        Display* pDis = (Display*)GetWindow()->display;
-+        XLockDisplay(pDis);
-+        XSetRegion( pDis, gc, (Region) m_Region );
-+        XUnlockDisplay(pDis);
-+    }
-+
-+    XEvent* pXEvent = (XEvent*) pEvent->param2;
-+    XExposeEvent* exposeEvent = (XExposeEvent*) pXEvent;
-+
-+    // get the rect for this site with respect to our parent
-+    HXRECTANGLE exposedRect = { exposeEvent->x,
-+                                exposeEvent->y,
-+                                exposeEvent->width,
-+                                exposeEvent->height };
-+    HXREGION* exposedRegion = HXCreateRegion();
-+    HXUnionRectWithRegion(&exposedRect, exposedRegion,  exposedRegion);
-+
-+    // does the site intersect the current clipping region?
-+    HXREGION* resultRegion = HXCreateRegion();
-+    HXIntersectRegion(exposedRegion, m_Region, resultRegion);
-+    HXBOOL bSiteIntersectsExposed = (HXEmptyRegion(resultRegion)==FALSE);
-+
-+    HXDestroyRegion(resultRegion);
-+    HXDestroyRegion(exposedRegion);
-+
-+    // if the exposed region intersects the sites clipping region
-+    if(bSiteIntersectsExposed)
-+    {
-+        m_pUser->HandleEvent(pEvent);
-+    }
-+
-+    //If the user doesn't handle the standard update event then send
-+    //them the cross platform HX_SURFACE_UPDATE event don't damage the
-+    //original event structure
-+    if(!pEvent->handled && m_pUser )
-+    {
-+        HX_ASSERT(GetWindow());
-+        HXxEvent event;
-+        event.event   = HX_SURFACE_UPDATE;
-+        event.window  = GetWindow()->window;
-+        event.param1  = m_pVideoSurface;
-+        event.param2  = GetWindow();
-+        event.result  = 0;
-+        event.handled = FALSE;
-+        m_pUser->HandleEvent(&event);
-+        pEvent->handled = event.handled;
-+    }
-+
-+
-+    //reset the gc to use no region
-+    if(m_bIsChildWindow && gc)
-+    {
-+        Display* pDisp = (Display*)GetWindow()->display;
-+        XLockDisplay(pDisp);
-+        XSetClipMask(pDisp, gc, None);
-+        XUnlockDisplay(pDisp);
-+    }
-+
-+    //Handle the drawing of our arrows...
-+    _DrawArrows();
-+
-+    //Now do all our children....
-+    CHXMapPtrToPtr::Iterator i = m_ChildrenMap.Begin();
-+    for(;i!=m_ChildrenMap.End();++i)
-+    {
-+        CHXExSite* pSite = (CHXExSite*) *i;
-+        pSite->_ForwardUpdateEvent(pEvent);
-+    }
-+
-+    Release();
-+}
-+
-+UINT32 CHXExSite::_MapKeySymToHXVK(KeySym sym, UINT32& uFlags )
-+{
-+    //XXXgfw if we add the extended flag in the HX_KEYBOARD event
-+    //structure then we can modify the flags here to show that these
-+    //keys are 'extended' in the windows sense.
-+    UINT32 ulRet = 0;
-+    switch( sym )
-+    {
-+       case XK_Shift_R:
-+           ulRet = XK_Shift_L;
-+           break;
-+       case XK_Alt_R:
-+           ulRet = XK_Alt_L;
-+           break;
-+       case XK_KP_Home:
-+           ulRet = XK_Home;
-+           break;
-+       case XK_KP_Next:
-+           ulRet = XK_Next;
-+           break;
-+       case XK_KP_Prior:
-+           ulRet = XK_Prior;
-+           break;
-+       case XK_KP_Enter:
-+           ulRet = XK_Return;
-+           break;
-+       case XK_KP_End:
-+           ulRet = XK_End;
-+           break;
-+       case XK_KP_Begin:
-+           ulRet = XK_Begin;
-+           break;
-+       case XK_KP_Left:
-+           ulRet = XK_Left;
-+           break;
-+       case XK_KP_Up:
-+           ulRet = XK_Up;
-+           break;
-+       case XK_Control_R:
-+           ulRet = XK_Control_L;
-+           break;
-+       case XK_KP_Right:
-+           ulRet = XK_Right;
-+           break;
-+       case XK_KP_Down:
-+           ulRet = XK_Down;
-+           break;
-+       case XK_KP_Insert:
-+           ulRet = XK_Insert;
-+           break;
-+       case XK_KP_Delete:
-+           ulRet = XK_Delete;
-+           break;
-+       default:
-+           ulRet = sym;
-+           break;
-+    }
-+    if( ulRet != sym )
-+    {
-+        //We have mapped a key from Right hand side, keypad, arrows
-+        //or other parts of an extended keyboard. Set the flag.
-+        uFlags |= HX_EXTENDED_KEY_MASK;
-+    }
-+    return ulRet;
-+}
-+
-+
-+HXBOOL CHXExSite::_ConvertToHXEvent(HXxEvent* pEvent )
-+{
-+    // get original events info from pEvent
-+    XEvent* pXEvent = (XEvent*) pEvent->param2;
-+    XButtonEvent* buttonEvent = (XButtonEvent*) pXEvent;
-+
-+
-+    //===============================================================
-+    //   Convert all other event to RMA generic events and pass back.
-+    //===============================================================
-+    if( ((pEvent->event == ButtonPress)   ||
-+         (pEvent->event == ButtonRelease) ||
-+         (pEvent->event == MotionNotify ) ||
-+         (pEvent->event == EnterNotify)   ||
-+         (pEvent->event == FocusIn)       ||
-+         (pEvent->event == FocusOut)      ||
-+         (pEvent->event == KeyPress)      ||
-+         (pEvent->event == KeyRelease)    ||
-+         (pEvent->event == LeaveNotify))
-+        )
-+    {
-+        // set modifier flags for all events....
-+        UINT32 flags = 0;
-+
-+        // create new HXxEvent
-+        HXxEvent theEvent;
-+
-+        //XXXgfw ouch....
-+        static HXxPoint realPt = {0,0};
-+
-+        //Init certain members.
-+        memset(&theEvent, 0, sizeof(HXxEvent));
-+        theEvent.window  = pEvent->window;
-+        theEvent.handled = FALSE;
-+
-+        //
-+        // NOTE:
-+        //
-+        // theEvent must be filled in by *ALL* event types.
-+        // theEvent will be memcopied into the pEvent passed
-+        // back to the basesite at the end of the method.
-+        //
-+
-+        //==================================================
-+        // LEAVE NOTIFY EVENT
-+        //==================================================
-+        if( pEvent->event==LeaveNotify)
-+        {
-+            if( m_pTopLevelSite->m_pMouseInSite )
-+            {
-+                HXxPoint oobPoint;
-+                oobPoint.x = -1;
-+                oobPoint.y = -1;
-+                HXxEvent Outevent = { HX_MOUSE_LEAVE,
-+                                      m_pWindow->window,
-+                                      (void*)&oobPoint,
-+                                      0, 0,
-+                                      FALSE };
-+                m_pTopLevelSite->m_pMouseInSite->EventOccurred(&Outevent);
-+                m_pTopLevelSite->m_pMouseInSite = NULL;
-+            }
-+            pEvent->handled=TRUE;
-+            return TRUE;
-+        }
-+
-+        //==================================================
-+        // ENTER NOTIFY EVENT
-+        //==================================================
-+        if( pEvent->event==EnterNotify)
-+        {
-+            pEvent->handled=TRUE;
-+            return TRUE;
-+        }
-+
-+        //==================================================
-+        // KEY PRESS/RELEASE EVENT
-+        //==================================================
-+        if ( pEvent->event == KeyPress || pEvent->event==KeyRelease )
-+        {
-+            XKeyEvent* pKeyEvent = (XKeyEvent*)pEvent->param2;
-+
-+            //
-+            //Set the event type
-+            //
-+            theEvent.event = pEvent->event==KeyPress?HX_KEY_DOWN:HX_KEY_UP;
-+
-+            //
-+            // Fill in the scan/key code.
-+            //
-+            flags =  pKeyEvent->keycode;
-+            flags &= 0x000000ff; //the scan code only gets bits 0-7
-+
-+            //
-+            // build key modifier list...
-+            //
-+            if( pKeyEvent->state & ShiftMask )
-+                flags |= HX_SHIFT_MASK;
-+
-+            if( pKeyEvent->state & ControlMask )
-+                flags |= HX_CTRL_MASK;
-+
-+            if( pKeyEvent->state & LockMask )
-+                flags |= HX_CAPS_LOCK_MASK;
-+
-+            if( pKeyEvent->state & Mod1Mask)
-+                flags |= HX_ALT_MASK;
-+
-+            if( pKeyEvent->state & Mod2Mask)
-+                flags |= HX_NUM_LOCK_MASK;
-+
-+            if( pKeyEvent->state & Mod5Mask)
-+                flags |= HX_SCROLL_LOCK_MASK;
-+
-+            //
-+            //Store the char pressed.
-+            //
-+            KeySym sym;
-+            char   szBuf[10]; /* Flawfinder: ignore */
-+            int    nNum;
-+
-+            //Save the state of the keys...
-+            unsigned int unSave = pKeyEvent->state;
-+            pKeyEvent->state=0;
-+
-+            //Lookup the key without any state.
-+            nNum = XLookupString( pKeyEvent, szBuf, 10, &sym, NULL );
-+            if( nNum > 0 )
-+            {
-+                theEvent.param1 = (void*)*szBuf;
-+            }
-+            else
-+            {
-+                theEvent.param1 = (void*)_MapKeySymToHXVK(sym, flags);
-+                flags |= HX_VIRTUAL_KEY_MASK;
-+            }
-+            //restore the state of the event
-+            pKeyEvent->state = unSave;
-+
-+            //Set the flags...
-+            theEvent.param2 = (void*)flags;
-+
-+            //Check for HX_CHAR needed or not.
-+            if( theEvent.event == HX_KEY_DOWN )
-+            {
-+                //We have to send an extra HX_CHAR event
-+                HXxEvent extraEvent;
-+                memcpy( &extraEvent, &theEvent, sizeof( extraEvent ) ); /* Flawfinder: ignore */
-+
-+                //Change the type.
-+                extraEvent.event = HX_CHAR;
-+
-+                //
-+                //Change the keycode to an translated ascii char.
-+                //
-+                KeySym sym;
-+                char   szBuf[10]; /* Flawfinder: ignore */
-+                int    nNum;
-+
-+                nNum = XLookupString( pKeyEvent, szBuf, 10, &sym, NULL );
-+
-+                if( nNum > 0 )
-+                {
-+                    extraEvent.param1 = (void*)*szBuf;
-+                }
-+                else
-+                {
-+                    extraEvent.param1 = (void*)_MapKeySymToHXVK(sym, flags);
-+                    flags |= HX_VIRTUAL_KEY_MASK;
-+                }
-+                extraEvent.param2 = (void*)flags;
-+
-+                //
-+                // Now send the extra event....
-+                //
-+                CHXBaseSite::EventOccurred(&extraEvent);
-+            }
-+        }
-+
-+        //==================================================
-+        // FOCUS OUT EVENT
-+        //==================================================
-+        if ( pEvent->event == FocusOut )
-+        {
-+            theEvent.event = HX_LOSE_FOCUS;
-+        }
-+
-+        if ( pEvent->event == FocusIn )
-+        {
-+            theEvent.event = HX_SET_FOCUS;
-+        }
-+
-+        //==================================================
-+        // MOUSE MOVE EVENT
-+        //==================================================
-+        if( pEvent->event == MotionNotify )
-+        {
-+            XMotionEvent* pp = (XMotionEvent*)pEvent->param2;
-+            theEvent.event = HX_MOUSE_MOVE;
-+
-+            if( pp->state&Button1Mask )
-+                flags |= HX_PRIMARY_BUTTON;
-+
-+            if( pp->state&Button2Mask )
-+                flags |= HX_CONTEXT_BUTTON;
-+
-+            if( pp->state&Button3Mask )
-+                flags |= HX_THIRD_BUTTON;
-+
-+            if(pp->state & ShiftMask)
-+                flags |= HX_SHIFT_KEY;
-+
-+            if(pp->state & ControlMask)
-+                flags |= HX_CTRL_KEY;
-+
-+            if(pp->state & Mod1Mask)
-+                flags |= HX_ALT_COMMAND_KEY;
-+
-+            theEvent.param2 = (void*) flags;
-+
-+            //Grab the X and Y.
-+            theEvent.param1 = (void*) &realPt;
-+            realPt.x = pp->x;
-+            realPt.y = pp->y;
-+        }
-+
-+        //==================================================
-+        // BUTTON PRESS/RELEASE EVENT
-+        //==================================================
-+        if((pEvent->event == ButtonPress) || (pEvent->event == ButtonRelease))
-+        {
-+            // remap event
-+            if (pEvent->event == ButtonPress)
-+            {
-+                if (buttonEvent->button == Button3)
-+                    theEvent.event = HX_CONTEXT_BUTTON_DOWN;
-+                else
-+                    theEvent.event = HX_PRIMARY_BUTTON_DOWN;
-+            }
-+            else if (pEvent->event == ButtonRelease)
-+            {
-+                if (buttonEvent->button == Button3)
-+                    theEvent.event = HX_CONTEXT_BUTTON_UP;
-+                else
-+                    theEvent.event = HX_PRIMARY_BUTTON_UP;
-+            }
-+
-+            if(buttonEvent->state & ShiftMask)
-+                flags |= HX_SHIFT_KEY;
-+
-+            if(buttonEvent->state & ControlMask)
-+                flags |= HX_CTRL_KEY;
-+
-+            theEvent.param2 = (void*) flags;
-+
-+            //Grab the X and Y.
-+            theEvent.param1 = (void*) &realPt;
-+            realPt.x = buttonEvent->x;
-+            realPt.y = buttonEvent->y;
-+        }
-+
-+        //Copy the new event back into the passed in one for
-+        //all events that fall through here...
-+        memcpy( pEvent, &theEvent, sizeof(HXxEvent) ); /* Flawfinder: ignore */
-+
-+#if defined(_DEBUG)
-+        //If the users presses control-primary button
-+        //dump info on all sites. If shift-context, then
-+        //just this site.
-+        if( (buttonEvent->state&ControlMask)&&
-+            (theEvent.event==HX_PRIMARY_BUTTON_DOWN))
-+        {
-+            DisplayAllSiteData();
-+        }
-+        if( (buttonEvent->state&ShiftMask)&&
-+            (theEvent.event==HX_PRIMARY_BUTTON_DOWN))
-+        {
-+            DisplaySiteData("");
-+        }
-+#endif
-+    }
-+    return pEvent->handled;
-+}
-+
-+
-+void CHXExSite::CheckColorSettings()
-+{
-+#if !defined(HELIX_FEATURE_HARDWARE_COLOR_CONTROLS)
-+    CHXBaseSite::CheckColorSettings();
-+#else
-+    CUnixSurf* pSurf = (CUnixSurf*)m_pVideoSurface;
-+    if( !pSurf->HasHWColorConrols() )
-+    {
-+        CHXBaseSite::CheckColorSettings();
-+    }
-+    else
-+    {
-+        pSurf->SetHWColorControls();
-+        
-+        //We do all color stuff except sharpmess in hardware.
-+        float fCurrentSharpness;
-+        INT16 bInterpolate;
-+        zm_pColorAcc->GetSharpnessAdjustments(&fCurrentSharpness, &bInterpolate);
-+        
-+        if (fCurrentSharpness != m_fSharpness)
-+        {
-+            zm_pColorAcc->SetSharpnessAdjustments(m_fSharpness, FALSE);
-+        }
-+    }
-+#endif
-+}
-+
-+//
-+// OK, here it is. Take care of any OS specific duties, like scrollbar
-+// stuff and expose events. Then, if the event isn't handled, convert
-+// to an RMA event and return.
-+HXBOOL CHXExSite::_HandleOSEvents(HXxEvent* pEvent)
-+{
-+    HXxPoint position = {0, 0};
-+    HXxPoint point;
-+
-+    if( NULL==pEvent )
-+    {
-+        return FALSE;
-+    }
-+
-+    return TRUE;
-+
-+#if defined(_DEBUG) && 0
-+//   fprintf( stderr, "this: %p m_pUser: %p ", this, m_pUser );
-+    switch( pEvent->event )
-+    {
-+       case HX_MOUSE_LEAVE:
-+           fprintf( stderr, "HX_MOUSE_LEAVE\n" );
-+           break;
-+//        case HX_MOUSE_MOVE:
-+//           point.x = ((HXxPoint*)pEvent->param1)->x;
-+//           point.y = ((HXxPoint*)pEvent->param1)->y;
-+//           fprintf( stderr, "HX_MOUSE_MOVE: %d %d\n", point.x, point.y );
-+//           break;
-+       case HX_MOUSE_ENTER:
-+           fprintf( stderr, "HX_MOUSE_ENTER\n" );
-+           break;
-+//        case MotionNotify:
-+//           point.x = ((XMotionEvent*)pEvent->param2)->x;
-+//           point.y = ((XMotionEvent*)pEvent->param2)->y;
-+//           fprintf( stderr, "MotionNotify: %d %d\n", point.x, point.y );
-+//           break;
-+       case Expose:
-+           fprintf( stderr, "Expose\n" );
-+           break;
-+       case EnterNotify :
-+           fprintf( stderr, "EnterNotify\n" );
-+           break;
-+       case LeaveNotify:
-+           fprintf( stderr, "LeaveNotify\n" );
-+           break;
-+       case KeyPress:
-+           fprintf( stderr, "this: %p m_pUser: %p ", this, m_pUser );
-+           fprintf( stderr, "Keypress\n\n" );
-+           break;
-+       case KeyRelease:
-+           fprintf( stderr, "this: %p m_pUser: %p ", this, m_pUser );
-+           fprintf( stderr, "KeyRelease\n" );
-+           break;
-+       default:
-+           fprintf( stderr, "Other\n" );
-+           break;
-+    }
-+#endif
-+
-+    //Find the ConfigureNotify events so we can drop to RGB from
-+    //overlay while we move....
-+//     if( pEvent->event == ConfigureNotify && this==m_pTopLevelSite )
-+//     {
-+//        XConfigureEvent* pev = (XConfigureEvent*)pEvent->param2;
-+//        if( m_pWindow && pev->window == (Window)m_pWindow->window )
-+//        {
-+//           HXxPoint p;
-+//           _GetPositionRelativeToActualWindow( p );
-+//  //           fprintf( stderr, "wint %p  -- x,y width, height: %d %d %d %d \n",
-+//  //                    pev->window,
-+//  //                    pev->x, pev->y, pev->width, pev->height);
-+//  //           fprintf( stderr, "size of site: %d %d\n", m_size.cx, m_size.cy);
-+//  //           fprintf( stderr, "pos of site: %d %d\n", m_topleft.x, m_topleft.y);
-+//           m_pTopLevelSite->m_pMutex->Lock();
-+//           m_pTopLevelSite->SiteMoving(0, 0);
-+//           m_pTopLevelSite->m_nLastMoveTime = HX_GET_TICKCOUNT();
-+//           m_pTopLevelSite->ScheduleCallback(MOUSE, 100);
-+//           m_pTopLevelSite->m_pMutex->Unlock();
-+//        }
-+//     }
-+
-+    //See if we should drop out of full screen
-+    if( pEvent->event == FocusOut && IsFullScreen() && !m_bIgnoreFocusOutInFS )
-+    {
-+//         fprintf( stderr, "_HandleOSEvents: focus out: " );
-+//         XEvent* pXEvent = (XEvent*) pEvent->param2;
-+//         XFocusChangeEvent* event = (XFocusChangeEvent*) pXEvent;
-+//         switch( event->mode )
-+//         {
-+//            case NotifyAncestor:
-+//                fprintf( stderr, "NotifyAncestor\n" );
-+//                break;
-+//            case NotifyVirtual:
-+//                fprintf( stderr, "NotifyVirtual\n" );
-+//                break;
-+//            case NotifyInferior:
-+//                fprintf( stderr, "NotifyInferior\n" );
-+//                break;
-+//            case NotifyNonlinear:
-+//                fprintf( stderr, "NotifyNonlinear\n" );
-+//                break;
-+//            case NotifyNonlinearVirtual:
-+//                fprintf( stderr, "NotifyNonlinearVirtual\n" );
-+//                break;
-+//            case NotifyPointer:
-+//                fprintf( stderr, "NotifyPointer\n" );
-+//                break;
-+//            case NotifyPointerRoot:
-+//                fprintf( stderr, "NotifyPointerRoot\n" );
-+//                break;
-+//            case NotifyDetailNone:
-+//                fprintf( stderr, "NotifyDetailNone\n" );
-+//                break;
-+//            default:
-+//                fprintf( stderr, "screwed.....\n" );
-+//         }
-+        ExitFullScreen();
-+    }
-+
-+
-+#if defined(_DEBUG) && defined(TEST_FULL_SCREEN)
-+    if( pEvent->event == KeyPress )
-+    {
-+        KeySym sym;
-+        char   szBuf[10]; /* Flawfinder: ignore */
-+        int    nNum;
-+
-+        //Lookup the key without any state.
-+        nNum = XLookupString( (XKeyEvent*)(pEvent->param2), szBuf, 10, &sym, NULL );
-+        if( nNum > 0 )
-+        {
-+            if( 'f' == szBuf[0] && IsFullScreen() )
-+            {
-+                //Exit full screen if 'f' is pressed.....
-+                m_pTopLevelSite->ExitFullScreen();
-+            }
-+            else if( 'f' == szBuf[0] && !IsFullScreen() )
-+            {
-+                //Enter full screen if 'f' is pressed.....
-+                m_pTopLevelSite->EnterFullScreen();
-+            }
-+
-+        }
-+
-+    }
-+#endif
-+
-+#if defined(_DEBUG) && defined(_TEST_COLOR_CONTROLS)
-+    if( pEvent->event == KeyPress )
-+    {
-+        KeySym sym;
-+        char   szBuf[10]; /* Flawfinder: ignore */
-+        int    nNum;
-+
-+        //Lookup the key without any state.
-+        nNum = XLookupString( (XKeyEvent*)(pEvent->param2), szBuf, 10, &sym, NULL );
-+        if( nNum > 0 )
-+        {
-+            if( 'b' == szBuf[0] )
-+            {
-+                SetBrightness( GetBrightness()-.05);
-+            }
-+            if( 'B' == szBuf[0] )
-+            {
-+                SetBrightness( GetBrightness()+.05);
-+            }
-+
-+            if( 'c' == szBuf[0] )
-+            {
-+                SetContrast( GetContrast()-.05);
-+            }
-+            if( 'C' == szBuf[0] )
-+            {
-+                SetContrast( GetContrast()+.05);
-+            }
-+
-+            if( 'h' == szBuf[0] )
-+            {
-+                SetHue( GetHue()-.05);
-+            }
-+            if( 'H' == szBuf[0] )
-+            {
-+                SetHue( GetHue()+.05 );
-+            }
-+
-+            if( 's' == szBuf[0] )
-+            {
-+                SetSaturation( GetSaturation()-.05);
-+            }
-+            if( 'S' == szBuf[0] )
-+            {
-+                SetSaturation( GetSaturation()+.05);
-+            }
-+            fprintf( stderr, "colors %f %f %f %f\n",
-+                     GetBrightness(),
-+                     GetContrast(),
-+                     GetSaturation(),
-+                     GetHue());
-+        }
-+
-+    }
-+#endif
-+
-+    //Exit full screen on ESC pressed......
-+    if( pEvent->event == KeyPress )
-+    {
-+        KeySym sym;
-+        char   szBuf[10]; /* Flawfinder: ignore */
-+        int    nNum;
-+
-+        //Lookup the key without any state.
-+        nNum = XLookupString( (XKeyEvent*)(pEvent->param2), szBuf, 10, &sym, NULL );
-+        if( nNum > 0 )
-+        {
-+            if( 27 == (int)szBuf[0] && IsFullScreen() )
-+            {
-+                //Exit full screen if esc is pressed.....
-+                m_pTopLevelSite->ExitFullScreen();
-+            }
-+        }
-+    }
-+
-+    //Find out if this is an event we are interested in.  Make sure we
-+    //are visible, it isn't a button, expose or FocusIn event and also
-+    //make sure it is headed for our window.
-+    if (!_ShouldProcess(pEvent))
-+    {
-+        return FALSE;
-+    }
-+
-+
-+    if(m_pUser && GetWindow() && GetWindow()->window)
-+    {
-+        //Do not send an update event to a hidden site.
-+        if( pEvent->event == Expose ||
-+            pEvent->event == FocusIn  ||
-+            pEvent->event == HX_SURFACE_UPDATE )
-+        {
-+            if( (m_ScrollVertButtonT || m_ScrollHorizButtonR) && IsSiteVisible() )
-+            {
-+                _DrawArrows();
-+            }
-+            _ForwardUpdateEvent(pEvent);
-+            return TRUE;
-+        }
-+        else
-+        {
-+            // get original events info from pEvent
-+            XEvent* pXEvent = (XEvent*) pEvent->param2;
-+            XButtonEvent* buttonEvent = (XButtonEvent*) pXEvent;
-+
-+
-+            //XXXgfw all this code sucks! It really need to be written
-+            //for just native events or RMA events. With the change to a
-+            //common site it is all screwed up. I am leaving it for now
-+            //so we can get on with transparancy but get back to it!
-+
-+            //If the user clicks MB1 on a scroll button, handle it here and
-+            //don't pass it up or let the user handle the event.
-+            //Hit detection here.
-+
-+            ////////////////////////////////////////////////////////
-+            // BEGIN SCROLLING GARBAGE
-+            ////////////////////////////////////////////////////////
-+            if(
-+                ((pEvent->event==ButtonPress || pEvent->event==ButtonRelease) &&
-+                 buttonEvent->button==Button1) &&
-+                (m_ScrollHorizButtonL || m_ScrollVertButtonB )
-+                )
-+            {
-+                int buttonX=0;
-+                int buttonY=0;
-+
-+                if( pEvent->event==ButtonRelease )
-+                {
-+                    if( m_bScrollingInProgress )
-+                    {
-+                        m_bScrollingInProgress = FALSE;
-+                        m_nScrollDir = 0;
-+                        return TRUE ;
-+                    }
-+                }
-+                else
-+                {
-+                    buttonX = buttonEvent->x;
-+                    buttonY = buttonEvent->y;
-+
-+                    HXBOOL bPointInSite = FALSE;
-+                    if( m_Region )
-+                        bPointInSite = HXPointInRegion(m_Region, buttonX, buttonY);
-+
-+                    if( bPointInSite )
-+                    {
-+                        if( m_ScrollHorizButtonL )
-+                        {
-+                            if( _InButton( m_ptScrollHorizPosL, buttonX, buttonY ))
-+                            {
-+                                m_bScrollingInProgress = TRUE;
-+                                m_nScrollDir = 1;
-+                            }
-+                            if( _InButton( m_ptScrollHorizPosR, buttonX, buttonY ))
-+                            {
-+                                m_bScrollingInProgress = TRUE;
-+                                m_nScrollDir = 2;
-+                            }
-+                        }
-+                        if( m_ScrollVertButtonT )
-+                        {
-+                            if( _InButton( m_ptScrollVertPosT, buttonX, buttonY ))
-+                            {
-+                                m_bScrollingInProgress = TRUE;
-+                                m_nScrollDir = 3;
-+                            }
-+                            if( _InButton( m_ptScrollVertPosB, buttonX, buttonY ))
-+                            {
-+                                m_bScrollingInProgress = TRUE;
-+                                m_nScrollDir = 4;
-+                            }
-+                        }
-+                    }
-+                }
-+
-+                if( (m_ScrollHorizButtonL||m_ScrollVertButtonT) && m_bScrollingInProgress)
-+                {
-+                    int xx=0;
-+                    int yy=0;
-+                    HXxWindow* pParentWindow = GetParentSite()->GetWindow();
-+                    //Make it scroll 10% of the parent window each click.
-+                    HXxSize sizeTmp;
-+                    GetParentSite()->GetSize(sizeTmp);
-+
-+                    //Set it to a percentage of the slider range.
-+                    int incX = sizeTmp.cx/10;
-+                    int incY = sizeTmp.cy/10;
-+
-+                    HX_ASSERT( pParentWindow );
-+
-+                    xx = m_XSliderPos;
-+                    yy = m_YSliderPos;
-+
-+                    if( m_nScrollDir == 1 )
-+                        xx-=incX;
-+                    if( m_nScrollDir == 2 )
-+                        xx+=incX;
-+                    if( m_nScrollDir == 3 )
-+                        yy-=incY;
-+                    if( m_nScrollDir == 4 )
-+                        yy+=incY;
-+
-+                    if( xx > m_size.cx-sizeTmp.cx )
-+                        xx = m_size.cx-sizeTmp.cx;
-+                    if( yy > m_size.cy-sizeTmp.cy)
-+                        yy = m_size.cy-sizeTmp.cy;
-+
-+                    if( xx < 0 )
-+                        xx = 0;
-+                    if( yy < 0 )
-+                        yy = 0;
-+
-+                    m_XSliderPos = xx;
-+                    m_YSliderPos = yy;
-+
-+                    HXxRect rect;
-+                    DamageRect(rect);
-+
-+                    InternalForceRedraw();
-+                }
-+                //Only throw away the event if it had something to do with
-+                //scolling.
-+                if( m_bScrollingInProgress )
-+                {
-+                    m_bScrollingInProgress = FALSE;
-+                    m_nScrollDir = 0;
-+                    return TRUE;
-+                }
-+            }
-+            ////////////////////////////////////////////////////////
-+            // END SCROLLING GARBAGE
-+            ////////////////////////////////////////////////////////
-+            point.x = -1;
-+            point.y = -1;
-+
-+            if( pEvent->event == MotionNotify)
-+            {
-+                point.x = ((XMotionEvent*)pXEvent)->x;
-+                point.y = ((XMotionEvent*)pXEvent)->y;
-+            }
-+            else if( pEvent->event == ButtonPress )
-+            {
-+                point.x = ((XMotionEvent*)pXEvent)->x;
-+                point.y = ((XMotionEvent*)pXEvent)->y;
-+            }
-+
-+            //
-+            //Give the user a chance at the native event.
-+            //
-+            if( m_RegionWithoutChildren && HXPointInRegion(m_RegionWithoutChildren, point.x, point.y ))
-+            {
-+                if( m_Region && HXPointInRegion(m_Region, point.x, point.y) )
-+                {
-+                    if (m_pUser)
-+                        m_pUser->HandleEvent(pEvent);
-+                }
-+                else
-+                {
-+                    INT32 handledCount = 0;
-+                    INT32 mapCount     = 0;
-+
-+                    //try send this to all of our children
-+                  _unixsitecpp1:
-+                    mapCount = m_ChildrenMap.GetCount();
-+                    CHXMapPtrToPtr::Iterator i;
-+                    for(i=m_ChildrenMap.Begin() ; i!=m_ChildrenMap.End() ; ++i)
-+                    {
-+                        CHXBaseSite* pSite = (CHXBaseSite*) *i;
-+                        pSite->_HandleOSEvents(pEvent);
-+                        if (pEvent->handled)
-+                        {
-+                            break;
-+                        }
-+                        handledCount+=pEvent->handled;
-+                        pEvent->handled=0;
-+
-+                        if (m_ChildrenMap.GetCount() != mapCount)
-+                        {
-+                            goto _unixsitecpp1;
-+                        }
-+                    }
-+                    if (handledCount)
-+                    {
-+                        pEvent->handled = 1;
-+                    }
-+                    HX_ASSERT(handledCount<2);
-+                }
-+            }
-+            pEvent->handled=FALSE;
-+        }
-+    }
-+
-+    return FALSE;
-+}
-+
-+void CHXExSite::_GenerateOSEvent(HXxEvent* pEvent, HXxEvent* pEvent2)
-+{
-+    //XXXgfw Not needed on UNIX I guess???
-+}
-+
-+void CHXExSite::_GenerateSetCursorEvent()
-+{
-+#ifdef _DEBUG
-+    fprintf( stderr, "CHXExSite::_GenerateSetCursorEvent\n" );
-+#endif
-+    //XXXgfw do we need this??
-+}
-+
-+void CHXExSite::_TryCreateXSlider()
-+{
-+#if 0
-+    if( !m_ScrollHorizButtonL && IsSiteVisible() )
-+        _CreateHorizScrollBar();
-+#endif
-+}
-+
-+void CHXExSite::_SetXSliderValues(INT32 range, INT32 pageSize)
-+{
-+    //XXXgfw this is a do nothing as long as we only have
-+    //scroll buttons on unix and not real scroll bars.
-+}
-+
-+void CHXExSite::_TryCreateYSlider()
-+{
-+#if 0
-+    if( !m_ScrollVertButtonT && IsSiteVisible() )
-+        _CreateVertScrollBar();
-+#endif
-+}
-+
-+void CHXExSite::_SetYSliderValues(INT32 range, INT32 pageSize)
-+{
-+    //XXXgfw this is a do nothing as long as we only have
-+    //scroll buttons on unix and not real scroll bars.
-+}
-+
-+void CHXExSite::_GetSystemSizeOfSliders(INT32* pWidth, INT32* pHeight)
-+{
-+#if 0
-+    *pWidth = *pHeight = SCROLL_BAR_WIDTH;
-+#endif
-+}
-+
-+HXBOOL CHXExSite::_IsWindowVisible()
-+{
-+#if 0
-+    HX_RESULT retVal = FALSE;
-+    //XXXgfw do this for now...
-+    retVal = IsSiteVisible();
-+    return retVal;
-+#else
-+    return FALSE;
-+#endif
-+
-+}
-+
-+void CHXExSite::_ShowXSlider(HXBOOL bShow)
-+{
-+#if 0
-+    if( GetWindow() )
-+    {
-+        if( bShow )
-+            _MapHorzScroll();
-+        else
-+            _UnmapHorzScroll();
-+    }
-+#endif
-+}
-+
-+void CHXExSite::_MoveXSlider( INT32 left,
-+                                INT32 top,
-+                                INT32 right,
-+                                INT32 bottom,
-+                                HXBOOL bRedraw )
-+{
-+    //Do nothing right now....
-+}
-+
-+void CHXExSite::_ShowYSlider(HXBOOL bShow)
-+{
-+#if 0
-+    if( GetWindow() )
-+    {
-+        if( bShow )
-+            _MapVertScroll();
-+        else
-+            _UnmapVertScroll();
-+    }
-+#endif
-+}
-+
-+void CHXExSite::_MoveYSlider( INT32 left,
-+                                INT32 top,
-+                                INT32 right,
-+                                INT32 bottom,
-+                                HXBOOL bRedraw)
-+{
-+    //do nothing right now...
-+}
-+
-+HXBOOL CHXExSite::_DoesXSliderExist()
-+{
-+    return FALSE;
-+//    return (m_ScrollHorizButtonL!=0);
-+}
-+
-+void* CHXExSite::_GetContainingWindow()
-+{
-+    //XXXgfw Do we need this???
-+    return NULL;
-+}
-+
-+void CHXExSite::_GetCursorPos(HXxPoint* pPoint)
-+{
-+    //Return the cursor pos in screen coords.
-+    Window rootWin;
-+    Window childWin;
-+    int rootX=0;
-+    int rootY=0;
-+    int childX=0;
-+    int childY=0;
-+    unsigned int mask=0;
-+    Bool ret=FALSE;
-+
-+    HX_ASSERT(GetWindow());
-+    Display* pDis = (Display*)GetWindow()->display;
-+    XLockDisplay(pDis);
-+    ret = XQueryPointer(pDis,
-+                        (Window)GetWindow()->window,
-+                        &rootWin,
-+                        &childWin,
-+                        &rootX, &rootY,
-+                        &childX, &childY,
-+                        &mask);
-+    XUnlockDisplay(pDis);
-+
-+    if(ret)
-+    {
-+        pPoint->x = rootX;
-+        pPoint->y = rootY;
-+    }
-+}
-+void* CHXExSite::_GetWindowWithCursor()
-+{
-+#if 0
-+    //Return the cursor pos in screen coords.
-+    void*        pRet  = NULL;
-+    int          rootX = 0;
-+    int          rootY = 0;
-+    int          childX= 0;
-+    int          childY= 0;
-+    unsigned int mask  = 0;
-+    Bool         ret   = FALSE;
-+    Window       rootWin;
-+    Window       childWin;
-+
-+    HX_ASSERT(GetWindow());
-+    Display* pDis = (Display*)GetWindow()->display;
-+    XLockDisplay(pDis);
-+    ret = XQueryPointer(pDis,
-+                        (Window)GetWindow()->window,
-+                        &rootWin,
-+                        &childWin,
-+                        &rootX, &rootY,
-+                        &childX, &childY,
-+                        &mask);
-+    XUnlockDisplay(pDis);
-+
-+    if(ret)
-+    {
-+        pRet = (void*)childWin;
-+    }
-+    return pRet;
-+#else
-+     HX_ASSERT( "Not implemented..." == NULL );
-+     return NULL;
-+#endif
-+}
-+
-+void CHXExSite::_MapPointToOSWindow(HXxPoint* pPt, void** pWindowHandle)
-+{
-+    //XXXgfw we could query the window tree and traverse down but that
-+    //is really slow and this isn't used right now.
-+    HX_ASSERT( "Not implemented..." == NULL );
-+}
-+
-+void CHXExSite::_ReInitPrimarySurface()
-+{
-+    //Nothing to do in unix here right?
-+}
-+
-+HXBOOL CHXExSite::_MoveWindow( void* win,
-+                               INT32 X,
-+                               INT32 Y,
-+                               INT32 nWidth,
-+                               INT32 nHeight,
-+                               HXBOOL bRepaint)
-+{
-+#if 0
-+    //XXXgfw we still have to do bRepaint....
-+    HX_ASSERT( m_pWindow && m_pWindow->window && m_pWindow->display);
-+    _DestroyScrollButtons();
-+    XLockDisplay((Display*) m_pWindow->display);
-+    XMoveResizeWindow( (Display*)m_pWindow->display,
-+                       (Window)m_pWindow->window,
-+                       X,
-+                       Y,
-+                       nWidth,
-+                       nHeight
-+                       );
-+    XUnlockDisplay((Display*) m_pWindow->display);
-+#else
-+    HX_ASSERT( "Not implemented..." == NULL );
-+#endif
-+    return TRUE;
-+}
-+
-+HXBOOL CHXExSite::_UpdateWindow(void* hWnd)
-+{
-+    //We need to generate a repaint here of the window....
-+    return TRUE;
-+}
-+
-+HXBOOL CHXExSite::_ShowWindow(void* hWnd, INT32 nCmdShow)
-+{
-+#if 0
-+    HX_ASSERT( nCmdShow==HX_SHOW_WINDOW || nCmdShow==HX_HIDE_WINDOW);
-+    if( !m_pWindow || !m_pWindow->window || !m_pWindow->display )
-+        return FALSE;
-+
-+    if( nCmdShow == HX_SHOW_WINDOW )
-+    {
-+        _MapScrollButtons();
-+        XLockDisplay((Display*) m_pWindow->display);
-+        XMapWindow( (Display*)m_pWindow->display, (Window)m_pWindow->window );
-+        XUnlockDisplay((Display*) m_pWindow->display);
-+    }
-+    else
-+    {
-+        _UnmapScrollButtons();
-+        XLockDisplay((Display*) m_pWindow->display);
-+        XUnmapWindow( (Display*)m_pWindow->display, (Window)m_pWindow->window );
-+        XUnlockDisplay((Display*) m_pWindow->display);
-+    }
-+#endif
-+    return TRUE;
-+}
-+
-+HXBOOL CHXExSite::_SetWindowPos(void* hWnd,
-+                                void* hWndInsertAfter,
-+                                INT32 X,
-+                                INT32 Y,
-+                                INT32 cx,
-+                                INT32 cy,
-+                                INT32 uFlags)
-+{
-+#ifdef _DEBUG
-+    fprintf( stderr, "Now what on earth is this suppose to do??\n" );
-+#endif
-+    return TRUE;
-+}
-+
-+HXBOOL CHXExSite::_SetWindowRgn(void* hWnd, HXREGION* hRgn, HXBOOL bRedraw)
-+{
-+#if 0
-+    HX_ASSERT( GetWindow() );
-+    Display* pDis = (Display*)GetWindow()->display;
-+    XLockDisplay(pDis);
-+    XSetRegion( pDis,
-+                (GC)m_pVideoSurface->_GetDC(NULL),
-+                (Region)hRgn
-+                );
-+    XUnlockDisplay(pDis);
-+    if( bRedraw )
-+    {
-+        HX_ASSERT("Redraw asked for here"==NULL );
-+    }
-+#endif
-+    return TRUE;
-+}
-+
-+void CHXExSite::_SetFocus(void* pWindow)
-+{
-+#if 0
-+    XWindowAttributes attr;
-+    HXxWindow*        pWin = GetWindow();
-+
-+    HX_ASSERT(pWin);
-+    HX_ASSERT(pWindow);
-+
-+    XLockDisplay((Display*) pWin->display);
-+    XGetWindowAttributes((Display*)pWin->display, (Window)pWindow, &attr);
-+    XUnlockDisplay((Display*) pWin->display);
-+    if( attr.map_state == IsViewable )
-+    {
-+        XLockDisplay((Display*) pWin->display);
-+        XSetInputFocus( (Display*)pWin->display,
-+                        (Window)pWindow,
-+                        RevertToParent,
-+                        CurrentTime
-+                        );
-+        XUnlockDisplay((Display*) pWin->display);
-+    }
-+
-+    return;
-+#endif
-+}
-+
-+HX_RESULT CHXExSite::_EnterFullScreen(HXxWindow* pWindow)
-+{
-+#if 0
-+    HXxWindow* pWin = GetWindow();
-+    HX_ASSERT( pWin && pWin->display && pWin->display);
-+    HX_ASSERT( this == m_pTopLevelSite );
-+
-+    if( 0 != m_winFullScreenWindow || IsFullScreen() )
-+    {
-+        //We are already in full screen
-+        return HXR_FAIL;
-+    }
-+
-+    //Create a override redirect window to fill the root.
-+    XSizeHints           size_hints;
-+    XLockDisplay((Display*) pWin->display);
-+    Screen*              pScreen = XDefaultScreenOfDisplay((Display*)pWin->display);
-+    XUnlockDisplay((Display*) pWin->display);
-+    UINT16               uHorzRes = WidthOfScreen(pScreen);
-+    UINT16               uVertRes = HeightOfScreen(pScreen);
-+    int                  attrMask = 0;
-+    XSetWindowAttributes attr;
-+
-+    memset(&attr, 0, sizeof(XSetWindowAttributes));
-+    attrMask = CWOverrideRedirect | CWBorderPixel |
-+        CWBackPixel | CWCursor;
-+    attr.cursor = None;
-+    attr.override_redirect = True;
-+    XLockDisplay((Display*)pWin->display);
-+    attr.background_pixel = BlackPixel((Display*)pWin->display,
-+                                       DefaultScreen((Display*)pWin->display));
-+    attr.border_pixel     = BlackPixel((Display*)pWin->display,
-+                                       DefaultScreen((Display*)pWin->display));
-+    XUnlockDisplay((Display*)pWin->display);
-+
-+    size_hints.flags  = PPosition | PSize;
-+    size_hints.x      = 0;
-+    size_hints.y      = 0;
-+    size_hints.width  = uHorzRes;
-+    size_hints.height = uVertRes;
-+
-+    //Create it.
-+    XLockDisplay((Display*) pWin->display);
-+    Window window = XCreateWindow((Display*)pWin->display,
-+                                  DefaultRootWindow((Display*)pWin->display),
-+                                  size_hints.x,
-+                                  size_hints.y,
-+                                  size_hints.width,
-+                                  size_hints.height,
-+                                  0,
-+                                  CopyFromParent,
-+                                  InputOutput,
-+                                  CopyFromParent,
-+                                  attrMask,
-+                                  &attr);
-+
-+    //Tell the WM about this window.
-+    XSetStandardProperties( (Display*)pWin->display,
-+                            window,
-+                            "unixfullscreen",
-+                            "unixfullscreen",
-+                            None,
-+                            NULL, 0,
-+                            &size_hints
-+                            );
-+
-+    int result = XSelectInput( zm_display, window,
-+                               ButtonPressMask   | ButtonReleaseMask | KeyPressMask    |
-+                               KeyReleaseMask    | EnterWindowMask   | LeaveWindowMask |
-+                               PointerMotionMask | ButtonMotionMask  | KeymapStateMask |
-+                               ExposureMask      | StructureNotifyMask | FocusChangeMask
-+                               );
-+
-+    //Map the window.
-+    XMapWindow((Display*)pWin->display, window);
-+    XUnlockDisplay((Display*) pWin->display);
-+
-+
-+    //Get ready to resize the presentation....
-+    if(m_pTopLevelSite)
-+    {
-+        m_pTopLevelSite->m_bDisableForceRedraw = TRUE;
-+    }
-+
-+    //Maintain aspect ratio and Scale it.
-+    float fXScale   = (float)uHorzRes/(float)(m_size.cx);
-+    float fYScale   = (float)uVertRes/(float)(m_size.cy);
-+    float fScale    = (fXScale<fYScale) ? fXScale : fYScale;
-+    int nWidth      = (int)(fScale*m_size.cx+.5);
-+    int nHeight     = (int)(fScale*m_size.cy+.5);
-+
-+    //Center the presentation and save the old size
-+    memcpy( &m_PreFullScreenSize, &m_size, sizeof( HXxSize) ); /* Flawfinder: ignore */
-+    HXxSize size = {nWidth, nHeight};
-+
-+    if( nWidth<uHorzRes )
-+        m_ptFullScreenOffset.x = (uHorzRes-nWidth)/2;
-+
-+    if( nHeight<uVertRes )
-+        m_ptFullScreenOffset.y = (uVertRes-nHeight)/2;
-+
-+    //Reparent our main window.......
-+    Window       winRootParent = 0;
-+    Window       winParent     = 0;
-+    Window*      pwinChildren  = NULL;
-+    unsigned int nNumChildren  = 0;
-+    XLockDisplay((Display*) pWin->display);
-+    XQueryTree( (Display*)pWin->display,
-+                (Window)pWin->window,
-+                &winRootParent,
-+                &winParent,
-+                &pwinChildren,
-+                &nNumChildren
-+                );
-+    //Free unused children list.
-+    XFree( pwinChildren );
-+    XUnlockDisplay((Display*) pWin->display);
-+
-+    HX_ASSERT( winParent );
-+    m_winOldParent = winParent;
-+    XLockDisplay((Display*) pWin->display);
-+    XReparentWindow( (Display*)pWin->display,
-+                     (Window)pWin->window,
-+                     window,
-+                     m_ptFullScreenOffset.x,
-+                     m_ptFullScreenOffset.y
-+                     );
-+
-+    //Flush event queue.
-+    XSync((Display*)pWin->display, False);
-+    XUnlockDisplay((Display*) pWin->display);
-+
-+    //Save it
-+    m_winFullScreenWindow = window;
-+    m_bInFullScreen = TRUE;
-+
-+    //Now resize it...
-+    SetSize(m_size);
-+    //Redraw the presentation....
-+    m_pTopLevelSite->m_bDisableForceRedraw = FALSE;
-+    _ForceRedrawAll();
-+
-+    //Give it focus....
-+    _SetFocus( (void*)pWin->window );
-+
-+    // now eat all the focusouts that came as a result of this reparent...
-+    XEvent event;
-+    XLockDisplay((Display*) pWin->display);
-+    HXBOOL status   =  XCheckTypedWindowEvent((Display*)pWin->display, (Window)pWin->window,
-+                                            FocusOut, &event);
-+    XUnlockDisplay((Display*) pWin->display);
-+    while (m_bWindowCreatedByCreate && status)
-+    {
-+        // just discarding these
-+        XLockDisplay((Display*) pWin->display);
-+        status   =  XCheckTypedWindowEvent((Display*)pWin->display, (Window)pWin->window,
-+                                           FocusOut, &event);
-+        XUnlockDisplay((Display*) pWin->display);
-+    }
-+
-+    //Update the status text...
-+    if(m_pStatusText)
-+    {
-+        m_pStatusText->ParentChangedSize();
-+        m_pStatusText->Show();
-+    }
-+
-+#else
-+    HX_ASSERT( "Not implemented..." == NULL );
-+#endif
-+    return HXR_OK;
-+}
-+
-+HX_RESULT CHXExSite::_ExitFullScreen()
-+{
-+#if 0
-+    HX_ASSERT( this == m_pTopLevelSite );
-+
-+    HXxWindow* pWin = GetWindow();
-+
-+    HX_ASSERT( pWin && pWin->display && pWin->window );
-+
-+    //Give the window back to the TLC.
-+
-+    XLockDisplay((Display*) pWin->display);
-+    XReparentWindow( (Display*)pWin->display,
-+                     (Window)pWin->window,
-+                     m_winOldParent,
-+                     m_position.x, m_position.y
-+                     );
-+    XUnlockDisplay((Display*) pWin->display);
-+
-+    //Just kill our window and take us out of full screen....
-+    if( 0 != m_winFullScreenWindow )
-+    {
-+        XLockDisplay((Display*) pWin->display);
-+        XDestroyWindow( (Display*)pWin->display, m_winFullScreenWindow );
-+        XUnlockDisplay((Display*) pWin->display);
-+        m_winFullScreenWindow = 0;
-+    }
-+
-+    m_bDisableForceRedraw = TRUE;
-+
-+    m_bInFullScreen = FALSE;
-+    HXxSize size = {0,0};
-+    memcpy( &size, &m_PreFullScreenSize, sizeof(HXxSize) ); /* Flawfinder: ignore */
-+    m_PreFullScreenSize.cx = m_PreFullScreenSize.cy = 0;
-+
-+    SetSize(size);
-+    _SetFocus( (void*)pWin->window );
-+    m_ptFullScreenOffset.x = 0;
-+    m_ptFullScreenOffset.y = 0;
-+
-+
-+    m_bDisableForceRedraw = FALSE;
-+    _ForceRedrawAll();
-+
-+    if(m_pStatusText)
-+    {
-+        m_pStatusText->ParentChangedSize();
-+        m_pStatusText->Hide();
-+    }
-+
-+    //move the site back to where it was.
-+    if( m_pTopLevelSite )
-+    {
-+        m_pTopLevelSite->_SetPosition(m_CreateWindowPos);
-+    }
-+
-+    return HXR_OK;
-+#else
-+    HX_ASSERT( "Not implemented..." == NULL );
-+#endif
-+}
-+
-+HX_RESULT CHXExSite::_EnterFullScreenNoNewWindow()
-+{
-+#if 0
-+    HXxWindow* pWin = GetWindow();
-+
-+    HX_ASSERT( pWin && pWin->display && pWin->display);
-+    HX_ASSERT( this == m_pTopLevelSite );
-+
-+    if(IsFullScreen() || !pWin)
-+    {
-+        //We are already in full screen
-+        return HXR_FAIL;
-+    }
-+
-+    //Get the screen size.
-+    XLockDisplay((Display*) pWin->display);
-+    Screen*              pScreen = XDefaultScreenOfDisplay((Display*)pWin->display);
-+    UINT16               uHorzRes = WidthOfScreen(pScreen);
-+    UINT16               uVertRes = HeightOfScreen(pScreen);
-+    XUnlockDisplay((Display*)pWin->display);
-+
-+    //Get ready to resize the presentation....
-+    if( m_pTopLevelSite )
-+    {
-+        m_pTopLevelSite->m_bDisableForceRedraw = TRUE;
-+    }
-+
-+    //Maintain aspect ratio and Scale it.
-+    float fXScale   = (float)uHorzRes/(float)(m_size.cx);
-+    float fYScale   = (float)uVertRes/(float)(m_size.cy);
-+    float fScale    = (fXScale<fYScale) ? fXScale : fYScale;
-+    int nWidth      = (int)(fScale*m_size.cx+.5);
-+    int nHeight     = (int)(fScale*m_size.cy+.5);
-+
-+    //Center the presentation and save the old size
-+    memcpy( &m_PreFullScreenSize, &m_size, sizeof( HXxSize) ); /* Flawfinder: ignore */
-+    
-+    HXxSize size = {nWidth, nHeight};
-+
-+    if( nWidth < uHorzRes )
-+    {
-+        m_ptFullScreenOffset.x = (uHorzRes - nWidth)/2;
-+    }
-+    
-+    if( nHeight < uVertRes )
-+    {
-+        m_ptFullScreenOffset.y = (uVertRes - nHeight)/2;
-+    }
-+
-+    //Reparent our main window.......
-+    Window       winRootParent = 0;
-+    Window       winParent     = 0;
-+    Window*      pwinChildren  = NULL;
-+    unsigned int nNumChildren  = 0;
-+    XLockDisplay((Display*) pWin->display);
-+    XQueryTree( (Display*)pWin->display,
-+				(Window)pWin->window,
-+				&winRootParent,
-+				&winParent,
-+				&pwinChildren,
-+				&nNumChildren
-+				);
-+
-+    //Free unused children list.
-+    XFree( pwinChildren );
-+    XUnlockDisplay((Display*) pWin->display);
-+    
-+    HX_ASSERT( winParent );
-+    m_winOldParent = winParent;
-+
-+    m_bInFullScreen = TRUE;
-+
-+    //Now resize it...
-+    SetSize(m_size);
-+
-+    //Redraw the presentation....
-+    if( m_pTopLevelSite )
-+    {
-+        m_pTopLevelSite->m_bDisableForceRedraw = FALSE;
-+    }
-+
-+    _ForceRedrawAll();
-+
-+    //Give it focus....
-+    _SetFocus( (void*)pWin->window );
-+
-+    // now eat all the focusouts that came as a result of this reparent...
-+    XEvent event;
-+    XLockDisplay((Display*) pWin->display);
-+    HXBOOL status   =  XCheckTypedWindowEvent((Display*)pWin->display, (Window)pWin->window,
-+        											FocusOut, &event);
-+    XUnlockDisplay((Display*) pWin->display);
-+    while (m_bWindowCreatedByCreate && status)
-+    {
-+        // just discarding these
-+        XLockDisplay((Display*) pWin->display);
-+        status   =  XCheckTypedWindowEvent((Display*)pWin->display, (Window)pWin->window,
-+										   FocusOut, &event);
-+        XUnlockDisplay((Display*) pWin->display);
-+    }
-+    
-+	//Update the status text...
-+    if(m_pStatusText)
-+    {
-+        m_pStatusText->ParentChangedSize();
-+        m_pStatusText->Show();
-+    }
-+#if defined(HELIX_CONFIG_MOBLIN)
-+    if(!m_pAttachWindowCallback)
-+    {
-+        m_pAttachWindowCallback = new CHXGenericCallback((void*)this, (fGenericCBFunc)AttachWindowCallback);
-+        m_pAttachWindowCallback->AddRef();
-+    }
-+    if(!m_pForceRedrawCallback)
-+    {
-+        m_pForceRedrawCallback = new CHXGenericCallback((void*)this, (fGenericCBFunc)ForceRedrawCallback);
-+        m_pForceRedrawCallback->AddRef();
-+    }
-+
-+    // schedule callback for Attaching Window
-+    if(m_pAttachWindowCallback)
-+    {
-+    	m_pAttachWindowCallback->CallbackScheduled(m_pScheduler->RelativeEnter(m_pAttachWindowCallback, 100));
-+    }
-+    if(m_pForceRedrawCallback)
-+    {
-+    	m_pForceRedrawCallback->CallbackScheduled(m_pScheduler->RelativeEnter(m_pForceRedrawCallback, 500));
-+    }
-+	
-+#endif
-+#else
-+    HX_ASSERT( "Not implemented..." == NULL );
-+#endif
-+    return HXR_OK;
-+}
-+
-+#if defined(HELIX_CONFIG_MOBLIN)    
-+void CHXExSite::AttachWindowCallback(void* pParam)
-+{
-+    CHXExSite* pObj = (CHXExSite*)pParam;
-+    if (pObj)
-+    {
-+        pObj->_AttachWindow();
-+    }
-+}
-+
-+
-+void CHXExSite::ForceRedrawCallback(void* pParam)
-+{
-+    CHXExSite* pObj = (CHXExSite*)pParam;
-+
-+    if (pObj)
-+    {
-+        UINT32 ulNumOfChildren = pObj->GetNumberOfChildSites();
-+        if(pObj->m_pTopLevelSite)
-+        {
-+            pObj->m_pTopLevelSite->m_bDisableForceRedraw = FALSE;
-+        }
-+        for ( UINT32 i = 0; i < ulNumOfChildren; ++i )
-+        {
-+            SPIHXSite spChildSite;
-+            if ( SUCCEEDED( pObj->GetNthChildSite( i, *spChildSite.AsInOutParam() ) ) 
-+			&& spChildSite.IsValid() )
-+            {
-+                spChildSite->DamageRegion( NULL );
-+                spChildSite->ForceRedraw();
-+            }
-+            
-+        }
-+    }
-+}
-+
-+void CHXExSite::RemovePendingCallback(CHXGenericCallback* pCB)
-+{
-+    if (pCB && 
-+        pCB->GetPendingCallback() &&
-+        m_pScheduler)
-+    {
-+        m_pScheduler->Remove(pCB->GetPendingCallback());
-+        pCB->CallbackCanceled();
-+    }
-+}
-+#endif
-+
-+HX_RESULT CHXExSite::_EnterFullScreenExt(HXxWindow* pWindow, IHXValues* pValues)
-+{
-+#if 0
-+    m_bReparent = FALSE;
-+    HX_RESULT res = HXR_OK;
-+    UINT32 ulReparent = 0;
-+
-+    if (pValues)
-+    {
-+        pValues->GetPropertyULONG32("Reparent", ulReparent);
-+    }
-+
-+    m_bReparent = (HXBOOL)ulReparent;
-+
-+    if (m_bReparent)
-+    {
-+        res = _EnterFullScreen(pWindow);
-+    }
-+    else
-+    {
-+        res = _EnterFullScreenNoNewWindow();
-+    }
-+    
-+    CHXBaseSite::FullScreenEntered(res);
-+    return res;
-+#else
-+    HX_ASSERT( "Not implemented..." == NULL );
-+    return HXR_OK;  /* this makes compiler happy */
-+#endif
-+}
-+
-+HX_RESULT CHXExSite::_ExitFullScreenExt()
-+{
-+#if 0
-+    HX_RESULT res = _ExitFullScreen();
-+#if defined(HELIX_CONFIG_MOBLIN)	
-+    // schedule callback for attaching window
-+    if(m_pAttachWindowCallback)
-+    {
-+        m_pAttachWindowCallback->CallbackScheduled(m_pScheduler->RelativeEnter(m_pAttachWindowCallback, 100));
-+    }
-+    // schedule callback for Force Redraw the window
-+    if(m_pForceRedrawCallback)
-+    {
-+        m_pForceRedrawCallback->CallbackScheduled(m_pScheduler->RelativeEnter(m_pForceRedrawCallback, 500));
-+    }
-+#endif	
-+    CHXBaseSite::FullScreenExited(res);
-+
-+    return res;
-+#else
-+    HX_ASSERT( "Not implemented..." == NULL );
-+    return HXR_OK;  /* this makes compiler happy */
-+#endif
-+
-+}
-+
-+HX_RESULT CHXExSite::_EventOccurred(HXxEvent* pEvent)
-+{
-+    return HXR_OK;
-+}
-+
-+HX_RESULT CHXExSite::_TestFullScreen( void* hTestBitmap,
-+                                        const char* pszStatusText )
-+{
-+#ifdef _DEBUG
-+    fprintf( stderr, "Going to test full screen....\n" );
-+#endif
-+    return HXR_OK;
-+}
-+
-+void CHXExSite::ProcessEvent(HXxEvent* pEvent)
-+{
-+    if(pEvent)
-+    {
-+        //Expose event compression. Combine all outstanding expose events
-+        //into one big region.
-+        if(Expose==pEvent->event)
-+        {
-+            _CollapseExposeEvents((XEvent*)pEvent->param2);
-+        }
-+    }
-+
-+    //Send the event to each registered UnixSite.
-+    void* pSite   = NULL;
-+    void* pWindow = NULL;
-+    POSITION  pos = z_mapSiteToWindow.GetStartPosition();
-+    while( pos )
-+    {
-+        z_mapSiteToWindow.GetNextAssoc(pos, pSite, pWindow);
-+        CHXExSite* pSiteWindowed = (CHXExSite*)pSite;
-+        CHXExSite* pTopLevel = NULL;
-+        HX_ASSERT(pSiteWindowed);
-+        pSiteWindowed->AddRef();
-+        pTopLevel = (CHXExSite*)pSiteWindowed->GetTopLevelSite();
-+
-+        if(pEvent)
-+        {
-+            //Call back into the basesite's event loop.
-+            pTopLevel->EventOccurred(pEvent);
-+        }
-+
-+        //XXXgfw As a workaround for the overlay not moving while the
-+        //player is paused, we will check it here and update it if needed.
-+
-+        //XXXRGG We might be able to use X's ConfigureNotify messages instead
-+        //of doing a refresh every 50 ms.
-+        pTopLevel->_UpdateOverlayIfNeeded();
-+
-+        pSiteWindowed->Release();
-+    }
-+}
-+
-+void CHXExSite::_CollapseExposeEvents(XEvent* xevent)
-+{
-+    Display*      display = xevent->xany.display;
-+    Window        window  = xevent->xany.window;
-+    XExposeEvent* expose_event = (XExposeEvent*)xevent;
-+    XEvent        new_event;
-+    XExposeEvent* new_expose_event = (XExposeEvent*)&new_event;
-+    ushort        x1;
-+    ushort        y1;
-+    ushort        x2;
-+    ushort        y2;
-+    ushort        x3;
-+    ushort        y3;
-+
-+    x1 = expose_event->x;
-+    y1 = expose_event->y;
-+    x2 = x1 + expose_event->width;
-+    y2 = y1 + expose_event->height;
-+    XLockDisplay(display);
-+    HXBOOL status = XCheckWindowEvent(display, window, ExposureMask, &new_event);
-+    XUnlockDisplay(display);
-+    while( status)
-+    {
-+        if (new_expose_event->x < x1)
-+            x1 = new_expose_event->x;
-+
-+        if (new_expose_event->y < y1)
-+            y1 = new_expose_event->y;
-+
-+        x3 = new_expose_event->x + new_expose_event->width;
-+        if (x3 > x2)
-+            x2 = x3;
-+
-+        y3 = new_expose_event->y + new_expose_event->height;
-+        if (y3 > y2)
-+            y2 = y3;
-+        XLockDisplay(display);
-+        status = XCheckWindowEvent(display, window, ExposureMask, &new_event);
-+        XUnlockDisplay(display);
-+
-+    }
-+
-+    expose_event->x = x1;
-+    expose_event->y = y1;
-+    expose_event->width = x2 - x1;
-+    expose_event->height = y2 - y1;
-+    expose_event->count = new_expose_event->count;
-+}
-+
-+
-+HXBOOL CHXExSite::_ShouldProcess(HXxEvent* pEvent)
-+{
-+    HXBOOL bShouldProcessThisEvent = TRUE;
-+
-+
-+    if( !IsSiteVisible() )
-+    {
-+        switch (pEvent->event)
-+        {
-+           case ButtonPress:
-+           case ButtonRelease:
-+           case Expose:
-+           case FocusIn:
-+               bShouldProcessThisEvent = FALSE;
-+               break;
-+           default:
-+               break;
-+        }
-+    }
-+
-+    if(m_pWindow && m_pWindow->window!=pEvent->window)
-+    {
-+        bShouldProcessThisEvent = FALSE;
-+    }
-+    return bShouldProcessThisEvent;
-+}
-+
-+
-+///////////////////////////////////////////////////////
-+//
-+// UnixEventHandler methods...
-+//
-+CHXExSite::UnixEventHandler::UnixEventHandler(CHXExSite* pParent)
-+    : m_pParent(pParent),
-+      m_lRefCount(0),
-+      m_cbHandle(0)
-+{
-+    HX_ASSERT(m_pParent);
-+    HX_ASSERT(m_pParent->m_pScheduler);
-+    m_cbHandle = m_pParent->m_pScheduler->RelativeEnter((IHXCallback*)this, 30);
-+}
-+
-+CHXExSite::UnixEventHandler::~UnixEventHandler()
-+{
-+    CancelCallback();
-+}
-+
-+void
-+CHXExSite::UnixEventHandler::CancelCallback()
-+{
-+    if( m_cbHandle && m_pParent && m_pParent->m_pScheduler )
-+    {
-+        UINT32 tempHandle = m_cbHandle;
-+        m_cbHandle = 0;
-+        m_pParent->m_pScheduler->Remove(tempHandle);
-+    }
-+}
-+
-+HX_RESULT CHXExSite::UnixEventHandler::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IHXCallback))
-+    {
-+        AddRef();
-+        *ppvObj = (IHXCallback*)this;
-+        return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+        AddRef();
-+        *ppvObj = this;
-+        return HXR_OK;
-+    }
-+
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+ULONG32 CHXExSite::UnixEventHandler::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+ULONG32 CHXExSite::UnixEventHandler::Release()
-+{
-+    HX_ASSERT(m_lRefCount>0);
-+    if( InterlockedDecrement(&m_lRefCount)>0 )
-+    {
-+        return m_lRefCount;
-+    }
-+    delete this;
-+    return 0;
-+}
-+
-+//IHXCallback methods
-+HX_RESULT CHXExSite::UnixEventHandler::Func()
-+{
-+    XEvent xevent;
-+    static HXxEvent pnevent;
-+
-+    m_cbHandle = 0;
-+    XLockDisplay(m_pParent->zm_display);
-+    int status = XPending(m_pParent->zm_display);
-+    XUnlockDisplay(m_pParent->zm_display);
-+    while(status)
-+    {
-+        XLockDisplay(m_pParent->zm_display);
-+        XNextEvent(m_pParent->zm_display, &xevent);
-+        XUnlockDisplay(m_pParent->zm_display);
-+
-+        // package native event in HXxEvent and send to dispatcher
-+        pnevent.event = xevent.type;
-+        pnevent.window = (void *)xevent.xany.window;
-+        pnevent.param1 = xevent.xany.display;
-+        pnevent.param2 = &xevent;
-+
-+        m_pParent->ProcessEvent(&pnevent);
-+        XLockDisplay(m_pParent->zm_display);
-+        status = XPending(m_pParent->zm_display);
-+        XUnlockDisplay(m_pParent->zm_display);
-+    }
-+
-+    if (m_pParent && m_pParent->m_pScheduler)
-+    {
-+        m_cbHandle = m_pParent->m_pScheduler->RelativeEnter((IHXCallback*)this, 30);
-+    }
-+    return HXR_OK;
-+}
-+
-+void CHXExSite::_UpdateOverlayIfNeeded()
-+{
-+    if( m_pVideoSurface )
-+    {
-+        if( m_pVideoSurface->m_nBltMode == HX_OVERLAY_BLT )
-+        {
-+            ULONG32 ulNow = HX_GET_BETTERTICKCOUNT();
-+            CUnixSurf* pSurf = (CUnixSurf*)m_pVideoSurface;
-+            if( ulNow- pSurf->m_ulLastOverlayUpdateTime > 50 )
-+            {
-+                SiteMoving(0,0);
-+            }
-+        }
-+    }
-+    LISTPOSITION pos = m_ChildrenInZOrder.GetHeadPosition();
-+    while(pos)
-+    {
-+        CHXExSite* pSite = (CHXExSite*)m_ChildrenInZOrder.GetNext(pos);
-+        pSite->_UpdateOverlayIfNeeded();
-+    }
-+}
-+
-+
-+HXBOOL  CHXExSite::_ShouldEnterForceRedraw()
-+{
-+    if( !m_bDamaged || !m_pUser || !IsSiteVisible() )
-+    {
-+        return FALSE;
-+    }
-+
-+    if(InterlockedIncrement(&m_lBltEntryCount)>1)
-+    {
-+        InterlockedDecrement(&m_lBltEntryCount);
-+        return FALSE;
-+    }
-+
-+    return TRUE;
-+}
-+
-+void  CHXExSite::_ExitForceRedraw()
-+{
-+    InterlockedDecrement(&m_lBltEntryCount);
-+}
-+
-Index: helix-libs/clientapps/clutter/exsite.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exsite.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,272 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: unixsite.h,v 1.10.2.3 2008/06/05 14:24:30 lovish Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ *                 Phil Dibowitz (jaymzh)
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef _UNIXSITE_H
-+#define _UNIXSITE_H
-+
-+#if defined(USE_XWINDOWS)
-+#include <X11/Xatom.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xos.h>
-+#include <X11/Intrinsic.h>
-+#include <X11/extensions/XShm.h>
-+#endif
-+
-+#include "basesite.h"
-+#include "hxcbobj.h"
-+#include "player.h"
-+
-+class CHXExSite : public CHXBaseSite
-+{
-+public:
-+
-+   friend class CExSurf;
-+   friend class CExRootSurf;
-+   
-+   CHXExSite( IUnknown* pContext,
-+                IUnknown* pUnkOuter,
-+                INT32 lInitialZorder,
-+                on_new_frame_cb_t on_new_frame_cb = NULL,
-+                void *context = NULL);
-+   
-+   static void ProcessEvent(HXxEvent* pEvent);
-+   Window CreateXWindow( Window win ); 
-+
-+   void _ForwardUpdateEvent(HXxEvent* pEvent);
-+
-+   //static member vars.
-+   static Display* zm_display;
-+   void _UpdateOverlayIfNeeded();
-+   HXBOOL m_bIgnoreFocusOutInFS;
-+
-+   //We override this.
-+   void CheckColorSettings();
-+
-+protected:
-+   
-+   virtual ~CHXExSite();
-+   
-+   //
-+   // CHXExSite only methods....
-+   //
-+   HX_RESULT   _OpenXDisplay(char* DiplayString);
-+   static void _CollapseExposeEvents(XEvent* xevent);
-+   HXBOOL        _ShouldProcess(HXxEvent* pEvent);
-+   void        _DrawArrows();
-+   void        _CreateHorizScrollBar(void);
-+   void        _CreateVertScrollBar(void);
-+   HXBOOL        _InButton(HXxPoint& pt, int x, int y );
-+   void        _DestroyScrollButtons();
-+   void        _MapScrollButtons();
-+   void        _MapHorzScroll();
-+   void        _MapVertScroll();
-+   void        _UnmapHorzScroll();
-+   void        _UnmapVertScroll();
-+   void        _UnmapScrollButtons();
-+   void        _BuildClipRegion();
-+   void        _ReleaseClippingRegion();
-+
-+   //
-+   // Seperate object for our callbacks to keep the events flowing.
-+   //
-+   class UnixEventHandler : public IHXCallback
-+   {
-+   public:
-+      UnixEventHandler(CHXExSite* pParent);
-+        
-+      //IUnknown methods
-+      virtual HX_RESULT QueryInterface(REFIID riid, void** ppvObj);
-+      virtual ULONG32 AddRef();
-+      virtual ULONG32 Release();
-+
-+      //IHXCallback methods
-+      virtual HX_RESULT Func(); 
-+      void CancelCallback();
-+        
-+   private:
-+      virtual ~UnixEventHandler();
-+       
-+      UnixEventHandler();
-+      UnixEventHandler(const UnixEventHandler&);
-+      UnixEventHandler& operator=(const UnixEventHandler& it );
-+        
-+      CHXExSite*   m_pParent;
-+      LONG32         m_lRefCount;
-+      CallbackHandle m_cbHandle;
-+
-+      IUnknown* m_pUnkPlayer;
-+   };
-+    
-+
-+   //
-+   // CHXBaseSite inherited methods
-+   //
-+   virtual void  _NeedWindowedSite();
-+   virtual void  _AttachWindow();
-+   virtual void  _DetachWindow();
-+   virtual void* _Create(void* ParentWindow, UINT32 style);
-+   virtual void  _Destroy(HXxWindow* pWindow); 
-+   virtual void  _SetSize(HXxSize size); 
-+   virtual void  _SetPosition(HXxPoint position); 
-+   virtual void  _DamageRect(HXxRect rect);
-+   virtual void  _DamageRegion(HXxRegion rect);
-+   virtual HXBOOL  _ShouldEnterForceRedraw(); 
-+   virtual void  _ExitForceRedraw(); 
-+   virtual void  _SendOSUpdateMessage(); 
-+   virtual void  _ShowSite(HXBOOL bShow); 
-+   virtual HXBOOL  _AtSystemTime(); 
-+   virtual void  _GetDeviceCaps( void* hdc,
-+                                 UINT16& uBitesPerPixel,
-+                                 UINT16& uHorzRes,
-+                                 UINT16& uVertRes ); 
-+   virtual void  _GetWindowRect(HXxRect* destRect);
-+   virtual void  _DestroySliders();
-+   virtual HXBOOL  _HandleOSEvents(HXxEvent* pEvent);
-+   virtual HXBOOL  _ConvertToHXEvent(HXxEvent* pEvent);
-+   virtual void  _GenerateOSEvent(HXxEvent* pEvent, HXxEvent* pEvent2);
-+   virtual void  _GenerateSetCursorEvent();
-+   virtual void  _TryCreateXSlider();
-+   virtual void  _SetXSliderValues(INT32 range, INT32 pageSize);
-+   virtual void  _TryCreateYSlider();
-+   virtual void  _SetYSliderValues(INT32 range, INT32 pageSize);
-+   virtual void  _GetSystemSizeOfSliders(INT32* pWidth, INT32* pHeight);
-+   virtual HXBOOL  _IsWindowVisible();
-+   virtual void  _ShowXSlider(HXBOOL bShow);
-+   virtual void  _MoveXSlider( INT32 left,
-+                               INT32 top,
-+                               INT32 right,
-+                               INT32 bottom,
-+                               HXBOOL bRedraw );
-+   virtual void  _ShowYSlider(HXBOOL bShow);
-+   virtual void  _MoveYSlider( INT32 left,
-+                               INT32 top,
-+                               INT32 right,
-+                               INT32 bottom,
-+                               HXBOOL bRedraw);
-+   virtual HXBOOL  _DoesXSliderExist();
-+   virtual void* _GetContainingWindow();
-+   virtual void  _GetCursorPos(HXxPoint* pPoint);
-+   virtual void  _MapPointToOSWindow(HXxPoint* pPt, void** pWindowHandle);
-+   virtual void* _GetWindowWithCursor();
-+   virtual void  _ReInitPrimarySurface();
-+   virtual HXBOOL  _MoveWindow( void* ,
-+                              INT32 X,
-+                              INT32 Y,
-+                              INT32 nWidth,
-+                              INT32 nHeight,
-+                              HXBOOL bRepaint);
-+   virtual HXBOOL  _UpdateWindow(void* hWnd);
-+   virtual HXBOOL  _ShowWindow(void* hWnd, INT32 nCmdShow);
-+   virtual HXBOOL  _SetWindowPos(void* hWnd,
-+                               void* hWndInsertAfter,
-+                               INT32 X,
-+                               INT32 Y,
-+                               INT32 cx,
-+                               INT32 cy,
-+                               INT32 uFlags);
-+   virtual HXBOOL  _SetWindowRgn(void* hWnd, HXREGION* hRgn, HXBOOL bRedraw);
-+   virtual void _SetFocus(void* pWindow);
-+    
-+   virtual HX_RESULT _EnterFullScreen(HXxWindow* pWindow = NULL);
-+   virtual HX_RESULT _EventOccurred(HXxEvent* pEvent);
-+   virtual HX_RESULT _ExitFullScreen();
-+   virtual HX_RESULT _TestFullScreen( void* hTestBitmap,
-+                                      const char* pszStatusText );
-+   virtual HX_RESULT _EnterFullScreenExt(HXxWindow* pWindow, IHXValues* pValues);
-+   virtual HX_RESULT _ExitFullScreenExt();
-+#if defined(HELIX_CONFIG_MOBLIN)
-+   static void	        AttachWindowCallback(void *pParam);
-+   static void	        ForceRedrawCallback(void *pParam);
-+   void                    RemovePendingCallback(CHXGenericCallback* pCB);
-+   
-+   CHXGenericCallback*     m_pAttachWindowCallback;
-+   CHXGenericCallback*     m_pForceRedrawCallback;
-+#endif   
-+   HXBOOL                  m_bReparent;   
-+
-+private:
-+
-+   //Protect unintentional copy and default ctors.
-+   CHXExSite();
-+   CHXExSite( const CHXExSite& );
-+   CHXExSite& operator=( const CHXExSite& it );
-+   HX_RESULT _EnterFullScreenNoNewWindow();
-+    
-+   //member vars.
-+   UnixEventHandler* m_pUnixEventHandler;
-+   static Cursor zm_GrabCursor;
-+   Window        m_ScrollHorizButtonL;
-+   Window        m_ScrollHorizButtonR;
-+   Window        m_ScrollVertButtonT;
-+   Window        m_ScrollVertButtonB;
-+   Window        m_winFullScreenWindow;
-+   Window        m_winOldParent;
-+   HXxPoint      m_ptScrollHorizPosL;
-+   HXxPoint      m_ptScrollHorizPosR;
-+   HXxPoint      m_ptScrollVertPosT;
-+   HXxPoint      m_ptScrollVertPosB;
-+   HXxPoint      m_ptFullScreenOffset;
-+   HXxSize       m_PreFullScreenSize;
-+   HXBOOL          m_bScrollingInProgress;
-+   int           m_nScrollDir;
-+   HXBOOL          m_bLastPointInSite;
-+   HXBOOL          m_bDamaged;
-+   //
-+   //Private helpers...
-+   //
-+
-+   //returns the HX_VK associated with this keysym....
-+   UINT32 _MapKeySymToHXVK(KeySym tmpSym, UINT32& uFlags);
-+   on_new_frame_cb_t m_on_new_frame_cb;
-+   void *m_context;
-+};
-+
-+#endif //_UNIXSITE_H
-Index: helix-libs/clientapps/clutter/exsitsup.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exsitsup.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,455 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifdef _WIN16
-+#include <windows.h>
-+#endif
-+
-+#include "hxcom.h"
-+#include "hxtypes.h"
-+#include "hxwintyp.h"
-+#include "hxwin.h"
-+#include "ihxpckts.h"
-+#include "hxcomm.h"
-+#include "fivemmap.h"
-+#include "hxstring.h" // CHXString
-+#include "exsite.h"
-+#include "exsitsup.h"
-+#include "pckunpck.h" // CreateBufferCCF
-+#include "ciddefs.h"  // CID_RGB32
-+#if defined(HELIX_FEATURE_PNG)
-+#include "pxpngenc.h" // PXPNGEncode::EncodeToPNGBuffer
-+#endif //  HELIX_FEATURE_PNG
-+#include "print.h"
-+
-+
-+#include "globals.h"
-+struct _stGlobals*& GetGlobal();
-+
-+/************************************************************************
-+ *  Method:
-+ *    Constructor
-+ */
-+	ExampleSiteSupplier::ExampleSiteSupplier(IUnknown* pUnkPlayer, on_new_frame_cb_t on_new_frame_cb = NULL, void *context = NULL)
-+	: m_lRefCount(0)
-+	, m_pSiteManager(NULL)
-+	, m_pSite(NULL)
-+	, m_pSiteCapture(NULL)
-+	, m_pCaptureBuffer(NULL)
-+	, m_pCCF(NULL)
-+	  , m_pUnkPlayer(pUnkPlayer)
-+	  , m_on_new_frame_cb(on_new_frame_cb)
-+      , m_context(context)
-+{
-+	if (m_pUnkPlayer)
-+	{
-+		m_pUnkPlayer->QueryInterface(IID_IHXSiteManager,
-+				(void**)&m_pSiteManager);
-+
-+		//printf("pauldebug:m_pUnkplayer->QueryInterface for m_pCCF calling\n");
-+		m_pUnkPlayer->QueryInterface(IID_IHXCommonClassFactory,
-+				(void**)&m_pCCF);
-+		//printf("pauldebug:m_pUnkplayer->QueryInterface for m_pCCF called\n");
-+
-+		m_pUnkPlayer->AddRef();
-+	}
-+};
-+
-+/************************************************************************
-+ *  Method:
-+ *    Destructor
-+ */
-+ExampleSiteSupplier::~ExampleSiteSupplier()
-+{
-+	HX_RELEASE(m_pSiteManager);
-+	HX_RELEASE(m_pSite);
-+	HX_RELEASE(m_pSiteCapture);
-+	HX_RELEASE(m_pCaptureBuffer);
-+	HX_RELEASE(m_pCCF);
-+	HX_RELEASE(m_pUnkPlayer);
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IUnknown::QueryInterface
-+ */
-+	STDMETHODIMP 
-+ExampleSiteSupplier::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+	if (IsEqualIID(riid, IID_IUnknown))
-+	{
-+		AddRef();
-+		*ppvObj = (IUnknown*)(IHXSiteSupplier*)this;
-+		return HXR_OK;
-+	}
-+	else if (IsEqualIID(riid, IID_IHXSiteSupplier))
-+	{
-+		AddRef();
-+		*ppvObj = (IHXSiteSupplier*)this;
-+		return HXR_OK;
-+	}
-+
-+	*ppvObj = NULL;
-+	return HXR_NOINTERFACE;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IUnknown::AddRef
-+ */
-+	STDMETHODIMP_(ULONG32) 
-+ExampleSiteSupplier::AddRef()
-+{
-+	return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IUnknown::Release
-+ */
-+	STDMETHODIMP_(ULONG32) 
-+ExampleSiteSupplier::Release()
-+{
-+	if (InterlockedDecrement(&m_lRefCount) > 0)
-+	{
-+		return m_lRefCount;
-+	}
-+
-+	delete this;
-+	return 0;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IHXSiteSupplier::SitesNeeded
-+ *  Purpose:
-+ *    Called to inform the site supplier that a site with a particular
-+ *    set of characteristics is needed. If the site supplier can 
-+ *    fulfill the request it should call the site manager and add one
-+ *    or more new sites.
-+ *    Note that the request for sites is associated with a Request ID
-+ *    the client core will inform the site supplier when this requested
-+ *    site is no longer needed.
-+ */
-+STDMETHODIMP 
-+ExampleSiteSupplier::SitesNeeded
-+(
-+ UINT32	uRequestID,
-+ IHXValues*	pProps
-+ )
-+{
-+	/*
-+	 * Don't create a site if the -NULL_RENDER command line option
-+	 * was given. - jfarr
-+	 */
-+	if (GetGlobal()->g_bNullRender)
-+	{
-+		return (HXR_OK);
-+	}
-+
-+	/*
-+	 * If there are no properties, then we can't really create a
-+	 * site, because we have no idea what type of site is desired!
-+	 */
-+	if (!pProps)
-+	{
-+		return HXR_INVALID_PARAMETER;
-+	}
-+
-+	HRESULT		hres		= HXR_OK;
-+	IHXValues*		pSiteProps	= NULL;
-+	IHXSiteWindowed*	pSiteWindowed	= NULL;
-+	IHXBuffer*		pValue		= NULL;
-+	UINT32		style		= 0;
-+	IHXSite*		pSite		= NULL;
-+
-+#if 0
-+	// Just let the RMA client core create a windowed site for us.
-+	hres = m_pCCF->CreateInstance(CLSID_IHXSiteWindowed,(void**)&pSiteWindowed);
-+	if (HXR_OK != hres)
-+	{
-+		goto exit;
-+	}
-+#else
-+	{
-+		*(void **)&pSiteWindowed = (IUnknown*)(IHXSiteWindowed*)(new CHXExSite(GetGlobal()->pMediaPlatform, NULL, 0, m_on_new_frame_cb, m_context));
-+		hres = ((IUnknown*)*(void **)&pSiteWindowed)->QueryInterface(IID_IHXSiteWindowed, (void**)&pSiteWindowed);
-+		if (HXR_OK != hres)
-+		{
-+			goto exit;
-+		}
-+	}
-+#endif
-+
-+	hres = pSiteWindowed->QueryInterface(IID_IHXSite,(void**)&pSite);
-+	if (HXR_OK != hres)
-+	{
-+		goto exit;
-+	}
-+
-+	if( !m_pSite )
-+	{
-+		m_pSite = pSite;
-+		m_pSite->AddRef();
-+	}
-+
-+
-+	hres = pSiteWindowed->QueryInterface(IID_IHXValues,(void**)&pSiteProps);
-+	if (HXR_OK != hres)
-+	{
-+		goto exit;
-+	}
-+
-+	/*
-+	 * We need to figure out what type of site we are supposed to
-+	 * to create. We need to "switch" between site user and site
-+	 * properties. So look for the well known site user properties
-+	 * that are mapped onto sites...
-+	 */
-+	hres = pProps->GetPropertyCString("playto",pValue);
-+	if (HXR_OK == hres)
-+	{
-+		pSiteProps->SetPropertyCString("channel",pValue);
-+		HX_RELEASE(pValue);
-+	}
-+	else
-+	{
-+		hres = pProps->GetPropertyCString("name",pValue);
-+		if (HXR_OK == hres)
-+		{
-+			pSiteProps->SetPropertyCString("LayoutGroup",pValue);
-+			HX_RELEASE(pValue);
-+		}
-+	}
-+
-+#ifdef _WINDOWS
-+	style = WS_OVERLAPPED | WS_VISIBLE | WS_CLIPCHILDREN;
-+#endif
-+
-+	hres = pSiteWindowed->Create(NULL, style);
-+	if (HXR_OK != hres)
-+	{
-+		goto exit;
-+	}
-+
-+	/*
-+	 * We need to wait until we have set all the properties before
-+	 * we add the site.
-+	 */
-+	hres = m_pSiteManager->AddSite(pSite);
-+	if (HXR_OK != hres)
-+	{
-+		goto exit;
-+	}
-+#ifdef _WINDOWS
-+	{
-+		HXxWindow* pWindow = pSiteWindowed->GetWindow();
-+		if (pWindow && pWindow->window) ::SetForegroundWindow( (HWND)(pWindow->window) );
-+	}
-+#endif
-+	m_CreatedSites.SetAt((void*)uRequestID,pSite);
-+	pSite->AddRef();
-+
-+exit:
-+
-+	HX_RELEASE(pSiteProps);
-+	HX_RELEASE(pSiteWindowed);
-+	HX_RELEASE(pSite);
-+
-+	return hres;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IHXSiteSupplier::SitesNotNeeded
-+ *  Purpose:
-+ *    Called to inform the site supplier that all sites from a previos
-+ *    site request are no longer needed. If the site supplier had 
-+ *    previously created non-persistant sites (like popup windows)
-+ *    to fulfill a request for sites it should call the site manager 
-+ *    and remove those sites.
-+ */
-+STDMETHODIMP 
-+ExampleSiteSupplier::SitesNotNeeded(UINT32 uRequestID)
-+{
-+    IHXSite*		pSite = NULL;
-+    IHXSiteWindowed*	pSiteWindowed = NULL;
-+    void*		pVoid = NULL;
-+
-+    if (!m_CreatedSites.Lookup((void*)uRequestID,pVoid))
-+    {
-+	return HXR_INVALID_PARAMETER;
-+    }
-+    pSite = (IHXSite*)pVoid;
-+
-+    m_pSiteManager->RemoveSite(pSite);
-+
-+    // Need to actually do the work on destroying the window
-+    // and all that jazz.
-+    pSite->QueryInterface(IID_IHXSiteWindowed,(void**)&pSiteWindowed);
-+
-+    pSiteWindowed->Destroy();
-+
-+    // ref count = 2
-+    pSiteWindowed->Release();
-+
-+    // ref count = 1; deleted from this object's view!
-+    pSite->Release();
-+
-+    m_CreatedSites.RemoveKey((void*)uRequestID);
-+
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IHXSiteSupplier::BeginChangeLayout
-+ *  Purpose:
-+ *    Called to inform the site supplier a layout change has beginning
-+ *    it can expect to recieve SitesNeeded() and SitesNotNeeded() calls
-+ *    while a layout change is in progress,
-+ */
-+STDMETHODIMP 
-+ExampleSiteSupplier::BeginChangeLayout()
-+{
-+    return HXR_OK;
-+}
-+
-+/************************************************************************
-+ *  Method:
-+ *    IHXSiteSupplier::DoneChangeLayout
-+ *  Purpose:
-+ *    Called to inform the site supplier the layout change has been
-+ *    completed.
-+ */
-+STDMETHODIMP 
-+ExampleSiteSupplier::DoneChangeLayout()
-+{
-+    return HXR_OK;
-+}
-+
-+HX_RESULT
-+ExampleSiteSupplier::CaptureImage(CHXString pszFileName, INT32 dWidth, INT32 dHeight)
-+{
-+    HX_RESULT res=HXR_FAIL;
-+
-+    // Get the IHXSiteCapture object from the site
-+    if (m_pSiteCapture == NULL)
-+    {
-+	if (m_pSite && m_pSite->QueryInterface(IID_IHXSiteCapture, (void**)&m_pSiteCapture) == HXR_OK)
-+	{
-+	    m_pSiteCapture->AddRef();
-+	}
-+    }
-+
-+    // Create the buffer that will receive the image data
-+    if (m_pCaptureBuffer == NULL)
-+    {
-+    	CreateBufferCCF(m_pCaptureBuffer, m_pCCF);
-+	if (!m_pCaptureBuffer)
-+	{
-+	    return HXR_OUTOFMEMORY;
-+	}
-+    }
-+
-+    HXBOOL bCanCapture = FALSE;
-+
-+    // Check if the site is available to capture an image
-+    if (m_pSiteCapture && (res = m_pSiteCapture->CanCapture(bCanCapture)) == HXR_OK && bCanCapture)
-+    {
-+	HX_RESULT res;
-+	HXxSize outputSize;
-+	outputSize.cx  = dWidth;
-+	outputSize.cy  = dHeight;
-+	m_strFileName = pszFileName;
-+
-+	// Asynchronous call. CaptureDone() will be called with result.
-+	res = m_pSiteCapture->Capture((IHXSiteCaptureResponse*)this, m_pCaptureBuffer, &outputSize, CID_RGB32);
-+    }
-+
-+    return res;
-+
-+}
-+
-+//
-+// IHXSiteCaptureResponse::CaptureDone
-+//
-+// Called when the site has captured the next frame.
-+// bmiOutputFormat points to image format description which
-+// is valid until the completion of CaptureDone.
-+// bmiOutputFormat can be different for every capture.
-+// pCaptureBuffer holds the image if supplied in
-+// Capture() method.  pCaptureBuffer is automatically
-+// resized if it has insufficient size to hold the image
-+// data.
-+//
-+// status may be:
-+//   HXR_FAIL  -- No capture was done. General Error. All data is invalid.
-+//   HXR_OK    -- Capture was done. Both variables are valid.
-+STDMETHODIMP
-+ExampleSiteSupplier::CaptureDone(REF(HX_RESULT) status,
-+			REF(HXBitmapInfoHeader) bmiOutputFormat,
-+			REF(IHXBuffer*) pCaptureBuffer)
-+{
-+    if (status == HXR_OK)
-+    {
-+#if defined(HELIX_FEATURE_PNG)
-+	// Convert capture buffer into PNG
-+	IHXBuffer* pConvertedBuffer=NULL;
-+	HX_RESULT res = HXR_OK;
-+	res = PXPNGEncode::EncodeToPNGBuffer(pCaptureBuffer, &bmiOutputFormat, m_pCCF, pConvertedBuffer);
-+	if (res == HXR_OK && !m_strFileName.IsEmpty())
-+	{
-+	    CHXString strTail = m_strFileName.Right(4);
-+	    if (strTail.CompareNoCase(".png") != 0)
-+	    {
-+		m_strFileName += ".png";
-+	    }
-+
-+	    FILE* fp = fopen(m_strFileName, "wb");
-+	    if (fp)
-+	    {
-+	        fwrite(pConvertedBuffer->GetBuffer(), 1, pConvertedBuffer->GetSize(), fp);
-+	        fclose(fp);
-+		STDOUT("Captured image to PNG file: %s\n", (const char*)m_strFileName);
-+		STDOUT("File size: %ld\n", pConvertedBuffer->GetSize());
-+	    }
-+	    HX_RELEASE(pConvertedBuffer);
-+	}
-+#endif //  HELIX_FEATURE_PNG
-+    }
-+
-+    return status;
-+}
-Index: helix-libs/clientapps/clutter/exsitsup.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exsitsup.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,154 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXSITSUP_H_
-+#define _EXSITSUP_H_
-+
-+#include "fivemmap.h"
-+#include "player.h"
-+
-+/****************************************************************************
-+ * 
-+ *  Class:
-+ *
-+ *	ExampleSiteSupplier
-+ *
-+ *  Purpose:
-+ *
-+ *	Implementation for ragui's IHXSiteSupplier
-+ *
-+ */
-+class ExampleSiteSupplier : 
-+	public IHXSiteSupplier
-+	, public IHXSiteCaptureResponse
-+{
-+private:
-+    LONG32		    m_lRefCount;
-+    IHXSiteManager*	    m_pSiteManager;
-+    IHXSite*		    m_pSite;
-+    IHXSiteCapture*	    m_pSiteCapture;
-+    IHXBuffer*		    m_pCaptureBuffer;
-+    IHXCommonClassFactory*  m_pCCF;
-+    IUnknown*		    m_pUnkPlayer;
-+    FiveMinuteMap	    m_CreatedSites;
-+    CHXString		    m_strFileName;
-+    on_new_frame_cb_t   m_on_new_frame_cb;
-+    void *              m_context;
-+
-+    ~ExampleSiteSupplier();
-+
-+public:
-+    ExampleSiteSupplier(IUnknown* pUnkPlayer, on_new_frame_cb_t new_frame_cb = NULL, void *context = NULL);
-+    
-+    /*
-+     * IUnknown methods
-+     */
-+    STDMETHOD(QueryInterface)	(THIS_
-+				REFIID riid,
-+				void** ppvObj);
-+
-+    STDMETHOD_(ULONG32,AddRef)	(THIS);
-+
-+    STDMETHOD_(ULONG32,Release)	(THIS);
-+
-+    /*
-+     * IHXSiteSupplier methods
-+     */
-+
-+    /************************************************************************
-+     *	Method:
-+     *	    IHXSiteSupplier::SitesNeeded
-+     *	Purpose:
-+     *	  Called to inform the site supplier that a site with a particular
-+     *	  set of characteristics is needed. If the site supplier can 
-+     *	  fulfill the request it should call the site manager and add one
-+     *	  or more new sites.
-+     *    Note that the request for sites is associated with a Request ID
-+     *    the client core will inform the site supplier when this requested
-+     *    site is no longer needed.
-+     */
-+    STDMETHOD(SitesNeeded)	(THIS_
-+				UINT32			uRequestID,
-+				IHXValues*		pSiteProps);
-+
-+    /************************************************************************
-+     *  Method:
-+     *    IHXSiteSupplier::SitesNotNeeded
-+     *  Purpose:
-+     *    Called to inform the site supplier that all sites from a previos
-+     *	  site request are no longer needed. If the site supplier had 
-+     *	  previously created non-persistant sites (like popup windows)
-+     *    to fulfill a request for sites it should call the site manager 
-+     *    and remove those sites.
-+     */
-+    STDMETHOD(SitesNotNeeded)
-+				(THIS_
-+				UINT32			uRequestID);
-+
-+
-+    /************************************************************************
-+     *  Method:
-+     *    IHXSiteSupplier::BeginChangeLayout
-+     *  Purpose:
-+     *    Called to inform the site supplier a layout change has beginning
-+     *	  it can expect to recieve SitesNeeded() and SitesNotNeeded() calls
-+     *	  while a layout change is in progress,
-+     */
-+    STDMETHOD(BeginChangeLayout) (THIS);
-+
-+    /************************************************************************
-+     *  Method:
-+     *    IHXSiteSupplier::DoneChangeLayout
-+     *  Purpose:
-+     *    Called to inform the site supplier the layout change has been
-+     *	  completed.
-+     */
-+    STDMETHOD(DoneChangeLayout) (THIS);
-+
-+    /*
-+     * IHXSiteCaptureResponse
-+     */
-+    STDMETHOD(CaptureDone)	(THIS_
-+				REF(HX_RESULT) 		 status,
-+                        	REF(HXBitmapInfoHeader)  bmiOutputFormat,
-+                        	REF(IHXBuffer*)          pImageDataBuffer
-+				);
-+
-+    HX_RESULT CaptureImage(CHXString pFileName, INT32 dWidth, INT32 dHeight);
-+
-+};
-+
-+#endif // _EXSITSUP_H_
-+
-Index: helix-libs/clientapps/clutter/exstateadvsnk.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exstateadvsnk.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,229 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include <stdio.h>
-+
-+#include "hxtypes.h"
-+
-+#include "hxcom.h"
-+#include "hxcomm.h"
-+#include "hxmon.h"
-+#include "hxcore.h"
-+#include "hxengin.h"
-+#include "hxclsnk.h"
-+#include "hxgroup.h"
-+#include "hxstrutl.h"
-+#include "exstateadvsnk.h"
-+#include "hxstring.h"
-+#include "hxprefs.h"
-+#include "excontxt.h"
-+
-+#include "print.h"
-+
-+#include "globals.h"
-+#include "player.h"
-+
-+struct _stGlobals*& GetGlobal(); //in main.cpp
-+
-+#ifdef __TCS__
-+extern unsigned long   gStreamTime;
-+ 
-+static int		iOpened = 0;
-+
-+
-+#if	defined(__cplusplus)
-+extern	"C"	{
-+#endif	/* defined(__cplusplus) */
-+
-+typedef enum hookBuffering {
-+	eContacting = 0,
-+	eConnecting = 1,
-+	eBuffering = 2,
-+	ePlaying = 3
-+}hookBuffering;
-+
-+void hookRealAudio_Buffering(hookBuffering connectState, int pct);
-+
-+void hookRealAudio_PlayPosition(unsigned long current,unsigned long duration);
-+
-+typedef enum hookState {
-+	ePlay = 0,
-+	ePause = 1,
-+	eStop = 2,
-+	eResume = 3,
-+	eComplete				// Clip is done playing
-+}hookState;
-+void hookRealAudio_State(hookState newState);
-+
-+
-+#if	defined(__cplusplus)
-+}
-+#endif	/* defined(__cplusplus) */
-+
-+#endif // __TCS__
-+
-+void PrintBuffer(const char* pszName,const unsigned char* pbBuf, unsigned int dwBytes);
-+
-+ExampleClientStateAdviceSink::ExampleClientStateAdviceSink(IUnknown* pUnknown, LONG32 lClientIndex, on_state_change_cb_t on_state_change_cb, void *context)
-+    : m_lRefCount (0)
-+    , m_lClientIndex (lClientIndex)
-+    , m_pUnknown (NULL)
-+    , m_State (HX_CLIENT_STATE_READY)
-+    , m_state_change_cb(on_state_change_cb)
-+    , m_context(context)
-+{
-+    if (pUnknown)
-+    {
-+        m_pUnknown = pUnknown;
-+        m_pUnknown->AddRef();
-+
-+        IHXPlayer* pPlayer;
-+        IHXClientStateAdviseSinkControl *pStateControl;
-+        if(HXR_OK == m_pUnknown->QueryInterface(IID_IHXPlayer,
-+                    (void**)&pPlayer))
-+        {
-+            m_pPlayer = pPlayer;
-+
-+
-+        }
-+
-+        if (HXR_OK == m_pUnknown->QueryInterface(IID_IHXClientStateAdviseSinkControl, (void **)&pStateControl))
-+        {
-+            pStateControl->AddClientStateAdviseSink(this);
-+        }
-+    }
-+
-+#ifdef __TCS__
-+    bEnableAdviceSink = TRUE;
-+    iOpened = 0;
-+#endif 
-+}
-+
-+ExampleClientStateAdviceSink::~ExampleClientStateAdviceSink(void)
-+{
-+
-+    if (m_pPlayer)
-+    {
-+	m_pPlayer->Release();
-+	m_pPlayer = NULL;
-+    }
-+    if (m_pUnknown)
-+    {
-+	m_pUnknown->Release();
-+	m_pUnknown = NULL;
-+    }
-+}
-+
-+
-+// *** IUnknown methods ***
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::QueryInterface
-+//  Purpose:
-+//	Implement this to export the interfaces supported by your 
-+//	object.
-+//
-+STDMETHODIMP ExampleClientStateAdviceSink::QueryInterface(REFIID riid, void** ppvObj)
-+{
-+    if (IsEqualIID(riid, IID_IUnknown))
-+    {
-+	AddRef();
-+	*ppvObj = (IUnknown*)(IHXClientStateAdviseSink *)this;
-+	return HXR_OK;
-+    }
-+    else if (IsEqualIID(riid, IID_IHXClientStateAdviseSink))
-+    {
-+	AddRef();
-+	*ppvObj = (IHXClientStateAdviseSink*)this;
-+	return HXR_OK;
-+    }
-+
-+    *ppvObj = NULL;
-+    return HXR_NOINTERFACE;
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::AddRef
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleClientStateAdviceSink::AddRef()
-+{
-+    return InterlockedIncrement(&m_lRefCount);
-+}
-+
-+/////////////////////////////////////////////////////////////////////////
-+//  Method:
-+//	IUnknown::Release
-+//  Purpose:
-+//	Everyone usually implements this the same... feel free to use
-+//	this implementation.
-+//
-+STDMETHODIMP_(ULONG32) ExampleClientStateAdviceSink::Release()
-+{
-+    if (InterlockedDecrement(&m_lRefCount) > 0)
-+    {
-+        return m_lRefCount;
-+    }
-+
-+    delete this;
-+    return 0;
-+}
-+
-+
-+/************************************************************************
-+ *      Method:
-+ *          IHXClientStateAdviseSink::OnStateChange
-+ *      Purpose:
-+ *          Called to advise the client state has changed state
-+ */
-+STDMETHODIMP ExampleClientStateAdviceSink::OnStateChange(UINT16 uOldState, UINT16 uNewState)
-+{
-+    if (m_state_change_cb)
-+        m_state_change_cb(uOldState, uNewState, m_context);
-+
-+    m_State = uNewState;
-+    return HXR_OK;
-+}
-+
-+EHXClientState ExampleClientStateAdviceSink::GetState()
-+{
-+    return m_State;
-+}
-+
-+
-Index: helix-libs/clientapps/clutter/exstateadvsnk.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/exstateadvsnk.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,108 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _EXAMPLE_CLIENT_STATE_ADVISE_SNK_H_
-+#define _EXAMPLE_CLIENT_STATE_ADVISE_SNK_H_
-+
-+#include "player.h"
-+
-+struct IHXClientStateAdviseSink;
-+struct IHXGroupSink;
-+struct IUnknown;
-+struct IHXRegistry;
-+struct IHXScheduler;
-+struct IHXCallback;
-+struct IHXPlayer;
-+struct IHXGroup;
-+
-+class ExampleClientStateAdviceSink : public IHXClientStateAdviseSink
-+{
-+    private:
-+        LONG32          m_lRefCount;
-+        LONG32          m_lClientIndex;
-+
-+        IUnknown*       m_pUnknown;
-+
-+        UINT32          m_ulStartTime;
-+        UINT32          m_ulStopTime;
-+
-+        UINT32    m_lCurrentBandwidth;
-+        UINT32    m_lAverageBandwidth;
-+        HXBOOL      m_bOnStop;
-+
-+        HXBOOL      m_bWaitForTrackStart;
-+
-+        on_state_change_cb_t m_state_change_cb;
-+        void *m_context;
-+        EHXClientState m_State;
-+
-+        // IHXCallback
-+        IHXPlayer*		m_pPlayer;
-+        ULONG32         m_hCallback;
-+        ~ExampleClientStateAdviceSink();
-+
-+
-+    public:
-+
-+        ExampleClientStateAdviceSink(IUnknown* /*IN*/ pUnknown, LONG32 /*IN*/ lClientIndex, on_state_change_cb_t on_state_change_cb = NULL, void *context = NULL);
-+
-+        /*
-+         *  IUnknown methods
-+         */
-+        STDMETHOD(QueryInterface) (THIS_
-+                REFIID riid,
-+                void** ppvObj);
-+
-+        STDMETHOD_(ULONG32,AddRef) (THIS);
-+
-+        STDMETHOD_(ULONG32,Release) (THIS);
-+
-+        /***********************************************************************
-+         *  Method:
-+         *     IHXClientStateAdviseSink::OnStateChange
-+         *    Purpose:
-+         *       Called by client engine to inform the client that the state has changed.
-+         *      States are defined in the enum EHXClientState, defined in this file.
-+         *
-+         */
-+        STDMETHOD(OnStateChange)    (THIS_
-+                UINT16 uOldState,
-+                UINT16 uNewState
-+                ) ;
-+
-+        EHXClientState GetState();
-+};
-+
-+#endif /* _EXAMPLECLSNK_ */
-Index: helix-libs/clientapps/clutter/fivemmap.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/fivemmap.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,175 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include <string.h>
-+#include "hxtypes.h"
-+#include "fivemmap.h"
-+
-+void* FiveMinuteMap::GetFirstValue()
-+{
-+    m_nCursor = 0;
-+
-+    if (m_nMapSize)
-+    {
-+       return m_pValueArray[m_nCursor];
-+    }
-+    else
-+    {
-+       return NULL;
-+    }
-+}
-+
-+void* FiveMinuteMap::GetNextValue()
-+{
-+    m_nCursor++;
-+
-+    if (m_nCursor < m_nMapSize)
-+    {
-+       return m_pValueArray[m_nCursor];
-+    }
-+    else
-+    {
-+       return NULL;
-+    }
-+}
-+
-+HXBOOL FiveMinuteMap::Lookup(void* Key, void*& Value) const
-+{
-+    HXBOOL bFound = FALSE;
-+    int nIndex = 0;
-+
-+    // If Key is alrady in the list, replace value
-+    for (; nIndex < m_nMapSize; nIndex++)
-+    {
-+	if (m_pKeyArray[nIndex] == Key)
-+	{
-+	    Value = m_pValueArray[nIndex];
-+	    bFound = TRUE;
-+	    goto exit;
-+	}
-+    }
-+
-+exit:
-+    return bFound;    
-+}
-+
-+void FiveMinuteMap::RemoveKey(void* Key)
-+{
-+    HXBOOL bFound = FALSE;
-+    int nIndex = 0;
-+
-+    // If Key is alrady in the list, replace value
-+    for (; nIndex < m_nMapSize; nIndex++)
-+    {
-+	if (m_pKeyArray[nIndex] == Key)
-+	{
-+	    if (nIndex < (m_nMapSize-1))
-+	    {
-+		memmove(&(m_pKeyArray[nIndex]),&(m_pKeyArray[nIndex+1]),sizeof(void*)*(m_nMapSize-(nIndex+1)));
-+		memmove(&(m_pValueArray[nIndex]),&(m_pValueArray[nIndex+1]),sizeof(void*)*(m_nMapSize-(nIndex+1)));
-+	    }
-+	    m_nMapSize--;
-+	    goto exit;
-+	}
-+    }
-+
-+exit:
-+    (NULL); // We're done!
-+}
-+
-+void FiveMinuteMap::RemoveValue(void* Value)
-+{
-+    HXBOOL bFound = FALSE;
-+    int nIndex = 0;
-+
-+    // If Value is alrady in the list, replace value
-+    for (; nIndex < m_nMapSize; nIndex++)
-+    {
-+	if (m_pValueArray[nIndex] == Value)
-+	{
-+	    if (nIndex < (m_nMapSize-1))
-+	    {
-+		memmove(&(m_pKeyArray[nIndex]),&(m_pKeyArray[nIndex+1]),sizeof(void*)*(m_nMapSize-(nIndex+1)));
-+		memmove(&(m_pValueArray[nIndex]),&(m_pValueArray[nIndex+1]),sizeof(void*)*(m_nMapSize-(nIndex+1)));
-+	    }
-+	    m_nMapSize--;
-+	    goto exit;
-+	}
-+    }
-+
-+exit:
-+    (NULL); // We're done!
-+}
-+
-+
-+void FiveMinuteMap::SetAt(void* Key, void* Value)
-+{
-+    int nIndex = 0;
-+
-+    // If Key is alrady in the list, replace value
-+    for (; nIndex < m_nMapSize; nIndex++)
-+    {
-+	if (m_pKeyArray[nIndex] == Key)
-+	{
-+	    m_pValueArray[nIndex] = Value;
-+	    goto exit;
-+	}
-+    }
-+
-+    // If we have room, add it to the end!
-+    if (m_nAllocSize == m_nMapSize)
-+    {
-+	m_nAllocSize += AllocationSize;
-+	void** pNewKeys   = new void*[m_nAllocSize];
-+	void** pNewValues = new void*[m_nAllocSize];
-+
-+	memcpy(pNewKeys,m_pKeyArray,sizeof(void*)*m_nMapSize); /* Flawfinder: ignore */
-+	memcpy(pNewValues,m_pValueArray,sizeof(void*)*m_nMapSize); /* Flawfinder: ignore */
-+
-+	delete [] m_pKeyArray;
-+	delete [] m_pValueArray;
-+
-+	m_pKeyArray = pNewKeys;
-+	m_pValueArray = pNewValues;
-+    }
-+
-+    m_pKeyArray[m_nMapSize] = Key;
-+    m_pValueArray[m_nMapSize] = Value;
-+    m_nMapSize++;
-+
-+exit:
-+    (NULL); // We're done!
-+}
-+
-Index: helix-libs/clientapps/clutter/fivemmap.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/fivemmap.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,79 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef _FIVEMMAP_H_
-+#define _FIVEMMAP_H_
-+
-+#ifndef _HXTYPES_H_
-+#error FiveMinuteMap assumes pntypes.h.
-+#endif
-+
-+class FiveMinuteMap
-+{
-+    const int AllocationSize;
-+
-+    void**  m_pKeyArray;
-+    void**  m_pValueArray;
-+    int	    m_nMapSize;
-+    int	    m_nAllocSize;
-+    int     m_nCursor;
-+public:
-+    FiveMinuteMap()
-+	: m_pKeyArray(NULL)
-+	, m_pValueArray(NULL)
-+	, m_nMapSize(0)
-+	, m_nAllocSize(0)
-+        , m_nCursor(0)
-+	, AllocationSize(10)
-+	{};
-+
-+    ~FiveMinuteMap()
-+	{
-+	    delete [] m_pKeyArray;
-+	    delete [] m_pValueArray;
-+	};
-+
-+    int  GetCount() {return m_nMapSize;}
-+
-+    void* GetFirstValue();
-+    void* GetNextValue();
-+
-+    HXBOOL Lookup(void* Key, void*& Value) const;
-+    void RemoveKey(void* Key);
-+    void RemoveValue(void* Value);
-+    void SetAt(void* Key, void* Value);
-+};
-+
-+#endif /* _FIVEMMAP_H_ */
-Index: helix-libs/clientapps/clutter/globals.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/globals.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,150 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+/****************************************************************************
-+ * 
-+ *  Test Client:
-+ *  
-+ *
-+ *  This is an test client running on Windows, Mac, and Unix without a GUI.
-+ *
-+ */ 
-+
-+#ifndef _SPLAY_GLOBALS_H
-+#define _SPLAY_GLOBALS_H
-+
-+#include "dllacces.h"
-+#include "dllpath.h"
-+#include "hxengin.h"
-+#include "hxplayvelocity.h"
-+#include "hxcore.h"
-+#include "ihxmedpltfm.h"
-+#include "excontxt.h"
-+#include "preflist.h"
-+
-+#define HX_COMMAND_BUFFER_SIZE 256
-+#define HX_MAX_NUM_MULTI_SEEKS 10
-+struct _stGlobals
-+{
-+    _stGlobals()
-+        : g_pDLLAccess(NULL),
-+	  g_nPlayers(0),
-+	  m_fpHXMediaPlatformOpen(NULL),
-+	  m_fpHXCreateMediaPlatform(NULL),
-+	  m_fpHXMediaPlatformClose(NULL),
-+	  m_fpCreateEngine(NULL),
-+	  m_fpCloseEngine(NULL),
-+	  m_fpSetDLLAccessPath(NULL),
-+	  bEnableAdviceSink(FALSE),
-+          bEnableVerboseMode(FALSE),
-+          g_bEnableSlowStart(TRUE),
-+          g_bOnBeginOccurred(FALSE),
-+          g_pszUsername( NULL),
-+          g_pszPassword(NULL),
-+          g_pszGUIDFile(NULL),
-+          g_pszGUIDList(NULL),
-+          g_Error(HXR_OK),
-+	  g_ulNumSecondsPlayed(0),
-+	  pMediaPlatform(NULL),
-+          g_pIHXKicker(NULL),
-+          bUseLegacyAPIs(FALSE),
-+	  pEngine(NULL),
-+          g_pQuickSeek(NULL),
-+          g_bNullRender(FALSE),
-+          g_bUserStop(FALSE),
-+          g_bInitVelocity(FALSE),
-+          g_bABD(FALSE),
-+          g_pVelocityCaps(NULL),
-+          g_ulNumMultiSeeks(0),
-+          g_ulMultiSeekIndex(0),
-+          g_bMultiSeek(FALSE),
-+    	  g_uThreadIDForKicker(-1)
-+    {
-+        memset(g_szCommandBuffer, 0, HX_COMMAND_BUFFER_SIZE);
-+        memset(g_szPriorCommandBuffer, 0, HX_COMMAND_BUFFER_SIZE);
-+        memset(g_Players, 0, sizeof(g_Players));
-+        memset(g_pszURLs, 0, sizeof(g_pszURLs));
-+        memset(g_pClientContexts, 0, sizeof(g_pClientContexts));
-+    }
-+
-+    #define MAX_NUM_PLAYERS     256
-+    IHXPlayer*              g_Players[MAX_NUM_PLAYERS];
-+    char                    *g_pszURLs[MAX_NUM_PLAYERS];
-+    ExampleClientContext    *g_pClientContexts[MAX_NUM_PLAYERS];
-+    int                      g_nPlayers;
-+    DLLAccessPath            g_statclnt;
-+    DLLAccess*              g_pDLLAccess;
-+    CHXPrefList             g_prefList;
-+
-+    FPHXMEDIAPLATFORMOPEN    m_fpHXMediaPlatformOpen;
-+    FPHXCREATEMEDIAPLATFORM  m_fpHXCreateMediaPlatform;
-+    FPHXMEDIAPLATFORMCLOSE   m_fpHXMediaPlatformClose;
-+
-+    FPRMCREATEENGINE         m_fpCreateEngine;
-+    FPRMCLOSEENGINE          m_fpCloseEngine;
-+    FPRMSETDLLACCESSPATH     m_fpSetDLLAccessPath;
-+
-+    HXBOOL                   bEnableAdviceSink;
-+    HXBOOL                   bEnableVerboseMode;
-+    HXBOOL                   g_bEnableSlowStart;
-+    HXBOOL                   g_bOnBeginOccurred;
-+    char*                    g_pszUsername;
-+    char*                    g_pszPassword;
-+    char*                    g_pszGUIDFile;
-+    char*                    g_pszGUIDList;
-+    HX_RESULT                g_Error;
-+    UINT32                   g_ulNumSecondsPlayed;
-+    IHXMediaPlatform*	     pMediaPlatform;
-+    IHXMediaPlatformKicker*  g_pIHXKicker;
-+    UINT32	             g_uThreadIDForKicker;
-+    pthread_t	             g_pThreadKickmanId;
-+    HXBOOL                   bUseLegacyAPIs;
-+    IHXClientEngine*         pEngine;
-+    IHXQuickSeek*            g_pQuickSeek;
-+    HXBOOL                   g_bNullRender;
-+    HXBOOL                   g_bUserStop;
-+    HXBOOL                   g_bInitVelocity;
-+    HXBOOL                   g_bABD;
-+    IHXPlaybackVelocityCaps* g_pVelocityCaps;
-+    HXBOOL                   g_bMultiSeek;
-+    UINT32                   g_ulMultiSeekTime[HX_MAX_NUM_MULTI_SEEKS];
-+    UINT32                   g_ulNumMultiSeeks;
-+    UINT32                   g_ulMultiSeekIndex;
-+    char                     g_szCommandBuffer[HX_COMMAND_BUFFER_SIZE];
-+    char                     g_szPriorCommandBuffer[HX_COMMAND_BUFFER_SIZE];
-+};
-+
-+
-+#endif // _SPLAY_GLOBALS_H
-Index: helix-libs/clientapps/clutter/iids.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/iids.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,50 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+// define all guids here once...
-+#define INITGUID
-+#define NCIHACK
-+#include "hxtypes.h"
-+#include "hxcom.h"
-+#include "hxiids.h"
-+#include "hxpiids.h"
-+#if defined _WINDOWS
-+#if defined (HELIX_FEATURE_DIRECT_SOUND)
-+#include "dsound.h"
-+#endif /* HELIX_FEATURE_DIRECT_SOUND */
-+#if defined (HELIX_FEATURE_VIDEO) && !defined(_WINCE)
-+#include "ddraw.h"
-+#endif /* HELIX_FEATURE_VIDEO */
-+#endif
-Index: helix-libs/clientapps/clutter/linux2.pcf
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/linux2.pcf	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,42 @@
-+# 
-+# ***** BEGIN LICENSE BLOCK ***** 
-+# Version: RCSL 1.0/RPSL 1.0 
-+#  
-+# Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+#      
-+# The contents of this file, and the files included with this file, are 
-+# subject to the current version of the RealNetworks Public Source License 
-+# Version 1.0 (the "RPSL") available at 
-+# http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+# the file under the RealNetworks Community Source License Version 1.0 
-+# (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+# in which case the RCSL will apply. You may also obtain the license terms 
-+# directly from RealNetworks.  You may not use this file except in 
-+# compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+# applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+# RCSL for the rights, obligations and limitations governing use of the 
-+# contents of the file.  
-+#  
-+# This file is part of the Helix DNA Technology. RealNetworks is the 
-+# developer of the Original Code and owns the copyrights in the portions 
-+# it created. 
-+#  
-+# This file, and the files included with this file, is distributed and made 
-+# available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+# EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+# FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+# 
-+# Technology Compatibility Kit Test Suite(s) Location: 
-+#    http://www.helixcommunity.org/content/tck 
-+# 
-+# Contributor(s): 
-+#  
-+# ***** END LICENSE BLOCK ***** 
-+# 
-+
-+project.AddSystemLibraries("dl", "m", "pthread")
-+
-+if (project.IsDefined("HELIX_FEATURE_VIDEO") and
-+    project.IsDefined("USE_XWINDOWS")):
-+	project.AddSystemLibraries("X11")
-Index: helix-libs/clientapps/clutter/player.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/player.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,1057 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: RCSL 1.0/RPSL 1.0
-+ *
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved.
-+ *
-+ * The contents of this file, and the files included with this file, are
-+ * subject to the current version of the RealNetworks Public Source License
-+ * Version 1.0 (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the RealNetworks Community Source License Version 1.0
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl,
-+ * in which case the RCSL will apply. You may also obtain the license terms
-+ * directly from RealNetworks.  You may not use this file except in
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or
-+ * RCSL for the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ *
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the portions
-+ * it created.
-+ *
-+ * This file, and the files included with this file, is distributed and made
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-+ *
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ *
-+ * Contributor(s):
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/****************************************************************************
-+ *
-+ *  Test Client:
-+ *
-+ *
-+ *  This is an test client running on Windows, Mac, and Unix without a GUI.
-+ *
-+ */
-+#include "hxtypes.h"
-+
-+#include <stdlib.h>
-+
-+#include "hlxclib/time.h"
-+#include "ihxmedpltfm.h"
-+#include "hxwintyp.h"
-+#include "hxcom.h"
-+#include "ihxpckts.h"
-+#include "hxcomm.h"
-+#include "hxmon.h"
-+#include "hxfiles.h"
-+#include "hxengin.h"
-+#include "hxcore.h"
-+#include "hxclsnk.h"
-+#include "hxgroup.h"
-+#include "hxerror.h"
-+#include "hxauth.h"
-+#include "hxwin.h"
-+#include "hxprefs.h"
-+#include "hxtbuf.h"
-+#include "fivemmap.h"
-+#include "dllacces.h"
-+#include "hxausvc.h"
-+#include "hxstrutl.h"
-+#include "hxgroup.h"
-+#include "hxwin.h"
-+#include "hxtick.h"
-+#include "hxbuffer.h"
-+#include "hxplayvelocity.h"
-+#include "pckunpck.h"  //  For CreateAndSetBufferCCF()
-+#include "hxvctrl.h"
-+#include "hxbsrc.h"
-+#include "excallback.h"
-+#include "pthread.h"
-+
-+#if defined(HELIX_FEATURE_PRESENTATION_FEATURE_SELECTION)
-+#include "hxpfs.h"
-+#endif //  HELIX_FEATURE_PRESENTATION_FEATURE_SELECTION.
-+
-+#if defined(HELIX_FEATURE_PREFERENCES)
-+#include "preflist.h"
-+#endif /* #if defined(HELIX_FEATURE_PREFERENCES) */
-+#include "exadvsnk.h"
-+#include "exerror.h"
-+#include "exsitsup.h"
-+#include "exaumgr.h"
-+#if defined(_WIN32)
-+#include "exabd.h"
-+#endif
-+#include "excontxt.h"
-+#include "print.h"
-+#if defined(USE_XWINDOWS)
-+#include <X11/Xlib.h>
-+#endif
-+#if defined (_UNIX)
-+#include <stdio.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <termios.h>
-+#endif
-+#if defined(_WINDOWS)
-+#include <conio.h>
-+#endif
-+
-+#ifdef __TCS__
-+#include <unistd.h>
-+#if defined(__cplusplus)
-+extern      "C"     {
-+#endif      /* defined(__cplusplus) */
-+    extern      unsigned long  tmosTimSleep(unsigned long ticks);
-+    unsigned long       gForcePlayerToStop = 0;
-+#if defined(__cplusplus)
-+}
-+#endif      /* defined(__cplusplus) */
-+#endif
-+
-+#if defined (_MACINTOSH) || defined (_MAC_UNIX)
-+bool gMacPlayerIsDone = false;
-+#endif
-+
-+
-+#if defined _VXWORKS
-+#include "sys/times.h"
-+#include "string.h"
-+#include "hxtime.h"
-+#endif
-+
-+#if defined(_MACINTOSH)
-+#ifndef _MAC_MACHO
-+#include <sioux.h>
-+#include <console.h>
-+#endif
-+#endif
-+
-+#include "dllpath.h"
-+
-+#ifdef _SYMBIAN
-+#include <e32svr.h>
-+#include "platform/symbian/symbian_event_hndlr.h"
-+#endif
-+
-+ENABLE_DLLACCESS_PATHS(g_SPlayAccessPath);
-+
-+// typedef for SetDLLAccessPath
-+
-+
-+#include "thrdutil.h"
-+
-+#if defined(_AIX)
-+#include <strings.h>
-+#endif
-+
-+#if defined _DEBUG || defined DEBUG
-+#include "debug.h"
-+#endif
-+
-+#ifndef MAX_PATH
-+#define MAX_PATH    256
-+#endif //!MAX_PATH
-+
-+#if defined(HELIX_CONFIG_NOSTATICS)
-+# include "globals/hxglobals.h"
-+#endif
-+
-+#define MAX_NUM_URLS 10
-+
-+#include "globals.h" //for global struct.
-+
-+#include "player.h"
-+
-+#if defined(_WINDOWS) && defined(_STATICALLY_LINKED)
-+HINSTANCE g_hInstance = NULL;
-+#endif
-+
-+struct _stGlobals*& GetGlobal()
-+{
-+#if defined(HELIX_CONFIG_NOSTATICS)
-+    static const struct _stGlobals* const _g_pstGlobals = NULL;
-+    struct _stGlobals*& g_pstGlobals = (struct _stGlobals*&)HXGlobalPtr::Get(&_g_pstGlobals);
-+#else
-+    static struct _stGlobals* g_pstGlobals = NULL;
-+#endif
-+    if( g_pstGlobals == NULL )
-+    {
-+        g_pstGlobals = new struct _stGlobals();
-+    }
-+    return g_pstGlobals;
-+
-+}
-+
-+
-+// Constants
-+const int DEFAULT_TIME_DELTA = 2000;
-+const int DEFAULT_STOP_TIME  = -1;
-+const int SLEEP_TIME         = 5;
-+const int GUID_LEN           = 64;
-+
-+// Function prototypes
-+void  PrintUsage(const char* pszAppName);
-+HXBOOL  AllPlayersDone(int nNumPlayers, IHXPlayer** ppPlayers);
-+void  StopAllPlayers(int nNumPlayers, IHXPlayer** ppPlayers);
-+HXBOOL  ReadGUIDFile();
-+char* GetAppName(char* pszArgv0);
-+
-+#ifdef __TCS__
-+#if defined(__cplusplus)
-+extern      "C"     {
-+#endif      /* defined(__cplusplus) */
-+
-+    extern      void    _alloc_stats(int verbose);
-+#if defined(__cplusplus)
-+}
-+#endif      /* defined(__cplusplus) */
-+
-+static  IHXPlayer** g_Players;
-+static  int         g_nPlayers = 0;
-+static  long        evtCount = 0;
-+static  long        evtFullCount = 0;
-+#endif
-+
-+
-+
-+#if defined(HELIX_FEATURE_PRESENTATION_FEATURE_SELECTION)
-+HX_RESULT
-+DumpPFdata(IHXPresentationFeatureManager* pPFMgr,
-+           const char* pszPFName)
-+{
-+    HX_RESULT hxr = HXR_OK;
-+
-+    IHXBuffer* pFeatureCurrentSetting = NULL;
-+    IHXValues* pFeatureOptions = NULL;
-+
-+    if (!pPFMgr  ||  !pszPFName)
-+    {
-+        hxr = HXR_INVALID_PARAMETER;
-+    }
-+    else
-+    {
-+        //  List all the options for this PF:
-+        HX_RESULT hxr = pPFMgr->GetPresentationFeature(
-+                pszPFName,
-+                pFeatureCurrentSetting,
-+                pFeatureOptions);
-+
-+        if (FAILED(hxr))
-+        {
-+            //  PF doesn't exist!
-+            STDOUT("\t%s - No such presentation feature\n\n", pszPFName);
-+        }
-+        else
-+        {
-+            //  Now, go through pFeatureOptions and display
-+            // them and their "is-selectable"-flag values:
-+            const char* pszPFOptionName = NULL;
-+            const char* pszPFCurSetting = pFeatureCurrentSetting?
-+                    (const char*)pFeatureCurrentSetting->GetBuffer() : NULL;
-+            UINT32 bPFOptionIsSelectableFlag = FALSE;
-+            IHXBuffer* pPFOptionIsSelectableFlag = NULL;
-+
-+            HX_ASSERT(pszPFCurSetting);
-+            STDOUT("\t%s\t(Current setting == \"%s\")\n", pszPFName, pszPFCurSetting?
-+                    pszPFCurSetting : "<ERROR: THIS PF HAS NO CURRENT SETTING!>");
-+            
-+            if (!pFeatureOptions) //  NULL is OK; that means freeform (open-ended):
-+            {
-+                STDOUT("\t\t(%s's options are freeform, i.e., open-ended)\n",
-+                        pszPFName);
-+            }
-+            else //  List all the options and their flags:
-+            {
-+                if (HXR_OK == pFeatureOptions->GetFirstPropertyCString(pszPFOptionName,
-+                        pPFOptionIsSelectableFlag)  &&  *pszPFOptionName)
-+                {
-+                    do
-+                    {
-+                        const UCHAR* pIsSelFlag = pPFOptionIsSelectableFlag->GetBuffer();
-+                        if (pIsSelFlag  &&  *pIsSelFlag)
-+                        {
-+                            //  Anything but '0' (zero) is treated as '1' (is selectable):
-+                            bPFOptionIsSelectableFlag = (HXBOOL)('0' != *pIsSelFlag  &&
-+                                    '\0' == *(pIsSelFlag+1));
-+                        }
-+                        else
-+                        {
-+                            //  Set the error, but we'll go ahead and treat it as '0':
-+                            hxr = HXR_INVALID_PARAMETER;
-+                            bPFOptionIsSelectableFlag = FALSE;
-+                        }
-+
-+                        STDOUT("\t\t%s\t\tIs selectable: %s\n",
-+                                pszPFOptionName, bPFOptionIsSelectableFlag? "yes":"no");
-+                        //  Release it to get the next PF:
-+                        HX_RELEASE(pPFOptionIsSelectableFlag);
-+                    } while (HXR_OK == pFeatureOptions->GetNextPropertyCString(
-+                                    pszPFOptionName, pPFOptionIsSelectableFlag));
-+                }
-+            }
-+
-+            HX_RELEASE(pPFOptionIsSelectableFlag);
-+        }
-+    }
-+
-+    HX_RELEASE(pFeatureCurrentSetting);
-+    HX_RELEASE(pFeatureOptions);
-+
-+    return hxr;
-+}
-+#endif //  HELIX_FEATURE_PRESENTATION_FEATURE_SELECTION.
-+
-+
-+char* RemoveWrappingQuotes(char* str)
-+{
-+    int len = strlen(str);
-+    if (len > 0)
-+    {
-+        if (str[len-1] == '"') str[--len] = 0;
-+        if (str[0] == '"') { int i = 0; do { str[i++] = str[i+1]; } while(--len); }
-+    }
-+    return str;
-+}
-+
-+void *kickman(void *dummy)
-+{
-+	while(1) {
-+		UINT32 sleepTime = 0;
-+		IHXMediaPlatformKicker* pKicker = GetGlobal()->g_pIHXKicker;
-+		if( pKicker )
-+		{
-+			pKicker->Kick(GetGlobal()->g_uThreadIDForKicker, &sleepTime);
-+		}
-+		usleep(sleepTime);
-+	}
-+}
-+
-+PLAYER_API int init_main( )
-+{
-+#if defined(_WIN32) && !defined(WIN32_PLATFORM_PSPC)
-+    setvbuf(stdout, NULL, _IONBF, 0);
-+#endif /* defined(_WIN32) && !defined(WIN32_PLATFORM_PSPC) */
-+
-+    FPHXMEDIAPLATFORMOPEN   fpHXMediaPlatformOpen   = NULL;
-+    FPHXCREATEMEDIAPLATFORM fpHXCreateMediaPlatform = NULL;
-+    FPHXMEDIAPLATFORMCLOSE  fpHXMediaPlatformClose  = NULL;
-+
-+    FPRMCREATEENGINE        fpCreateEngine          = NULL;
-+    FPRMCLOSEENGINE         fpCloseEngine           = NULL;
-+    FPRMSETDLLACCESSPATH    fpSetDll                = NULL;
-+
-+    HX_RESULT               theErr                  = HXR_OK;
-+    ExampleClientContext**  ppExContexts            = NULL;
-+#if defined(HELIX_FEATURE_AUTO_BANDWIDTH_DETECTION) && defined(_WIN32)
-+    ExampleABD*             pABD                    = NULL;
-+#endif
-+    IHXPlayer**             ppPlayers               = NULL;
-+    IHXQuickSeek*           ppQuickSeek             = NULL;
-+    IHXErrorSink*           pErrorSink              = NULL;
-+    IHXErrorSinkControl*    pErrorSinkControl       = NULL;
-+    UINT32                  ulABDResult             = 0;
-+    UINT32                  ulProbPktSize           = 0;
-+    UINT32                  ulProbPktNum            = 0;
-+#if defined(HELIX_FEATURE_PLAYBACK_VELOCITY)
-+    INT32                   lVelocity               = 100;
-+    INT32                   lKeyFrameMode           = 0;
-+    INT32                   lAutoSwitch             = 0;
-+#endif /* #if defined(HELIX_FEATURE_PLAYBACK_VELOCITY) */
-+    CHXString*              pABDServer              = NULL;
-+    char*                   pszURL[MAX_NUM_URLS];
-+    char*                   pszURLOrig[MAX_NUM_URLS];
-+    UINT32                  ulNumURLsFound          = 0;
-+    int                     nNumPlayers             = 1;
-+    int                     nNumPlayRepeats         = 1;
-+    int                     nTimeDelta              = DEFAULT_TIME_DELTA;
-+    int                     nStopTime               = DEFAULT_STOP_TIME;
-+    bool                    bStopTime               = true;
-+    int                     i                       = 0;
-+    char*                   pszGUIDList             = NULL;
-+#ifdef _MACINTOSH
-+    char                    dllhome[MAX_PATH]       = {'\0'}; /* Flawfinder: ignore */
-+#elif defined(_SYMBIAN)
-+    char                    dllhome[MAX_PATH]       = "c:"; /* Flawfinder: ignore */
-+#else
-+    char                    dllhome[MAX_PATH]       = {'.','\0'}; /* Flawfinder: ignore */
-+#endif
-+    DLLAccess*              pDLLAccess              = NULL;
-+    char                    staticLibPath[MAX_PATH] = {0}; /* Flawfinder: ignore */
-+#ifdef _WINDOWS
-+    HINSTANCE               hDll                    = NULL;
-+#endif
-+    bool                    bStopping = false;
-+    int                     nPlay = 0;
-+
-+    // NULL out the URL arrays
-+    memset(pszURL, 0, MAX_NUM_URLS * sizeof(char*));
-+    memset(pszURLOrig, 0, MAX_NUM_URLS * sizeof(char*));
-+
-+
-+    //See if the user has set their HELIX_LIBS env var. This is overridden by the
-+    //-l option.
-+    const char* pszHelixLibs = getenv("HELIX_LIBS");
-+    if( pszHelixLibs )
-+        SafeStrCpy( dllhome,  pszHelixLibs, MAX_PATH);
-+
-+
-+
-+    GetGlobal()->bEnableAdviceSink = TRUE;
-+    GetGlobal()->g_prefList.Add("UseOverlay", "0");
-+
-+    SafeSprintf(staticLibPath, MAX_PATH, "%s/%s", dllhome, "hxmedpltfm.so");
-+
-+	if (dllhome)
-+    {
-+        GetDLLAccessPath()->SetPath(DLLTYPE_COMMON, dllhome);
-+        GetDLLAccessPath()->SetPath(DLLTYPE_PLUGIN, dllhome);
-+        GetDLLAccessPath()->SetPath(DLLTYPE_CODEC, dllhome);
-+    }
-+
-+    // initialize the globals
-+    GetGlobal()->m_fpCreateEngine    = NULL;
-+    GetGlobal()->m_fpCloseEngine = NULL;
-+    GetGlobal()->g_nPlayers = 0;
-+
-+  // prepare/load the HXCore module
-+    pDLLAccess = new DLLAccess();
-+
-+    STDOUT("Simpleplayer is looking for the client core at %s\n", staticLibPath );
-+
-+    if (DLLAccess::DLL_OK != pDLLAccess->open(staticLibPath))
-+    {
-+        const char* pErrorString = NULL;
-+        pErrorString = pDLLAccess->getErrorString();
-+        STDERR("splayer: %s\n\n", pErrorString);
-+#ifndef _STATICALLY_LINKED
-+#ifndef _MACINTOSH
-+        //Make sure the user has told us where to find the DLLs at. Either
-+        //with the -l option or with the HELIX_LIBS env var.
-+        STDERR("You must tell the player where to find the client core and\n");
-+        STDERR("all of its supporting DLLs and codecs. Please use the -l\n");
-+        STDERR("option or set your HELIX_LIBS env variable to point the player.\n");
-+        STDERR("to where you have all of the DLLs installed.\n\n" );
-+        //PrintUsage(argv[0]);
-+#endif
-+#endif
-+        goto cleanup;
-+    }
-+
-+    GetGlobal()->m_fpHXMediaPlatformOpen = (FPHXMEDIAPLATFORMOPEN) pDLLAccess->getSymbol("HXMediaPlatformOpen");
-+    GetGlobal()->m_fpHXCreateMediaPlatform = (FPHXCREATEMEDIAPLATFORM) pDLLAccess->getSymbol("HXCreateMediaPlatform");
-+    GetGlobal()->m_fpHXMediaPlatformClose = (FPHXMEDIAPLATFORMCLOSE) pDLLAccess->getSymbol("HXMediaPlatformClose");
-+
-+    GetGlobal()->m_fpCreateEngine = (FPRMCREATEENGINE) pDLLAccess->getSymbol("CreateEngine");
-+    GetGlobal()->m_fpCloseEngine  = (FPRMCLOSEENGINE)  pDLLAccess->getSymbol("CloseEngine");
-+    GetGlobal()->m_fpSetDLLAccessPath = (FPRMSETDLLACCESSPATH) pDLLAccess->getSymbol("SetDLLAccessPath");
-+
-+    if (GetGlobal()->m_fpHXMediaPlatformOpen == NULL    ||
-+        GetGlobal()->m_fpHXCreateMediaPlatform == NULL  ||
-+        GetGlobal()->m_fpHXMediaPlatformClose == NULL   ||
-+        GetGlobal()->m_fpCreateEngine == NULL           ||
-+        GetGlobal()->m_fpCloseEngine  == NULL           ||
-+        GetGlobal()->m_fpSetDLLAccessPath == NULL )
-+    {
-+        theErr = HXR_FAILED;
-+        goto cleanup;
-+    }
-+
-+#if defined(USE_XWINDOWS) && defined(HELIX_FEATURE_VIDEO)
-+    XInitThreads();
-+#endif
-+    
-+    {
-+        fpHXMediaPlatformOpen = GetGlobal()->m_fpHXMediaPlatformOpen;
-+        fpHXCreateMediaPlatform = GetGlobal()->m_fpHXCreateMediaPlatform;
-+        fpHXMediaPlatformClose = GetGlobal()->m_fpHXMediaPlatformClose;
-+
-+        if (HXR_OK != fpHXMediaPlatformOpen())
-+        {
-+            theErr = HXR_FAILED;
-+            goto cleanup;
-+        }
-+
-+        if (HXR_OK != fpHXCreateMediaPlatform((IHXMediaPlatform**)&GetGlobal()->pMediaPlatform))
-+        {
-+            theErr = HXR_FAILED;
-+            goto cleanup;
-+        }
-+
-+        IHXMediaPlatform* pMediaPlatform = GetGlobal()->pMediaPlatform;
-+        
-+
-+        if (HXR_OK != pMediaPlatform->AddPluginPath("HelixSimplePlayer", dllhome))
-+        {
-+            theErr = HXR_FAILED;
-+            goto cleanup;
-+        }
-+
-+        if (HXR_OK != pMediaPlatform->Init(NULL))
-+        {
-+            theErr = HXR_FAILED;
-+            goto cleanup;
-+        }
-+    
-+        IHXCommonClassFactory* pCCF = NULL;
-+        if (HXR_OK != pMediaPlatform->QueryInterface(IID_IHXCommonClassFactory,
-+                                                     (void**)&pCCF))
-+        {
-+            theErr = HXR_FAILED;
-+            goto cleanup;
-+        }
-+
-+       if (HXR_OK != pCCF->CreateInstance(CLSID_IHXClientEngine, (void**)&GetGlobal()->pEngine))
-+        {
-+            HX_RELEASE(pCCF);
-+            theErr = HXR_FAILED;
-+            goto cleanup;
-+        }
-+
-+        HX_RELEASE(pCCF);
-+
-+        IHXMediaPlatformKicker* pKicker = NULL;
-+        pMediaPlatform->QueryInterface(IID_IHXMediaPlatformKicker, (void**)&pKicker);
-+        HX_ASSERT(pKicker);
-+        GetGlobal()->g_pIHXKicker = pKicker;
-+	GetGlobal()->g_uThreadIDForKicker = HXGetCurrentThreadID();
-+
-+	pthread_t thread_id;
-+	pthread_create(&thread_id, NULL, kickman, NULL);
-+	GetGlobal()->g_pThreadKickmanId = thread_id;
-+    }
-+
-+
-+
-+    {
-+
-+
-+#if defined(_WIN32) && !defined(WIN32_PLATFORM_PSPC)
-+        SetConsoleCtrlHandler((PHANDLER_ROUTINE)HandlerRoutine,
-+                              TRUE);
-+#endif
-+
-+    }
-+
-+    return HXR_OK;
-+
-+  cleanup:
-+    deinit_main();
-+    return HXR_FAIL;
-+}
-+
-+/* Get the least index to available entry in Getglobal()->gPlayers */
-+static int get_index()
-+{
-+    int i;
-+    /* an simple implementation */
-+    for (i = 0; i < MAX_NUM_PLAYERS; i++)
-+    {
-+        if (GetGlobal()->g_Players[i] == NULL) 
-+            return i;
-+    }
-+
-+    return -1;
-+}
-+
-+PLAYER_API unsigned int get_curr_playtime(void *pPlayerHandle)
-+{
-+    unsigned int time = 0;
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    if (pPlayer)
-+        time = pPlayer->GetCurrentPlayTime();
-+    return time;
-+}
-+
-+PLAYER_API int get_player(void **ppPlayerHandle, on_buffering_cb_t on_buffering_cb, on_pos_length_cb_t on_pos_length_cb, on_state_change_cb_t on_state_change_cb, on_new_frame_cb_t on_new_frame_cb, void *context)
-+{
-+    int index = get_index();
-+    IHXPlayer **ppPlayer = (IHXPlayer **)ppPlayerHandle;
-+    ExampleClientContext*  pExContext       = NULL;
-+    pExContext = new ExampleClientContext(index);
-+    if (!pExContext)
-+    {
-+        return HXR_UNEXPECTED;
-+    }
-+    pExContext->AddRef();
-+
-+    ppPlayer[0] = NULL;
-+    IHXClientEngine* pEngine = GetGlobal()->pEngine;
-+    if (HXR_OK != pEngine->CreatePlayer(*ppPlayer))
-+    {
-+        HX_RELEASE(pExContext);
-+        return HXR_FAILED;
-+    }
-+#if 1
-+    char*                   pszGUIDList             = NULL;
-+    //initialize the example context
-+    pszGUIDList = GetGlobal()->g_pszGUIDList;
-+    {
-+        char pszGUID[GUID_LEN + 1]; /* Flawfinder: ignore */ // add 1 for terminator
-+        char* token = NULL;
-+        IHXPreferences* pPreferences = NULL;
-+
-+        pszGUID[0] = '\0';
-+
-+        if (pszGUIDList)
-+        {
-+            // Get next GUID from the GUID list
-+            {
-+                token = strtok(pszGUIDList, "\n\0");
-+            }
-+            if (token)
-+            {
-+                strncpy(pszGUID, token, GUID_LEN); /* Flawfinder: ignore */
-+                pszGUID[GUID_LEN] = '\0';
-+            }
-+        }
-+
-+        ppPlayer[0]->QueryInterface(IID_IHXPreferences,
-+                                     (void**) &pPreferences);
-+        
-+        pExContext->Init(ppPlayer[0], pPreferences, pszGUID, on_buffering_cb, on_pos_length_cb, on_state_change_cb, on_new_frame_cb, context);
-+
-+        ppPlayer[0]->SetClientContext(pExContext);
-+
-+        HX_RELEASE(pPreferences);
-+
-+        IHXErrorSinkControl*    pErrorSinkControl       = NULL;
-+        ppPlayer[0]->QueryInterface(IID_IHXErrorSinkControl,
-+                                     (void**) &pErrorSinkControl);
-+    
-+        if (pErrorSinkControl)
-+        {
-+            IHXErrorSink*           pErrorSink              = NULL;
-+            pExContext->QueryInterface(IID_IHXErrorSink,
-+                    (void**) &pErrorSink);
-+            if (pErrorSink)
-+            {
-+                pErrorSinkControl->AddErrorSink(pErrorSink, HXLOG_EMERG, HXLOG_INFO);
-+            }
-+            HX_RELEASE(pErrorSink);
-+        }
-+        HX_RELEASE(pErrorSinkControl);
-+	GetGlobal()->g_prefList.SetPreferences(ppPlayer[0]);
-+
-+    }
-+#endif
-+    HX_ASSERT(GetGlobal()->g_nPlayers < MAX_NUM_PLAYERS);
-+    GetGlobal()->g_Players[index] = ppPlayer[0];
-+    GetGlobal()->g_pClientContexts[index] = pExContext;
-+    GetGlobal()->g_nPlayers++;
-+
-+    return HXR_OK;
-+}
-+
-+static int get_index_by_player( IHXPlayer *pPlayer)
-+{
-+    int i;
-+    /* an simple implementation */
-+    for (i = 0; i < MAX_NUM_PLAYERS; i++)
-+    {
-+       if (GetGlobal()->g_Players[i] && GetGlobal()->g_Players[i] == pPlayer)
-+           return i;
-+    }
-+
-+    return -1;
-+}
-+
-+PLAYER_API int player_openurl( void *pPlayerHandle, char *pszRawURL)
-+{
-+    HX_RESULT ret;
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    int index = get_index_by_player(pPlayer);
-+    if (index < 0)
-+        return HXR_FAIL;
-+    
-+    char *pszURLOrig = RemoveWrappingQuotes(pszRawURL);
-+
-+    //if no "://" was found lets add file:// by default so that you
-+    //can refer to local content as just ./splay ~/Content/startrek.rm,
-+    //for example, and not ./splay file:///home/gregory/Content/startrek.rm
-+    char* pszAddOn = NULL;
-+    if( strstr( pszURLOrig, "://") )
-+        pszAddOn = (char *)"";
-+    else
-+        pszAddOn = (char *)"file://";
-+
-+    char *pszURL = new char[strlen(pszURLOrig)+strlen(pszAddOn)+1];
-+    sprintf( pszURL, "%s%s", pszAddOn, pszURLOrig ); /* Flawfinder: ignore */
-+    // Increment the number of URLs we have found
-+    STDERR("opening %s on player\n", pszURL);
-+
-+    GetGlobal()->g_pszURLs[index] = pszURL;
-+    ret = pPlayer->OpenURL(pszURL);
-+ 
-+    UINT32 sleepTime = 0;
-+
-+    IHXMediaPlatformKicker* pKicker = GetGlobal()->g_pIHXKicker;
-+    if( pKicker )
-+    {
-+        pKicker->Kick(HXGetCurrentThreadID(), &sleepTime);
-+    }
-+
-+    return ret;
-+}
-+
-+PLAYER_API int put_player( void *pPlayerHandle)
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    int index;
-+    index = get_index_by_player(pPlayer);
-+    if (index < 0)
-+        return HXR_FAIL;
-+
-+    ExampleClientContext *pClientContext = GetGlobal()->g_pClientContexts[index];
-+    if (pClientContext) {
-+        pClientContext->Release();
-+        pClientContext = NULL;
-+    }
-+
-+    GetGlobal()->g_pClientContexts[index] = NULL;
-+    if (pPlayer) {
-+        if (GetGlobal()->pEngine) {
-+            GetGlobal()->pEngine->ClosePlayer(pPlayer);
-+        }
-+        pPlayer->Release();
-+        pPlayer = NULL;
-+    }
-+    GetGlobal()->g_Players[index] = NULL;
-+    GetGlobal()->g_nPlayers--;
-+    delete [] GetGlobal()->g_pszURLs[index];
-+    GetGlobal()->g_pszURLs[index] = NULL;
-+
-+    return HXR_OK;
-+}
-+
-+PLAYER_API int player_geturl( void *pPlayerHandle, char **pszURL)
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    int index = get_index_by_player(pPlayer);
-+    if (index >= 0) {
-+        *pszURL = GetGlobal()->g_pszURLs[index];
-+        return HXR_OK;
-+    }
-+
-+    return  HXR_FAIL;
-+}
-+
-+PLAYER_API int player_begin( void *pPlayerHandle )
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    UINT32 sleepTime = 0;
-+    pPlayer->Begin();
-+
-+#if 0
-+    IHXMediaPlatformKicker* pKicker = GetGlobal()->g_pIHXKicker;
-+	    if( pKicker )
-+	    {
-+		    pKicker->Kick(HXGetCurrentThreadID(), &sleepTime);
-+	    }
-+#endif
-+    return HXR_OK;
-+}
-+
-+PLAYER_API int player_pause( void *pPlayerHandle )
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    UINT32 sleepTime = 0;
-+    pPlayer->Pause();
-+
-+#if 0
-+    IHXMediaPlatformKicker* pKicker = GetGlobal()->g_pIHXKicker;
-+	    if( pKicker )
-+	    {
-+		    pKicker->Kick(HXGetCurrentThreadID(), &sleepTime);
-+	    }
-+#endif
-+    return HXR_OK;
-+}
-+
-+PLAYER_API int player_stop( void *pPlayerHandle )
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    pPlayer->Stop();
-+    return HXR_OK;
-+}
-+
-+#if 0
-+int main(int argc, char *argv[])
-+{
-+    IHXPlayer *pPlayer;
-+    init_main();
-+    while(1) {
-+        get_player(&pPlayer);
-+        player_openurl(pPlayer, argv[1]);
-+        player_begin(pPlayer);
-+     //   sleep(2);
-+        player_stop(pPlayer);
-+        put_player(pPlayer);
-+    }
-+    deinit_main();
-+    return 0;
-+}
-+#endif
-+
-+PLAYER_API int player_seek(void *pPlayerHandle, int pos)
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    if (pPlayer == NULL)
-+        return HXR_FAIL;
-+
-+    return pPlayer->Seek(pos);
-+}
-+PLAYER_API int player_getvolume(void *pPlayerHandle)
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    if (pPlayer == NULL)
-+        return HXR_FAIL;
-+
-+    int volume = 0;
-+
-+    IHXAudioPlayer* pAudioPlayer = NULL;
-+    pPlayer->QueryInterface(IID_IHXAudioPlayer, (void**) &pAudioPlayer);
-+    if (pAudioPlayer)
-+    {
-+        // Get the IHXVolume
-+        IHXVolume* pVolume = pAudioPlayer->GetAudioVolume();
-+        if (pVolume)
-+        {
-+            volume = pVolume->GetVolume();
-+        }
-+        HX_RELEASE(pVolume);
-+    }
-+    HX_RELEASE(pAudioPlayer);
-+
-+    return volume;
-+}
-+
-+
-+PLAYER_API int player_setvolume(void *pPlayerHandle, unsigned short volume)
-+{
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    if (pPlayer == NULL)
-+        return HXR_FAIL;
-+
-+    IHXAudioPlayer* pAudioPlayer = NULL;
-+    pPlayer->QueryInterface(IID_IHXAudioPlayer, (void**) &pAudioPlayer);
-+    if (pAudioPlayer)
-+    {
-+        // Get the IHXVolume
-+        IHXVolume* pVolume = pAudioPlayer->GetAudioVolume();
-+        if (pVolume)
-+        {
-+            pVolume->SetVolume(volume);
-+        }
-+        HX_RELEASE(pVolume);
-+    }
-+    HX_RELEASE(pAudioPlayer);
-+}
-+
-+PLAYER_API int deinit_main()
-+{
-+ 
-+    pthread_cancel(GetGlobal()->g_pThreadKickmanId);
-+    int ret ;
-+    ret = pthread_join(GetGlobal()->g_pThreadKickmanId, NULL);
-+    if (ret < 0) {
-+	    perror("pthread_join error\n");
-+    }
-+#if defined(HELIX_FEATURE_PLAYBACK_VELOCITY)
-+    if (GetGlobal()->g_pVelocityCaps)
-+    {
-+        IHXPlaybackVelocityCaps* pCaps = GetGlobal()->g_pVelocityCaps;
-+        pCaps->Release();
-+        GetGlobal()->g_pVelocityCaps = NULL;
-+    }
-+#endif /* #if defined(HELIX_FEATURE_PLAYBACK_VELOCITY) */
-+
-+#ifdef __TCS__
-+    g_nPlayers = 0;
-+#endif
-+
-+    
-+    {
-+        IHXClientEngine* pEngine = GetGlobal()->pEngine;
-+
-+        if (pEngine)
-+        {
-+            IHXClientEngine2* pEngine2 = NULL;
-+            if (HXR_OK == pEngine->QueryInterface(IID_IHXClientEngine2, 
-+                                                  (void**)&pEngine2))
-+            {
-+                pEngine2->Close();
-+            }
-+            HX_RELEASE(pEngine2);
-+        }
-+        HX_RELEASE(GetGlobal()->pEngine);
-+        HX_RELEASE(GetGlobal()->g_pIHXKicker);
-+        
-+        if (GetGlobal()->pMediaPlatform)
-+        {
-+            // Reset() not only close the platform but also remove all
-+            // persistent information(i.e. preferences) maintained by the
-+            // platform
-+            // GetGlobal()->pMediaPlatform->Reset(NULL);
-+            GetGlobal()->pMediaPlatform->Close();
-+            HX_RELEASE(GetGlobal()->pMediaPlatform);
-+        }
-+
-+        if (GetGlobal()->m_fpHXMediaPlatformClose)
-+        {
-+            GetGlobal()->m_fpHXMediaPlatformClose();
-+        }
-+    }
-+
-+
-+    if (GetGlobal()->bEnableVerboseMode)
-+    {
-+        STDOUT("\nDone.\n");
-+    }
-+
-+    if (GetGlobal()->g_pszUsername)
-+    {
-+        delete [] GetGlobal()->g_pszUsername;
-+        GetGlobal()->g_pszUsername = NULL;
-+    }
-+    if (GetGlobal()->g_pszPassword)
-+    {
-+        delete [] GetGlobal()->g_pszPassword;
-+        GetGlobal()->g_pszPassword = NULL;
-+    }
-+    if (GetGlobal()->g_pszGUIDFile)
-+    {
-+        delete [] GetGlobal()->g_pszGUIDFile;
-+        GetGlobal()->g_pszGUIDFile = NULL;
-+    }
-+    if (GetGlobal()->g_pszGUIDList)
-+    {
-+        delete [] GetGlobal()->g_pszGUIDList;
-+        GetGlobal()->g_pszGUIDList = NULL;
-+    }
-+    // If an error occurred during playback, return that
-+    
-+    if (GetGlobal()->g_Error != HXR_OK)
-+    {
-+        return GetGlobal()->g_Error;
-+    }
-+    // or HXR_OK (if there was more than one player)
-+    else
-+    {
-+        return HXR_OK;
-+    }
-+}
-+char* GetAppName(char* pszArgv0)
-+{
-+    char* pszAppName;
-+
-+    pszAppName = strrchr(pszArgv0, '\\');
-+
-+    if (NULL == pszAppName)
-+    {
-+        return pszArgv0;
-+    }
-+    else
-+    {
-+        return pszAppName + 1;
-+    }
-+}
-+
-+void PrintUsage(const char* pszAppName)
-+{
-+}
-+
-+
-+
-+HXBOOL ReadGUIDFile()
-+{
-+    HXBOOL  bSuccess = FALSE;
-+    FILE* pFile    = NULL;
-+    int   nNumRead = 0;
-+    int   readSize = 10000;
-+    char*  pszBuffer = new char[readSize];
-+
-+    if (GetGlobal()->g_pszGUIDFile)
-+    {
-+        if((pFile = fopen(GetGlobal()->g_pszGUIDFile, "r")) != NULL)
-+        {
-+            // Read in the entire file
-+            nNumRead = fread(pszBuffer, sizeof(char), readSize, pFile);
-+            pszBuffer[nNumRead] = '\0';
-+
-+            // Store it for later parsing
-+            GetGlobal()->g_pszGUIDList = new char[nNumRead + 1];
-+            strcpy(GetGlobal()->g_pszGUIDList, pszBuffer); /* Flawfinder: ignore */
-+
-+            fclose(pFile);
-+            pFile = NULL;
-+
-+            if (nNumRead > 0)
-+            {
-+                bSuccess = TRUE;
-+            }
-+        }
-+    }
-+
-+    delete [] pszBuffer;
-+
-+    return bSuccess;
-+}
-+
-+static int are_all_src_seekable(IHXPlayer *pPlayer)
-+{
-+    UINT16 nSrcCnt;
-+    nSrcCnt = pPlayer->GetSourceCount();
-+    HXSource *pSource = NULL;    /* This is brute-force */
-+    for (UINT16 i = 0; i < nSrcCnt; i++) 
-+    {
-+        if (pPlayer->GetSource(i, (IUnknown *&)pSource) == HXR_OK)
-+        {
-+            if (!pSource->IsSeekable())
-+                return FALSE;
-+
-+
-+        }
-+    }
-+
-+}
-+
-+PLAYER_API int player_canseek(void *pPlayerHandle)
-+{
-+    if (!pPlayerHandle)
-+        return FALSE;
-+
-+    IHXPlayer *pPlayer = (IHXPlayer *)pPlayerHandle;
-+    ExampleClientContext*  pExContext=NULL;
-+    if (pPlayer->GetClientContext((IUnknown*&)pExContext) != HXR_OK)
-+        return FALSE;
-+
-+    if (!pExContext)
-+        return FALSE;
-+
-+    EHXClientState State = pExContext->GetState();
-+
-+    int all_src_seekable =  are_all_src_seekable(pPlayer);
-+
-+    HX_RELEASE(pExContext);
-+
-+    if (State < HX_CLIENT_STATE_CONNECTED)
-+        return TRUE;
-+
-+    if (all_src_seekable && (!pPlayer->IsLive() || State == HX_CLIENT_STATE_PAUSED))
-+        return TRUE;
-+
-+    return FALSE;
-+}
-+
-+
-Index: helix-libs/clientapps/clutter/player.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/player.h	2008-10-13 06:54:45.000000000 -0700
-@@ -0,0 +1,60 @@
-+#ifndef _PLAYER_H_
-+#define _PLAYER_H_
-+
-+#ifdef __cplusplus
-+#define PLAYER_API    extern "C"
-+#else
-+#define PLAYER_API
-+#endif
-+
-+/* Duplicate of  EHXClientState */
-+typedef enum _EPlayerStateState
-+{
-+    PLAYER_STATE_READY = 0,  // uninitialized
-+    PLAYER_STATE_CONNECTING, // attempting to connect to sources
-+    PLAYER_STATE_CONNECTED,  // connected to sources (realized)
-+    PLAYER_STATE_OPENING,    // opening sources
-+    PLAYER_STATE_OPENED,     // opened sources
-+    PLAYER_STATE_PREFETCHING,// obtaining resources, buffering, etc.
-+    PLAYER_STATE_PREFETCHED, // ready for playback at time zero
-+    PLAYER_STATE_PLAYING,    // currently playing
-+    PLAYER_STATE_PAUSED,     // paused
-+    PLAYER_STATE_SEEKING     // seeking
-+} EHXPlayerState;
-+
-+typedef struct {
-+    int left;
-+    int top;
-+    int right;
-+    int bottom;
-+} PlayerRect;
-+
-+typedef struct {
-+    PlayerRect Rect;
-+    unsigned int  cx;
-+    unsigned int cy;
-+} PlayerImgInfo;
-+
-+typedef void (*on_pos_length_cb_t)(unsigned int, unsigned int, void *);
-+typedef void (*on_buffering_cb_t)(unsigned int, unsigned short, void *);
-+typedef void (*on_state_change_cb_t)(unsigned short, unsigned short, void *);
-+typedef void (*on_new_frame_cb_t)(unsigned char *p, unsigned int size, PlayerImgInfo *rect, void *context);
-+
-+PLAYER_API int init_main();
-+PLAYER_API int deinit_main();
-+PLAYER_API int get_player(void **ppPlayerHandle, on_buffering_cb_t on_buffering_cb, on_pos_length_cb_t on_pos_length_cb, on_state_change_cb_t on_state_change_cb, on_new_frame_cb_t on_new_frame_cb, void *context);
-+PLAYER_API int player_openurl( void *pPlayerHandle, char *pszRawURL);
-+PLAYER_API int put_player( void *pPlayerHandle);
-+PLAYER_API int player_geturl( void *pPlayerHandle, char **pszURL);
-+PLAYER_API int player_begin( void *pPlayerHandle );
-+PLAYER_API int player_stop( void *pPlayerHandle );
-+PLAYER_API int player_pause( void *pPlayerHandle );
-+PLAYER_API unsigned int get_curr_playtime(void *pPlayerHandle);
-+PLAYER_API int player_seek(void *pPlayerHandle, int pos);
-+PLAYER_API int player_getvolume(void *pPlayerHandle);
-+PLAYER_API int player_setvolume(void *pPlayerHandle, unsigned short volumn);
-+PLAYER_API int player_canseek(void *pPlayerHandle);
-+
-+
-+#endif
-+
-Index: helix-libs/clientapps/clutter/preflist.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/preflist.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,142 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: preflist.cpp,v 1.2 2007/07/06 20:32:36 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+#include "preflist.h"
-+
-+#include "hxstring.h"
-+#include "hxccf.h"
-+#include "hxprefs.h"
-+#include "ihxpckts.h"
-+
-+class CHXPrefInfo
-+{
-+public:
-+    CHXPrefInfo(const char* pKey, const char* pValue);
-+    ~CHXPrefInfo();
-+    
-+    const char* Key() const { return m_key;}
-+    const char* Value() const { return m_value;}
-+
-+private:
-+    CHXString m_key;
-+    CHXString m_value;
-+};
-+
-+CHXPrefInfo::CHXPrefInfo(const char* pKey, const char* pValue) :
-+    m_key(pKey),
-+    m_value(pValue)
-+{}
-+
-+CHXPrefInfo::~CHXPrefInfo()
-+{}
-+
-+CHXPrefList::CHXPrefList()
-+{}
-+
-+CHXPrefList::~CHXPrefList()
-+{
-+    Clear();
-+}
-+
-+void CHXPrefList::Add(const char* pKey, const char* pValue)
-+{
-+    CHXPrefInfo* pInfo = new CHXPrefInfo(pKey, pValue);
-+
-+    if (pInfo)
-+    {
-+        if (!m_prefInfo.AddTail(pInfo))
-+        {
-+            // We failed to insert the preference.
-+            HX_DELETE(pInfo);
-+        }
-+    }
-+}
-+
-+void CHXPrefList::Clear()
-+{
-+    while(!m_prefInfo.IsEmpty())
-+    {
-+        CHXPrefInfo* pInfo = (CHXPrefInfo*)m_prefInfo.RemoveHead();
-+        HX_DELETE(pInfo);
-+    }
-+}
-+
-+void CHXPrefList::SetPreferences(IUnknown* pContext)
-+{
-+    IHXPreferences* pPrefs = NULL;
-+    IHXCommonClassFactory* pCCF = NULL;
-+
-+    if (pContext &&
-+        (HXR_OK == pContext->QueryInterface(IID_IHXPreferences,
-+                                            (void**)&pPrefs)) &&
-+        (HXR_OK == pContext->QueryInterface(IID_IHXCommonClassFactory,
-+                                            (void**)&pCCF)))
-+    {
-+        CHXSimpleList::Iterator itr = m_prefInfo.Begin();
-+        
-+        for(; itr != m_prefInfo.End(); ++itr)
-+        {
-+            CHXPrefInfo* pInfo = (CHXPrefInfo*)(*itr);
-+            
-+            IHXBuffer* pBuf = NULL;
-+            
-+            if ((HXR_OK == pCCF->CreateInstance(CLSID_IHXBuffer,
-+                                                (void**)&pBuf)) &&
-+                (HXR_OK == pBuf->Set((const unsigned char*)pInfo->Value(),
-+                                     strlen(pInfo->Value()))))
-+            {
-+                pPrefs->WritePref(pInfo->Key(), pBuf);
-+            }
-+
-+            HX_RELEASE(pBuf);
-+        }
-+    }
-+
-+    HX_RELEASE(pPrefs);
-+    HX_RELEASE(pCCF);
-+}
-Index: helix-libs/clientapps/clutter/preflist.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/preflist.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,69 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: preflist.h,v 1.2 2007/07/06 20:32:36 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+#ifndef PREFLIST_H
-+#define PREFLIST_H
-+
-+#include "hxslist.h"
-+
-+class CHXPrefList
-+{
-+public:
-+    CHXPrefList();
-+    ~CHXPrefList();
-+
-+    void Add(const char* pKey, const char* pValue);
-+    void Clear();
-+
-+    void SetPreferences(IUnknown* pContext);
-+
-+private:
-+    CHXSimpleList m_prefInfo;
-+};
-+
-+#endif /* PREFLIST_H */
-Index: helix-libs/clientapps/clutter/print.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/print.cpp	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,80 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include "print.h"
-+#ifdef WIN32_PLATFORM_PSPC
-+#include "hlxosstr.h"
-+#include <winbase.h>
-+#endif
-+
-+int print2stdout(const char* pFmt, ...)
-+{
-+    va_list args;
-+    
-+    va_start(args, pFmt);
-+
-+#ifdef WIN32_PLATFORM_PSPC
-+    char szMessage[512];
-+    int ret = vsprintf(szMessage, pFmt, args);
-+    OutputDebugString(OS_STRING(szMessage));
-+#else
-+    int ret = vfprintf(stdout, pFmt, args);
-+#endif
-+
-+    va_end(args);
-+
-+    return ret;
-+}
-+
-+int print2stderr(const char* pFmt, ...)
-+{
-+    va_list args;
-+    
-+    va_start(args, pFmt);
-+
-+#ifdef WIN32_PLATFORM_PSPC
-+    char szMessage[512];
-+    int ret = vsprintf(szMessage, pFmt, args);
-+    OutputDebugString(OS_STRING(szMessage));
-+#else
-+    int ret = vfprintf(stderr, pFmt, args);
-+#endif
-+
-+    va_end(args);
-+
-+    return ret;
-+}
-Index: helix-libs/clientapps/clutter/print.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/print.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,60 @@
-+/* ***** BEGIN LICENSE BLOCK ***** 
-+ * Version: RCSL 1.0/RPSL 1.0 
-+ *  
-+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+ *      
-+ * The contents of this file, and the files included with this file, are 
-+ * subject to the current version of the RealNetworks Public Source License 
-+ * Version 1.0 (the "RPSL") available at 
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+ * the file under the RealNetworks Community Source License Version 1.0 
-+ * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+ * in which case the RCSL will apply. You may also obtain the license terms 
-+ * directly from RealNetworks.  You may not use this file except in 
-+ * compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+ * applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+ * RCSL for the rights, obligations and limitations governing use of the 
-+ * contents of the file.  
-+ *  
-+ * This file is part of the Helix DNA Technology. RealNetworks is the 
-+ * developer of the Original Code and owns the copyrights in the portions 
-+ * it created. 
-+ *  
-+ * This file, and the files included with this file, is distributed and made 
-+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location: 
-+ *    http://www.helixcommunity.org/content/tck 
-+ * 
-+ * Contributor(s): 
-+ *  
-+ * ***** END LICENSE BLOCK ***** */ 
-+
-+#ifndef PRINT_H
-+#define PRINT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifdef _SYMBIAN
-+#include "platform/symbian/symbian_print.h"
-+
-+#define STDOUT symbianPrint
-+#define STDERR symbianPrint
-+#else
-+int print2stdout(const char* pFmt, ...);
-+int print2stderr(const char* pFmt, ...);
-+#define STDOUT print2stdout
-+#define STDERR print2stderr
-+#endif
-+
-+#ifdef __cplusplus
-+};
-+#endif
-+
-+
-+#endif /* PRINT_H */
-Index: helix-libs/clientapps/clutter/shmhelp.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/shmhelp.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,88 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: shmhelp.h,v 1.5 2007/07/06 20:54:01 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#if defined(USE_XWINDOWS)
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/extensions/XShm.h>
-+#endif
-+
-+#include "hxcom.h"
-+#include "hxtypes.h"
-+
-+
-+class ShmHelp
-+{
-+  public:
-+
-+   //Helpers
-+   static void Init(Display* pDisplay );
-+   static HXBOOL ShmAvailable();
-+   static HX_RESULT DetachSharedRegion(UCHAR**ppMem, XShmSegmentInfo* pInfo );
-+   static HX_RESULT CreateSharedRegion( INT32 nSize,
-+                                        UCHAR**ppMem,
-+                                        int* pnShmID,
-+                                        XShmSegmentInfo* pInfo );
-+   
-+
-+  protected:
-+   
-+  private:
-+   static HXBOOL zm_bUseShm;
-+   
-+   //The X11 Segment ID....
-+   static int      zm_nSegment;
-+   static Display* zm_pDisplay;
-+
-+   ShmHelp();
-+   ShmHelp(Display*);
-+   ~ShmHelp();
-+   
-+};
-+
-Index: helix-libs/clientapps/clutter/unix.pcf
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/unix.pcf	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,65 @@
-+# 
-+# ***** BEGIN LICENSE BLOCK ***** 
-+# Version: RCSL 1.0/RPSL 1.0 
-+#  
-+# Portions Copyright (c) 1995-2002 RealNetworks, Inc. All Rights Reserved. 
-+#      
-+# The contents of this file, and the files included with this file, are 
-+# subject to the current version of the RealNetworks Public Source License 
-+# Version 1.0 (the "RPSL") available at 
-+# http://www.helixcommunity.org/content/rpsl unless you have licensed 
-+# the file under the RealNetworks Community Source License Version 1.0 
-+# (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
-+# in which case the RCSL will apply. You may also obtain the license terms 
-+# directly from RealNetworks.  You may not use this file except in 
-+# compliance with the RPSL or, if you have a valid RCSL with RealNetworks 
-+# applicable to this file, the RCSL.  Please see the applicable RPSL or 
-+# RCSL for the rights, obligations and limitations governing use of the 
-+# contents of the file.  
-+#  
-+# This file is part of the Helix DNA Technology. RealNetworks is the 
-+# developer of the Original Code and owns the copyrights in the portions 
-+# it created. 
-+#  
-+# This file, and the files included with this file, is distributed and made 
-+# available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
-+# EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
-+# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS 
-+# FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
-+# 
-+# Technology Compatibility Kit Test Suite(s) Location: 
-+#    http://www.helixcommunity.org/content/tck 
-+# 
-+# Contributor(s): 
-+#  
-+# ***** END LICENSE BLOCK ***** 
-+# 
-+
-+
-+if( ('HELIX_FEATURE_MINI_SITE' not in project.defines) and
-+    (platform.name in ('linux2', 'linux-i386')) and
-+    ('HELIX_FEATURE_VIDEO' in project.defines) and
-+    (project.BuildOption("nodll"))
-+    ):
-+              project.sys_libraries.append('Xv', 'Xext')
-+
-+
-+
-+
-+if project.BuildOption("nodll"):
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV20"):
-+		if platform.name in ('linux2', 'linux-i386', 'win32') and sysinfo.arch == 'i386':
-+			project.AddLibraries(GetSDKPath("rvg2dec_libs") + '[adecg2]')
-+		else:
-+			project.AddLibraries(GetSDKPath("rvg2dec_libs") + '[cdecg2]')
-+                
-+	if project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV30") or \
-+           project.IsDefined("HELIX_FEATURE_VIDEO_CODEC_RV40"):
-+		if project.IsDefined("HELIX_FEATURE_ANSIC_RV89COMBO"):
-+	 		project.AddLibraries(GetSDKPath("rv89combo_c_libs")+"[cdec]")
-+	 	else:
-+			if platform.name in ('linux2', 'linux-i386') and sysinfo.arch == 'i386':
-+			        project.AddLibraries(GetSDKPath("rv89combo_libs")+"[adec40]")
-+			else:
-+			        project.AddLibraries(GetSDKPath("rv89combo_libs")+"[cdec40]")
-+
-Index: helix-libs/clientapps/clutter/unixcmap.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/unixcmap.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,51 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: unixcmap.h,v 1.3 2007/07/06 20:54:01 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+EXTERN_C Colormap HXGetXColormap(Display* pDisplay, Window window);
-+EXTERN_C void HXFindBestXColor(Display* pDisplay, Colormap cmap, XColor* desired);
-Index: helix-libs/clientapps/clutter/visuals.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ helix-libs/clientapps/clutter/visuals.h	2008-10-13 06:05:49.000000000 -0700
-@@ -0,0 +1,74 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Source last modified: $Id: visuals.h,v 1.4 2007/07/06 20:54:01 jfinnecy Exp $
-+ * 
-+ * Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
-+ * 
-+ * The contents of this file, and the files included with this file,
-+ * are subject to the current version of the RealNetworks Public
-+ * Source License (the "RPSL") available at
-+ * http://www.helixcommunity.org/content/rpsl unless you have licensed
-+ * the file under the current version of the RealNetworks Community
-+ * Source License (the "RCSL") available at
-+ * http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-+ * will apply. You may also obtain the license terms directly from
-+ * RealNetworks.  You may not use this file except in compliance with
-+ * the RPSL or, if you have a valid RCSL with RealNetworks applicable
-+ * to this file, the RCSL.  Please see the applicable RPSL or RCSL for
-+ * the rights, obligations and limitations governing use of the
-+ * contents of the file.
-+ * 
-+ * Alternatively, the contents of this file may be used under the
-+ * terms of the GNU General Public License Version 2 (the
-+ * "GPL") in which case the provisions of the GPL are applicable
-+ * instead of those above. If you wish to allow use of your version of
-+ * this file only under the terms of the GPL, and not to allow others
-+ * to use your version of this file under the terms of either the RPSL
-+ * or RCSL, indicate your decision by deleting the provisions above
-+ * and replace them with the notice and other provisions required by
-+ * the GPL. If you do not delete the provisions above, a recipient may
-+ * use your version of this file under the terms of any one of the
-+ * RPSL, the RCSL or the GPL.
-+ * 
-+ * This file is part of the Helix DNA Technology. RealNetworks is the
-+ * developer of the Original Code and owns the copyrights in the
-+ * portions it created.
-+ * 
-+ * This file, and the files included with this file, is distributed
-+ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
-+ * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
-+ * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-+ * ENJOYMENT OR NON-INFRINGEMENT.
-+ * 
-+ * Technology Compatibility Kit Test Suite(s) Location:
-+ *    http://www.helixcommunity.org/content/tck
-+ * 
-+ * Contributor(s):
-+ * 
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef _UNIX
-+#error This is the UNIX platform specific implementation.
-+#endif
-+
-+#ifndef _VISUALS_H_
-+#define _VISUALS_H_
-+
-+#if defined(USE_XWINDOWS)
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xos.h>
-+#endif
-+
-+//
-+// These functions are loaded with dlsym() so turn off name mangling
-+// with extern "C". 
-+//
-+extern "C" {
-+
-+Visual* GetBestVisual(Display* display);
-+Visual* GetVisual(Display* display, long mask, XVisualInfo* templ);
-+
-+}
-+
-+#endif	// _VISUALS_H_
diff --git a/meta/packages/helix/helix-libs/helix-player.pc b/meta/packages/helix/helix-libs/helix-player.pc
deleted file mode 100644
index 5d2994809..000000000
--- a/meta/packages/helix/helix-libs/helix-player.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: helix-player
-Description: Helix Player Interface
-Version: 4.1.0 
-Libs: -L${libdir} -lhelix-player -lstdc++
-Cflags: -I/opt/helix/include -D_UNIX
-Requires: 
diff --git a/meta/packages/helix/helix-libs/hxclient.pc b/meta/packages/helix/helix-libs/hxclient.pc
deleted file mode 100644
index 8f64d2567..000000000
--- a/meta/packages/helix/helix-libs/hxclient.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/opt/helix
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: hxclient
-Description: Helix Client Libraries off the Atlas Branch
-Version: 4.1.0 
-Libs: -L${libdir} -lhxclient -lstdc++
-Cflags: -I${includedir} -D_UNIX
-Requires: 
diff --git a/meta/packages/helix/ribosome.bb b/meta/packages/helix/ribosome.bb
deleted file mode 100644
index 3cea6f675..000000000
--- a/meta/packages/helix/ribosome.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Ribosome: HelixCommunity Build System"
-SECTION = "base"
-HOMEPAGE = "http://helixcommunity.org"
-LICENSE = "GPLv2"
-
-_SNAPSHOT = "22102008"
-_TARBALL_SERVER = "http://git.moblin.org/repos/users/rusty"
-
-PV="r0"
-PR = "r1"
-
-SRC_URI = "${_TARBALL_SERVER}/ribosome-${_SNAPSHOT}.tar.bz2 \
-           ${_TARBALL_SERVER}/client-bif-${_SNAPSHOT}.tar.bz2 \
-           ${_TARBALL_SERVER}/common-bif-${_SNAPSHOT}.tar.bz2 \
-           file://ribosome/clutter.bif \
-           file://ribosome/buildrc"
-
-S = "${WORKDIR}"
-
-COMPATIBLE_HOST = '(i.86.*-linux)'
-
-do_install() {
-	# Install build system of doom
-	install -d ${D}${libdir}
-	cp -a ribosome-${_SNAPSHOT} ${D}${libdir}/ribosome
-	install -m 0644 ribosome/buildrc ${D}${libdir}/ribosome/
-
-	# Install client BIF's
-	install -d ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
-	install -m 0644 client-bif-${_SNAPSHOT}/*.bif \
-           ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF
-
-	# Install common BIF's
-	install -d ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
-	install -m 0644 common-bif-${_SNAPSHOT}/*.bif \
-           ${D}${libdir}/ribosome/bif-cvs/helix/common/build/BIF
-
-	# Install our own custom BIF
-	install -m 0644 ribosome/*.bif ${D}${libdir}/ribosome/bif-cvs/helix/client/build/BIF/
-	
-	# The [ and ] characters break packaging, remove for now
-	rm -rf ${D}${libdir}/ribosome/test/data/utils/[client-restricted]
-}
diff --git a/meta/packages/helix/ribosome/buildrc b/meta/packages/helix/ribosome/buildrc
deleted file mode 100644
index 6dbc47a06..000000000
--- a/meta/packages/helix/ribosome/buildrc
+++ /dev/null
@@ -1,4 +0,0 @@
-AddMultiCVS("helix",":ext:cvs.helixcommunity.org:/cvsroot/")
-AddBIFPath("common", "[helix]/common/build/BIF")
-AddBIFPath("client", "[helix]/client/build/BIF")
-SetSDKPath("oggvorbissdk", "/usr/")
diff --git a/meta/packages/helix/ribosome/clutter.bif b/meta/packages/helix/ribosome/clutter.bif
deleted file mode 100755
index a87fcb3fa..000000000
--- a/meta/packages/helix/ribosome/clutter.bif
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" ?>
-<build id="clutter">
-  <inherit id="hxclient_3_1_0_atlas"/>
-  <cvs root="helix"/>
-  <cvs tag="hxclient_3_1_0_atlas"/>
-  <default target="clutter" profile="helix-client-all-defines" options=""/>
-  <targets>
-
-    <!-- clutter -->
-    <module id="clutter" name="clientapps/clutter" group="core">
-      <includeplatforms>
-        unix 
-      </includeplatforms>
-
-      <defines>
-        HELIX_FEATURE_AUDIO_VORBIS
-        HELIX_FEATURE_VIDEO_THEORA 
-        HELIX_FEATURE_NETSERVICES_SHIM
-        HELIX_FEATURE_AVIFF
-        HELIX_CONFIG_SLUGGISHAUTOUPGRADE
-        HELIX_FEATURE_ALSA
-        _FORTIFY_SOURCE=2
-      </defines>      
-
-      <source_dependlist>
-        client_include
-        datatype_tools_dtdriver_dtdrplin
-      </source_dependlist>
-
-      <dependlist>
-        helix_client_objs
-        player_hxclientkit
-        player_hxclientkit_src_hxrecordengine
-        client_core
-        client_resource
-        client_xres
-        protocol_sdp
-        video_site
-        datatype_smil
-        datatype_text_realtext_fileformat
-        datatype_text_realtext_renderer
-        datatype_tools_dtdriver_dtdrplin
-        datatype_ogg_fileformat
-        datatype_vorbis_renderer
-        datatype_theora_renderer
-        datatype_h261_renderer
-        datatype_h263
-        datatype_group_audio
-        datatype_group_image
-        datatype_ram
-        datatype_sdp
-        datatype_avi_fileformat        
-        filesystem_local
-        filesystem_http
-        filesystem_memory
-        common_auth_authmgr
-        common_auth_rn5auth
-        client_auth_basicauth
-        common_log_logsystem
-        common_log_logobserverfile
-      </dependlist>
-
-    </module>
-
-  </targets>
-
-</build>
-
diff --git a/meta/packages/images/poky-image-live.bb b/meta/packages/images/poky-image-live.bb
deleted file mode 100644
index a3bfbfc71..000000000
--- a/meta/packages/images/poky-image-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/lirc/files/lirc_sir-sa1100.patch b/meta/packages/lirc/files/lirc_sir-sa1100.patch
deleted file mode 100644
index 245b28ac5..000000000
--- a/meta/packages/lirc/files/lirc_sir-sa1100.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lirc/drivers/lirc_sir/lirc_sir.c.orig	2004-11-18 17:30:17 +0100
-+++ lirc/drivers/lirc_sir/lirc_sir.c	2004-11-18 17:30:21 +0100
-@@ -628,6 +628,7 @@
- 	struct timeval curr_tv;
- 	static unsigned long deltv;
- #ifdef LIRC_ON_SA1100
-+	unsigned long deltintrtv;
- 	int status;
- 	static int n=0;
- 	
diff --git a/meta/packages/lirc/files/lircd.conf_nslu2 b/meta/packages/lirc/files/lircd.conf_nslu2
deleted file mode 100644
index 5fbaba469..000000000
--- a/meta/packages/lirc/files/lircd.conf_nslu2
+++ /dev/null
@@ -1,1886 +0,0 @@
-# This file is modified for the NSLU2.
-# It's based on http://lirc.sourceforge.net/remotes/philips/RC-5
-# and should support all RC5 compatible remotes.
-# The timings are for a de-underclocked NSLU2.
-
-# To see which key generates which code, run "irw".
-# To check whether lirc works at all, run "mode2 -d /dev/lirc"
-# after stopping lircd with "/etc/init.d/lircd stop".
-# To learn a new remote, run "irrecord -d /dev/lirc /etc/lircd.conf.new" and after
-# success "mv /etc/lircd.conf.new /etc/lircd.conf".
-# You could also take the timing values from /etc/lircd.conf.new
-# and paste it in here.
-# See also /etc/lircrc.
-
-begin remote
-
-  name         RC5
-  bits         13
-  flags        RC5|CONST_LENGTH
-  eps          30
-  aeps         100
-# if it doesn't work, you could change the following values:
-  one          863   921
-  zero         863   921
-  plead        947
-  gap          113626
-  min_repeat   1
-  repeat_bit   2
-
-      begin codes
-          amp1-0                            0x0000000000001400
-          amp1-1                            0x0000000000001401
-          amp1-2                            0x0000000000001402
-          amp1-3                            0x0000000000001403
-          amp1-4                            0x0000000000001404
-          amp1-5                            0x0000000000001405
-          amp1-6                            0x0000000000001406
-          amp1-7                            0x0000000000001407
-          amp1-8                            0x0000000000001408
-          amp1-9                            0x0000000000001409
-          amp1-graphic_equalizer_left       0x000000000000140A
-          amp1-graphic_equalizer_right      0x000000000000140B
-          amp1-standby                      0x000000000000140C
-          amp1-mute/demute                  0x000000000000140D
-          amp1-P.P.                         0x000000000000140E
-          amp1-display                      0x000000000000140F
-          amp1-volume+                      0x0000000000001410
-          amp1-volume-                      0x0000000000001411
-          amp1-brightness+                  0x0000000000001412
-          amp1-brightness-                  0x0000000000001413
-          amp1-colour_saturation+           0x0000000000001414
-          amp1-colour_saturation-           0x0000000000001415
-          amp1-bass+                        0x0000000000001416
-          amp1-bass-                        0x0000000000001417
-          amp1-treble+                      0x0000000000001418
-          amp1-treble-                      0x0000000000001419
-          amp1-balance_right                0x000000000000141A
-          amp1-balance_left                 0x000000000000141B
-          amp1-graph_equal_left&right       0x000000000000141C
-          amp1-loudness                     0x000000000000141D
-          amp1-high_tone_filter             0x000000000000141E
-          amp1-low_tone_filter              0x000000000000141F
-          amp1-step+                        0x0000000000001420
-          amp1-step-                        0x0000000000001421
-          amp1-signal_path_scroll           0x0000000000001422
-          amp1-INVALID                      0x0000000000001423
-          amp1-INVALID                      0x0000000000001424
-          amp1-surround_mode                0x0000000000001425
-          amp1-sleeptimer                   0x0000000000001426
-          amp1-balance_rear                 0x0000000000001427
-          amp1-balance_front                0x0000000000001428
-          amp1-TPS                          0x0000000000001429
-          amp1-timer_set                    0x000000000000142A
-          amp1-timer_up                     0x000000000000142B
-          amp1-timer_down                   0x000000000000142C
-          amp1-timer_memo                   0x000000000000142D
-          amp1-acoustic_memory              0x000000000000142E
-          amp1-acoustic_memory_select       0x000000000000142F
-          amp1-pause                        0x0000000000001430
-          amp1-erase                        0x0000000000001431
-          amp1-rewind                       0x0000000000001432
-          amp1-go_to                        0x0000000000001433
-          amp1-wind                         0x0000000000001434
-          amp1-play                         0x0000000000001435
-          amp1-stop                         0x0000000000001436
-          amp1-recording                    0x0000000000001437
-          amp1-external1                    0x0000000000001438
-          amp1-external2                    0x0000000000001439
-          amp1-clear_all_memory             0x000000000000143A
-          amp1-INVALID                      0x000000000000143B
-          amp1-dyn_range_expand/compr       0x000000000000143C
-          amp1-system_standby               0x000000000000143D
-          amp1-INVALID                      0x000000000000143E
-          amp1-system_select                0x000000000000143F
-          amp1-surround_sound               0x0000000000000400
-          amp1-balance_front                0x0000000000000401
-          amp1-balance_rear                 0x0000000000000402
-          amp1-sound_effects1               0x0000000000000403
-          amp1-sound_effects2               0x0000000000000404
-          amp1-sound_effects3               0x0000000000000405
-          amp1-sound_effects4               0x0000000000000406
-          amp1-sound_effects5               0x0000000000000407
-          amp1-sound_or_menu_func.1         0x0000000000000408
-          amp1-sound_or_menu_func.2         0x0000000000000409
-          amp1-sound_or_menu_func.3         0x000000000000040A
-          amp1-linear_function_up           0x000000000000040D
-          amp1-linear_function_down         0x000000000000040E
-          amp1-catalogue                    0x000000000000040F
-          amp1-cursor_step_up               0x0000000000000410
-          amp1-cursor_step_down             0x0000000000000411
-          amp1-menu_on                      0x0000000000000412
-          amp1-menu_off                     0x0000000000000413
-          amp1-display_A/V_status           0x0000000000000414
-          amp1-cursor_step_left             0x0000000000000415
-          amp1-cursor_step_right            0x0000000000000416
-          amp1-menu_function                0x0000000000000417
-          amp1-PIP_on/off                   0x0000000000000418
-          amp1-PIP_shift                    0x0000000000000419
-          amp1-PIP_main_swap                0x000000000000041A
-          amp1-strobe_on/off                0x000000000000041B
-          amp1-multi_strobe                 0x000000000000041C
-          amp1-main_freezed                 0x000000000000041D
-          amp1-3/9_multi_scan               0x000000000000041E
-          amp1-PIP_mode_select              0x000000000000041F
-          amp1-mosaic                       0x0000000000000420
-          amp1-solarization                 0x0000000000000421
-          amp1-main_stored                  0x0000000000000422
-          amp1-PIP_strobe                   0x0000000000000423
-          amp1-recall_main                  0x0000000000000424
-          amp1-PIP_freeze                   0x0000000000000425
-          amp1-PIP_step_up                  0x0000000000000426
-          amp1-PIP_step_down                0x0000000000000427
-          amp1-INVALID                      0x000000000000042C
-          amp1-INVALID                      0x0000000000000430
-          amp1-INVALID                      0x0000000000000431
-          amp1-INVALID                      0x0000000000000436
-          amp1-INVALID                      0x0000000000000437
-          amp1-connect                      0x000000000000043B
-          amp1-disconnect                   0x000000000000043C
-          amp2-0                            0x00000000000014C0
-          amp2-1                            0x00000000000014C1
-          amp2-2                            0x00000000000014C2
-          amp2-3                            0x00000000000014C3
-          amp2-4                            0x00000000000014C4
-          amp2-5                            0x00000000000014C5
-          amp2-6                            0x00000000000014C6
-          amp2-7                            0x00000000000014C7
-          amp2-8                            0x00000000000014C8
-          amp2-9                            0x00000000000014C9
-          amp2-graphic_equalizer_left       0x00000000000014CA
-          amp2-graphic_equalizer_right      0x00000000000014CB
-          amp2-standby                      0x00000000000014CC
-          amp2-mute/demute                  0x00000000000014CD
-          amp2-P.P.                         0x00000000000014CE
-          amp2-display                      0x00000000000014CF
-          amp2-volume+                      0x00000000000014D0
-          amp2-volume-                      0x00000000000014D1
-          amp2-brightness+                  0x00000000000014D2
-          amp2-brightness-                  0x00000000000014D3
-          amp2-colour_saturation+           0x00000000000014D4
-          amp2-colour_saturation-           0x00000000000014D5
-          amp2-bass+                        0x00000000000014D6
-          amp2-bass-                        0x00000000000014D7
-          amp2-treble+                      0x00000000000014D8
-          amp2-treble-                      0x00000000000014D9
-          amp2-balance_right                0x00000000000014DA
-          amp2-balance_left                 0x00000000000014DB
-          amp2-graph_equal_left&right       0x00000000000014DC
-          amp2-loudness                     0x00000000000014DD
-          amp2-high_tone_filter             0x00000000000014DE
-          amp2-low_tone_filter              0x00000000000014DF
-          amp2-step+                        0x00000000000014E0
-          amp2-step-                        0x00000000000014E1
-          amp2-signal_path_scroll           0x00000000000014E2
-          amp2-INVALID                      0x00000000000014E3
-          amp2-INVALID                      0x00000000000014E4
-          amp2-surround_mode                0x00000000000014E5
-          amp2-sleeptimer                   0x00000000000014E6
-          amp2-balance_rear                 0x00000000000014E7
-          amp2-balance_front                0x00000000000014E8
-          amp2-TPS                          0x00000000000014E9
-          amp2-timer_set                    0x00000000000014EA
-          amp2-timer_up                     0x00000000000014EB
-          amp2-timer_down                   0x00000000000014EC
-          amp2-timer_memo                   0x00000000000014ED
-          amp2-acoustic_memory              0x00000000000014EE
-          amp2-acoustic_memory_select       0x00000000000014EF
-          amp2-pause                        0x00000000000014F0
-          amp2-erase                        0x00000000000014F1
-          amp2-rewind                       0x00000000000014F2
-          amp2-go_to                        0x00000000000014F3
-          amp2-wind                         0x00000000000014F4
-          amp2-play                         0x00000000000014F5
-          amp2-stop                         0x00000000000014F6
-          amp2-recording                    0x00000000000014F7
-          amp2-external1                    0x00000000000014F8
-          amp2-external2                    0x00000000000014F9
-          amp2-clear_all_memory             0x00000000000014FA
-          amp2-INVALID                      0x00000000000014FB
-          amp2-dyn_range_expand/compr       0x00000000000014FC
-          amp2-system_standby               0x00000000000014FD
-          amp2-INVALID                      0x00000000000014FE
-          amp2-system_select                0x00000000000014FF
-          amp2-surround_sound               0x00000000000004C0
-          amp2-balance_front                0x00000000000004C1
-          amp2-balance_rear                 0x00000000000004C2
-          amp2-sound_effects1               0x00000000000004C3
-          amp2-sound_effects2               0x00000000000004C4
-          amp2-sound_effects3               0x00000000000004C5
-          amp2-sound_effects4               0x00000000000004C6
-          amp2-sound_effects5               0x00000000000004C7
-          amp2-sound_or_menu_func.1         0x00000000000004C8
-          amp2-sound_or_menu_func.2         0x00000000000004C9
-          amp2-sound_or_menu_func.3         0x00000000000004CA
-          amp2-linear_function_up           0x00000000000004CD
-          amp2-linear_function_down         0x00000000000004CE
-          amp2-catalogue                    0x00000000000004CF
-          amp2-cursor_step_up               0x00000000000004D0
-          amp2-cursor_step_down             0x00000000000004D1
-          amp2-menu_on                      0x00000000000004D2
-          amp2-menu_off                     0x00000000000004D3
-          amp2-display_A/V_status           0x00000000000004D4
-          amp2-cursor_step_left             0x00000000000004D5
-          amp2-cursor_step_right            0x00000000000004D6
-          amp2-menu_function                0x00000000000004D7
-          amp2-PIP_on/off                   0x00000000000004D8
-          amp2-PIP_shift                    0x00000000000004D9
-          amp2-PIP_main_swap                0x00000000000004DA
-          amp2-strobe_on/off                0x00000000000004DB
-          amp2-multi_strobe                 0x00000000000004DC
-          amp2-main_freezed                 0x00000000000004DD
-          amp2-3/9_multi_scan               0x00000000000004DE
-          amp2-PIP_mode_select              0x00000000000004DF
-          amp2-mosaic                       0x00000000000004E0
-          amp2-solarization                 0x00000000000004E1
-          amp2-main_stored                  0x00000000000004E2
-          amp2-PIP_strobe                   0x00000000000004E3
-          amp2-recall_main                  0x00000000000004E4
-          amp2-PIP_freeze                   0x00000000000004E5
-          amp2-PIP_step_up                  0x00000000000004E6
-          amp2-PIP_step_down                0x00000000000004E7
-          amp2-INVALID                      0x00000000000004EC
-          amp2-INVALID                      0x00000000000004F0
-          amp2-INVALID                      0x00000000000004F1
-          amp2-INVALID                      0x00000000000004F6
-          amp2-INVALID                      0x00000000000004F7
-          amp2-connect                      0x00000000000004FB
-          amp2-disconnect                   0x00000000000004FC
-          cd-0                              0x0000000000001500
-          cd-1                              0x0000000000001501
-          cd-2                              0x0000000000001502
-          cd-3                              0x0000000000001503
-          cd-4                              0x0000000000001504
-          cd-5                              0x0000000000001505
-          cd-6                              0x0000000000001506
-          cd-7                              0x0000000000001507
-          cd-8                              0x0000000000001508
-          cd-9                              0x0000000000001509
-          cd-cursor_scroll                  0x000000000000150A
-          cd-display_scroll                 0x000000000000150B
-          cd-standby                        0x000000000000150C
-          cd-mute/demute                    0x000000000000150D
-          cd-P.P._(personal_pref.)          0x000000000000150E
-          cd-display                        0x000000000000150F
-          cd-volume+                        0x0000000000001510
-          cd-volume-                        0x0000000000001511
-          cd-brightness+                    0x0000000000001512
-          cd-brightness-                    0x0000000000001513
-          cd-colour_saturation+             0x0000000000001514
-          cd-colour_saturation-             0x0000000000001515
-          cd-bass+                          0x0000000000001516
-          cd-bass-                          0x0000000000001517
-          cd-treble+                        0x0000000000001518
-          cd-treble-                        0x0000000000001519
-          cd-balance_right                  0x000000000000151A
-          cd-balance_left                   0x000000000000151B
-          cd-rept_once/TSPo/shuffle         0x000000000000151C
-          cd-repeat_cont/TSPc               0x000000000000151D
-          cd-select+                        0x000000000000151E
-          cd-select-                        0x000000000000151F
-          cd-next                           0x0000000000001520
-          cd-previous                       0x0000000000001521
-          cd-index_next                     0x0000000000001522
-          cd-index_previous                 0x0000000000001523
-          cd-play/program                   0x0000000000001524
-          cd-speed_nominal                  0x0000000000001525
-          cd-speed+                         0x0000000000001526
-          cd-speed-                         0x0000000000001527
-          cd-INVALID                        0x0000000000001528
-          cd-store_execute                  0x0000000000001529
-          cd-INVALID                        0x000000000000152A
-          cd-scan_forward                   0x000000000000152B
-          cd-INVALID                        0x000000000000152C
-          cd-open/close                     0x000000000000152D
-          cd-INVALID                        0x000000000000152E
-          cd-INVALID                        0x000000000000152F
-          cd-pause                          0x0000000000001530
-          cd-erase                          0x0000000000001531
-          cd-rewind                         0x0000000000001532
-          cd-go_to                          0x0000000000001533
-          cd-wind                           0x0000000000001534
-          cd-play                           0x0000000000001535
-          cd-stop                           0x0000000000001536
-          cd-recording                      0x0000000000001537
-          cd-external1                      0x0000000000001538
-          cd-external2                      0x0000000000001539
-          cd-clear_all_memory               0x000000000000153A
-          cd-repeat_A/B_program             0x000000000000153B
-          cd-dynamic_range_expand           0x000000000000153C
-          cd-system_standby                 0x000000000000153D
-          cd-dynamic_range_compress         0x000000000000153E
-          cd-system_select                  0x000000000000153F
-          cd-surround_sound                 0x0000000000000500
-          cd-balance_front                  0x0000000000000501
-          cd-balance_rear                   0x0000000000000502
-          cd-sound_effects1                 0x0000000000000503
-          cd-sound_effects2                 0x0000000000000504
-          cd-sound_effects3                 0x0000000000000505
-          cd-sound_effects4                 0x0000000000000506
-          cd-sound_effects5                 0x0000000000000507
-          cd-sound_or_menu_func.1           0x0000000000000508
-          cd-sound_or_menu_func.2           0x0000000000000509
-          cd-sound_or_menu_func.3           0x000000000000050A
-          cd-linear_function_up             0x000000000000050D
-          cd-linear_function_down           0x000000000000050E
-          cd-sound_or_menu_func.            0x000000000000050F
-          cd-cursor_step_up                 0x0000000000000510
-          cd-cursor_step_down               0x0000000000000511
-          cd-menu_on                        0x0000000000000512
-          cd-menu_off                       0x0000000000000513
-          cd-display_A/V_status             0x0000000000000514
-          cd-cursor_step_left               0x0000000000000515
-          cd-cursor_step_right              0x0000000000000516
-          cd-menu_function                  0x0000000000000517
-          cd-PIP_on/off                     0x0000000000000518
-          cd-PIP_shift                      0x0000000000000519
-          cd-PIP_main_swap                  0x000000000000051A
-          cd-strobe_on/off                  0x000000000000051B
-          cd-multi_strobe                   0x000000000000051C
-          cd-main_freezed                   0x000000000000051D
-          cd-3/9_multi_scan                 0x000000000000051E
-          cd-PIP_mode_select                0x000000000000051F
-          cd-mosaic                         0x0000000000000520
-          cd-solarization                   0x0000000000000521
-          cd-main_stored                    0x0000000000000522
-          cd-PIP_strobe                     0x0000000000000523
-          cd-recall_main                    0x0000000000000524
-          cd-PIP_freeze                     0x0000000000000525
-          cd-PIP_step_up                    0x0000000000000526
-          cd-PIP_step_down                  0x0000000000000527
-          cd-INVALID                        0x0000000000000528
-          cd-INVALID                        0x0000000000000529
-          cd-INVALID                        0x000000000000052A
-          cd-INVALID                        0x000000000000052B
-          cd-FTS                            0x000000000000052C
-          cd-INVALID                        0x000000000000052D
-          cd-INVALID                        0x0000000000000532
-          cd-INVALID                        0x0000000000000533
-          cd-INVALID                        0x0000000000000534
-          cd-INVALID                        0x0000000000000535
-          cd-sub_mode1                      0x0000000000000536
-          cd-sub_mode2                      0x0000000000000537
-          cd-connect                        0x000000000000053B
-          cd-disconnect                     0x000000000000053C
-          lv1-0                             0x0000000000001100
-          lv1-1                             0x0000000000001101
-          lv1-2                             0x0000000000001102
-          lv1-3                             0x0000000000001103
-          lv1-4                             0x0000000000001104
-          lv1-5                             0x0000000000001105
-          lv1-6                             0x0000000000001106
-          lv1-7                             0x0000000000001107
-          lv1-8                             0x0000000000001108
-          lv1-9                             0x0000000000001109
-          lv1-picture_number/time           0x000000000000110A
-          lv1-channel_number                0x000000000000110B
-          lv1-standby                       0x000000000000110C
-          lv1-mute/demute                   0x000000000000110D
-          lv1-P.P._(personal_pref.)         0x000000000000110E
-          lv1-display                       0x000000000000110F
-          lv1-volume+                       0x0000000000001110
-          lv1-volume-                       0x0000000000001111
-          lv1-brightness+                   0x0000000000001112
-          lv1-brightness-                   0x0000000000001113
-          lv1-colour_saturation+            0x0000000000001114
-          lv1-colour_saturation-            0x0000000000001115
-          lv1-bass+                         0x0000000000001116
-          lv1-bass-                         0x0000000000001117
-          lv1-treble+                       0x0000000000001118
-          lv1-treble-                       0x0000000000001119
-          lv1-balance_right                 0x000000000000111A
-          lv1-balance_left                  0x000000000000111B
-          lv1-repeat_once/TSPo              0x000000000000111C
-          lv1-repeat_cont/TSPc              0x000000000000111D
-          lv1-next                          0x000000000000111E
-          lv1-fast_run_reverse              0x000000000000111F
-          lv1-entry                         0x0000000000001120
-          lv1-auto_stop/memory              0x0000000000001121
-          lv1-slow_run_reverse              0x0000000000001122
-          lv1-audio1                        0x0000000000001123
-          lv1-audio2                        0x0000000000001124
-          lv1-still_picture                 0x0000000000001125
-          lv1-speed+                        0x0000000000001126
-          lv1-speed-                        0x0000000000001127
-          lv1-slow_run_forward              0x0000000000001128
-          lv1-still_forward                 0x0000000000001129
-          lv1-fast_run_forward              0x000000000000112A
-          lv1-search_automatic              0x000000000000112B
-          lv1-scan_reverse                  0x000000000000112C
-          lv1-open/close_(eject)            0x000000000000112D
-          lv1-scan_forward                  0x000000000000112E
-          lv1-play_reverse                  0x000000000000112F
-          lv1-pause                         0x0000000000001130
-          lv1-erase                         0x0000000000001131
-          lv1-rewind                        0x0000000000001132
-          lv1-go_to                         0x0000000000001133
-          lv1-wind                          0x0000000000001134
-          lv1-play                          0x0000000000001135
-          lv1-stop                          0x0000000000001136
-          lv1-recording                     0x0000000000001137
-          lv1-external1                     0x0000000000001138
-          lv1-external2                     0x0000000000001139
-          lv1-clear_all_memory              0x000000000000113A
-          lv1-freeze_segment                0x000000000000113B
-          lv1-TXT_(pal)/ant.sw_(ntsc)       0x000000000000113C
-          lv1-system_standby                0x000000000000113D
-          lv1-CX_on/off                     0x000000000000113E
-          lv1-system_select                 0x000000000000113F
-          lv1-surround_sound                0x0000000000000100
-          lv1-balance_front                 0x0000000000000101
-          lv1-balance_rear                  0x0000000000000102
-          lv1-sound_effects1                0x0000000000000103
-          lv1-sound_effects2                0x0000000000000104
-          lv1-sound_effects3                0x0000000000000105
-          lv1-sound_effects4                0x0000000000000106
-          lv1-sound_effects5                0x0000000000000107
-          lv1-sound_or_menu_func.1          0x0000000000000108
-          lv1-sound_or_menu_func.2          0x0000000000000109
-          lv1-sound_or_menu_func.3          0x000000000000010A
-          lv1-INVALID                       0x000000000000010B
-          lv1-INVALID                       0x000000000000010C
-          lv1-linear_function_up            0x000000000000010D
-          lv1-linear_function_down          0x000000000000010E
-          lv1-sound_or_menu_func.           0x000000000000010F
-          lv1-cursor_step_up                0x0000000000000110
-          lv1-cursor_step_down              0x0000000000000111
-          lv1-menu_on                       0x0000000000000112
-          lv1-menu_off                      0x0000000000000113
-          lv1-display_A/V_status            0x0000000000000114
-          lv1-cursor_step_left              0x0000000000000115
-          lv1-cursor_step_right             0x0000000000000116
-          lv1-menu_function                 0x0000000000000117
-          lv1-PIP_on/off                    0x0000000000000118
-          lv1-PIP_shift                     0x0000000000000119
-          lv1-PIP_main_swap                 0x000000000000011A
-          lv1-strobe_on/off                 0x000000000000011B
-          lv1-multi_strobe                  0x000000000000011C
-          lv1-main_freezed                  0x000000000000011D
-          lv1-3/9_multi_scan                0x000000000000011E
-          lv1-PIP_mode_select               0x000000000000011F
-          lv1-mosaic                        0x0000000000000120
-          lv1-solarization                  0x0000000000000121
-          lv1-main_stored                   0x0000000000000122
-          lv1-PIP_strobe                    0x0000000000000123
-          lv1-recall_main                   0x0000000000000124
-          lv1-PIP_freeze                    0x0000000000000125
-          lv1-PIP_step_up                   0x0000000000000126
-          lv1-PIP_step_down                 0x0000000000000127
-          lv1-INVALID                       0x0000000000000128
-          lv1-INVALID                       0x0000000000000129
-          lv1-INVALID                       0x000000000000012A
-          lv1-INVALID                       0x000000000000012B
-          lv1-INVALID                       0x000000000000012C
-          lv1-INVALID                       0x000000000000012D
-          lv1-INVALID                       0x0000000000000130
-          lv1-INVALID                       0x0000000000000131
-          lv1-INVALID                       0x0000000000000132
-          lv1-INVALID                       0x0000000000000133
-          lv1-INVALID                       0x0000000000000134
-          lv1-INVALID                       0x0000000000000135
-          lv1-sub_mode1                     0x0000000000000136
-          lv1-sub_mode2                     0x0000000000000137
-          lv1-INVALID                       0x0000000000000138
-          lv1-INVALID                       0x0000000000000139
-          lv1-INVALID                       0x000000000000013A
-          lv1-connect                       0x000000000000013B
-          lv1-disconnect                    0x000000000000013C
-          lv2-0                             0x0000000000001300
-          lv2-1                             0x0000000000001301
-          lv2-2                             0x0000000000001302
-          lv2-3                             0x0000000000001303
-          lv2-4                             0x0000000000001304
-          lv2-5                             0x0000000000001305
-          lv2-6                             0x0000000000001306
-          lv2-7                             0x0000000000001307
-          lv2-8                             0x0000000000001308
-          lv2-9                             0x0000000000001309
-          lv2-picture_number/time           0x000000000000130A
-          lv2-chapter_number                0x000000000000130B
-          lv2-standby                       0x000000000000130C
-          lv2-mute/demute                   0x000000000000130D
-          lv2-P.P._(personal_pref.)         0x000000000000130E
-          lv2-display                       0x000000000000130F
-          lv2-volume+                       0x0000000000001310
-          lv2-volume-                       0x0000000000001311
-          lv2-brightness+                   0x0000000000001312
-          lv2-brightness-                   0x0000000000001313
-          lv2-colour_saturation+            0x0000000000001314
-          lv2-colour_saturation-            0x0000000000001315
-          lv2-bass+                         0x0000000000001316
-          lv2-bass-                         0x0000000000001317
-          lv2-treble+                       0x0000000000001318
-          lv2-treble-                       0x0000000000001319
-          lv2-balance_right                 0x000000000000131A
-          lv2-balance_left                  0x000000000000131B
-          lv2-repeat_once/TSPo              0x000000000000131C
-          lv2-repeat_cont/TSPc              0x000000000000131D
-          lv2-next                          0x000000000000131E
-          lv2-programming                   0x000000000000131F
-          lv2-INVALID                       0x0000000000001320
-          lv2-auto_stop/memory              0x0000000000001321
-          lv2-slow_run_reverse              0x0000000000001322
-          lv2-stereo_left/right             0x0000000000001323
-          lv2-previous                      0x0000000000001324
-          lv2-still_reverse                 0x0000000000001325
-          lv2-speed+                        0x0000000000001326
-          lv2-speed-                        0x0000000000001327
-          lv2-slow_run_forward              0x0000000000001328
-          lv2-still_forward                 0x0000000000001329
-          lv2-digital_multi_screen          0x000000000000132A
-          lv2-strobe                        0x000000000000132B
-          lv2-scan_reverse                  0x000000000000132C
-          lv2-open/close_(eject)            0x000000000000132D
-          lv2-scan_forward                  0x000000000000132E
-          lv2-INVALID                       0x000000000000132F
-          lv2-pause                         0x0000000000001330
-          lv2-erase                         0x0000000000001331
-          lv2-rewind                        0x0000000000001332
-          lv2-go_to                         0x0000000000001333
-          lv2-wind                          0x0000000000001334
-          lv2-play                          0x0000000000001335
-          lv2-stop                          0x0000000000001336
-          lv2-recording                     0x0000000000001337
-          lv2-external1                     0x0000000000001338
-          lv2-external2                     0x0000000000001339
-          lv2-clear_all_memory              0x000000000000133A
-          lv2-repeat_A/B_program            0x000000000000133B
-          lv2-TXT_(pal)/ant.sw_(ntsc)       0x000000000000133C
-          lv2-system_standby                0x000000000000133D
-          lv2-CX_on/off                     0x000000000000133E
-          lv2-system_select                 0x000000000000133F
-          lv2-surround_sound                0x0000000000000300
-          lv2-balance_front                 0x0000000000000301
-          lv2-balance_rear                  0x0000000000000302
-          lv2-sound_effects1                0x0000000000000303
-          lv2-sound_effects2                0x0000000000000304
-          lv2-sound_effects3                0x0000000000000305
-          lv2-sound_effects4                0x0000000000000306
-          lv2-sound_effects5                0x0000000000000307
-          lv2-sound_or_menu_func.1          0x0000000000000308
-          lv2-sound_or_menu_func.2          0x0000000000000309
-          lv2-sound_or_menu_func.3          0x000000000000030A
-          lv2-linear_function_up            0x000000000000030D
-          lv2-linear_function_down          0x000000000000030E
-          lv2-sound_or_menu_func.           0x000000000000030F
-          lv2-cursor_step_up                0x0000000000000310
-          lv2-cursor_step_down              0x0000000000000311
-          lv2-menu_on                       0x0000000000000312
-          lv2-menu_off                      0x0000000000000313
-          lv2-display_A/V_status            0x0000000000000314
-          lv2-cursor_step_left              0x0000000000000315
-          lv2-cursor_step_right             0x0000000000000316
-          lv2-menu_function                 0x0000000000000317
-          lv2-PIP_on/off                    0x0000000000000318
-          lv2-PIP_shift                     0x0000000000000319
-          lv2-PIP_main_swap                 0x000000000000031A
-          lv2-strobe_on/off                 0x000000000000031B
-          lv2-multi_strobe                  0x000000000000031C
-          lv2-main_freezed                  0x000000000000031D
-          lv2-3/9_multi_scan                0x000000000000031E
-          lv2-PIP_mode_select               0x000000000000031F
-          lv2-mosaic                        0x0000000000000320
-          lv2-solarization                  0x0000000000000321
-          lv2-main_stored                   0x0000000000000322
-          lv2-PIP_strobe                    0x0000000000000323
-          lv2-recall_main                   0x0000000000000324
-          lv2-PIP_freeze                    0x0000000000000325
-          lv2-PIP_step_up                   0x0000000000000326
-          lv2-PIP_step_down                 0x0000000000000327
-          lv2-FTS                           0x000000000000032C
-          lv2-index_next                    0x0000000000000330
-          lv2-index_previous                0x0000000000000331
-          lv2-sub_mode1                     0x0000000000000336
-          lv2-sub_mode2                     0x0000000000000337
-          lv2-connect                       0x000000000000033B
-          lv2-disconnect                    0x000000000000033C
-          phono-0                           0x0000000000001540
-          phono-1                           0x0000000000001541
-          phono-2                           0x0000000000001542
-          phono-3                           0x0000000000001543
-          phono-4                           0x0000000000001544
-          phono-5                           0x0000000000001545
-          phono-6                           0x0000000000001546
-          phono-7                           0x0000000000001547
-          phono-8                           0x0000000000001548
-          phono-9                           0x0000000000001549
-          phono-INVALID                     0x000000000000154A
-          phono-INVALID                     0x000000000000154B
-          phono-standby                     0x000000000000154C
-          phono-mute/demute                 0x000000000000154D
-          phono-P.P.                        0x000000000000154E
-          phono-display                     0x000000000000154F
-          phono-volume+                     0x0000000000001550
-          phono-volume-                     0x0000000000001551
-          phono-brightness+                 0x0000000000001552
-          phono-brightness-                 0x0000000000001553
-          phono-colour_saturation+          0x0000000000001554
-          phono-colour_saturation-          0x0000000000001555
-          phono-bass+                       0x0000000000001556
-          phono-bass-                       0x0000000000001557
-          phono-treble+                     0x0000000000001558
-          phono-treble-                     0x0000000000001559
-          phono-balance_right               0x000000000000155A
-          phono-balance_left                0x000000000000155B
-          phono-repeat_once                 0x000000000000155C
-          phono-repeat_continuously         0x000000000000155D
-          phono-select+                     0x000000000000155E
-          phono-select-                     0x000000000000155F
-          phono-next                        0x0000000000001560
-          phono-previous                    0x0000000000001561
-          phono-index_next                  0x0000000000001562
-          phono-index_previous              0x0000000000001563
-          phono-stereo/mono                 0x0000000000001564
-          phono-INVALID                     0x0000000000001565
-          phono-INVALID                     0x0000000000001566
-          phono-INVALID                     0x0000000000001567
-          phono-INVALID                     0x0000000000001568
-          phono-store_execute               0x0000000000001569
-          phono-INVALID                     0x000000000000156A
-          phono-scan_forward                0x000000000000156B
-          phono-INVALID                     0x000000000000156C
-          phono-open/close                  0x000000000000156D
-          phono-wave_scroll                 0x000000000000156E
-          phono-INVALID                     0x000000000000156F
-          phono-pause                       0x0000000000001570
-          phono-erase                       0x0000000000001571
-          phono-rewind                      0x0000000000001572
-          phono-go_to                       0x0000000000001573
-          phono-wind                        0x0000000000001574
-          phono-play                        0x0000000000001575
-          phono-stop                        0x0000000000001576
-          phono-recording                   0x0000000000001577
-          phono-external1                   0x0000000000001578
-          phono-external2                   0x0000000000001579
-          phono-clear_all_memory            0x000000000000157A
-          phono-INVALID                     0x000000000000157B
-          phono-INVALID                     0x000000000000157C
-          phono-system_standby              0x000000000000157D
-          phono-counter_memory              0x000000000000157E
-          phono-system_select               0x000000000000157F
-          phono-surround_sound              0x0000000000000540
-          phono-balance_front               0x0000000000000541
-          phono-balance_rear                0x0000000000000542
-          phono-sound_effects1              0x0000000000000543
-          phono-sound_effects2              0x0000000000000544
-          phono-sound_effects3              0x0000000000000545
-          phono-sound_effects4              0x0000000000000546
-          phono-sound_effects5              0x0000000000000547
-          phono-sound_or_menu_func.1        0x0000000000000548
-          phono-sound_or_menu_func.2        0x0000000000000549
-          phono-sound_or_menu_func.3        0x000000000000054A
-          phono-linear_function_up          0x000000000000054D
-          phono-linear_function_down        0x000000000000054E
-          phono-sound_or_menu_func.         0x000000000000054F
-          phono-cursor_step_up              0x0000000000000550
-          phono-cursor_step_down            0x0000000000000551
-          phono-menu_on                     0x0000000000000552
-          phono-menu_off                    0x0000000000000553
-          phono-display_A/V_status          0x0000000000000554
-          phono-cursor_step_left            0x0000000000000555
-          phono-cursor_step_right           0x0000000000000556
-          phono-menu_function               0x0000000000000557
-          phono-PIP_on/off                  0x0000000000000558
-          phono-PIP_shift                   0x0000000000000559
-          phono-PIP_main_swap               0x000000000000055A
-          phono-strobe_on/off               0x000000000000055B
-          phono-multi_strobe                0x000000000000055C
-          phono-main_freezed                0x000000000000055D
-          phono-3/9_multi_scan              0x000000000000055E
-          phono-PIP_mode_select             0x000000000000055F
-          phono-mosaic                      0x0000000000000560
-          phono-solarization                0x0000000000000561
-          phono-main_stored                 0x0000000000000562
-          phono-PIP_strobe                  0x0000000000000563
-          phono-recall_main                 0x0000000000000564
-          phono-PIP_freeze                  0x0000000000000565
-          phono-PIP_step_up                 0x0000000000000566
-          phono-PIP_step_down               0x0000000000000567
-          phono-INVALID                     0x0000000000000568
-          phono-INVALID                     0x0000000000000569
-          phono-INVALID                     0x000000000000056A
-          phono-INVALID                     0x000000000000056B
-          phono-INVALID                     0x000000000000056C
-          phono-INVALID                     0x000000000000056D
-          phono-INVALID                     0x0000000000000572
-          phono-INVALID                     0x0000000000000573
-          phono-INVALID                     0x0000000000000574
-          phono-INVALID                     0x0000000000000575
-          phono-sub_mode                    0x0000000000000576
-          phono-sub_mode                    0x0000000000000577
-          phono-connect                     0x000000000000057B
-          phono-disconnect                  0x000000000000057C
-          rec1-0                            0x0000000000001480
-          rec1-1                            0x0000000000001481
-          rec1-2                            0x0000000000001482
-          rec1-3                            0x0000000000001483
-          rec1-4                            0x0000000000001484
-          rec1-5                            0x0000000000001485
-          rec1-6                            0x0000000000001486
-          rec1-7                            0x0000000000001487
-          rec1-8                            0x0000000000001488
-          rec1-9                            0x0000000000001489
-          rec1-INVALID                      0x000000000000148A
-          rec1-INVALID                      0x000000000000148B
-          rec1-standby                      0x000000000000148C
-          rec1-mute/demute                  0x000000000000148D
-          rec1-P.P.                         0x000000000000148E
-          rec1-display                      0x000000000000148F
-          rec1-volume+                      0x0000000000001490
-          rec1-volume-                      0x0000000000001491
-          rec1-brightness+                  0x0000000000001492
-          rec1-brightness-                  0x0000000000001493
-          rec1-colour_saturation+           0x0000000000001494
-          rec1-colour_saturation-           0x0000000000001495
-          rec1-bass+                        0x0000000000001496
-          rec1-bass-                        0x0000000000001497
-          rec1-treble+                      0x0000000000001498
-          rec1-treble-                      0x0000000000001499
-          rec1-balance_right                0x000000000000149A
-          rec1-balance_left                 0x000000000000149B
-          rec1-repeat_once                  0x000000000000149C
-          rec1-repeat_continuously          0x000000000000149D
-          rec1-select+                      0x000000000000149E
-          rec1-select-                      0x000000000000149F
-          rec1-next                         0x00000000000014A0
-          rec1-previous                     0x00000000000014A1
-          rec1-INVALID                      0x00000000000014A2
-          rec1-last_record_cancel           0x00000000000014A3
-          rec1-sequential                   0x00000000000014A4
-          rec1-blank_search                 0x00000000000014A5
-          rec1-INVALID                      0x00000000000014A6
-          rec1-INVALID                      0x00000000000014A7
-          rec1-recording_pause              0x00000000000014A8
-          rec1-store_execute                0x00000000000014A9
-          rec1-recording_blank              0x00000000000014AA
-          rec1-scan_forward                 0x00000000000014AB
-          rec1-mechanism_A                  0x00000000000014AC
-          rec1-eject                        0x00000000000014AD
-          rec1-mechanism_B                  0x00000000000014AE
-          rec1-play_reverse                 0x00000000000014AF
-          rec1-pause                        0x00000000000014B0
-          rec1-erase                        0x00000000000014B1
-          rec1-rewind                       0x00000000000014B2
-          rec1-go_to                        0x00000000000014B3
-          rec1-wind                         0x00000000000014B4
-          rec1-play                         0x00000000000014B5
-          rec1-stop                         0x00000000000014B6
-          rec1-recording                    0x00000000000014B7
-          rec1-external1                    0x00000000000014B8
-          rec1-external2                    0x00000000000014B9
-          rec1-clear_all_memory             0x00000000000014BA
-          rec1-INVALID                      0x00000000000014BB
-          rec1-INVALID                      0x00000000000014BC
-          rec1-system_standby               0x00000000000014BD
-          rec1-INVALID                      0x00000000000014BE
-          rec1-system_select                0x00000000000014BF
-          rec1-surround_sound               0x0000000000000480
-          rec1-balance_front                0x0000000000000481
-          rec1-balance_rear                 0x0000000000000482
-          rec1-sound_effects1               0x0000000000000483
-          rec1-sound_effects2               0x0000000000000484
-          rec1-sound_effects3               0x0000000000000485
-          rec1-sound_effects4               0x0000000000000486
-          rec1-sound_effects5               0x0000000000000487
-          rec1-sound_or_menu_func.1         0x0000000000000488
-          rec1-sound_or_menu_func.2         0x0000000000000489
-          rec1-sound_or_menu_func.3         0x000000000000048A
-          rec1-linear_function_up           0x000000000000048D
-          rec1-linear_function_down         0x000000000000048E
-          rec1-sound_or_menu_func.          0x000000000000048F
-          rec1-cursor_step_up               0x0000000000000490
-          rec1-cursor_step_down             0x0000000000000491
-          rec1-menu_on                      0x0000000000000492
-          rec1-menu_off                     0x0000000000000493
-          rec1-display_A/V_status           0x0000000000000494
-          rec1-cursor_step_left             0x0000000000000495
-          rec1-cursor_step_right            0x0000000000000496
-          rec1-menu_function                0x0000000000000497
-          rec1-PIP_on/off                   0x0000000000000498
-          rec1-PIP_shift                    0x0000000000000499
-          rec1-PIP_main_swap                0x000000000000049A
-          rec1-strobe_on/off                0x000000000000049B
-          rec1-multi_strobe                 0x000000000000049C
-          rec1-main_freezed                 0x000000000000049D
-          rec1-3/9_multi_scan               0x000000000000049E
-          rec1-PIP_mode_select              0x000000000000049F
-          rec1-mosaic                       0x00000000000004A0
-          rec1-solarization                 0x00000000000004A1
-          rec1-main_stored                  0x00000000000004A2
-          rec1-PIP_strobe                   0x00000000000004A3
-          rec1-recall_main                  0x00000000000004A4
-          rec1-PIP_freeze                   0x00000000000004A5
-          rec1-PIP_step_up                  0x00000000000004A6
-          rec1-PIP_step_down                0x00000000000004A7
-          rec1-automatic_start_ID           0x00000000000004A8
-          rec1-write_skip_ID                0x00000000000004A9
-          rec1-skip_on/off                  0x00000000000004AA
-          rec1-write_end_ID                 0x00000000000004AB
-          rec1-write_FTS                    0x00000000000004AC
-          rec1-write_TOC                    0x00000000000004AD
-          rec1-write_start_ID               0x00000000000004B2
-          rec1-Ca/Er/SK_ID                  0x00000000000004B3
-          rec1-reformat                     0x00000000000004B4
-          rec1-blank_search                 0x00000000000004B5
-          rec1-sub_mode                     0x00000000000004B6
-          rec1-sub_mode                     0x00000000000004B7
-          rec1-connect                      0x00000000000004BB
-          rec1-disconnect                   0x00000000000004BC
-          rec2-0                            0x00000000000015C0
-          rec2-1                            0x00000000000015C1
-          rec2-2                            0x00000000000015C2
-          rec2-3                            0x00000000000015C3
-          rec2-4                            0x00000000000015C4
-          rec2-5                            0x00000000000015C5
-          rec2-6                            0x00000000000015C6
-          rec2-7                            0x00000000000015C7
-          rec2-8                            0x00000000000015C8
-          rec2-9                            0x00000000000015C9
-          rec2-INVALID                      0x00000000000015CA
-          rec2-INVALID                      0x00000000000015CB
-          rec2-standby                      0x00000000000015CC
-          rec2-mute/demute                  0x00000000000015CD
-          rec2-P.P.                         0x00000000000015CE
-          rec2-display                      0x00000000000015CF
-          rec2-volume+                      0x00000000000015D0
-          rec2-volume-                      0x00000000000015D1
-          rec2-brightness+                  0x00000000000015D2
-          rec2-brightness-                  0x00000000000015D3
-          rec2-colour_saturation+           0x00000000000015D4
-          rec2-colour_saturation-           0x00000000000015D5
-          rec2-bass+                        0x00000000000015D6
-          rec2-bass-                        0x00000000000015D7
-          rec2-treble+                      0x00000000000015D8
-          rec2-treble-                      0x00000000000015D9
-          rec2-balance_right                0x00000000000015DA
-          rec2-balance_left                 0x00000000000015DB
-          rec2-repeat_once                  0x00000000000015DC
-          rec2-repeat_continuously          0x00000000000015DD
-          rec2-select+                      0x00000000000015DE
-          rec2-select-                      0x00000000000015DF
-          rec2-next                         0x00000000000015E0
-          rec2-previous                     0x00000000000015E1
-          rec2-INVALID                      0x00000000000015E2
-          rec2-last_record_cancel           0x00000000000015E3
-          rec2-sequential                   0x00000000000015E4
-          rec2-blank_search                 0x00000000000015E5
-          rec2-INVALID                      0x00000000000015E6
-          rec2-INVALID                      0x00000000000015E7
-          rec2-recording_pause              0x00000000000015E8
-          rec2-store_execute                0x00000000000015E9
-          rec2-recording_blank              0x00000000000015EA
-          rec2-scan_forward                 0x00000000000015EB
-          rec2-mechanism_A                  0x00000000000015EC
-          rec2-eject                        0x00000000000015ED
-          rec2-mechanism_B                  0x00000000000015EE
-          rec2-play_reverse                 0x00000000000015EF
-          rec2-pause                        0x00000000000015F0
-          rec2-erase                        0x00000000000015F1
-          rec2-rewind                       0x00000000000015F2
-          rec2-go_to                        0x00000000000015F3
-          rec2-wind                         0x00000000000015F4
-          rec2-play                         0x00000000000015F5
-          rec2-stop                         0x00000000000015F6
-          rec2-recording                    0x00000000000015F7
-          rec2-external1                    0x00000000000015F8
-          rec2-external2                    0x00000000000015F9
-          rec2-clear_all_memory             0x00000000000015FA
-          rec2-INVALID                      0x00000000000015FB
-          rec2-INVALID                      0x00000000000015FC
-          rec2-system_standby               0x00000000000015FD
-          rec2-INVALID                      0x00000000000015FE
-          rec2-system_select                0x00000000000015FF
-          rec2-surround_sound               0x00000000000005C0
-          rec2-balance_front                0x00000000000005C1
-          rec2-balance_rear                 0x00000000000005C2
-          rec2-sound_effects1               0x00000000000005C3
-          rec2-sound_effects2               0x00000000000005C4
-          rec2-sound_effects3               0x00000000000005C5
-          rec2-sound_effects4               0x00000000000005C6
-          rec2-sound_effects5               0x00000000000005C7
-          rec2-sound_or_menu_func.1         0x00000000000005C8
-          rec2-sound_or_menu_func.2         0x00000000000005C9
-          rec2-sound_or_menu_func.3         0x00000000000005CA
-          rec2-linear_function_up           0x00000000000005CD
-          rec2-linear_function_down         0x00000000000005CE
-          rec2-sound_or_menu_func.          0x00000000000005CF
-          rec2-cursor_step_up               0x00000000000005D0
-          rec2-cursor_step_down             0x00000000000005D1
-          rec2-menu_on                      0x00000000000005D2
-          rec2-menu_off                     0x00000000000005D3
-          rec2-display_A/V_status           0x00000000000005D4
-          rec2-cursor_step_left             0x00000000000005D5
-          rec2-cursor_step_right            0x00000000000005D6
-          rec2-menu_function                0x00000000000005D7
-          rec2-PIP_on/off                   0x00000000000005D8
-          rec2-PIP_shift                    0x00000000000005D9
-          rec2-PIP_main_swap                0x00000000000005DA
-          rec2-strobe_on/off                0x00000000000005DB
-          rec2-multi_strobe                 0x00000000000005DC
-          rec2-main_freezed                 0x00000000000005DD
-          rec2-3/9_multi_scan               0x00000000000005DE
-          rec2-PIP_mode_select              0x00000000000005DF
-          rec2-mosaic                       0x00000000000005E0
-          rec2-solarization                 0x00000000000005E1
-          rec2-main_stored                  0x00000000000005E2
-          rec2-PIP_strobe                   0x00000000000005E3
-          rec2-recall_main                  0x00000000000005E4
-          rec2-PIP_freeze                   0x00000000000005E5
-          rec2-PIP_step_up                  0x00000000000005E6
-          rec2-PIP_step_down                0x00000000000005E7
-          rec2-automatic_start_ID           0x00000000000005E8
-          rec2-write_skip_ID                0x00000000000005E9
-          rec2-skip_on/off                  0x00000000000005EA
-          rec2-write_end_ID                 0x00000000000005EB
-          rec2-write_FTS                    0x00000000000005EC
-          rec2-write_TOC                    0x00000000000005ED
-          rec2-write_start_ID               0x00000000000005F2
-          rec2-Ca/Er/SK_ID                  0x00000000000005F3
-          rec2-reformat                     0x00000000000005F4
-          rec2-blank_search                 0x00000000000005F5
-          rec2-sub_mode                     0x00000000000005F6
-          rec2-sub_mode                     0x00000000000005F7
-          rec2-connect                      0x00000000000005FB
-          rec2-disconnect                   0x00000000000005FC
-          sat-0                             0x0000000000001200
-          sat-1                             0x0000000000001201
-          sat-2                             0x0000000000001202
-          sat-3                             0x0000000000001203
-          sat-4                             0x0000000000001204
-          sat-5                             0x0000000000001205
-          sat-6                             0x0000000000001206
-          sat-7                             0x0000000000001207
-          sat-8                             0x0000000000001208
-          sat-9                             0x0000000000001209
-          sat-1/2_digits                    0x000000000000120A
-          sat-channel/program_mode          0x000000000000120B
-          sat-standby                       0x000000000000120C
-          sat-mute/demute                   0x000000000000120D
-          sat-P.P.                          0x000000000000120E
-          sat-display                       0x000000000000120F
-          sat-volume+                       0x0000000000001210
-          sat-volume-                       0x0000000000001211
-          sat-brightness+                   0x0000000000001212
-          sat-brightness-                   0x0000000000001213
-          sat-colour_saturation+            0x0000000000001214
-          sat-colour_saturation-            0x0000000000001215
-          sat-bass+                         0x0000000000001216
-          sat-bass-                         0x0000000000001217
-          sat-treble+                       0x0000000000001218
-          sat-treble-                       0x0000000000001219
-          sat-balance_right                 0x000000000000121A
-          sat-balance_left                  0x000000000000121B
-          sat-INVALID                       0x000000000000121C
-          sat-INVALID                       0x000000000000121D
-          sat-INVALID                       0x000000000000121E
-          sat-INVALID                       0x000000000000121F
-          sat-channel/program+              0x0000000000001220
-          sat-channel/program-              0x0000000000001221
-          sat-INVALID                       0x0000000000001222
-          sat-language_select/mode1         0x0000000000001223
-          sat-special_stereo_on/off         0x0000000000001224
-          sat-audio_mixed_/_mode2           0x0000000000001225
-          sat-INVALID                       0x0000000000001226
-          sat-INVALID                       0x0000000000001227
-          sat-INVALID                       0x0000000000001228
-          sat-INVALID                       0x0000000000001229
-          sat-INVALID                       0x000000000000122A
-          sat-INVALID                       0x000000000000122B
-          sat-INVALID                       0x000000000000122C
-          sat-INVALID                       0x000000000000122D
-          sat-subtitle                      0x000000000000122E
-          sat-INVALID                       0x000000000000122F
-          sat-pause                         0x0000000000001230
-          sat-erase                         0x0000000000001231
-          sat-rewind                        0x0000000000001232
-          sat-go_to                         0x0000000000001233
-          sat-wind                          0x0000000000001234
-          sat-play                          0x0000000000001235
-          sat-stop                          0x0000000000001236
-          sat-recording                     0x0000000000001237
-          sat-external1                     0x0000000000001238
-          sat-external2                     0x0000000000001239
-          sat-INVALID                       0x000000000000123A
-          sat-INVALID                       0x000000000000123B
-          sat-TXT_submode                   0x000000000000123C
-          sat-system_standby                0x000000000000123D
-          sat-INVALID                       0x000000000000123E
-          sat-system_select                 0x000000000000123F
-          sat-surround_sound                0x0000000000000200
-          sat-balance_front                 0x0000000000000201
-          sat-balance_rear                  0x0000000000000202
-          sat-sound_effects1                0x0000000000000203
-          sat-sound_effects2                0x0000000000000204
-          sat-sound_effects3                0x0000000000000205
-          sat-sound_effects4                0x0000000000000206
-          sat-sound_effects5                0x0000000000000207
-          sat-sound_or_menu_func.1          0x0000000000000208
-          sat-sound_or_menu_func.2          0x0000000000000209
-          sat-sound_or_menu_func.3          0x000000000000020A
-          sat-INVALID                       0x000000000000020B
-          sat-INVALID                       0x000000000000020C
-          sat-linear_function_up            0x000000000000020D
-          sat-linear_function_down          0x000000000000020E
-          sat-sound_or_menu_func.           0x000000000000020F
-          sat-cursor_step_up                0x0000000000000210
-          sat-cursor_step_down              0x0000000000000211
-          sat-menu_on                       0x0000000000000212
-          sat-menu_off                      0x0000000000000213
-          sat-display_A/V_status            0x0000000000000214
-          sat-cursor_step_left              0x0000000000000215
-          sat-cursor_step_right             0x0000000000000216
-          sat-menu_function                 0x0000000000000217
-          sat-PIP_on/off                    0x0000000000000218
-          sat-PIP_shift                     0x0000000000000219
-          sat-PIP_main_swap                 0x000000000000021A
-          sat-strobe_on/off                 0x000000000000021B
-          sat-multi_strobe                  0x000000000000021C
-          sat-main_freezed                  0x000000000000021D
-          sat-3/9_multi_scan                0x000000000000021E
-          sat-PIP_mode_select               0x000000000000021F
-          sat-mosaic                        0x0000000000000220
-          sat-solarization                  0x0000000000000221
-          sat-main_stored                   0x0000000000000222
-          sat-PIP_strobe                    0x0000000000000223
-          sat-recall_main                   0x0000000000000224
-          sat-PIP_freeze                    0x0000000000000225
-          sat-PIP_step_up                   0x0000000000000226
-          sat-PIP_step_down                 0x0000000000000227
-          sat-INVALID                       0x0000000000000228
-          sat-INVALID                       0x0000000000000229
-          sat-INVALID                       0x000000000000022A
-          sat-INVALID                       0x000000000000022B
-          sat-INVALID                       0x000000000000022C
-          sat-INVALID                       0x000000000000022D
-          sat-INVALID                       0x0000000000000230
-          sat-INVALID                       0x0000000000000231
-          sat-INVALID                       0x0000000000000232
-          sat-INVALID                       0x0000000000000233
-          sat-INVALID                       0x0000000000000234
-          sat-INVALID                       0x0000000000000235
-          sat-sub_mode                      0x0000000000000236
-          sat-sub_mode                      0x0000000000000237
-          sat-INVALID                       0x0000000000000238
-          sat-INVALID                       0x0000000000000239
-          sat-INVALID                       0x000000000000023A
-          sat-connect                       0x000000000000023B
-          sat-INVALID                       0x000000000000023C
-          text-0                            0x0000000000001080
-          text-1                            0x0000000000001081
-          text-2                            0x0000000000001082
-          text-3                            0x0000000000001083
-          text-4                            0x0000000000001084
-          text-5                            0x0000000000001085
-          text-6                            0x0000000000001086
-          text-7                            0x0000000000001087
-          text-8                            0x0000000000001088
-          text-9                            0x0000000000001089
-          text-step_page+                   0x000000000000108A
-          text-step_page-                   0x000000000000108B
-          text-standby                      0x000000000000108C
-          text-mute/demute                  0x000000000000108D
-          text-P.P.                         0x000000000000108E
-          text-display                      0x000000000000108F
-          text-volume+                      0x0000000000001090
-          text-volume-                      0x0000000000001091
-          text-brightness+                  0x0000000000001092
-          text-brightness-                  0x0000000000001093
-          text-colour_saturation+           0x0000000000001094
-          text-colour_saturation-           0x0000000000001095
-          text-bass+                        0x0000000000001096
-          text-bass-                        0x0000000000001097
-          text-treble+                      0x0000000000001098
-          text-treble-                      0x0000000000001099
-          text-balance_right                0x000000000000109A
-          text-balance_left                 0x000000000000109B
-          text-enter/validation_(Frnc)      0x000000000000109C
-          text-memory_out                   0x000000000000109D
-          text-sequence_out                 0x000000000000109E
-          text-INVALID                      0x000000000000109F
-          text-exchange                     0x00000000000010A0
-          text-index/summary_(France)       0x00000000000010A1
-          text-row_zero_(France)            0x00000000000010A2
-          text-1st/2nd_language             0x00000000000010A3
-          text-spacial_stereo_on/off        0x00000000000010A4
-          text-INVALID                      0x00000000000010A5
-          text-hardcopy_printer             0x00000000000010A6
-          text-antiope_TV_mixed_(Frnc)      0x00000000000010A7
-          text-PIP_select                   0x00000000000010A8
-          text-page_hold_on/off             0x00000000000010A9
-          text-clck_timed_page_(F:magazine) 0x00000000000010AA
-          text-large_top/lrge_bot/norm      0x00000000000010AB
-          text-reveal/conceal/canc_pic      0x00000000000010AC
-          text-cancel_teletext_picture      0x00000000000010AD
-          text-TV/Text_mixed/Subtitle       0x00000000000010AE
-          text-PIP_shift                    0x00000000000010AF
-          text-pause                        0x00000000000010B0
-          text-erase                        0x00000000000010B1
-          text-rewind                       0x00000000000010B2
-          text-go_to                        0x00000000000010B3
-          text-wind                         0x00000000000010B4
-          text-play                         0x00000000000010B5
-          text-stop                         0x00000000000010B6
-          text-recording                    0x00000000000010B7
-          text-external1                    0x00000000000010B8
-          text-external2                    0x00000000000010B9
-          text-PIP_display_mode             0x00000000000010BA
-          text-INVALID                      0x00000000000010BB
-          text-INVALID                      0x00000000000010BC
-          text-system_standby               0x00000000000010BD
-          text-news_flash_(France)          0x00000000000010BE
-          text-system_select                0x00000000000010BF
-          text-surround_sound               0x0000000000000080
-          text-balance_front                0x0000000000000081
-          text-balance_rear                 0x0000000000000082
-          text-sound_effects1               0x0000000000000083
-          text-sound_effects2               0x0000000000000084
-          text-sound_effects3               0x0000000000000085
-          text-sound_effects4               0x0000000000000086
-          text-sound_effects5               0x0000000000000087
-          text-sound_or_menu_func.1         0x0000000000000088
-          text-sound_or_menu_func.2         0x0000000000000089
-          text-sound_or_menu_func.3         0x000000000000008A
-          text-linear_function_up           0x000000000000008D
-          text-linear_function_down         0x000000000000008E
-          text-sound_or_menu_func.          0x000000000000008F
-          text-cursor_step_up               0x0000000000000090
-          text-cursor_step_down             0x0000000000000091
-          text-menu_on                      0x0000000000000092
-          text-menu_off                     0x0000000000000093
-          text-display_A/V_status           0x0000000000000094
-          text-cursor_step_left             0x0000000000000095
-          text-cursor_step_right            0x0000000000000096
-          text-menu_function                0x0000000000000097
-          text-PIP_on/off                   0x0000000000000098
-          text-PIP_shift                    0x0000000000000099
-          text-PIP_main_swap                0x000000000000009A
-          text-strobe_on/off                0x000000000000009B
-          text-multi_strobe                 0x000000000000009C
-          text-main_freezed                 0x000000000000009D
-          text-3/9_multi_scan               0x000000000000009E
-          text-PIP_mode_select              0x000000000000009F
-          text-mosaic                       0x00000000000000A0
-          text-solarization                 0x00000000000000A1
-          text-main_stored                  0x00000000000000A2
-          text-PIP_strobe                   0x00000000000000A3
-          text-recall_main                  0x00000000000000A4
-          text-PIP_freeze                   0x00000000000000A5
-          text-PIP_step_up                  0x00000000000000A6
-          text-PIP_step_down                0x00000000000000A7
-          text-red                          0x00000000000000AB
-          text-green                        0x00000000000000AC
-          text-yellow                       0x00000000000000AD
-          text-cyan                         0x00000000000000AE
-          text-INVALID                      0x00000000000000AF
-          text-sub_mode                     0x00000000000000B6
-          text-sub_mode                     0x00000000000000B7
-          text-cleaning_up                  0x00000000000000BA
-          text-connect                      0x00000000000000BB
-          text-disconnect                   0x00000000000000BC
-          text-cleaning_up1                 0x00000000000000BD
-          text-cleaning_up2                 0x00000000000000BE
-          text-cleaning_up3                 0x00000000000000BF
-          tuner-0                           0x0000000000001440
-          tuner-1                           0x0000000000001441
-          tuner-2                           0x0000000000001442
-          tuner-3                           0x0000000000001443
-          tuner-4                           0x0000000000001444
-          tuner-5                           0x0000000000001445
-          tuner-6                           0x0000000000001446
-          tuner-7                           0x0000000000001447
-          tuner-8                           0x0000000000001448
-          tuner-9                           0x0000000000001449
-          tuner-1/2_digits                  0x000000000000144A
-          tuner-INVALID                     0x000000000000144B
-          tuner-standby                     0x000000000000144C
-          tuner-mute/demute                 0x000000000000144D
-          tuner-P.P.                        0x000000000000144E
-          tuner-display                     0x000000000000144F
-          tuner-volume+                     0x0000000000001450
-          tuner-volume-                     0x0000000000001451
-          tuner-brightness+                 0x0000000000001452
-          tuner-brightness-                 0x0000000000001453
-          tuner-colour_saturation+          0x0000000000001454
-          tuner-colour_saturation-          0x0000000000001455
-          tuner-bass+                       0x0000000000001456
-          tuner-bass-                       0x0000000000001457
-          tuner-treble+                     0x0000000000001458
-          tuner-treble-                     0x0000000000001459
-          tuner-balance_right               0x000000000000145A
-          tuner-balance_left                0x000000000000145B
-          tuner-INVALID                     0x000000000000145C
-          tuner-INVALID                     0x000000000000145D
-          tuner-search+                     0x000000000000145E
-          tuner-search-                     0x000000000000145F
-          tuner-preset+                     0x0000000000001460
-          tuner-preset-                     0x0000000000001461
-          tuner-INVALID                     0x0000000000001462
-          tuner-INVALID                     0x0000000000001463
-          tuner-INVALID                     0x0000000000001464
-          tuner-mono/stereo                 0x0000000000001465
-          tuner-INVALID                     0x0000000000001466
-          tuner-INVALID                     0x0000000000001467
-          tuner-RF_switch                   0x0000000000001468
-          tuner-store_execute               0x0000000000001469
-          tuner-INVALID                     0x000000000000146A
-          tuner-scan_forward                0x000000000000146B
-          tuner-INVALID                     0x000000000000146C
-          tuner-FM                          0x000000000000146D
-          tuner-MW_(USA:_MW/FM)             0x000000000000146E
-          tuner-LW                          0x000000000000146F
-          tuner-pause                       0x0000000000001470
-          tuner-erase                       0x0000000000001471
-          tuner-rewind                      0x0000000000001472
-          tuner-go_to                       0x0000000000001473
-          tuner-wind                        0x0000000000001474
-          tuner-play                        0x0000000000001475
-          tuner-stop                        0x0000000000001476
-          tuner-recording                   0x0000000000001477
-          tuner-external1                   0x0000000000001478
-          tuner-external2                   0x0000000000001479
-          tuner-clear_all_memory            0x000000000000147A
-          tuner-INVALID                     0x000000000000147B
-          tuner-INVALID                     0x000000000000147C
-          tuner-system_standby              0x000000000000147D
-          tuner-INVALID                     0x000000000000147E
-          tuner-system_select               0x000000000000147F
-          tuner-surround_sound              0x0000000000000440
-          tuner-balance_front               0x0000000000000441
-          tuner-balance_rear                0x0000000000000442
-          tuner-sound_effects1              0x0000000000000443
-          tuner-sound_effects2              0x0000000000000444
-          tuner-sound_effects3              0x0000000000000445
-          tuner-sound_effects4              0x0000000000000446
-          tuner-sound_effects5              0x0000000000000447
-          tuner-sound_or_menu_func.1        0x0000000000000448
-          tuner-sound_or_menu_func.2        0x0000000000000449
-          tuner-sound_or_menu_func.3        0x000000000000044A
-          tuner-linear_function_up          0x000000000000044D
-          tuner-linear_function_down        0x000000000000044E
-          tuner-sound_or_menu_func.         0x000000000000044F
-          tuner-cursor_step_up              0x0000000000000450
-          tuner-cursor_step_down            0x0000000000000451
-          tuner-menu_on                     0x0000000000000452
-          tuner-menu_off                    0x0000000000000453
-          tuner-display_A/V_status          0x0000000000000454
-          tuner-cursor_step_left            0x0000000000000455
-          tuner-cursor_step_right           0x0000000000000456
-          tuner-menu_function               0x0000000000000457
-          tuner-PIP_on/off                  0x0000000000000458
-          tuner-PIP_shift                   0x0000000000000459
-          tuner-PIP_main_swap               0x000000000000045A
-          tuner-strobe_on/off               0x000000000000045B
-          tuner-multi_strobe                0x000000000000045C
-          tuner-main_freezed                0x000000000000045D
-          tuner-3/9_multi_scan              0x000000000000045E
-          tuner-PIP_mode_select             0x000000000000045F
-          tuner-mosaic                      0x0000000000000460
-          tuner-solarization                0x0000000000000461
-          tuner-main_stored                 0x0000000000000462
-          tuner-PIP_strobe                  0x0000000000000463
-          tuner-recall_main                 0x0000000000000464
-          tuner-PIP_freeze                  0x0000000000000465
-          tuner-PIP_step_up                 0x0000000000000466
-          tuner-PIP_step_down               0x0000000000000467
-          tuner-INVALID                     0x000000000000046C
-          tuner-INVALID                     0x0000000000000470
-          tuner-INVALID                     0x0000000000000471
-          tuner-INVALID                     0x0000000000000476
-          tuner-INVALID                     0x0000000000000477
-          tuner-connect                     0x000000000000047B
-          tuner-disconnect                  0x000000000000047C
-          tv1-0                             0x0000000000001000
-          tv1-1                             0x0000000000001001
-          tv1-2                             0x0000000000001002
-          tv1-3                             0x0000000000001003
-          tv1-4                             0x0000000000001004
-          tv1-5                             0x0000000000001005
-          tv1-6                             0x0000000000001006
-          tv1-7                             0x0000000000001007
-          tv1-8                             0x0000000000001008
-          tv1-9                             0x0000000000001009
-          tv1-1/2/3_digs_(japan:10)         0x000000000000100A
-          tv1-channel/program(jap:11)       0x000000000000100B
-          tv1-standby                       0x000000000000100C
-          tv1-mute/demute                   0x000000000000100D
-          tv1-P.P._(personal_pref.)         0x000000000000100E
-          tv1-display                       0x000000000000100F
-          tv1-volume+                       0x0000000000001010
-          tv1-volume-                       0x0000000000001011
-          tv1-brightness+                   0x0000000000001012
-          tv1-brightness-                   0x0000000000001013
-          tv1-colour_saturation+            0x0000000000001014
-          tv1-colour_saturation-            0x0000000000001015
-          tv1-bass+                         0x0000000000001016
-          tv1-bass-                         0x0000000000001017
-          tv1-treble+                       0x0000000000001018
-          tv1-treble-                       0x0000000000001019
-          tv1-balance_right                 0x000000000000101A
-          tv1-balance_left                  0x000000000000101B
-          tv1-contrast+                     0x000000000000101C
-          tv1-contrast-                     0x000000000000101D
-          tv1-search+                       0x000000000000101E
-          tv1-tint/hue+                     0x000000000000101F
-          tv1-channel/program+              0x0000000000001020
-          tv1-channel/program-              0x0000000000001021
-          tv1-alt/channel                   0x0000000000001022
-          tv1-1st/2nd_language              0x0000000000001023
-          tv1-spacial_stereo_on/off         0x0000000000001024
-          tv1-mono/stereo_(USA)             0x0000000000001025
-          tv1-sleeptimer                    0x0000000000001026
-          tv1-tint/hue-                     0x0000000000001027
-          tv1-RF_switch/PIP_select          0x0000000000001028
-          tv1-vote                          0x0000000000001029
-          tv1-timed_page/channel            0x000000000000102A
-          tv1-increment_(USA)               0x000000000000102B
-          tv1-decrement_(USA)               0x000000000000102C
-          tv1-INVALID                       0x000000000000102D
-          tv1-2nd_controls_(USA:menu)       0x000000000000102E
-          tv1-PIP_shift                     0x000000000000102F
-          tv1-pause                         0x0000000000001030
-          tv1-erase                         0x0000000000001031
-          tv1-rewind                        0x0000000000001032
-          tv1-go_to                         0x0000000000001033
-          tv1-wind                          0x0000000000001034
-          tv1-play                          0x0000000000001035
-          tv1-stop                          0x0000000000001036
-          tv1-recording                     0x0000000000001037
-          tv1-external1                     0x0000000000001038
-          tv1-external2                     0x0000000000001039
-          tv1-PIP_display_mode              0x000000000000103A
-          tv1-view_data_mode/advance        0x000000000000103B
-          tv1-teletext_submode_(J:12)       0x000000000000103C
-          tv1-system_standby                0x000000000000103D
-          tv1-crispener_on/off              0x000000000000103E
-          tv1-system_select                 0x000000000000103F
-          tv1-surround_sound                0x0000000000000000
-          tv1-balance_front                 0x0000000000000001
-          tv1-balance_rear                  0x0000000000000002
-          tv1-sound_effects1                0x0000000000000003
-          tv1-sound_effects2                0x0000000000000004
-          tv1-sound_effects3                0x0000000000000005
-          tv1-sound_effects4                0x0000000000000006
-          tv1-sound_effects5                0x0000000000000007
-          tv1-sound_or_menu_func.1          0x0000000000000008
-          tv1-sound_or_menu_func.2          0x0000000000000009
-          tv1-sound_or_menu_func.3          0x000000000000000A
-          tv1-linear_function_up            0x000000000000000D
-          tv1-linear_function_down          0x000000000000000E
-          tv1-sound_or_menu_func.           0x000000000000000F
-          tv1-cursor_step_up                0x0000000000000010
-          tv1-cursor_step_down              0x0000000000000011
-          tv1-menu_on                       0x0000000000000012
-          tv1-menu_off                      0x0000000000000013
-          tv1-display_A/V_status            0x0000000000000014
-          tv1-cursor_step_left              0x0000000000000015
-          tv1-cursor_step_right             0x0000000000000016
-          tv1-menu_function                 0x0000000000000017
-          tv1-PIP_on/off                    0x0000000000000018
-          tv1-PIP_shift                     0x0000000000000019
-          tv1-PIP_main_swap                 0x000000000000001A
-          tv1-strobe_on/off                 0x000000000000001B
-          tv1-multi_strobe                  0x000000000000001C
-          tv1-main_freezed                  0x000000000000001D
-          tv1-3/9_multi_scan                0x000000000000001E
-          tv1-PIP_mode_select               0x000000000000001F
-          tv1-mosaic                        0x0000000000000020
-          tv1-solarization                  0x0000000000000021
-          tv1-main_stored                   0x0000000000000022
-          tv1-PIP_strobe                    0x0000000000000023
-          tv1-recall_main                   0x0000000000000024
-          tv1-PIP_freeze                    0x0000000000000025
-          tv1-PIP_step_up                   0x0000000000000026
-          tv1-PIP_step_down                 0x0000000000000027
-          tv1-INVALID                       0x000000000000002B
-          tv1-INVALID                       0x000000000000002C
-          tv1-INVALID                       0x000000000000002D
-          tv1-INVALID                       0x000000000000002E
-          tv1-index                         0x000000000000002F
-          tv1-sub_mode                      0x0000000000000036
-          tv1-sub_mode                      0x0000000000000037
-          tv1-cleaning_up                   0x000000000000003A
-          tv1-connect                       0x000000000000003B
-          tv1-disconnect                    0x000000000000003C
-          tv1-cleaning_up1                  0x000000000000003D
-          tv1-cleaning_up2                  0x000000000000003E
-          tv1-cleaning_up3                  0x000000000000003F
-          tv2-0                             0x0000000000001040
-          tv2-1                             0x0000000000001041
-          tv2-2                             0x0000000000001042
-          tv2-3                             0x0000000000001043
-          tv2-4                             0x0000000000001044
-          tv2-5                             0x0000000000001045
-          tv2-6                             0x0000000000001046
-          tv2-7                             0x0000000000001047
-          tv2-8                             0x0000000000001048
-          tv2-9                             0x0000000000001049
-          tv2-1/2/3_digs_(japan:10)         0x000000000000104A
-          tv2-channel/program(jap:11)       0x000000000000104B
-          tv2-standby                       0x000000000000104C
-          tv2-mute/demute                   0x000000000000104D
-          tv2-P.P._(personal_pref.)         0x000000000000104E
-          tv2-display                       0x000000000000104F
-          tv2-volume+                       0x0000000000001050
-          tv2-volume-                       0x0000000000001051
-          tv2-brightness+                   0x0000000000001052
-          tv2-brightness-                   0x0000000000001053
-          tv2-colour_saturation+            0x0000000000001054
-          tv2-colour_saturation-            0x0000000000001055
-          tv2-bass+                         0x0000000000001056
-          tv2-bass-                         0x0000000000001057
-          tv2-treble+                       0x0000000000001058
-          tv2-treble-                       0x0000000000001059
-          tv2-balance_right                 0x000000000000105A
-          tv2-balance_left                  0x000000000000105B
-          tv2-contrast+                     0x000000000000105C
-          tv2-contrast-                     0x000000000000105D
-          tv2-search+                       0x000000000000105E
-          tv2-tint/hue+                     0x000000000000105F
-          tv2-channel/program+              0x0000000000001060
-          tv2-channel/program-              0x0000000000001061
-          tv2-alt/channel                   0x0000000000001062
-          tv2-1st/2nd_language              0x0000000000001063
-          tv2-spacial_stereo_on/off         0x0000000000001064
-          tv2-mono/stereo_(USA)             0x0000000000001065
-          tv2-sleeptimer                    0x0000000000001066
-          tv2-tint/hue-                     0x0000000000001067
-          tv2-RF_switch/PIP_select          0x0000000000001068
-          tv2-vote                          0x0000000000001069
-          tv2-timed_page/channel            0x000000000000106A
-          tv2-increment_(USA)               0x000000000000106B
-          tv2-decrement_(USA)               0x000000000000106C
-          tv2-INVALID                       0x000000000000106D
-          tv2-2nd_controls_(USA:menu)       0x000000000000106E
-          tv2-PIP_shift                     0x000000000000106F
-          tv2-pause                         0x0000000000001070
-          tv2-erase                         0x0000000000001071
-          tv2-rewind                        0x0000000000001072
-          tv2-go_to                         0x0000000000001073
-          tv2-wind                          0x0000000000001074
-          tv2-play                          0x0000000000001075
-          tv2-stop                          0x0000000000001076
-          tv2-recording                     0x0000000000001077
-          tv2-external1                     0x0000000000001078
-          tv2-external2                     0x0000000000001079
-          tv2-PIP_display_mode              0x000000000000107A
-          tv2-view_data_mode/advance        0x000000000000107B
-          tv2-teletext_submode_(J:12)       0x000000000000107C
-          tv2-system_standby                0x000000000000107D
-          tv2-crispener_on/off              0x000000000000107E
-          tv2-system_select                 0x000000000000107F
-          tv2-surround_sound                0x0000000000000040
-          tv2-balance_front                 0x0000000000000041
-          tv2-balance_rear                  0x0000000000000042
-          tv2-sound_effects1                0x0000000000000043
-          tv2-sound_effects2                0x0000000000000044
-          tv2-sound_effects3                0x0000000000000045
-          tv2-sound_effects4                0x0000000000000046
-          tv2-sound_effects5                0x0000000000000047
-          tv2-sound_or_menu_func.1          0x0000000000000048
-          tv2-sound_or_menu_func.2          0x0000000000000049
-          tv2-sound_or_menu_func.3          0x000000000000004A
-          tv2-linear_function_up            0x000000000000004D
-          tv2-linear_function_down          0x000000000000004E
-          tv2-sound_or_menu_func.           0x000000000000004F
-          tv2-cursor_step_up                0x0000000000000050
-          tv2-cursor_step_down              0x0000000000000051
-          tv2-menu_on                       0x0000000000000052
-          tv2-menu_off                      0x0000000000000053
-          tv2-display_A/V_status            0x0000000000000054
-          tv2-cursor_step_left              0x0000000000000055
-          tv2-cursor_step_right             0x0000000000000056
-          tv2-menu_function                 0x0000000000000057
-          tv2-PIP_on/off                    0x0000000000000058
-          tv2-PIP_shift                     0x0000000000000059
-          tv2-PIP_main_swap                 0x000000000000005A
-          tv2-strobe_on/off                 0x000000000000005B
-          tv2-multi_strobe                  0x000000000000005C
-          tv2-main_freezed                  0x000000000000005D
-          tv2-3/9_multi_scan                0x000000000000005E
-          tv2-PIP_mode_select               0x000000000000005F
-          tv2-mosaic                        0x0000000000000060
-          tv2-solarization                  0x0000000000000061
-          tv2-main_stored                   0x0000000000000062
-          tv2-PIP_strobe                    0x0000000000000063
-          tv2-recall_main                   0x0000000000000064
-          tv2-PIP_freeze                    0x0000000000000065
-          tv2-PIP_step_up                   0x0000000000000066
-          tv2-PIP_step_down                 0x0000000000000067
-          tv2-INVALID                       0x000000000000006B
-          tv2-INVALID                       0x000000000000006C
-          tv2-INVALID                       0x000000000000006D
-          tv2-INVALID                       0x000000000000006E
-          tv2-index                         0x000000000000006F
-          tv2-sub_mode                      0x0000000000000076
-          tv2-sub_mode                      0x0000000000000077
-          tv2-cleaning_up                   0x000000000000007A
-          tv2-connect                       0x000000000000007B
-          tv2-disconnect                    0x000000000000007C
-          tv2-cleaning_up1                  0x000000000000007D
-          tv2-cleaning_up2                  0x000000000000007E
-          tv2-cleaning_up3                  0x000000000000007F
-          vcr1-0                            0x0000000000001140
-          vcr1-1                            0x0000000000001141
-          vcr1-2                            0x0000000000001142
-          vcr1-3                            0x0000000000001143
-          vcr1-4                            0x0000000000001144
-          vcr1-5                            0x0000000000001145
-          vcr1-6                            0x0000000000001146
-          vcr1-7                            0x0000000000001147
-          vcr1-8                            0x0000000000001148
-          vcr1-9                            0x0000000000001149
-          vcr1-1/2_digits/AM/PM             0x000000000000114A
-          vcr1-channel/program_mode         0x000000000000114B
-          vcr1-standby                      0x000000000000114C
-          vcr1-mute/demute                  0x000000000000114D
-          vcr1-P.P.                         0x000000000000114E
-          vcr1-display                      0x000000000000114F
-          vcr1-volume+                      0x0000000000001150
-          vcr1-volume-                      0x0000000000001151
-          vcr1-brightness+                  0x0000000000001152
-          vcr1-brightness-                  0x0000000000001153
-          vcr1-colour_saturation+           0x0000000000001154
-          vcr1-colour_saturation-           0x0000000000001155
-          vcr1-bass+                        0x0000000000001156
-          vcr1-bass-                        0x0000000000001157
-          vcr1-treble+                      0x0000000000001158
-          vcr1-treble-                      0x0000000000001159
-          vcr1-balance_right                0x000000000000115A
-          vcr1-balance_left                 0x000000000000115B
-          vcr1-ITR_(OTR)_delay              0x000000000000115C
-          vcr1-timer_programming            0x000000000000115D
-          vcr1-record_select                0x000000000000115E
-          vcr1-fast_run_reverse             0x000000000000115F
-          vcr1-step+                        0x0000000000001160
-          vcr1-step-                        0x0000000000001161
-          vcr1-slow_run_reverse             0x0000000000001162
-          vcr1-audio_output_select          0x0000000000001163
-          vcr1-clock/channel                0x0000000000001164
-          vcr1-speed-                       0x0000000000001165
-          vcr1-speed+                       0x0000000000001166
-          vcr1-Instant_Time_Recording       0x0000000000001167
-          vcr1-slow_run_forward             0x0000000000001168
-          vcr1-still_forward                0x0000000000001169
-          vcr1-fast_run_forward             0x000000000000116A
-          vcr1-index_scan                   0x000000000000116B
-          vcr1-scan_reverse                 0x000000000000116C
-          vcr1-eject                        0x000000000000116D
-          vcr1-scan_forward                 0x000000000000116E
-          vcr1-play_reverse                 0x000000000000116F
-          vcr1-pause                        0x0000000000001170
-          vcr1-erase                        0x0000000000001171
-          vcr1-rewind                       0x0000000000001172
-          vcr1-go_to                        0x0000000000001173
-          vcr1-wind                         0x0000000000001174
-          vcr1-play                         0x0000000000001175
-          vcr1-stop                         0x0000000000001176
-          vcr1-recording                    0x0000000000001177
-          vcr1-external1                    0x0000000000001178
-          vcr1-external2                    0x0000000000001179
-          vcr1-short/long_play              0x000000000000117A
-          vcr1-counter_memory               0x000000000000117B
-          vcr1-scroll_local_display         0x000000000000117C
-          vcr1-system_standby               0x000000000000117D
-          vcr1-RF_switch                    0x000000000000117E
-          vcr1-system_select                0x000000000000117F
-          vcr1-surround_sound               0x0000000000000140
-          vcr1-balance_front                0x0000000000000141
-          vcr1-balance_rear                 0x0000000000000142
-          vcr1-sound_effects1               0x0000000000000143
-          vcr1-sound_effects2               0x0000000000000144
-          vcr1-sound_effects3               0x0000000000000145
-          vcr1-sound_effects4               0x0000000000000146
-          vcr1-sound_effects5               0x0000000000000147
-          vcr1-sound_or_menu_func.1         0x0000000000000148
-          vcr1-sound_or_menu_func.2         0x0000000000000149
-          vcr1-sound_or_menu_func.3         0x000000000000014A
-          vcr1-data_stream_start            0x000000000000014B
-          vcr1-data_stream_end              0x000000000000014C
-          vcr1-linear_function_up           0x000000000000014D
-          vcr1-linear_function_down         0x000000000000014E
-          vcr1-catalogue                    0x000000000000014F
-          vcr1-cursor_step_up               0x0000000000000150
-          vcr1-cursor_step_down             0x0000000000000151
-          vcr1-menu_on                      0x0000000000000152
-          vcr1-menu_off                     0x0000000000000153
-          vcr1-display_A/V_status           0x0000000000000154
-          vcr1-cursor_step_left             0x0000000000000155
-          vcr1-cursor_step_right            0x0000000000000156
-          vcr1-acknowledge                  0x0000000000000157
-          vcr1-PIP_on/off                   0x0000000000000158
-          vcr1-PIP_shift                    0x0000000000000159
-          vcr1-PIP_main_swap                0x000000000000015A
-          vcr1-strobe_on/off                0x000000000000015B
-          vcr1-multi_strobe                 0x000000000000015C
-          vcr1-main_freezed                 0x000000000000015D
-          vcr1-3/9_multi_scan               0x000000000000015E
-          vcr1-PIP_mode_select              0x000000000000015F
-          vcr1-mosaic                       0x0000000000000160
-          vcr1-solarization                 0x0000000000000161
-          vcr1-main_stored                  0x0000000000000162
-          vcr1-PIP_strobe                   0x0000000000000163
-          vcr1-recall_main                  0x0000000000000164
-          vcr1-PIP_freeze                   0x0000000000000165
-          vcr1-PIP_step_up                  0x0000000000000166
-          vcr1-PIP_step_down                0x0000000000000167
-          vcr1-automatic_start_ID           0x0000000000000168
-          vcr1-write_skip_ID                0x0000000000000169
-          vcr1-skip_on/off                  0x000000000000016A
-          vcr1-write_end_ID                 0x000000000000016B
-          vcr1-write_FTS                    0x000000000000016C
-          vcr1-write_TOC                    0x000000000000016D
-          vcr1-viss_index_next              0x0000000000000170
-          vcr1-viss_index_previous          0x0000000000000171
-          vcr1-mark                         0x0000000000000172
-          vcr1-erase                        0x0000000000000173
-          vcr1-renumber                     0x0000000000000174
-          vcr1-blank_search                 0x0000000000000175
-          vcr1-sub_mode                     0x0000000000000176
-          vcr1-sub_mode                     0x0000000000000177
-          vcr1-auto_repeat                  0x0000000000000178
-          vcr1-insert_temp                  0x0000000000000179
-          vcr1-scr_loc_disp                 0x000000000000017A
-          vcr1-connect                      0x000000000000017B
-          vcr1-INVALID                      0x000000000000017C
-          vcr2-0                            0x0000000000001180
-          vcr2-1                            0x0000000000001181
-          vcr2-2                            0x0000000000001182
-          vcr2-3                            0x0000000000001183
-          vcr2-4                            0x0000000000001184
-          vcr2-5                            0x0000000000001185
-          vcr2-6                            0x0000000000001186
-          vcr2-7                            0x0000000000001187
-          vcr2-8                            0x0000000000001188
-          vcr2-9                            0x0000000000001189
-          vcr2-1/2_digits/AM/PM             0x000000000000118A
-          vcr2-channel/program_mode         0x000000000000118B
-          vcr2-standby                      0x000000000000118C
-          vcr2-mute/demute                  0x000000000000118D
-          vcr2-P.P.                         0x000000000000118E
-          vcr2-display                      0x000000000000118F
-          vcr2-volume+                      0x0000000000001190
-          vcr2-volume-                      0x0000000000001191
-          vcr2-brightness+                  0x0000000000001192
-          vcr2-brightness-                  0x0000000000001193
-          vcr2-colour_saturation+           0x0000000000001194
-          vcr2-colour_saturation-           0x0000000000001195
-          vcr2-bass+                        0x0000000000001196
-          vcr2-bass-                        0x0000000000001197
-          vcr2-treble+                      0x0000000000001198
-          vcr2-treble-                      0x0000000000001199
-          vcr2-balance_right                0x000000000000119A
-          vcr2-balance_left                 0x000000000000119B
-          vcr2-ITR_(OTR)_delay              0x000000000000119C
-          vcr2-timer_programming            0x000000000000119D
-          vcr2-record_select                0x000000000000119E
-          vcr2-fast_run_reverse             0x000000000000119F
-          vcr2-step+                        0x00000000000011A0
-          vcr2-step-                        0x00000000000011A1
-          vcr2-slow_run_reverse             0x00000000000011A2
-          vcr2-audio_output_select          0x00000000000011A3
-          vcr2-clock/channel                0x00000000000011A4
-          vcr2-speed-                       0x00000000000011A5
-          vcr2-speed+                       0x00000000000011A6
-          vcr2-Instant_Time_Recording       0x00000000000011A7
-          vcr2-slow_run_forward             0x00000000000011A8
-          vcr2-still_forward                0x00000000000011A9
-          vcr2-fast_run_forward             0x00000000000011AA
-          vcr2-index_scan                   0x00000000000011AB
-          vcr2-scan_reverse                 0x00000000000011AC
-          vcr2-eject                        0x00000000000011AD
-          vcr2-scan_forward                 0x00000000000011AE
-          vcr2-play_reverse                 0x00000000000011AF
-          vcr2-pause                        0x00000000000011B0
-          vcr2-erase                        0x00000000000011B1
-          vcr2-rewind                       0x00000000000011B2
-          vcr2-go_to                        0x00000000000011B3
-          vcr2-wind                         0x00000000000011B4
-          vcr2-play                         0x00000000000011B5
-          vcr2-stop                         0x00000000000011B6
-          vcr2-recording                    0x00000000000011B7
-          vcr2-external1                    0x00000000000011B8
-          vcr2-external2                    0x00000000000011B9
-          vcr2-short/long_play              0x00000000000011BA
-          vcr2-counter_memory               0x00000000000011BB
-          vcr2-scroll_local_display         0x00000000000011BC
-          vcr2-system_standby               0x00000000000011BD
-          vcr2-RF_switch                    0x00000000000011BE
-          vcr2-system_select                0x00000000000011BF
-          vcr2-surround_sound               0x0000000000000180
-          vcr2-balance_front                0x0000000000000181
-          vcr2-balance_rear                 0x0000000000000182
-          vcr2-sound_effects1               0x0000000000000183
-          vcr2-sound_effects2               0x0000000000000184
-          vcr2-sound_effects3               0x0000000000000185
-          vcr2-sound_effects4               0x0000000000000186
-          vcr2-sound_effects5               0x0000000000000187
-          vcr2-sound_or_menu_func.1         0x0000000000000188
-          vcr2-sound_or_menu_func.2         0x0000000000000189
-          vcr2-sound_or_menu_func.3         0x000000000000018A
-          vcr2-data_stream_start            0x000000000000018B
-          vcr2-data_stream_end              0x000000000000018C
-          vcr2-linear_function_up           0x000000000000018D
-          vcr2-linear_function_down         0x000000000000018E
-          vcr2-catalogue                    0x000000000000018F
-          vcr2-cursor_step_up               0x0000000000000190
-          vcr2-cursor_step_down             0x0000000000000191
-          vcr2-menu_on                      0x0000000000000192
-          vcr2-menu_off                     0x0000000000000193
-          vcr2-display_A/V_status           0x0000000000000194
-          vcr2-cursor_step_left             0x0000000000000195
-          vcr2-cursor_step_right            0x0000000000000196
-          vcr2-acknowledge                  0x0000000000000197
-          vcr2-PIP_on/off                   0x0000000000000198
-          vcr2-PIP_shift                    0x0000000000000199
-          vcr2-PIP_main_swap                0x000000000000019A
-          vcr2-strobe_on/off                0x000000000000019B
-          vcr2-multi_strobe                 0x000000000000019C
-          vcr2-main_freezed                 0x000000000000019D
-          vcr2-3/9_multi_scan               0x000000000000019E
-          vcr2-PIP_mode_select              0x000000000000019F
-          vcr2-mosaic                       0x00000000000001A0
-          vcr2-solarization                 0x00000000000001A1
-          vcr2-main_stored                  0x00000000000001A2
-          vcr2-PIP_strobe                   0x00000000000001A3
-          vcr2-recall_main                  0x00000000000001A4
-          vcr2-PIP_freeze                   0x00000000000001A5
-          vcr2-PIP_step_up                  0x00000000000001A6
-          vcr2-PIP_step_down                0x00000000000001A7
-          vcr2-automatic_start_ID           0x00000000000001A8
-          vcr2-write_skip_ID                0x00000000000001A9
-          vcr2-skip_on/off                  0x00000000000001AA
-          vcr2-write_end_ID                 0x00000000000001AB
-          vcr2-write_FTS                    0x00000000000001AC
-          vcr2-write_TOC                    0x00000000000001AD
-          vcr2-viss_index_next              0x00000000000001B0
-          vcr2-viss_index_previous          0x00000000000001B1
-          vcr2-mark                         0x00000000000001B2
-          vcr2-erase                        0x00000000000001B3
-          vcr2-renumber                     0x00000000000001B4
-          vcr2-blank_search                 0x00000000000001B5
-          vcr2-sub_mode                     0x00000000000001B6
-          vcr2-sub_mode                     0x00000000000001B7
-          vcr2-auto_repeat                  0x00000000000001B8
-          vcr2-insert_temp                  0x00000000000001B9
-          vcr2-scr_loc_disp                 0x00000000000001BA
-          vcr2-connect                      0x00000000000001BB
-          vcr2-INVALID                      0x00000000000001BC
-          vd-0                              0x00000000000010C0
-          vd-1                              0x00000000000010C1
-          vd-2                              0x00000000000010C2
-          vd-3                              0x00000000000010C3
-          vd-4                              0x00000000000010C4
-          vd-5                              0x00000000000010C5
-          vd-6                              0x00000000000010C6
-          vd-7                              0x00000000000010C7
-          vd-8                              0x00000000000010C8
-          vd-9                              0x00000000000010C9
-          vd-=/=_=/=                        0x00000000000010CA
-          vd-*                              0x00000000000010CB
-          vd-standby                        0x00000000000010CC
-          vd-mute/demute                    0x00000000000010CD
-          vd-P.P.                           0x00000000000010CE
-          vd-display                        0x00000000000010CF
-          vd-volume+                        0x00000000000010D0
-          vd-volume-                        0x00000000000010D1
-          vd-brightness+                    0x00000000000010D2
-          vd-brightness-                    0x00000000000010D3
-          vd-colour_saturation+             0x00000000000010D4
-          vd-colour_saturation-             0x00000000000010D5
-          vd-bass+                          0x00000000000010D6
-          vd-bass-                          0x00000000000010D7
-          vd-treble+                        0x00000000000010D8
-          vd-treble-                        0x00000000000010D9
-          vd-balance_right                  0x00000000000010DA
-          vd-balance_left                   0x00000000000010DB
-          vd-INVALID                        0x00000000000010DC
-          vd-INVALID                        0x00000000000010DD
-          vd-attribute_on/off               0x00000000000010DE
-          vd-INVALID                        0x00000000000010DF
-          vd-INVALID                        0x00000000000010E0
-          vd-index                          0x00000000000010E1
-          vd-INVALID                        0x00000000000010E2
-          vd-1st/2nd_language               0x00000000000010E3
-          vd-spacial_stereo_on/off          0x00000000000010E4
-          vd-INVALID                        0x00000000000010E5
-          vd-hardcopy_printer               0x00000000000010E6
-          vd-INVALID                        0x00000000000010E7
-          vd-terminal_initiation            0x00000000000010E8
-          vd-INVALID                        0x00000000000010E9
-          vd-INVALID                        0x00000000000010EA
-          vd-large_top/lrge_bot/norm        0x00000000000010EB
-          vd-INVALID                        0x00000000000010EC
-          vd-INVALID                        0x00000000000010ED
-          vd-TV/Text_mixed                  0x00000000000010EE
-          vd-view_data_line_off             0x00000000000010EF
-          vd-pause                          0x00000000000010F0
-          vd-erase                          0x00000000000010F1
-          vd-rewind                         0x00000000000010F2
-          vd-go_to                          0x00000000000010F3
-          vd-wind                           0x00000000000010F4
-          vd-play                           0x00000000000010F5
-          vd-stop                           0x00000000000010F6
-          vd-recording                      0x00000000000010F7
-          vd-external1                      0x00000000000010F8
-          vd-external2                      0x00000000000010F9
-          vd-INVALID                        0x00000000000010FA
-          vd-view_data_line_on              0x00000000000010FB
-          vd-INVALID                        0x00000000000010FC
-          vd-system_standby                 0x00000000000010FD
-          vd-INVALID                        0x00000000000010FE
-          vd-system_select                  0x00000000000010FF
-          vd-surround_sound                 0x00000000000000C0
-          vd-balance_front                  0x00000000000000C1
-          vd-balance_rear                   0x00000000000000C2
-          vd-sound_effects1                 0x00000000000000C3
-          vd-sound_effects2                 0x00000000000000C4
-          vd-sound_effects3                 0x00000000000000C5
-          vd-sound_effects4                 0x00000000000000C6
-          vd-sound_effects5                 0x00000000000000C7
-          vd-sound_or_menu_func.1           0x00000000000000C8
-          vd-sound_or_menu_func.2           0x00000000000000C9
-          vd-sound_or_menu_func.3           0x00000000000000CA
-          vd-linear_function_up             0x00000000000000CD
-          vd-linear_function_down           0x00000000000000CE
-          vd-sound_or_menu_func.            0x00000000000000CF
-          vd-cursor_step_up                 0x00000000000000D0
-          vd-cursor_step_down               0x00000000000000D1
-          vd-menu_on                        0x00000000000000D2
-          vd-menu_off                       0x00000000000000D3
-          vd-display_A/V_status             0x00000000000000D4
-          vd-cursor_step_left               0x00000000000000D5
-          vd-cursor_step_right              0x00000000000000D6
-          vd-menu_function                  0x00000000000000D7
-          vd-PIP_on/off                     0x00000000000000D8
-          vd-PIP_shift                      0x00000000000000D9
-          vd-PIP_main_swap                  0x00000000000000DA
-          vd-strobe_on/off                  0x00000000000000DB
-          vd-multi_strobe                   0x00000000000000DC
-          vd-main_freezed                   0x00000000000000DD
-          vd-3/9_multi_scan                 0x00000000000000DE
-          vd-PIP_mode_select                0x00000000000000DF
-          vd-mosaic                         0x00000000000000E0
-          vd-solarization                   0x00000000000000E1
-          vd-main_stored                    0x00000000000000E2
-          vd-PIP_strobe                     0x00000000000000E3
-          vd-recall_main                    0x00000000000000E4
-          vd-PIP_freeze                     0x00000000000000E5
-          vd-PIP_step_up                    0x00000000000000E6
-          vd-PIP_step_down                  0x00000000000000E7
-          vd-INVALID                        0x00000000000000EB
-          vd-INVALID                        0x00000000000000EC
-          vd-INVALID                        0x00000000000000ED
-          vd-INVALID                        0x00000000000000EE
-          vd-INVALID                        0x00000000000000EF
-          vd-sub_mode                       0x00000000000000F6
-          vd-sub_mode                       0x00000000000000F7
-          vd-cleaning_up                    0x00000000000000FA
-          vd-connect                        0x00000000000000FB
-          vd-disconnect                     0x00000000000000FC
-          vd-cleaning_up1                   0x00000000000000FD
-          vd-cleaning_up2                   0x00000000000000FE
-          vd-cleaning_up3                   0x00000000000000FF
-      end codes
-
-end remote
-
diff --git a/meta/packages/lirc/files/lircd.init b/meta/packages/lirc/files/lircd.init
deleted file mode 100755
index 11ce62447..000000000
--- a/meta/packages/lirc/files/lircd.init
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for Familiar
-# Copy it to /etc/init.d/lircd and type
-# > update-rc.d lircd defaults 20
-#
-
-
-test -f /usr/sbin/lircd || exit 0
-test -f /etc/lircd.conf || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting lirc daemon: lircd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping lirc daemon: lircd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/lircd
-    echo "."
-    ;;
-  reload|force-reload)
-    start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircd
-    ;;
-  restart)
-    echo -n "Stopping lirc daemon: lircd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/lircd
-    sleep 1
-    echo -n "Starting lirc daemon: lircd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc
-    echo "."
-    ;;
-  *)
-    echo "Usage: /etc/init.d/lircd {start|stop|reload|restart|force-reload}"
-    exit 1
-esac
-
-exit 0
diff --git a/meta/packages/lirc/files/lircexec.init b/meta/packages/lirc/files/lircexec.init
deleted file mode 100755
index 3a8c1a306..000000000
--- a/meta/packages/lirc/files/lircexec.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for Familiar
-# Copy it to /etc/init.d/lircexecd and type
-# > update-rc.d lircexecd defaults 20
-# It must be started after lircd (and it does alphabetically :-)
-# irexec reads /etc/lircrc by default
-
-
-test -f /usr/bin/irexec || exit 0
-test -f /etc/lircrc || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting lircexec daemon: irexec"
-    start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping lircexec daemon: irexec"
-    start-stop-daemon --stop --quiet --exec /usr/bin/irexec
-    echo "."
-    ;;
-  restart|force-restart)
-    echo -n "Stopping lircexec daemon: irexec"
-    start-stop-daemon --stop --quiet --exec /usr/bin/irexec
-    sleep 1
-    echo -n "Starting lircexec daemon: irexec"
-    start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon
-    echo "."
-    ;;
-  *)
-    echo "Usage: /etc/init.d/lircexec {start|stop|reload|restart|force-restart}"
-    exit 1
-esac
-
-exit 0
diff --git a/meta/packages/lirc/files/lircmd.init b/meta/packages/lirc/files/lircmd.init
deleted file mode 100755
index 1a96207db..000000000
--- a/meta/packages/lirc/files/lircmd.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for Familiar
-# Copy it to /etc/init.d/lirc and type
-# > update-rc.d lirc defaults 20
-#
-
-
-test -f /usr/sbin/lircmd || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting lirc daemon: lircmd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping lirc daemon: lircmd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
-    echo "."
-    ;;
-  reload|force-reload)
-    start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircmd
-    ;;
-  restart)
-    echo -n "Stopping lirc daemon: lircmd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
-    sleep 1
-    echo -n "Starting lirc daemon: lircmd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
-    echo "."
-    ;;
-  *)
-    echo "Usage: /etc/init.d/lircmd {start|stop|reload|restart|force-reload}"
-    exit 1
-esac
-
-exit 0
diff --git a/meta/packages/lirc/files/lircrc_nslu2 b/meta/packages/lirc/files/lircrc_nslu2
deleted file mode 100644
index 0669d90b0..000000000
--- a/meta/packages/lirc/files/lircrc_nslu2
+++ /dev/null
@@ -1,113 +0,0 @@
-# This is the default files read by all lirc clients
-# (see also /etc/lircd.conf)
-
-# I run /sbin/buzzer before every command to get an audible feedback
-
-## Here LIRC could shutdown your system
-#begin
-#  prog = irexec
-#  remote = RC5
-#  repeat = 0
-#  button = vcr2-standby
-#  config = /sbin/buzzer; /sbin/halt
-#end
-
-
-## Here LIRC controls your mpd music deamon
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-pause
-  config = /sbin/buzzer; mpc toggle
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-step+
-  config = /sbin/buzzer; mpc next
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-step-
-  config = /sbin/buzzer; mpc prev
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-scan_forward
-  config = /sbin/buzzer; mpc seek +00:00:30
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-scan_reverse
-  config = /sbin/buzzer; mpc seek -00:00:30
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-brightness+
-  config = /sbin/buzzer; mpc volume +20
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-brightness-
-  config = /sbin/buzzer; mpc volume -20
-end
-
-
-## Here LIRC acts as an repeater
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-volume+
-  config = /sbin/buzzer; irsend SEND_ONCE RC5 amp1-volume+
-end
-begin
-  prog = irexec
-  remote = RC5
-  repeat = 0
-  button = vcr2-volume-
-  config = /sbin/buzzer; irsend SEND_ONCE RC5 amp1-volume-
-end
-
-
-## Here LIRC is the input device for your LC display software
-begin
-  prog = lcdd
-  remote = RC5
-  repeat = 0
-  button = vcr2-1
-  config = A
-end
-begin
-  prog = lcdd
-  remote = RC5
-  repeat = 0
-  button = vcr2-2
-  config = B
-end
-begin
-  prog = lcdd
-  remote = RC5
-  repeat = 0
-  button = vcr2-3
-  config = C
-end
-begin
-  prog = lcdd
-  remote = RC5
-  repeat = 0
-  button = vcr2-4
-  config = D
-end
diff --git a/meta/packages/lirc/files/split-hauppauge.patch b/meta/packages/lirc/files/split-hauppauge.patch
deleted file mode 100644
index 170a233ff..000000000
--- a/meta/packages/lirc/files/split-hauppauge.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- lirc/remotes/hauppauge/lircd.conf.hauppauge~	2003-05-03 15:42:30.000000000 +0100
-+++ lirc/remotes/hauppauge/lircd.conf.hauppauge	2004-10-10 20:14:14.000000000 +0100
-@@ -51,71 +51,3 @@
-       end codes
- 
- end remote
--
--
--#
--# this config file was automatically generated
--# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
--#
--# contributed by 
--#
--# brand: 				Hauppauge
--# model no. of remote control: 
--# devices being controlled by this remote: PVR 2/350
--#
--
--begin remote
--
--  name  hauppauge_pvr
--  bits           13
--  flags RC5|CONST_LENGTH
--  eps            30
--  aeps          100
--
--  one           969   811
--  zero          969   811
--  plead        1097
--  gap          114605
--  toggle_bit      2
--
--
--      begin codes
--          Power                    0x00000000000017FD
--          Go                       0x00000000000017FB
--          1                        0x00000000000017C1
--          2                        0x00000000000017C2
--          3                        0x00000000000017C3
--          4                        0x00000000000017C4
--          5                        0x00000000000017C5
--          6                        0x00000000000017C6
--          7                        0x00000000000017C7
--          8                        0x00000000000017C8
--          9                        0x00000000000017C9
--          Back/Exit                0x00000000000017DF
--          0                        0x00000000000017C0
--          Menu                     0x00000000000017CD
--          Red                      0x00000000000017CB
--          Green                    0x00000000000017EE
--          Yellow                   0x00000000000017F8
--          Blue                     0x00000000000017E9
--          Ch+                      0x00000000000017E0
--          Ch-                      0x00000000000017E1
--          Vol-                     0x00000000000017D1
--          Vol+                     0x00000000000017D0
--          Ok                       0x00000000000017E5
--          Mute                     0x00000000000017CF
--          Blank                    0x00000000000017CC
--          Full                     0x00000000000017FC
--          Rewind                   0x00000000000017F2
--          Play                     0x00000000000017F5
--          Forward                  0x00000000000017F4
--          Record                   0x00000000000017F7
--          Stop                     0x00000000000017F6
--          Pause                    0x00000000000017F0
--          Replay                   0x00000000000017E4
--          Skip                     0x00000000000017DE
--      end codes
--
--end remote
--
--
---- /dev/null	2004-06-13 02:32:19.000000000 +0100
-+++ lirc/remotes/hauppauge/lircd.conf.hauppauge-pvr	2004-10-10 20:14:05.000000000 +0100
-@@ -0,0 +1,64 @@
-+#
-+# this config file was automatically generated
-+# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
-+#
-+# contributed by 
-+#
-+# brand: 				Hauppauge
-+# model no. of remote control: 
-+# devices being controlled by this remote: PVR 2/350
-+#
-+
-+begin remote
-+
-+  name  hauppauge_pvr
-+  bits           13
-+  flags RC5|CONST_LENGTH
-+  eps            30
-+  aeps          100
-+
-+  one           969   811
-+  zero          969   811
-+  plead        1097
-+  gap          114605
-+  toggle_bit      2
-+
-+
-+      begin codes
-+          Power                    0x00000000000017FD
-+          Go                       0x00000000000017FB
-+          1                        0x00000000000017C1
-+          2                        0x00000000000017C2
-+          3                        0x00000000000017C3
-+          4                        0x00000000000017C4
-+          5                        0x00000000000017C5
-+          6                        0x00000000000017C6
-+          7                        0x00000000000017C7
-+          8                        0x00000000000017C8
-+          9                        0x00000000000017C9
-+          Back/Exit                0x00000000000017DF
-+          0                        0x00000000000017C0
-+          Menu                     0x00000000000017CD
-+          Red                      0x00000000000017CB
-+          Green                    0x00000000000017EE
-+          Yellow                   0x00000000000017F8
-+          Blue                     0x00000000000017E9
-+          Ch+                      0x00000000000017E0
-+          Ch-                      0x00000000000017E1
-+          Vol-                     0x00000000000017D1
-+          Vol+                     0x00000000000017D0
-+          Ok                       0x00000000000017E5
-+          Mute                     0x00000000000017CF
-+          Blank                    0x00000000000017CC
-+          Full                     0x00000000000017FC
-+          Rewind                   0x00000000000017F2
-+          Play                     0x00000000000017F5
-+          Forward                  0x00000000000017F4
-+          Record                   0x00000000000017F7
-+          Stop                     0x00000000000017F6
-+          Pause                    0x00000000000017F0
-+          Replay                   0x00000000000017E4
-+          Skip                     0x00000000000017DE
-+      end codes
-+
-+end remote
diff --git a/meta/packages/lirc/lirc-config.inc b/meta/packages/lirc/lirc-config.inc
deleted file mode 100644
index 03bfc61e3..000000000
--- a/meta/packages/lirc/lirc-config.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=${DRIVER}"
-
-DRIVER ?= "serial"
-# fails to build at the moment, re-enable later
-#DRIVER_collie = "sa1100"
-DRIVER_h3600 = "sa1100"
-DRIVER_simpad = "sa1100"
-DRIVER_nslu2 = "nslu2"
-# XXX Why is X disabled on all these platforms anyway?
-EXTRA_OECONF_append_collie = " --without-x"
-EXTRA_OECONF_append_h3600 = " --without-x"
-EXTRA_OECONF_append_simpad = " --without-x"
-EXTRA_OECONF_append_nslu2 = " --without-x --with-transmitter --with-soft-carrier"
diff --git a/meta/packages/lirc/lirc-modules_0.8.3.bb b/meta/packages/lirc/lirc-modules_0.8.3.bb
deleted file mode 100644
index ee1de7194..000000000
--- a/meta/packages/lirc/lirc-modules_0.8.3.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/kernel virtual/fakeroot-native"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
-           file://lirc_sir-sa1100.patch;patch=1"
-S = "${WORKDIR}/lirc-${PV}"
-
-inherit autotools module-base
-
-include lirc-config.inc
-
-do_compile() {
-	# ${KERNEL_LD} doesn't understand the LDFLAGS, so suppress them
-	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS=""
-}
-
-fakeroot do_install() {
-	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
-	rm -rf ${D}/dev
-}
-
-pkg_postinst() {
-#!/bin/sh
-set -e
-if [ ! -c $D/dev/lirc ]; then mknod $D/dev/lirc c 61 0; fi
-exit 0
-}
-
-FILES_${PN} = "/lib/modules"
diff --git a/meta/packages/lirc/lirc_0.8.3.bb b/meta/packages/lirc/lirc_0.8.3.bb
deleted file mode 100644
index 9e4cacc3e..000000000
--- a/meta/packages/lirc/lirc_0.8.3.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/kernel virtual/libx11 libxau libsm libice"
-PR = "r5"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
-      file://lircd.init file://lircmd.init"
-S = "${WORKDIR}/lirc-${PV}"
-
-inherit autotools module-base update-rc.d
-
-INITSCRIPT_NAME = "lircd"
-INITSCRIPT_PARAMS = "defaults 20"
-
-include lirc-config.inc
-
-EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
-
-        install -d ${D}${datadir}/lirc/
-        cp -pPR ${S}/remotes ${D}${datadir}/lirc/
-}
-
-PACKAGES =+ "lirc-x"
-
-FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2"
diff --git a/meta/packages/llvm/llvm-native/fix_ldflags_export.patch b/meta/packages/llvm/llvm-native/fix_ldflags_export.patch
deleted file mode 100644
index 77511d68f..000000000
--- a/meta/packages/llvm/llvm-native/fix_ldflags_export.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: trunk/tools/llvm-config/Makefile
-===================================================================
---- trunk.orig/tools/llvm-config/Makefile	2008-02-11 15:14:22.000000000 +0000
-+++ trunk/tools/llvm-config/Makefile	2008-04-11 16:58:06.000000000 +0100
-@@ -27,7 +27,7 @@
- # This is blank for now.  We need to be careful about adding stuff here:
- # LDFLAGS tend not to be portable, and we don't currently require the
- # user to use libtool when linking against LLVM.
--SUB_LDFLAGS = 
-+SUB_LDFLAGS = ${LD.Flags}
- 
- FinalLibDeps = $(PROJ_OBJ_DIR)/FinalLibDeps.txt
- LibDeps      = $(PROJ_OBJ_DIR)/LibDeps.txt
-@@ -57,10 +57,11 @@
- # Build our final script.
- $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
- 	$(Echo) "Building llvm-config script."
-+	$(Echo) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),'
- 	$(Verb) $(ECHO) 's,@LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed
- 	$(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed
- 	$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed
--	$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
-+	$(Verb) $(ECHO) 's#@LLVM_LDFLAGS@#$(SUB_LDFLAGS)#' >> temp.sed
- 	$(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
- 	$(Verb) $(SED) -f temp.sed < $< > $@
- 	$(Verb) $(RM) temp.sed
diff --git a/meta/packages/llvm/llvm-native_svn.bb b/meta/packages/llvm/llvm-native_svn.bb
deleted file mode 100644
index 56cc0d97b..000000000
--- a/meta/packages/llvm/llvm-native_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DEPENDS = "flex-native"
-SRC_URI = "svn://llvm.org/svn/llvm-project/llvm;proto=http;module=trunk \
-           file://fix_ldflags_export.patch;patch=1"
-
-PV = "0.0+${SRCREV}"
-PR = "r1"
-
-S = "${WORKDIR}/trunk"
-
-inherit autotools native 
-
-EXTRA_OECONF = "--enable-optimized"
-EXTRA_OEMAKE = "ENABLE_OPTIMIZED=1"
\ No newline at end of file
diff --git a/meta/packages/maemo/nokia770-init/fixup-770.sh b/meta/packages/maemo/nokia770-init/fixup-770.sh
deleted file mode 100644
index 0f1734d2a..000000000
--- a/meta/packages/maemo/nokia770-init/fixup-770.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-case "$1" in
-  start)
-        echo -n "Unmounting virtual fs from initrd"
-        umount /mnt/initfs/sys
-        umount /mnt/initfs/proc
-        ln -s /dev/vc/0 /dev/tty0
-        ln -s /dev/vc/1 /dev/tty1
-        ln -s /dev/vc/2 /dev/tty2
-        ln -s /dev/vc/3 /dev/tty3
-        ln -s /dev/vc/4 /dev/tty4
-        ln -s /dev/vc/5 /dev/tty5
-        ln -s /dev/vc/6 /dev/tty6
-        ln -s /dev/vc/7 /dev/tty7
-        /sbin/ifconfig wlan0 up
-        ;;
-  stop)
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0 
-                                                                   
\ No newline at end of file
diff --git a/meta/packages/maemo/nokia770-init_1.0.bb b/meta/packages/maemo/nokia770-init_1.0.bb
deleted file mode 100644
index 9075c016a..000000000
--- a/meta/packages/maemo/nokia770-init_1.0.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-LICENSE    = "GPL"
-PR         = "r7"
-
-DEPENDS    = "base-passwd"
-
-SRC_URI    = "file://fixup-770.sh"
-
-COMPATIBLE_MACHINE = "(nokia770|nokia800)"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "fixup-770.sh"
-INITSCRIPT_PARAMS = "defaults 01"
-
-FILES_${PN} = "${sysconfdir} ${libdir}"
-
-do_install () {
-        install -d ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/fixup-770.sh ${D}/${sysconfdir}/init.d/fixup-770.sh
-
-	install -d ${D}/lib/firmware
-}
-
-pkg_postinst () {
-#!/bin/sh
-
-# set up some links to firmware and modules in initrd
-	mkdir -p $D/lib/firmware
-        ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3825.arm $D/lib/firmware/3825.arm
-        ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3826.arm $D/lib/firmware/3826.arm
-        ln -sf /mnt/initfs/usr/lib/hotplug/firmware/bc4fw.bin $D/lib/firmware/bc4fw.bin
-        ln -sf /mnt/initfs/usr/lib/hotplug/firmware/brf6150fw.bin $D/lib/firmware/brf6150fw.bin
-        ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3825.arm $D/lib/firmware/mtlm3825.arm
-        ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3826.arm $D/lib/firmware/mtlm3826.arm
-
-#	rm -rf $D/lib/modules
-#	ln -s /mnt/initfs/lib/modules $D/lib/modules
-}
diff --git a/meta/packages/maemo/xpext/auxdir.patch b/meta/packages/maemo/xpext/auxdir.patch
deleted file mode 100644
index da5841a13..000000000
--- a/meta/packages/maemo/xpext/auxdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.old	2005-06-03 12:53:28.000000000 +0200
-+++ configure.ac	2005-06-03 12:54:29.000000000 +0200
-@@ -25,9 +25,9 @@
- 
- AC_PREREQ([2.57])
- AC_INIT([spext], [1.0], [lauri.leukkunen@nokia.com], spext)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--AC_CONFIG_AUX_DIR(.)
- 
- dnl PKG_CHECK_MODULES(FIXESEXT, fixesext)
- 
diff --git a/meta/packages/maemo/xpext_1.0-5.bb b/meta/packages/maemo/xpext_1.0-5.bb
deleted file mode 100644
index 5be3d1c04..000000000
--- a/meta/packages/maemo/xpext_1.0-5.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "X Server Nokia 770 extensions library"
-LICENSE= "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libxext"
-PR = "r1"
-
-SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
-           file://auxdir.patch;patch=1;pnum=0"
-S = "${WORKDIR}/xpext-1.0"
-
-# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
-
-inherit autotools pkgconfig
-
-do_configure_prepend () {
-  cd ${S}
-  chmod +x ./autogen.sh
-  ./autogen.sh
-}
diff --git a/meta/packages/maemo/xsp_1.0.0-8.bb b/meta/packages/maemo/xsp_1.0.0-8.bb
deleted file mode 100644
index c722213c8..000000000
--- a/meta/packages/maemo/xsp_1.0.0-8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Server Nokia 770 extensions library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE= "MIT"
-DEPENDS = "virtual/libx11 libxext xpext"
-
-PR = "r1"
-
-SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
-S = "${WORKDIR}/Xsp"
-
-inherit autotools pkgconfig
diff --git a/meta/packages/network-suspend-scripts/files/ifupdown b/meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown
index d458da686..d458da686 100644
--- a/meta/packages/network-suspend-scripts/files/ifupdown
+++ b/meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown
diff --git a/meta/packages/network-suspend-scripts/files/usbnet b/meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet
index 3731f6339..3731f6339 100644
--- a/meta/packages/network-suspend-scripts/files/usbnet
+++ b/meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet
diff --git a/meta/packages/osc/osc-native_svn.bb b/meta/packages/osc/osc-native_svn.bb
deleted file mode 100755
index ab0ee0ba3..000000000
--- a/meta/packages/osc/osc-native_svn.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "osc - OpenSUSE build service command-line tool."
-HOMEPAGE = "http://en.opensuse.org/Build_Service/CLI"
-SECTION = "console/utils"
-LICENSE = "GPL"
-PV  = "0.0+svnr${SRCREV}"
-PR = "r1"
-DEPENDS = "python-native rpm-native"
-RDEPENDS = ""
-
-SRC_URI = "svn://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python;module=osc;proto=https"
-S = "${WORKDIR}/osc"
-
-inherit native
-
-do_install() {
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py build ||
-        oefatal "python setup.py build execution failed."
-
-        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}${prefix} --install-data=${D}${datadir} || \
-        oefatal "python setup.py install execution failed."
-
-        ln -sf osc-wrapper.py ${D}${bindir}/osc
-}
-
diff --git a/meta/packages/tasks/task-poky-x11-netbook.bb b/meta/packages/tasks/task-poky-x11-netbook.bb
deleted file mode 100644
index a5ebb5407..000000000
--- a/meta/packages/tasks/task-poky-x11-netbook.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2008 Intel.
-#
-
-DESCRIPTION = "Netbook Tasks for Poky"
-PR = "r1"
-
-PACKAGES = "\
-    task-poky-x11-netbook \
-    task-poky-x11-netbook-dbg \
-    task-poky-x11-netbook-dev \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-NETWORK_MANAGER ?= "networkmanager-applet"
-RDEPENDS_task-poky-x11-netbook = "\
-    mutter \
-    matchbox-desktop \
-    matchbox-session-netbook \
-    matchbox-config-gtk \
-    xcursor-transparent-theme \
-    sato-icon-theme \
-    settings-daemon \
-    gtk-sato-engine \
-    ${NETWORK_MANAGER}"
diff --git a/meta/packages/yum/createrepo-native/pathfix.patch b/meta/packages/yum/createrepo-native/pathfix.patch
deleted file mode 100644
index a09a51ccc..000000000
--- a/meta/packages/yum/createrepo-native/pathfix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Index: createrepo-0.9/Makefile
-===================================================================
---- createrepo-0.9.orig/Makefile	2008-08-23 17:49:24.000000000 +0100
-+++ createrepo-0.9/Makefile	2008-08-23 17:52:01.000000000 +0100
-@@ -10,22 +10,6 @@
- SHELL = /bin/sh
- top_srcdir = .
- srcdir = .
--prefix = /usr
--exec_prefix = ${prefix}
--
--bindir = ${exec_prefix}/bin
--sbindir = ${exec_prefix}/sbin
--libexecdir = ${exec_prefix}/libexec
--datadir = ${prefix}/share
--sysconfdir = ${prefix}/etc
--sharedstatedir = ${prefix}/com
--localstatedir = ${prefix}/var
--libdir = ${exec_prefix}/lib
--infodir = ${prefix}/info
--docdir = 
--includedir = ${prefix}/include
--oldincludedir = /usr/include
--mandir = ${prefix}/share/man
- 
- pkgdatadir = $(datadir)/$(PKGNAME)
- pkglibdir = $(libdir)/$(PKGNAME)
-Index: createrepo-0.9/bin/Makefile
-===================================================================
---- createrepo-0.9.orig/bin/Makefile	2008-08-23 17:50:13.000000000 +0100
-+++ createrepo-0.9/bin/Makefile	2008-08-23 17:50:23.000000000 +0100
-@@ -1,22 +1,6 @@
- SHELL = /bin/sh
- top_srcdir = ..
- srcdir = ../bin
--prefix = /usr
--exec_prefix = ${prefix}
--
--bindir = ${exec_prefix}/bin
--sbindir = ${exec_prefix}/sbin
--libexecdir = ${exec_prefix}/libexec
--datadir = ${prefix}/share
--sysconfdir = ${prefix}/etc
--sharedstatedir = ${prefix}/com
--localstatedir = ${prefix}/var
--libdir = ${exec_prefix}/lib
--infodir = ${prefix}/info
--docdir = 
--includedir = ${prefix}/include
--oldincludedir = /usr/include
--mandir = ${prefix}/man
- 
- pkgdatadir = $(datadir)/$(PKGNAME)
- pkglibdir = $(libdir)/$(PKGNAME)
-Index: createrepo-0.9/docs/Makefile
-===================================================================
---- createrepo-0.9.orig/docs/Makefile	2008-08-23 17:52:42.000000000 +0100
-+++ createrepo-0.9/docs/Makefile	2008-08-23 17:52:50.000000000 +0100
-@@ -1,22 +1,6 @@
- SHELL = /bin/sh
- top_srcdir = ..
- srcdir = ../docs
--prefix = /usr
--exec_prefix = ${prefix}
--
--bindir = ${exec_prefix}/bin
--sbindir = ${exec_prefix}/sbin
--libexecdir = ${exec_prefix}/libexec
--datadir = ${prefix}/share
--sysconfdir = ${prefix}/etc
--sharedstatedir = ${prefix}/com
--localstatedir = ${prefix}/var
--libdir = ${exec_prefix}/lib
--infodir = ${prefix}/info
--docdir = 
--includedir = ${prefix}/include
--oldincludedir = /usr/include
--mandir = ${datadir}/man
- 
- pkgdatadir = $(datadir)/$(PKGNAME)
- pkglibdir = $(libdir)/$(PKGNAME)
diff --git a/meta/packages/yum/createrepo-native_0.9.8.bb b/meta/packages/yum/createrepo-native_0.9.8.bb
deleted file mode 100644
index 895f2e96f..000000000
--- a/meta/packages/yum/createrepo-native_0.9.8.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DEPENDS = "python-native libxml2-native"
-RDEPENDS = "yum-native"
-
-SRC_URI = "http://createrepo.baseurl.org/download/createrepo-${PV}.tar.gz \
-           file://pathfix.patch;patch=1 "
-PR = "r2"
-
-inherit autotools native
-
-S = "${WORKDIR}/createrepo-${PV}"
-
-do_compile_append () {
-	sed -e 's#exec /usr/share#exec ${datadir}#' -i ${S}/bin/createrepo
-	sed -e 's#exec /usr/share#exec ${datadir}#' -i ${S}/bin/modifyrepo
-	sed -e 's#!/usr/bin/python#!${bindir}/python#' -i ${S}/genpkgmetadata.py
-	sed -e 's#!/usr/bin/python#!${bindir}/python#' -i ${S}/modifyrepo.py
-}
diff --git a/meta/packages/yum/files/98_yum b/meta/packages/yum/files/98_yum
deleted file mode 100644
index cb4047ad2..000000000
--- a/meta/packages/yum/files/98_yum
+++ /dev/null
@@ -1 +0,0 @@
-d root root 0755 /var/cache/yum none
diff --git a/meta/packages/yum/files/extract-postinst.awk b/meta/packages/yum/files/extract-postinst.awk
deleted file mode 100644
index 8f2836b32..000000000
--- a/meta/packages/yum/files/extract-postinst.awk
+++ /dev/null
@@ -1,11 +0,0 @@
-/Name:.*/ {
-  package = substr($0, 7)
-  next
-}
-/postinstall.*scriptlet .*/ {
-  next
-}
-{
-  print $0 >> ENVIRON["D"] "/etc/rpm-postinsts/" package ".sh"
-}
-    
diff --git a/meta/packages/yum/files/fix b/meta/packages/yum/files/fix
deleted file mode 100644
index bcb3301e1..000000000
--- a/meta/packages/yum/files/fix
+++ /dev/null
@@ -1,18 +0,0 @@
----
- rpmUtils/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- yum-3.2.18.orig/rpmUtils/Makefile
-+++ yum-3.2.18/rpmUtils/Makefile
-@@ -1,10 +1,10 @@
- PYTHON=python
- PACKAGE = $(shell basename `pwd`)
- PYFILES = $(wildcard *.py)
- PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
--PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
-+PYSYSDIR := /usr
- PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
- PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
- 
- all: 
- 	echo "Nothing to do"
diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch
deleted file mode 100644
index 61f477172..000000000
--- a/meta/packages/yum/files/hacks.patch
+++ /dev/null
@@ -1,81 +0,0 @@
----
- rpmUtils/arch.py        |    3 +++
- rpmUtils/transaction.py |    1 +
- yum/constants.py        |    2 +-
- yum/depsolve.py         |    2 ++
- 4 files changed, 7 insertions(+), 1 deletion(-)
-
-Index: yum-3.2.18/rpmUtils/arch.py
-===================================================================
---- yum-3.2.18.orig/rpmUtils/arch.py	2008-06-17 14:05:42.000000000 +0100
-+++ yum-3.2.18/rpmUtils/arch.py	2008-10-02 22:09:19.000000000 +0100
-@@ -275,6 +275,12 @@
-     return arch
-         
- def getCanonArch(skipRpmPlatform = 0):
-+    import os
-+    if 'YUM_ARCH_FORCE' in os.environ:
-+        return os.environ['YUM_ARCH_FORCE']
-+
-+    sys.exit(1)
-+
-     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
-         try:
-             f = open("/etc/rpm/platform", "r")
-@@ -331,6 +338,12 @@
-        base arch is the arch before noarch in the arches dict if myarch is not
-        a key in the multilibArches."""
- 
-+    import os
-+    if 'YUM_ARCH_FORCE' in os.environ:
-+        return os.environ['YUM_ARCH_FORCE']
-+
-+    sys.exit(1)
-+
-     if not myarch:
-         myarch = canonArch
- 
-Index: yum-3.2.18/rpmUtils/transaction.py
-===================================================================
---- yum-3.2.18.orig/rpmUtils/transaction.py	2008-06-17 14:05:42.000000000 +0100
-+++ yum-3.2.18/rpmUtils/transaction.py	2008-10-02 17:09:57.000000000 +0100
-@@ -43,6 +43,7 @@
-                          'clean']
-         self.tsflags = []
-         self.open = True
-+        self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH)
- 
-     def __del__(self):
-         # Automatically close the rpm transaction when the reference is lost
-Index: yum-3.2.18/yum/constants.py
-===================================================================
---- yum-3.2.18.orig/yum/constants.py	2008-07-21 16:56:54.000000000 +0100
-+++ yum-3.2.18/yum/constants.py	2008-10-02 17:09:57.000000000 +0100
-@@ -17,7 +17,7 @@
- """
- 
- #Constants
--YUM_PID_FILE = '/var/run/yum.pid'
-+YUM_PID_FILE = '/var/run2/yum.pid'
- 
- #transaction set states
- TS_UPDATE = 10
-Index: yum-3.2.18/yum/depsolve.py
-===================================================================
---- yum-3.2.18.orig/yum/depsolve.py	2008-08-06 17:05:16.000000000 +0100
-+++ yum-3.2.18/yum/depsolve.py	2008-10-02 17:09:57.000000000 +0100
-@@ -141,9 +141,14 @@
-             else:
-                 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
- 
-+        self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST)
-+        self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS)
-+
-         probfilter = 0
-         for flag in self.tsInfo.probFilterFlags:
-             probfilter |= flag
-+        probfilter |= rpm.RPMPROB_FILTER_IGNOREOS
-+        probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
-         self._ts.setProbFilter(probfilter)
- 
-     def whatProvides(self, name, flags, version):
diff --git a/meta/packages/yum/files/paths.patch b/meta/packages/yum/files/paths.patch
deleted file mode 100644
index 0175d05b3..000000000
--- a/meta/packages/yum/files/paths.patch
+++ /dev/null
@@ -1,106 +0,0 @@
----
- Makefile      |   18 +++++++++---------
- docs/Makefile |   12 ++++++------
- etc/Makefile  |   20 ++++++++++----------
- 3 files changed, 25 insertions(+), 25 deletions(-)
-
-Index: yum-3.2.27/Makefile
-===================================================================
---- yum-3.2.27.orig/Makefile	2010-03-04 01:10:20.000000000 +0000
-+++ yum-3.2.27/Makefile	2010-03-23 13:49:50.663912930 +0000
-@@ -22,19 +22,19 @@
- 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
- 
- install:
--	mkdir -p $(DESTDIR)/usr/share/yum-cli
-+	mkdir -p $(DESTDIR)$(datadir)/yum-cli
- 	for p in $(PYFILES) ; do \
--		install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
-+		install -m 644 $$p $(DESTDIR)$(datadir)/yum-cli/$$p; \
- 	done
--	mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py
--	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
-+	mv $(DESTDIR)$(datadir)/yum-cli/yum-updatesd.py $(DESTDIR)$(datadir)/yum-cli/yumupd.py
-+	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)$(datadir)/yum-cli', 1, '$(PYDIR)', 1)"
- 
--	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
--	install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
--	install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
-+	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
-+	install -m 755 bin/yum.py $(DESTDIR)$(bindir)/yum
-+	install -m 755 bin/yum-updatesd.py $(DESTDIR)$(sbindir)/yum-updatesd
- 
--	mkdir -p $(DESTDIR)/var/cache/yum
--	mkdir -p $(DESTDIR)/var/lib/yum	
-+	mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
-+	mkdir -p $(DESTDIR)$(localstatedir)/lib/yum
- 
- 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
- 
-Index: yum-3.2.27/docs/Makefile
-===================================================================
---- yum-3.2.27.orig/docs/Makefile	2009-04-07 14:57:06.000000000 +0100
-+++ yum-3.2.27/docs/Makefile	2010-03-23 13:52:30.086667913 +0000
-@@ -6,10 +6,10 @@
- 	rm -fr epydoc
- 
- install:
--	mkdir -p $(DESTDIR)/usr/share/man/man5
--	mkdir -p $(DESTDIR)/usr/share/man/man8
--	install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
--	install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
--	install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
--	install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
--	install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
-+	mkdir -p $(DESTDIR)$(mandir)/man5
-+	mkdir -p $(DESTDIR)$(mandir)/man8
-+	install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
-+	install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
-+	install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
-+	install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
-+	install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
-Index: yum-3.2.27/etc/Makefile
-===================================================================
---- yum-3.2.27.orig/etc/Makefile	2009-10-26 18:56:06.000000000 +0000
-+++ yum-3.2.27/etc/Makefile	2010-03-23 13:54:40.421912460 +0000
-@@ -1,4 +1,4 @@
--YUMETC=$(DESTDIR)/etc/yum
-+YUMETC=$(DESTDIR)$(sysconfdir)/yum
- 
- all:
- 	echo "Nothing to do"
-@@ -7,23 +7,23 @@
- 	rm -f *.pyc *.pyo *~
- 
- install:
--	mkdir -p $(DESTDIR)/etc/yum/
--	mkdir -p $(DESTDIR)/etc/yum/repos.d
-+	mkdir -p $(DESTDIR)$(sysconfdir)/yum/
-+	mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
- 
- 	install -m 644 yum.conf $(YUMETC)/yum.conf
- 
- 	install -m 644 version-groups.conf $(YUMETC)/version-groups.conf
- 
--	mkdir -p $(DESTDIR)/etc/logrotate.d
--	install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
-+	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
-+	install -m 644 yum.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/yum
- 
--	mkdir -p $(DESTDIR)/etc/rc.d/init.d
--	install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd
-+	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
-+	install -m 755 yum-updatesd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/yum-updatesd
- 
--	mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
--	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
-+	mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d/
-+	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/yum-updatesd.conf
- 
--	install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
-+	install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf
- 
--	mkdir -p $(DESTDIR)/etc/bash_completion.d
--	install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
-+	mkdir -p $(DESTDIR)$(sysconfdir)/bash_completion.d
-+	install -m 644 yum.bash $(DESTDIR)$(sysconfdir)/bash_completion.d
diff --git a/meta/packages/yum/files/paths2.patch b/meta/packages/yum/files/paths2.patch
deleted file mode 100644
index 8fe6d0c98..000000000
--- a/meta/packages/yum/files/paths2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
----
- rpmUtils/Makefile |    2 +-
- yum/Makefile      |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: yum-3.2.27/rpmUtils/Makefile
-===================================================================
---- yum-3.2.27.orig/rpmUtils/Makefile	2010-03-24 17:26:39.759798777 +0000
-+++ yum-3.2.27/rpmUtils/Makefile	2010-03-24 17:26:54.835863845 +0000
-@@ -2,8 +2,8 @@
- PACKAGE = $(shell basename `pwd`)
- PYFILES = $(wildcard *.py)
- PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
--PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
--PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
-+PYSYSDIR = $(libdir)
-+PYLIBDIR = $(PYSYSDIR)/python$(PYVER)
- PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
- 
- all: 
-Index: yum-3.2.27/yum/Makefile
-===================================================================
---- yum-3.2.27.orig/yum/Makefile	2010-03-24 17:26:39.759798777 +0000
-+++ yum-3.2.27/yum/Makefile	2010-03-24 17:26:43.726773783 +0000
-@@ -2,8 +2,8 @@
- PACKAGE = $(shell basename `pwd`)
- PYFILES = $(wildcard *.py)
- PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
--PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
--PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
-+PYSYSDIR = $(libdir)
-+PYLIBDIR = $(PYSYSDIR)/python$(PYVER)
- PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
- 
- all: 
diff --git a/meta/packages/yum/files/yum-install-recommends.py b/meta/packages/yum/files/yum-install-recommends.py
deleted file mode 100755
index 64716f2c3..000000000
--- a/meta/packages/yum/files/yum-install-recommends.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-import os, sys
-
-root = sys.argv[1]
-installcmd = sys.argv[2]
-
-#
-# Take an rpm image and look through for Recommends:. For each recommends 
-# found, try and install any matching packages including any Recommends for
-# packages installed by us.
-#
-
-
-def get_recommends():
-    deps = []
-    output = os.popen("rpm --root %s -aq --recommends" % (root))
-    lines = output.readlines()
-    for line in lines:
-        line = line.replace("(none)","")
-        if line:
-            deps.append(line.split()[0])
-    return deps
-
-processed = []
-
-while True:
-    toinstall = []
-    recommends = set(get_recommends())
-    for item in recommends:
-        if item not in processed:
-            toinstall.append(item)
-    if len(toinstall) != 0:
-        print "Installing %s" % " ".join(toinstall)
-        os.system("%s %s" % (installcmd, " ".join(toinstall)))
-    else:
-        break
-    processed.extend(toinstall)
-
-    
diff --git a/meta/packages/yum/yum_3.2.27.bb b/meta/packages/yum/yum_3.2.27.bb
deleted file mode 100644
index acebc79dd..000000000
--- a/meta/packages/yum/yum_3.2.27.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "yum package manger is an automatic updater for rpm."
-HOMEPAGE = "http://yum.baseurl.org/"
-BUGTRACKER = "http://yum.baseurl.org/report"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
-                    file://yum/sqlutils.py;beginline=2;endline=14;md5=d704ae6a9d69ce90768ab9188236b992"
-
-RDEPENDS = "python-rpm python-core python-iniparse python-urlgrabber \
-            python-shell python-re python-logging python-pickle \
-	    python-netserver python-compression \
-	    python-unixadmin python-xml python-sqlite3 \
-	    python-textutils python-fcntl python-email \
-	    yum-metadata-parser"
-
-PR = "r9"
-
-SRC_URI = "http://yum.baseurl.org/download/3.2/yum-${PV}.tar.gz \
-           file://paths.patch;apply=yes \
-           file://paths2.patch;apply=yes \
-	   file://yum-install-recommends.py \
-	   file://extract-postinst.awk \
-	   file://98_yum"
-
-S = "${WORKDIR}/yum-${PV}"
-
-inherit autotools
-
-do_compile_append () {
-	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
-	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
-}
-
-do_install_append () {
-	install -d ${D}${bindir}/
-	install ${WORKDIR}/extract-postinst.awk ${D}${bindir}/
-	install ${WORKDIR}/yum-install-recommends.py ${D}${bindir}/
-	rmdir ${D}${localstatedir}/cache/yum
-	rmdir ${D}${localstatedir}/cache
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/98_yum ${D}/etc/default/volatiles
-}
-
-FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/packages/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 8ac523d19..8ac523d19 100644
--- a/meta/packages/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
diff --git a/meta/packages/acpid/acpid/init b/meta/recipes-bsp/acpid/acpid/init
index ef08b5959..ef08b5959 100755
--- a/meta/packages/acpid/acpid/init
+++ b/meta/recipes-bsp/acpid/acpid/init
diff --git a/meta/packages/acpid/acpid_1.0.6.bb b/meta/recipes-bsp/acpid/acpid_1.0.6.bb
index 364aa8200..364aa8200 100644
--- a/meta/packages/acpid/acpid_1.0.6.bb
+++ b/meta/recipes-bsp/acpid/acpid_1.0.6.bb
diff --git a/meta/packages/eee-acpi-scripts/eee-acpi-scripts_git.bb b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
index 4c26504bd..4c26504bd 100644
--- a/meta/packages/eee-acpi-scripts/eee-acpi-scripts_git.bb
+++ b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
diff --git a/meta/packages/eee-acpi-scripts/files/policy-funcs b/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
index fd099df0d..fd099df0d 100644
--- a/meta/packages/eee-acpi-scripts/files/policy-funcs
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
diff --git a/meta/packages/eee-acpi-scripts/files/powerbtn.patch b/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
index 3f79c3e61..3f79c3e61 100644
--- a/meta/packages/eee-acpi-scripts/files/powerbtn.patch
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
diff --git a/meta/packages/eee-acpi-scripts/files/remove-doc-check.patch b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
index 8f6c4fcaa..8f6c4fcaa 100644
--- a/meta/packages/eee-acpi-scripts/files/remove-doc-check.patch
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
diff --git a/meta/packages/formfactor/files/akita/machconfig b/meta/recipes-bsp/formfactor/files/akita/machconfig
index a9649e03b..a9649e03b 100755
--- a/meta/packages/formfactor/files/akita/machconfig
+++ b/meta/recipes-bsp/formfactor/files/akita/machconfig
diff --git a/meta/packages/formfactor/files/beagleboard/machconfig b/meta/recipes-bsp/formfactor/files/beagleboard/machconfig
index a46859f13..a46859f13 100755
--- a/meta/packages/formfactor/files/beagleboard/machconfig
+++ b/meta/recipes-bsp/formfactor/files/beagleboard/machconfig
diff --git a/meta/packages/formfactor/files/bootcdx86/machconfig b/meta/recipes-bsp/formfactor/files/bootcdx86/machconfig
index adf707ee8..adf707ee8 100644
--- a/meta/packages/formfactor/files/bootcdx86/machconfig
+++ b/meta/recipes-bsp/formfactor/files/bootcdx86/machconfig
diff --git a/meta/packages/formfactor/files/c7x0/machconfig b/meta/recipes-bsp/formfactor/files/c7x0/machconfig
index ad3620f8f..ad3620f8f 100755
--- a/meta/packages/formfactor/files/c7x0/machconfig
+++ b/meta/recipes-bsp/formfactor/files/c7x0/machconfig
diff --git a/meta/packages/formfactor/files/cm-x270/machconfig b/meta/recipes-bsp/formfactor/files/cm-x270/machconfig
index f7387295e..f7387295e 100755
--- a/meta/packages/formfactor/files/cm-x270/machconfig
+++ b/meta/recipes-bsp/formfactor/files/cm-x270/machconfig
diff --git a/meta/packages/formfactor/files/config b/meta/recipes-bsp/formfactor/files/config
index ed15d9e03..ed15d9e03 100755
--- a/meta/packages/formfactor/files/config
+++ b/meta/recipes-bsp/formfactor/files/config
diff --git a/meta/packages/formfactor/files/em-x270/machconfig b/meta/recipes-bsp/formfactor/files/em-x270/machconfig
index 651e59e12..651e59e12 100755
--- a/meta/packages/formfactor/files/em-x270/machconfig
+++ b/meta/recipes-bsp/formfactor/files/em-x270/machconfig
diff --git a/meta/packages/formfactor/files/htcuniversal/machconfig b/meta/recipes-bsp/formfactor/files/htcuniversal/machconfig
index a9649e03b..a9649e03b 100755
--- a/meta/packages/formfactor/files/htcuniversal/machconfig
+++ b/meta/recipes-bsp/formfactor/files/htcuniversal/machconfig
diff --git a/meta/packages/formfactor/files/igep0020/machconfig b/meta/recipes-bsp/formfactor/files/igep0020/machconfig
index ffce01227..ffce01227 100755
--- a/meta/packages/formfactor/files/igep0020/machconfig
+++ b/meta/recipes-bsp/formfactor/files/igep0020/machconfig
diff --git a/meta/packages/formfactor/files/machconfig b/meta/recipes-bsp/formfactor/files/machconfig
index e69de29bb..e69de29bb 100755
--- a/meta/packages/formfactor/files/machconfig
+++ b/meta/recipes-bsp/formfactor/files/machconfig
diff --git a/meta/packages/formfactor/files/netbook/machconfig b/meta/recipes-bsp/formfactor/files/netbook/machconfig
index bef4ce3c9..bef4ce3c9 100644
--- a/meta/packages/formfactor/files/netbook/machconfig
+++ b/meta/recipes-bsp/formfactor/files/netbook/machconfig
diff --git a/meta/packages/formfactor/files/nokia800/machconfig b/meta/recipes-bsp/formfactor/files/nokia800/machconfig
index ebe626c30..ebe626c30 100755
--- a/meta/packages/formfactor/files/nokia800/machconfig
+++ b/meta/recipes-bsp/formfactor/files/nokia800/machconfig
diff --git a/meta/packages/formfactor/files/om-gta01/machconfig b/meta/recipes-bsp/formfactor/files/om-gta01/machconfig
index 38a9bb0be..38a9bb0be 100644
--- a/meta/packages/formfactor/files/om-gta01/machconfig
+++ b/meta/recipes-bsp/formfactor/files/om-gta01/machconfig
diff --git a/meta/packages/formfactor/files/omap-3430ldp/machconfig b/meta/recipes-bsp/formfactor/files/omap-3430ldp/machconfig
index 341ae1cf8..341ae1cf8 100755
--- a/meta/packages/formfactor/files/omap-3430ldp/machconfig
+++ b/meta/recipes-bsp/formfactor/files/omap-3430ldp/machconfig
diff --git a/meta/packages/formfactor/files/omap-3430sdp/machconfig b/meta/recipes-bsp/formfactor/files/omap-3430sdp/machconfig
index 341ae1cf8..341ae1cf8 100755
--- a/meta/packages/formfactor/files/omap-3430sdp/machconfig
+++ b/meta/recipes-bsp/formfactor/files/omap-3430sdp/machconfig
diff --git a/meta/packages/formfactor/files/qemuarm/machconfig b/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/packages/formfactor/files/qemuarm/machconfig
+++ b/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
diff --git a/meta/packages/formfactor/files/qemuarmv6/machconfig b/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/packages/formfactor/files/qemuarmv6/machconfig
+++ b/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
diff --git a/meta/packages/formfactor/files/qemuarmv7/machconfig b/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/packages/formfactor/files/qemuarmv7/machconfig
+++ b/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
diff --git a/meta/packages/formfactor/files/qemux86/machconfig b/meta/recipes-bsp/formfactor/files/qemux86/machconfig
index 56a2ae2e3..56a2ae2e3 100755
--- a/meta/packages/formfactor/files/qemux86/machconfig
+++ b/meta/recipes-bsp/formfactor/files/qemux86/machconfig
diff --git a/meta/packages/formfactor/files/spitz/machconfig b/meta/recipes-bsp/formfactor/files/spitz/machconfig
index a9649e03b..a9649e03b 100755
--- a/meta/packages/formfactor/files/spitz/machconfig
+++ b/meta/recipes-bsp/formfactor/files/spitz/machconfig
diff --git a/meta/packages/formfactor/files/zylonite/machconfig b/meta/recipes-bsp/formfactor/files/zylonite/machconfig
index 89f7f0c99..89f7f0c99 100755
--- a/meta/packages/formfactor/files/zylonite/machconfig
+++ b/meta/recipes-bsp/formfactor/files/zylonite/machconfig
diff --git a/meta/packages/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index bee1b380a..bee1b380a 100644
--- a/meta/packages/formfactor/formfactor_0.0.bb
+++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
diff --git a/meta/packages/grub/grub-0.97/autohell.patch b/meta/recipes-bsp/grub/grub-0.97/autohell.patch
index 279c529bb..279c529bb 100644
--- a/meta/packages/grub/grub-0.97/autohell.patch
+++ b/meta/recipes-bsp/grub/grub-0.97/autohell.patch
diff --git a/meta/packages/grub/grub_0.97.bb b/meta/recipes-bsp/grub/grub_0.97.bb
index 6b6b5b0c2..6b6b5b0c2 100644
--- a/meta/packages/grub/grub_0.97.bb
+++ b/meta/recipes-bsp/grub/grub_0.97.bb
diff --git a/meta/packages/keymaps/files/akita/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/akita/keymap-2.4.map
index e6339979e..e6339979e 100644
--- a/meta/packages/keymaps/files/akita/keymap-2.4.map
+++ b/meta/recipes-bsp/keymaps/files/akita/keymap-2.4.map
diff --git a/meta/packages/keymaps/files/akita/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/akita/keymap-2.6.map
index 11a0e8b4d..11a0e8b4d 100644
--- a/meta/packages/keymaps/files/akita/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/akita/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/c7x0/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map
index 6fc3a9a9c..6fc3a9a9c 100755
--- a/meta/packages/keymaps/files/c7x0/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/collie/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/collie/keymap-2.4.map
index 4cd8325bb..4cd8325bb 100644
--- a/meta/packages/keymaps/files/collie/keymap-2.4.map
+++ b/meta/recipes-bsp/keymaps/files/collie/keymap-2.4.map
diff --git a/meta/packages/keymaps/files/collie/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/collie/keymap-2.6.map
index 13eb7d288..13eb7d288 100644
--- a/meta/packages/keymaps/files/collie/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/collie/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/h2200/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/h2200/keymap-2.6.map
index 8b4c43fe0..8b4c43fe0 100644
--- a/meta/packages/keymaps/files/h2200/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/h2200/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/htcuniversal/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/htcuniversal/keymap-2.6.map
index 0d036752d..0d036752d 100644
--- a/meta/packages/keymaps/files/htcuniversal/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/htcuniversal/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-de.map b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-de.map
index 98083d2e5..98083d2e5 100644
--- a/meta/packages/keymaps/files/jornada6xx/keymap-de.map
+++ b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-de.map
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-sp.map b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-sp.map
index ba0538774..ba0538774 100644
--- a/meta/packages/keymaps/files/jornada6xx/keymap-sp.map
+++ b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-sp.map
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-uk.map b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-uk.map
index a7bb08246..a7bb08246 100644
--- a/meta/packages/keymaps/files/jornada6xx/keymap-uk.map
+++ b/meta/recipes-bsp/keymaps/files/jornada6xx/keymap-uk.map
diff --git a/meta/packages/keymaps/files/keymap.sh b/meta/recipes-bsp/keymaps/files/keymap.sh
index 6ebc63426..6ebc63426 100755
--- a/meta/packages/keymaps/files/keymap.sh
+++ b/meta/recipes-bsp/keymaps/files/keymap.sh
diff --git a/meta/packages/keymaps/files/poodle/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/poodle/keymap-2.6.map
index a39b886f5..a39b886f5 100644
--- a/meta/packages/keymaps/files/poodle/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/poodle/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/spitz/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/spitz/keymap-2.4.map
index e6339979e..e6339979e 100644
--- a/meta/packages/keymaps/files/spitz/keymap-2.4.map
+++ b/meta/recipes-bsp/keymaps/files/spitz/keymap-2.4.map
diff --git a/meta/packages/keymaps/files/spitz/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/spitz/keymap-2.6.map
index 11a0e8b4d..11a0e8b4d 100644
--- a/meta/packages/keymaps/files/spitz/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/spitz/keymap-2.6.map
diff --git a/meta/packages/keymaps/files/tosa/keymap-2.4.map b/meta/recipes-bsp/keymaps/files/tosa/keymap-2.4.map
index 31ca75b66..31ca75b66 100644
--- a/meta/packages/keymaps/files/tosa/keymap-2.4.map
+++ b/meta/recipes-bsp/keymaps/files/tosa/keymap-2.4.map
diff --git a/meta/packages/keymaps/files/tosa/keymap-2.6.map b/meta/recipes-bsp/keymaps/files/tosa/keymap-2.6.map
index b85d5616e..b85d5616e 100644
--- a/meta/packages/keymaps/files/tosa/keymap-2.6.map
+++ b/meta/recipes-bsp/keymaps/files/tosa/keymap-2.6.map
diff --git a/meta/packages/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index c24a529f4..c24a529f4 100644
--- a/meta/packages/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
diff --git a/meta/packages/libacpi/files/makefile-fix.patch b/meta/recipes-bsp/libacpi/files/makefile-fix.patch
index 919392976..919392976 100644
--- a/meta/packages/libacpi/files/makefile-fix.patch
+++ b/meta/recipes-bsp/libacpi/files/makefile-fix.patch
diff --git a/meta/packages/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index e60d934ea..e60d934ea 100644
--- a/meta/packages/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
diff --git a/meta/packages/orinoco/files/orinoco_cs.conf b/meta/recipes-bsp/orinoco/files/orinoco_cs.conf
index 8d3db61d1..8d3db61d1 100644
--- a/meta/packages/orinoco/files/orinoco_cs.conf
+++ b/meta/recipes-bsp/orinoco/files/orinoco_cs.conf
diff --git a/meta/packages/orinoco/files/spectrum_fw.h b/meta/recipes-bsp/orinoco/files/spectrum_fw.h
index 94c825d37..94c825d37 100644
--- a/meta/packages/orinoco/files/spectrum_fw.h
+++ b/meta/recipes-bsp/orinoco/files/spectrum_fw.h
diff --git a/meta/packages/orinoco/orinoco-conf_1.0.bb b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
index 89fe1df28..89fe1df28 100644
--- a/meta/packages/orinoco/orinoco-conf_1.0.bb
+++ b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
diff --git a/meta/packages/orinoco/spectrum-fw.bb b/meta/recipes-bsp/orinoco/spectrum-fw.bb
index 04849c319..04849c319 100644
--- a/meta/packages/orinoco/spectrum-fw.bb
+++ b/meta/recipes-bsp/orinoco/spectrum-fw.bb
diff --git a/meta/packages/orinoco/spectrum-fw/get_symbol_fw b/meta/recipes-bsp/orinoco/spectrum-fw/get_symbol_fw
index 80420b01a..80420b01a 100755
--- a/meta/packages/orinoco/spectrum-fw/get_symbol_fw
+++ b/meta/recipes-bsp/orinoco/spectrum-fw/get_symbol_fw
diff --git a/meta/packages/orinoco/spectrum-fw/parse_symbol_fw b/meta/recipes-bsp/orinoco/spectrum-fw/parse_symbol_fw
index 7fe0ea57c..7fe0ea57c 100755
--- a/meta/packages/orinoco/spectrum-fw/parse_symbol_fw
+++ b/meta/recipes-bsp/orinoco/spectrum-fw/parse_symbol_fw
diff --git a/meta/packages/pciutils/pciutils-3.1.5/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch
index 1bfe72475..1bfe72475 100644
--- a/meta/packages/pciutils/pciutils-3.1.5/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.5/configure.patch
diff --git a/meta/packages/pciutils/pciutils-3.1.5/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.5/guess-fix.patch
index 9072d2a68..9072d2a68 100644
--- a/meta/packages/pciutils/pciutils-3.1.5/guess-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.5/guess-fix.patch
diff --git a/meta/packages/pciutils/pciutils-3.1.5/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.5/lib-build-fix.patch
index 1e81f8401..1e81f8401 100644
--- a/meta/packages/pciutils/pciutils-3.1.5/lib-build-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.5/lib-build-fix.patch
diff --git a/meta/packages/pciutils/pciutils-3.1.5/pcimodules-pciutils.diff b/meta/recipes-bsp/pciutils/pciutils-3.1.5/pcimodules-pciutils.diff
index 36ea3b76b..36ea3b76b 100644
--- a/meta/packages/pciutils/pciutils-3.1.5/pcimodules-pciutils.diff
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.5/pcimodules-pciutils.diff
diff --git a/meta/packages/pciutils/pciutils_3.1.5.bb b/meta/recipes-bsp/pciutils/pciutils_3.1.5.bb
index 73fe1cca6..73fe1cca6 100644
--- a/meta/packages/pciutils/pciutils_3.1.5.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.1.5.bb
diff --git a/meta/packages/pcmciautils/pcmciautils-017/makefile_fix.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch
index 82dbfa869..82dbfa869 100644
--- a/meta/packages/pcmciautils/pcmciautils-017/makefile_fix.patch
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-017/makefile_fix.patch
diff --git a/meta/packages/pcmciautils/pcmciautils-017/version_workaround.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
index 57efa68d3..57efa68d3 100644
--- a/meta/packages/pcmciautils/pcmciautils-017/version_workaround.patch
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
diff --git a/meta/packages/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 750a2cf60..750a2cf60 100644
--- a/meta/packages/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
diff --git a/meta/packages/pcmciautils/pcmciautils_017.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
index 109b17d76..109b17d76 100644
--- a/meta/packages/pcmciautils/pcmciautils_017.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
diff --git a/meta/packages/pointercal/files/akita/pointercal b/meta/recipes-bsp/pointercal/files/akita/pointercal
index 89f407efb..89f407efb 100644
--- a/meta/packages/pointercal/files/akita/pointercal
+++ b/meta/recipes-bsp/pointercal/files/akita/pointercal
diff --git a/meta/packages/pointercal/files/c7x0/pointercal b/meta/recipes-bsp/pointercal/files/c7x0/pointercal
index eb99f6075..eb99f6075 100644
--- a/meta/packages/pointercal/files/c7x0/pointercal
+++ b/meta/recipes-bsp/pointercal/files/c7x0/pointercal
diff --git a/meta/packages/pointercal/files/htcuniversal/pointercal b/meta/recipes-bsp/pointercal/files/htcuniversal/pointercal
index f78c816e0..f78c816e0 100644
--- a/meta/packages/pointercal/files/htcuniversal/pointercal
+++ b/meta/recipes-bsp/pointercal/files/htcuniversal/pointercal
diff --git a/meta/packages/pointercal/files/om-gta01/pointercal b/meta/recipes-bsp/pointercal/files/om-gta01/pointercal
index 198fd2a77..198fd2a77 100644
--- a/meta/packages/pointercal/files/om-gta01/pointercal
+++ b/meta/recipes-bsp/pointercal/files/om-gta01/pointercal
diff --git a/meta/packages/pointercal/files/omap-3430ldp/pointercal b/meta/recipes-bsp/pointercal/files/omap-3430ldp/pointercal
index 42cf01b85..42cf01b85 100644
--- a/meta/packages/pointercal/files/omap-3430ldp/pointercal
+++ b/meta/recipes-bsp/pointercal/files/omap-3430ldp/pointercal
diff --git a/meta/packages/pointercal/files/pointercal b/meta/recipes-bsp/pointercal/files/pointercal
index e69de29bb..e69de29bb 100644
--- a/meta/packages/pointercal/files/pointercal
+++ b/meta/recipes-bsp/pointercal/files/pointercal
diff --git a/meta/packages/pointercal/files/qemuarm/pointercal b/meta/recipes-bsp/pointercal/files/qemuarm/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/packages/pointercal/files/qemuarm/pointercal
+++ b/meta/recipes-bsp/pointercal/files/qemuarm/pointercal
diff --git a/meta/packages/pointercal/files/qemuarmv6/pointercal b/meta/recipes-bsp/pointercal/files/qemuarmv6/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/packages/pointercal/files/qemuarmv6/pointercal
+++ b/meta/recipes-bsp/pointercal/files/qemuarmv6/pointercal
diff --git a/meta/packages/pointercal/files/qemuarmv7/pointercal b/meta/recipes-bsp/pointercal/files/qemuarmv7/pointercal
index abd84ca4b..abd84ca4b 100644
--- a/meta/packages/pointercal/files/qemuarmv7/pointercal
+++ b/meta/recipes-bsp/pointercal/files/qemuarmv7/pointercal
diff --git a/meta/packages/pointercal/files/qemux86/pointercal b/meta/recipes-bsp/pointercal/files/qemux86/pointercal
index 640053d39..640053d39 100644
--- a/meta/packages/pointercal/files/qemux86/pointercal
+++ b/meta/recipes-bsp/pointercal/files/qemux86/pointercal
diff --git a/meta/packages/pointercal/files/spitz/pointercal b/meta/recipes-bsp/pointercal/files/spitz/pointercal
index 7e9f7a846..7e9f7a846 100644
--- a/meta/packages/pointercal/files/spitz/pointercal
+++ b/meta/recipes-bsp/pointercal/files/spitz/pointercal
diff --git a/meta/packages/pointercal/pointercal_0.0.bb b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
index 6565c6bac..6565c6bac 100644
--- a/meta/packages/pointercal/pointercal_0.0.bb
+++ b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
diff --git a/meta/packages/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb b/meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
index 22a55b278..22a55b278 100644
--- a/meta/packages/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
+++ b/meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb
diff --git a/meta/packages/misc-binary-only/prism-firmware.bb b/meta/recipes-bsp/prism-firmware/prism-firmware.bb
index 903c55e15..903c55e15 100644
--- a/meta/packages/misc-binary-only/prism-firmware.bb
+++ b/meta/recipes-bsp/prism-firmware/prism-firmware.bb
diff --git a/meta/packages/misc-binary-only/prism-firmware/hostap.rules b/meta/recipes-bsp/prism-firmware/prism-firmware/hostap.rules
index dece98ae9..dece98ae9 100644
--- a/meta/packages/misc-binary-only/prism-firmware/hostap.rules
+++ b/meta/recipes-bsp/prism-firmware/prism-firmware/hostap.rules
diff --git a/meta/packages/misc-binary-only/prism-firmware/prism-fw.sh b/meta/recipes-bsp/prism-firmware/prism-firmware/prism-fw.sh
index 619f612be..619f612be 100644
--- a/meta/packages/misc-binary-only/prism-firmware/prism-fw.sh
+++ b/meta/recipes-bsp/prism-firmware/prism-firmware/prism-fw.sh
diff --git a/meta/packages/sharp-binary-only/sharp-flash-header-c700.bb b/meta/recipes-bsp/sharp-binary-only/sharp-flash-header-c700.bb
index 38e09d809..38e09d809 100644
--- a/meta/packages/sharp-binary-only/sharp-flash-header-c700.bb
+++ b/meta/recipes-bsp/sharp-binary-only/sharp-flash-header-c700.bb
diff --git a/meta/packages/sharp-binary-only/sharp-flash-header-c700/header-c700.bin b/meta/recipes-bsp/sharp-binary-only/sharp-flash-header-c700/header-c700.bin
index d2328b00b..d2328b00b 100644
--- a/meta/packages/sharp-binary-only/sharp-flash-header-c700/header-c700.bin
+++ b/meta/recipes-bsp/sharp-binary-only/sharp-flash-header-c700/header-c700.bin
diff --git a/meta/packages/v86d/v86d/fbsetup b/meta/recipes-bsp/v86d/v86d/fbsetup
index 2a409cc52..2a409cc52 100755
--- a/meta/packages/v86d/v86d/fbsetup
+++ b/meta/recipes-bsp/v86d/v86d/fbsetup
diff --git a/meta/packages/v86d/v86d_0.1.9.bb b/meta/recipes-bsp/v86d/v86d_0.1.9.bb
index 19510b934..19510b934 100644
--- a/meta/packages/v86d/v86d_0.1.9.bb
+++ b/meta/recipes-bsp/v86d/v86d_0.1.9.bb
diff --git a/meta/packages/x-load/files/signGP.c b/meta/recipes-bsp/x-load/files/signGP.c
index 0e8ed07f5..0e8ed07f5 100644
--- a/meta/packages/x-load/files/signGP.c
+++ b/meta/recipes-bsp/x-load/files/signGP.c
diff --git a/meta/packages/x-load/signgp-native.bb b/meta/recipes-bsp/x-load/signgp-native.bb
index 7eabb07bc..7eabb07bc 100644
--- a/meta/packages/x-load/signgp-native.bb
+++ b/meta/recipes-bsp/x-load/signgp-native.bb
diff --git a/meta/packages/x-load/x-load-git/beagleboard/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
index 3131cda6b..3131cda6b 100644
--- a/meta/packages/x-load/x-load-git/beagleboard/armv7-a.patch
+++ b/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
diff --git a/meta/packages/x-load/x-load-git/beagleboard/name.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
index 98dcbae49..98dcbae49 100644
--- a/meta/packages/x-load/x-load-git/beagleboard/name.patch
+++ b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
diff --git a/meta/packages/x-load/x-load-git/omap3evm/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
index 3131cda6b..3131cda6b 100644
--- a/meta/packages/x-load/x-load-git/omap3evm/armv7-a.patch
+++ b/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
diff --git a/meta/packages/x-load/x-load-git/overo/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
index 3131cda6b..3131cda6b 100644
--- a/meta/packages/x-load/x-load-git/overo/armv7-a.patch
+++ b/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
diff --git a/meta/packages/x-load/x-load.inc b/meta/recipes-bsp/x-load/x-load.inc
index 7073b13fe..7073b13fe 100644
--- a/meta/packages/x-load/x-load.inc
+++ b/meta/recipes-bsp/x-load/x-load.inc
diff --git a/meta/packages/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb
index 1c1ce128a..1c1ce128a 100644
--- a/meta/packages/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
diff --git a/meta/packages/zaurus-updater/encdec-updater.bb b/meta/recipes-bsp/zaurus-updater/encdec-updater.bb
index c59d0e297..c59d0e297 100644
--- a/meta/packages/zaurus-updater/encdec-updater.bb
+++ b/meta/recipes-bsp/zaurus-updater/encdec-updater.bb
diff --git a/meta/packages/zaurus-updater/encdec-updater/encdec-updater.c b/meta/recipes-bsp/zaurus-updater/encdec-updater/encdec-updater.c
index b894623c6..b894623c6 100644
--- a/meta/packages/zaurus-updater/encdec-updater/encdec-updater.c
+++ b/meta/recipes-bsp/zaurus-updater/encdec-updater/encdec-updater.c
diff --git a/meta/packages/zaurus-updater/zaurus-updater.bb b/meta/recipes-bsp/zaurus-updater/zaurus-updater.bb
index a621761d6..a621761d6 100644
--- a/meta/packages/zaurus-updater/zaurus-updater.bb
+++ b/meta/recipes-bsp/zaurus-updater/zaurus-updater.bb
diff --git a/meta/packages/zaurus-updater/zaurus-updater/gnu-tar.gz b/meta/recipes-bsp/zaurus-updater/zaurus-updater/gnu-tar.gz
index 93d1a4370..93d1a4370 100644
--- a/meta/packages/zaurus-updater/zaurus-updater/gnu-tar.gz
+++ b/meta/recipes-bsp/zaurus-updater/zaurus-updater/gnu-tar.gz
diff --git a/meta/packages/zaurus-updater/zaurus-updater/updater.sh b/meta/recipes-bsp/zaurus-updater/zaurus-updater/updater.sh
index 22d4b3914..22d4b3914 100644
--- a/meta/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/meta/recipes-bsp/zaurus-updater/zaurus-updater/updater.sh
diff --git a/meta/packages/zaurusd/zaurusd_svn.bb b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
index 7d7bf198f..7d7bf198f 100644
--- a/meta/packages/zaurusd/zaurusd_svn.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
diff --git a/meta/packages/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 2a5bf4a18..2a5bf4a18 100644
--- a/meta/packages/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
diff --git a/meta/packages/avahi/avahi_0.6.27.bb b/meta/recipes-connectivity/avahi/avahi_0.6.27.bb
index a4c22a8b0..a4c22a8b0 100644
--- a/meta/packages/avahi/avahi_0.6.27.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.27.bb
diff --git a/meta/packages/avahi/files/00avahi-autoipd b/meta/recipes-connectivity/avahi/files/00avahi-autoipd
index a0ab81460..a0ab81460 100644
--- a/meta/packages/avahi/files/00avahi-autoipd
+++ b/meta/recipes-connectivity/avahi/files/00avahi-autoipd
diff --git a/meta/packages/avahi/files/99avahi-autoipd b/meta/recipes-connectivity/avahi/files/99avahi-autoipd
index 234cdaa3e..234cdaa3e 100644
--- a/meta/packages/avahi/files/99avahi-autoipd
+++ b/meta/recipes-connectivity/avahi/files/99avahi-autoipd
diff --git a/meta/packages/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch
index f76a965b8..f76a965b8 100644
--- a/meta/packages/avahi/files/initscript.patch
+++ b/meta/recipes-connectivity/avahi/files/initscript.patch
diff --git a/meta/packages/bluez/bluez-dtl1-workaround/02dtl1_cs.sh b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround/02dtl1_cs.sh
index fefc72e07..fefc72e07 100644
--- a/meta/packages/bluez/bluez-dtl1-workaround/02dtl1_cs.sh
+++ b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround/02dtl1_cs.sh
diff --git a/meta/packages/bluez/bluez-dtl1-workaround_1.0.bb b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
index 64000b7a5..64000b7a5 100644
--- a/meta/packages/bluez/bluez-dtl1-workaround_1.0.bb
+++ b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
diff --git a/meta/packages/bluez/bluez-hcidump_1.42.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_1.42.bb
index 4c117281a..4c117281a 100644
--- a/meta/packages/bluez/bluez-hcidump_1.42.bb
+++ b/meta/recipes-connectivity/bluez/bluez-hcidump_1.42.bb
diff --git a/meta/packages/bluez/bluez4-4.66/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.66/bluetooth.conf
index ca5e9e4f2..ca5e9e4f2 100644
--- a/meta/packages/bluez/bluez4-4.66/bluetooth.conf
+++ b/meta/recipes-connectivity/bluez/bluez4-4.66/bluetooth.conf
diff --git a/meta/packages/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch
index 91c802bc4..91c802bc4 100644
--- a/meta/packages/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch
+++ b/meta/recipes-connectivity/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch
diff --git a/meta/packages/bluez/bluez4-4.66/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.66/hid2hci_usb_init.patch
index ed15fd5a1..ed15fd5a1 100644
--- a/meta/packages/bluez/bluez4-4.66/hid2hci_usb_init.patch
+++ b/meta/recipes-connectivity/bluez/bluez4-4.66/hid2hci_usb_init.patch
diff --git a/meta/packages/bluez/bluez4-4.66/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.66/sbc-thumb.patch
index 474423670..474423670 100644
--- a/meta/packages/bluez/bluez4-4.66/sbc-thumb.patch
+++ b/meta/recipes-connectivity/bluez/bluez4-4.66/sbc-thumb.patch
diff --git a/meta/packages/bluez/bluez4_4.66.bb b/meta/recipes-connectivity/bluez/bluez4_4.66.bb
index 7abf0faa6..7abf0faa6 100644
--- a/meta/packages/bluez/bluez4_4.66.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.66.bb
diff --git a/meta/packages/connman/connman-gnome_git.bb b/meta/recipes-connectivity/connman/connman-gnome_git.bb
index 440ba285c..440ba285c 100644
--- a/meta/packages/connman/connman-gnome_git.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_git.bb
diff --git a/meta/packages/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 9a623d7f4..9a623d7f4 100644
--- a/meta/packages/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
diff --git a/meta/packages/connman/connman_0.48.bb b/meta/recipes-connectivity/connman/connman_0.48.bb
index 269f98721..269f98721 100644
--- a/meta/packages/connman/connman_0.48.bb
+++ b/meta/recipes-connectivity/connman/connman_0.48.bb
diff --git a/meta/packages/connman/connman_git.bb b/meta/recipes-connectivity/connman/connman_git.bb
index 82cd976e5..82cd976e5 100644
--- a/meta/packages/connman/connman_git.bb
+++ b/meta/recipes-connectivity/connman/connman_git.bb
diff --git a/meta/packages/connman/files/connman b/meta/recipes-connectivity/connman/files/connman
index f8154f68f..f8154f68f 100755
--- a/meta/packages/connman/files/connman
+++ b/meta/recipes-connectivity/connman/files/connman
diff --git a/meta/packages/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch b/meta/recipes-connectivity/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch
index 57df7196e..57df7196e 100644
--- a/meta/packages/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch
+++ b/meta/recipes-connectivity/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch
diff --git a/meta/packages/connman/files/connman-install-tests.patch b/meta/recipes-connectivity/connman/files/connman-install-tests.patch
index 0ea3758f2..0ea3758f2 100644
--- a/meta/packages/connman/files/connman-install-tests.patch
+++ b/meta/recipes-connectivity/connman/files/connman-install-tests.patch
diff --git a/meta/packages/connman/files/dbusperms.patch b/meta/recipes-connectivity/connman/files/dbusperms.patch
index 100af0367..100af0367 100644
--- a/meta/packages/connman/files/dbusperms.patch
+++ b/meta/recipes-connectivity/connman/files/dbusperms.patch
diff --git a/meta/packages/connman/files/udevfix.patch b/meta/recipes-connectivity/connman/files/udevfix.patch
index 803bec528..803bec528 100644
--- a/meta/packages/connman/files/udevfix.patch
+++ b/meta/recipes-connectivity/connman/files/udevfix.patch
diff --git a/meta/packages/galago/galago-daemon_0.5.1.bb b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
index 9570e503c..9570e503c 100644
--- a/meta/packages/galago/galago-daemon_0.5.1.bb
+++ b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
diff --git a/meta/packages/galago/libgalago-0.5.2/mkdir.patch b/meta/recipes-connectivity/galago/libgalago-0.5.2/mkdir.patch
index f893bffc6..f893bffc6 100644
--- a/meta/packages/galago/libgalago-0.5.2/mkdir.patch
+++ b/meta/recipes-connectivity/galago/libgalago-0.5.2/mkdir.patch
diff --git a/meta/packages/galago/libgalago-0.5.2/pkgconfig.patch b/meta/recipes-connectivity/galago/libgalago-0.5.2/pkgconfig.patch
index 33d4daaba..33d4daaba 100644
--- a/meta/packages/galago/libgalago-0.5.2/pkgconfig.patch
+++ b/meta/recipes-connectivity/galago/libgalago-0.5.2/pkgconfig.patch
diff --git a/meta/packages/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
index fe82a618e..fe82a618e 100644
--- a/meta/packages/galago/libgalago_0.5.2.bb
+++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
diff --git a/meta/packages/gupnp/gssdp_0.7.1.bb b/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb
index 5b4c903c6..5b4c903c6 100644
--- a/meta/packages/gupnp/gssdp_0.7.1.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.7.1.bb
diff --git a/meta/packages/gupnp/gupnp-av_0.4.bb b/meta/recipes-connectivity/gupnp/gupnp-av_0.4.bb
index 57fad7b84..57fad7b84 100644
--- a/meta/packages/gupnp/gupnp-av_0.4.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp-av_0.4.bb
diff --git a/meta/packages/gupnp/gupnp-av_0.5.2.bb b/meta/recipes-connectivity/gupnp/gupnp-av_0.5.2.bb
index 57fad7b84..57fad7b84 100644
--- a/meta/packages/gupnp/gupnp-av_0.5.2.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp-av_0.5.2.bb
diff --git a/meta/packages/gupnp/gupnp-tools_0.8.bb b/meta/recipes-connectivity/gupnp/gupnp-tools_0.8.bb
index be4f3510b..be4f3510b 100644
--- a/meta/packages/gupnp/gupnp-tools_0.8.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp-tools_0.8.bb
diff --git a/meta/packages/gupnp/gupnp_0.13.2.bb b/meta/recipes-connectivity/gupnp/gupnp_0.13.2.bb
index 2a12e5ce2..2a12e5ce2 100644
--- a/meta/packages/gupnp/gupnp_0.13.2.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp_0.13.2.bb
diff --git a/meta/packages/gypsy/files/fixups.patch b/meta/recipes-connectivity/gypsy/files/fixups.patch
index 8bc8c5cba..8bc8c5cba 100644
--- a/meta/packages/gypsy/files/fixups.patch
+++ b/meta/recipes-connectivity/gypsy/files/fixups.patch
diff --git a/meta/packages/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc
index f0d90b290..f0d90b290 100644
--- a/meta/packages/gypsy/gypsy.inc
+++ b/meta/recipes-connectivity/gypsy/gypsy.inc
diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/recipes-connectivity/gypsy/gypsy_0.6.bb
index ee669e5ef..ee669e5ef 100644
--- a/meta/packages/gypsy/gypsy_0.6.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_0.6.bb
diff --git a/meta/packages/gypsy/gypsy_svn.bb b/meta/recipes-connectivity/gypsy/gypsy_svn.bb
index ac1b6bc12..ac1b6bc12 100644
--- a/meta/packages/gypsy/gypsy_svn.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_svn.bb
diff --git a/meta/packages/irda-utils/irda-utils-0.9.18/init b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
index 63750f187..63750f187 100755
--- a/meta/packages/irda-utils/irda-utils-0.9.18/init
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
diff --git a/meta/packages/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
index 9ef8a59fb..9ef8a59fb 100644
--- a/meta/packages/irda-utils/irda-utils_0.9.18.bb
+++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
diff --git a/meta/packages/loudmouth/loudmouth_1.4.0.bb b/meta/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
index f9d84f910..f9d84f910 100644
--- a/meta/packages/loudmouth/loudmouth_1.4.0.bb
+++ b/meta/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
diff --git a/meta/packages/ofono/files/ofono b/meta/recipes-connectivity/ofono/files/ofono
index 6d46fb896..6d46fb896 100644
--- a/meta/packages/ofono/files/ofono
+++ b/meta/recipes-connectivity/ofono/files/ofono
diff --git a/meta/packages/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 8948e57ae..8948e57ae 100644
--- a/meta/packages/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
diff --git a/meta/packages/ofono/ofono_0.17.bb b/meta/recipes-connectivity/ofono/ofono_0.17.bb
index 02b64e5b2..02b64e5b2 100644
--- a/meta/packages/ofono/ofono_0.17.bb
+++ b/meta/recipes-connectivity/ofono/ofono_0.17.bb
diff --git a/meta/packages/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index 3e2c4108c..3e2c4108c 100644
--- a/meta/packages/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
diff --git a/meta/packages/telepathy/empathy/no-gnome-doc.patch b/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
index 13e7943da..13e7943da 100644
--- a/meta/packages/telepathy/empathy/no-gnome-doc.patch
+++ b/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
diff --git a/meta/packages/telepathy/empathy_2.26.1.bb b/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb
index fe506faf1..fe506faf1 100644
--- a/meta/packages/telepathy/empathy_2.26.1.bb
+++ b/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb
diff --git a/meta/packages/telepathy/libtelepathy/doublefix.patch b/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
index 5ff1c436d..5ff1c436d 100644
--- a/meta/packages/telepathy/libtelepathy/doublefix.patch
+++ b/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
diff --git a/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch b/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
index ec0156758..ec0156758 100644
--- a/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch
+++ b/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
diff --git a/meta/packages/telepathy/libtelepathy_0.3.3.bb b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
index c1e0c76bd..c1e0c76bd 100644
--- a/meta/packages/telepathy/libtelepathy_0.3.3.bb
+++ b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
diff --git a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb b/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
index dfb7e39b0..dfb7e39b0 100644
--- a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
diff --git a/meta/packages/telepathy/telepathy-gabble/gabble.manager b/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
index 9000cd41c..9000cd41c 100644
--- a/meta/packages/telepathy/telepathy-gabble/gabble.manager
+++ b/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
diff --git a/meta/packages/telepathy/telepathy-gabble_0.7.8.bb b/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
index 84eed373f..84eed373f 100644
--- a/meta/packages/telepathy/telepathy-gabble_0.7.8.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
diff --git a/meta/packages/telepathy/telepathy-glib_0.9.2.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.9.2.bb
index 5c773bdb2..5c773bdb2 100644
--- a/meta/packages/telepathy/telepathy-glib_0.9.2.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.9.2.bb
diff --git a/meta/packages/telepathy/telepathy-idle_0.1.2.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.2.bb
index d152e31a2..d152e31a2 100644
--- a/meta/packages/telepathy/telepathy-idle_0.1.2.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.2.bb
diff --git a/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch b/meta/recipes-connectivity/telepathy/telepathy-mission-control/pkgconfig.patch
index 08a53d9e4..08a53d9e4 100644
--- a/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch
+++ b/meta/recipes-connectivity/telepathy/telepathy-mission-control/pkgconfig.patch
diff --git a/meta/packages/telepathy/telepathy-mission-control_4.67.bb b/meta/recipes-connectivity/telepathy/telepathy-mission-control_4.67.bb
index 3af177970..3af177970 100644
--- a/meta/packages/telepathy/telepathy-mission-control_4.67.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-mission-control_4.67.bb
diff --git a/meta/packages/telepathy/telepathy-python_0.15.1.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.1.bb
index 0898b321e..0898b321e 100644
--- a/meta/packages/telepathy/telepathy-python_0.15.1.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.1.bb
diff --git a/meta/packages/wireless-tools/wireless-tools/man.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
index fd8cf4277..fd8cf4277 100644
--- a/meta/packages/wireless-tools/wireless-tools/man.patch
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
diff --git a/meta/packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
index 2518a5c83..2518a5c83 100755
--- a/meta/packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/wireless-tools.if-pre-up
diff --git a/meta/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
index 4c8e95bf2..4c8e95bf2 100644
--- a/meta/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
diff --git a/meta/packages/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index 6bb1193c6..6bb1193c6 100644
--- a/meta/packages/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/99_wpa_supplicant b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/99_wpa_supplicant
index 6ff4dd882..6ff4dd882 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/99_wpa_supplicant
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/99_wpa_supplicant
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/defaults-sane b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/defaults-sane
index 67c4cbddf..67c4cbddf 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/defaults-sane
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/defaults-sane
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/defconfig b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/defconfig
index c16534339..c16534339 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/defconfig
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/defconfig
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/defconfig-gnutls
index e325bb83e..e325bb83e 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/defconfig-gnutls
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/init.sh b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/init.sh
index bc7ee9184..bc7ee9184 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/init.sh
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/init.sh
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa-supplicant.sh b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa-supplicant.sh
index 5c9e5d33a..5c9e5d33a 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa-supplicant.sh
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa-supplicant.sh
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-0.5.7-always-scan.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-0.5.7-always-scan.patch
index 25afd07a1..25afd07a1 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-0.5.7-always-scan.patch
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-0.5.7-always-scan.patch
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-fix-deprecated-dbus-function.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-fix-deprecated-dbus-function.patch
index dbd5e4e93..dbd5e4e93 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-fix-deprecated-dbus-function.patch
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant-fix-deprecated-dbus-function.patch
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf
index f0c993d19..f0c993d19 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf-sane b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf-sane
index c91ffe0c8..c91ffe0c8 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf-sane
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant.conf-sane
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant_default.conf b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant_default.conf
index 8eebdeb5c..8eebdeb5c 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant_default.conf
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.2/wpa_supplicant_default.conf
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index 78ce914c3..78ce914c3 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.2.bb
index d1f6c6d6c..d1f6c6d6c 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.2.bb
diff --git a/meta/packages/zeroconf/zeroconf/compilefix.patch b/meta/recipes-connectivity/zeroconf/zeroconf/compilefix.patch
index b7b917dc2..b7b917dc2 100644
--- a/meta/packages/zeroconf/zeroconf/compilefix.patch
+++ b/meta/recipes-connectivity/zeroconf/zeroconf/compilefix.patch
diff --git a/meta/packages/zeroconf/zeroconf/debian-zeroconf b/meta/recipes-connectivity/zeroconf/zeroconf/debian-zeroconf
index c3705d278..c3705d278 100644
--- a/meta/packages/zeroconf/zeroconf/debian-zeroconf
+++ b/meta/recipes-connectivity/zeroconf/zeroconf/debian-zeroconf
diff --git a/meta/packages/zeroconf/zeroconf/zeroconf-default b/meta/recipes-connectivity/zeroconf/zeroconf/zeroconf-default
index cc07b275f..cc07b275f 100644
--- a/meta/packages/zeroconf/zeroconf/zeroconf-default
+++ b/meta/recipes-connectivity/zeroconf/zeroconf/zeroconf-default
diff --git a/meta/packages/zeroconf/zeroconf_0.9.bb b/meta/recipes-connectivity/zeroconf/zeroconf_0.9.bb
index f22466eea..f22466eea 100644
--- a/meta/packages/zeroconf/zeroconf_0.9.bb
+++ b/meta/recipes-connectivity/zeroconf/zeroconf_0.9.bb
diff --git a/meta/packages/base-files/base-files/akita/fstab b/meta/recipes-core/base-files/base-files/akita/fstab
index 5f2c94134..5f2c94134 100644
--- a/meta/packages/base-files/base-files/akita/fstab
+++ b/meta/recipes-core/base-files/base-files/akita/fstab
diff --git a/meta/packages/base-files/base-files/akita/rotation b/meta/recipes-core/base-files/base-files/akita/rotation
index 2a14d6089..2a14d6089 100644
--- a/meta/packages/base-files/base-files/akita/rotation
+++ b/meta/recipes-core/base-files/base-files/akita/rotation
diff --git a/meta/packages/base-files/base-files/c7x0/fstab b/meta/recipes-core/base-files/base-files/c7x0/fstab
index e065e8112..e065e8112 100644
--- a/meta/packages/base-files/base-files/c7x0/fstab
+++ b/meta/recipes-core/base-files/base-files/c7x0/fstab
diff --git a/meta/packages/base-files/base-files/c7x0/usbd b/meta/recipes-core/base-files/base-files/c7x0/usbd
index 40931ee8e..40931ee8e 100644
--- a/meta/packages/base-files/base-files/c7x0/usbd
+++ b/meta/recipes-core/base-files/base-files/c7x0/usbd
diff --git a/meta/packages/base-files/base-files/collie/fstab b/meta/recipes-core/base-files/base-files/collie/fstab
index dc3499b90..dc3499b90 100644
--- a/meta/packages/base-files/base-files/collie/fstab
+++ b/meta/recipes-core/base-files/base-files/collie/fstab
diff --git a/meta/packages/base-files/base-files/collie/usbd b/meta/recipes-core/base-files/base-files/collie/usbd
index 425761458..425761458 100644
--- a/meta/packages/base-files/base-files/collie/usbd
+++ b/meta/recipes-core/base-files/base-files/collie/usbd
diff --git a/meta/packages/base-files/base-files/filesystems b/meta/recipes-core/base-files/base-files/filesystems
index 653593a43..653593a43 100644
--- a/meta/packages/base-files/base-files/filesystems
+++ b/meta/recipes-core/base-files/base-files/filesystems
diff --git a/meta/packages/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab
index f0eed36ed..f0eed36ed 100644
--- a/meta/packages/base-files/base-files/fstab
+++ b/meta/recipes-core/base-files/base-files/fstab
diff --git a/meta/packages/base-files/base-files/host.conf b/meta/recipes-core/base-files/base-files/host.conf
index 1a8c1e151..1a8c1e151 100644
--- a/meta/packages/base-files/base-files/host.conf
+++ b/meta/recipes-core/base-files/base-files/host.conf
diff --git a/meta/packages/base-files/base-files/htcuniversal/rotation b/meta/recipes-core/base-files/base-files/htcuniversal/rotation
index 2a14d6089..2a14d6089 100644
--- a/meta/packages/base-files/base-files/htcuniversal/rotation
+++ b/meta/recipes-core/base-files/base-files/htcuniversal/rotation
diff --git a/meta/packages/base-files/base-files/hx2000/fstab b/meta/recipes-core/base-files/base-files/hx2000/fstab
index 2d4b7aae7..2d4b7aae7 100644
--- a/meta/packages/base-files/base-files/hx2000/fstab
+++ b/meta/recipes-core/base-files/base-files/hx2000/fstab
diff --git a/meta/packages/base-files/base-files/inputrc b/meta/recipes-core/base-files/base-files/inputrc
index b5c4c8af2..b5c4c8af2 100644
--- a/meta/packages/base-files/base-files/inputrc
+++ b/meta/recipes-core/base-files/base-files/inputrc
diff --git a/meta/packages/base-files/base-files/issue b/meta/recipes-core/base-files/base-files/issue
index 329af4665..329af4665 100644
--- a/meta/packages/base-files/base-files/issue
+++ b/meta/recipes-core/base-files/base-files/issue
diff --git a/meta/packages/base-files/base-files/issue.net b/meta/recipes-core/base-files/base-files/issue.net
index 6dc3588b4..6dc3588b4 100644
--- a/meta/packages/base-files/base-files/issue.net
+++ b/meta/recipes-core/base-files/base-files/issue.net
diff --git a/meta/packages/base-files/base-files/licenses/Artistic b/meta/recipes-core/base-files/base-files/licenses/Artistic
index 5f221241e..5f221241e 100644
--- a/meta/packages/base-files/base-files/licenses/Artistic
+++ b/meta/recipes-core/base-files/base-files/licenses/Artistic
diff --git a/meta/packages/base-files/base-files/licenses/BSD b/meta/recipes-core/base-files/base-files/licenses/BSD
index c7a0aa4f9..c7a0aa4f9 100644
--- a/meta/packages/base-files/base-files/licenses/BSD
+++ b/meta/recipes-core/base-files/base-files/licenses/BSD
diff --git a/meta/packages/base-files/base-files/licenses/GFDL-1.2 b/meta/recipes-core/base-files/base-files/licenses/GFDL-1.2
index 4a0fe1c8d..4a0fe1c8d 100644
--- a/meta/packages/base-files/base-files/licenses/GFDL-1.2
+++ b/meta/recipes-core/base-files/base-files/licenses/GFDL-1.2
diff --git a/meta/packages/base-files/base-files/licenses/GPL-2 b/meta/recipes-core/base-files/base-files/licenses/GPL-2
index d60c31a97..d60c31a97 100644
--- a/meta/packages/base-files/base-files/licenses/GPL-2
+++ b/meta/recipes-core/base-files/base-files/licenses/GPL-2
diff --git a/meta/packages/base-files/base-files/licenses/GPL-3 b/meta/recipes-core/base-files/base-files/licenses/GPL-3
index 443254047..443254047 100644
--- a/meta/packages/base-files/base-files/licenses/GPL-3
+++ b/meta/recipes-core/base-files/base-files/licenses/GPL-3
diff --git a/meta/packages/base-files/base-files/licenses/LGPL-2 b/meta/recipes-core/base-files/base-files/licenses/LGPL-2
index f5030495b..f5030495b 100644
--- a/meta/packages/base-files/base-files/licenses/LGPL-2
+++ b/meta/recipes-core/base-files/base-files/licenses/LGPL-2
diff --git a/meta/packages/base-files/base-files/licenses/LGPL-2.1 b/meta/recipes-core/base-files/base-files/licenses/LGPL-2.1
index b124cf581..b124cf581 100644
--- a/meta/packages/base-files/base-files/licenses/LGPL-2.1
+++ b/meta/recipes-core/base-files/base-files/licenses/LGPL-2.1
diff --git a/meta/packages/base-files/base-files/licenses/LGPL-3 b/meta/recipes-core/base-files/base-files/licenses/LGPL-3
index fc8a5de7e..fc8a5de7e 100644
--- a/meta/packages/base-files/base-files/licenses/LGPL-3
+++ b/meta/recipes-core/base-files/base-files/licenses/LGPL-3
diff --git a/meta/packages/base-files/base-files/motd b/meta/recipes-core/base-files/base-files/motd
index e69de29bb..e69de29bb 100644
--- a/meta/packages/base-files/base-files/motd
+++ b/meta/recipes-core/base-files/base-files/motd
diff --git a/meta/packages/base-files/base-files/mtx-1/fstab b/meta/recipes-core/base-files/base-files/mtx-1/fstab
index ee3fab0c1..ee3fab0c1 100644
--- a/meta/packages/base-files/base-files/mtx-1/fstab
+++ b/meta/recipes-core/base-files/base-files/mtx-1/fstab
diff --git a/meta/packages/base-files/base-files/mtx-1/profile b/meta/recipes-core/base-files/base-files/mtx-1/profile
index bedf2fc7d..bedf2fc7d 100644
--- a/meta/packages/base-files/base-files/mtx-1/profile
+++ b/meta/recipes-core/base-files/base-files/mtx-1/profile
diff --git a/meta/packages/base-files/base-files/nokia770/fstab b/meta/recipes-core/base-files/base-files/nokia770/fstab
index 7dbae252f..7dbae252f 100644
--- a/meta/packages/base-files/base-files/nokia770/fstab
+++ b/meta/recipes-core/base-files/base-files/nokia770/fstab
diff --git a/meta/packages/base-files/base-files/nsswitch.conf b/meta/recipes-core/base-files/base-files/nsswitch.conf
index 06f03d22a..06f03d22a 100644
--- a/meta/packages/base-files/base-files/nsswitch.conf
+++ b/meta/recipes-core/base-files/base-files/nsswitch.conf
diff --git a/meta/packages/base-files/base-files/poodle/fstab b/meta/recipes-core/base-files/base-files/poodle/fstab
index b96b750eb..b96b750eb 100644
--- a/meta/packages/base-files/base-files/poodle/fstab
+++ b/meta/recipes-core/base-files/base-files/poodle/fstab
diff --git a/meta/packages/base-files/base-files/poodle/usbd b/meta/recipes-core/base-files/base-files/poodle/usbd
index 40931ee8e..40931ee8e 100644
--- a/meta/packages/base-files/base-files/poodle/usbd
+++ b/meta/recipes-core/base-files/base-files/poodle/usbd
diff --git a/meta/packages/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index aa1c20fdb..aa1c20fdb 100644
--- a/meta/packages/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
diff --git a/meta/packages/base-files/base-files/rotation b/meta/recipes-core/base-files/base-files/rotation
index c22708346..c22708346 100644
--- a/meta/packages/base-files/base-files/rotation
+++ b/meta/recipes-core/base-files/base-files/rotation
diff --git a/meta/packages/base-files/base-files/share/dot.bashrc b/meta/recipes-core/base-files/base-files/share/dot.bashrc
index 4be63686c..4be63686c 100644
--- a/meta/packages/base-files/base-files/share/dot.bashrc
+++ b/meta/recipes-core/base-files/base-files/share/dot.bashrc
diff --git a/meta/packages/base-files/base-files/share/dot.profile b/meta/recipes-core/base-files/base-files/share/dot.profile
index 979793e8b..979793e8b 100644
--- a/meta/packages/base-files/base-files/share/dot.profile
+++ b/meta/recipes-core/base-files/base-files/share/dot.profile
diff --git a/meta/packages/base-files/base-files/shells b/meta/recipes-core/base-files/base-files/shells
index ce39b3dde..ce39b3dde 100644
--- a/meta/packages/base-files/base-files/shells
+++ b/meta/recipes-core/base-files/base-files/shells
diff --git a/meta/packages/base-files/base-files/spitz/fstab b/meta/recipes-core/base-files/base-files/spitz/fstab
index 3d0e508df..3d0e508df 100644
--- a/meta/packages/base-files/base-files/spitz/fstab
+++ b/meta/recipes-core/base-files/base-files/spitz/fstab
diff --git a/meta/packages/base-files/base-files/spitz/rotation b/meta/recipes-core/base-files/base-files/spitz/rotation
index 2a14d6089..2a14d6089 100644
--- a/meta/packages/base-files/base-files/spitz/rotation
+++ b/meta/recipes-core/base-files/base-files/spitz/rotation
diff --git a/meta/packages/base-files/base-files/sysctl.conf b/meta/recipes-core/base-files/base-files/sysctl.conf
index d466a94ee..d466a94ee 100644
--- a/meta/packages/base-files/base-files/sysctl.conf
+++ b/meta/recipes-core/base-files/base-files/sysctl.conf
diff --git a/meta/packages/base-files/base-files/tosa/fstab b/meta/recipes-core/base-files/base-files/tosa/fstab
index e065e8112..e065e8112 100644
--- a/meta/packages/base-files/base-files/tosa/fstab
+++ b/meta/recipes-core/base-files/base-files/tosa/fstab
diff --git a/meta/packages/base-files/base-files/tosa/usbd b/meta/recipes-core/base-files/base-files/tosa/usbd
index 8c8004416..8c8004416 100644
--- a/meta/packages/base-files/base-files/tosa/usbd
+++ b/meta/recipes-core/base-files/base-files/tosa/usbd
diff --git a/meta/packages/base-files/base-files/usbd b/meta/recipes-core/base-files/base-files/usbd
index e69de29bb..e69de29bb 100644
--- a/meta/packages/base-files/base-files/usbd
+++ b/meta/recipes-core/base-files/base-files/usbd
diff --git a/meta/packages/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index a8f092db0..a8f092db0 100644
--- a/meta/packages/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
diff --git a/meta/packages/base-passwd/base-passwd-3.5.22/mysql.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
index 8bfd75792..8bfd75792 100644
--- a/meta/packages/base-passwd/base-passwd-3.5.22/mysql.patch
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
diff --git a/meta/packages/base-passwd/base-passwd-3.5.22/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
index 52650166f..52650166f 100644
--- a/meta/packages/base-passwd/base-passwd-3.5.22/nobash.patch
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
diff --git a/meta/packages/base-passwd/base-passwd-3.5.22/root-home.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
index 87c4655a0..87c4655a0 100644
--- a/meta/packages/base-passwd/base-passwd-3.5.22/root-home.patch
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
diff --git a/meta/packages/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
index f0ca8e628..f0ca8e628 100644
--- a/meta/packages/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
diff --git a/meta/packages/busybox/busybox-1.16.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch
index 803dc411d..803dc411d 100644
--- a/meta/packages/busybox/busybox-1.16.2/B921600.patch
+++ b/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch
diff --git a/meta/packages/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
index 041aa6c54..041aa6c54 100644
--- a/meta/packages/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
+++ b/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
diff --git a/meta/packages/busybox/busybox-1.16.2/defconfig b/meta/recipes-core/busybox/busybox-1.16.2/defconfig
index 431da94dd..431da94dd 100644
--- a/meta/packages/busybox/busybox-1.16.2/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.16.2/defconfig
diff --git a/meta/packages/busybox/busybox-1.16.2/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch
index bc9b427ea..bc9b427ea 100644
--- a/meta/packages/busybox/busybox-1.16.2/get_header_tar.patch
+++ b/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch
diff --git a/meta/packages/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
index bedb97443..bedb97443 100644
--- a/meta/packages/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
diff --git a/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch b/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
index 89eeb425a..89eeb425a 100644
--- a/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
+++ b/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
diff --git a/meta/packages/busybox/busybox-1.16.2/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch
index 81bca634a..81bca634a 100644
--- a/meta/packages/busybox/busybox-1.16.2/udhcpscript.patch
+++ b/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch
diff --git a/meta/packages/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 8c258135c..8c258135c 100644
--- a/meta/packages/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
diff --git a/meta/packages/busybox/busybox_1.16.2.bb b/meta/recipes-core/busybox/busybox_1.16.2.bb
index 0952f4ddb..0952f4ddb 100644
--- a/meta/packages/busybox/busybox_1.16.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.16.2.bb
diff --git a/meta/packages/busybox/files/busybox-cron b/meta/recipes-core/busybox/files/busybox-cron
index f0e6b1562..f0e6b1562 100755
--- a/meta/packages/busybox/files/busybox-cron
+++ b/meta/recipes-core/busybox/files/busybox-cron
diff --git a/meta/packages/busybox/files/busybox-httpd b/meta/recipes-core/busybox/files/busybox-httpd
index c8348e54a..c8348e54a 100755
--- a/meta/packages/busybox/files/busybox-httpd
+++ b/meta/recipes-core/busybox/files/busybox-httpd
diff --git a/meta/packages/busybox/files/busybox-udhcpd b/meta/recipes-core/busybox/files/busybox-udhcpd
index c43903e8d..c43903e8d 100755
--- a/meta/packages/busybox/files/busybox-udhcpd
+++ b/meta/recipes-core/busybox/files/busybox-udhcpd
diff --git a/meta/packages/busybox/files/default.script b/meta/recipes-core/busybox/files/default.script
index f2ac987a2..f2ac987a2 100644
--- a/meta/packages/busybox/files/default.script
+++ b/meta/recipes-core/busybox/files/default.script
diff --git a/meta/packages/busybox/files/find-touchscreen.sh b/meta/recipes-core/busybox/files/find-touchscreen.sh
index 1582ea891..1582ea891 100644
--- a/meta/packages/busybox/files/find-touchscreen.sh
+++ b/meta/recipes-core/busybox/files/find-touchscreen.sh
diff --git a/meta/packages/busybox/files/hwclock.sh b/meta/recipes-core/busybox/files/hwclock.sh
index 2e50425ba..2e50425ba 100644
--- a/meta/packages/busybox/files/hwclock.sh
+++ b/meta/recipes-core/busybox/files/hwclock.sh
diff --git a/meta/packages/busybox/files/mount.busybox b/meta/recipes-core/busybox/files/mount.busybox
index fef945b7b..fef945b7b 100755
--- a/meta/packages/busybox/files/mount.busybox
+++ b/meta/recipes-core/busybox/files/mount.busybox
diff --git a/meta/packages/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script
index 5cc21b9de..5cc21b9de 100644
--- a/meta/packages/busybox/files/simple.script
+++ b/meta/recipes-core/busybox/files/simple.script
diff --git a/meta/packages/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index 9edaa1505..9edaa1505 100644
--- a/meta/packages/busybox/files/syslog
+++ b/meta/recipes-core/busybox/files/syslog
diff --git a/meta/packages/busybox/files/syslog.conf b/meta/recipes-core/busybox/files/syslog.conf
index d4a0e02f5..d4a0e02f5 100644
--- a/meta/packages/busybox/files/syslog.conf
+++ b/meta/recipes-core/busybox/files/syslog.conf
diff --git a/meta/packages/busybox/files/umount.busybox b/meta/recipes-core/busybox/files/umount.busybox
index f3731626e..f3731626e 100755
--- a/meta/packages/busybox/files/umount.busybox
+++ b/meta/recipes-core/busybox/files/umount.busybox
diff --git a/meta/packages/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
index f6bd91e3e..f6bd91e3e 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/codepage.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
diff --git a/meta/packages/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
index 29012fe88..29012fe88 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/compile.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
diff --git a/meta/packages/console-tools/console-tools-0.3.2/config/codeset.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4
index 863c9cfa7..863c9cfa7 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/config/codeset.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4
diff --git a/meta/packages/console-tools/console-tools-0.3.2/config/gettext.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4
index e4d524cf0..e4d524cf0 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/config/gettext.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4
diff --git a/meta/packages/console-tools/console-tools-0.3.2/config/glibc21.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4
index 5b88ef231..5b88ef231 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/config/glibc21.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4
diff --git a/meta/packages/console-tools/console-tools-0.3.2/config/iconv.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4
index 17237344a..17237344a 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/config/iconv.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4
diff --git a/meta/packages/console-tools/console-tools-0.3.2/config/lcmessage.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4
index 18d47a94f..18d47a94f 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/config/lcmessage.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4
diff --git a/meta/packages/console-tools/console-tools-0.3.2/config/progtest.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4
index 35dc3da1f..35dc3da1f 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/config/progtest.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4
diff --git a/meta/packages/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
index f5b75327e..f5b75327e 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/configure.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
diff --git a/meta/packages/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
index 47d7ea54b..47d7ea54b 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/kbdrate.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
diff --git a/meta/packages/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
index c73d8a3d9..c73d8a3d9 100644
--- a/meta/packages/console-tools/console-tools-0.3.2/uclibc-fileno.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
diff --git a/meta/packages/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 3c5067f10..3c5067f10 100644
--- a/meta/packages/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
diff --git a/meta/packages/dbus-wait/dbus-wait_svn.bb b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
index 10e1db812..10e1db812 100644
--- a/meta/packages/dbus-wait/dbus-wait_svn.bb
+++ b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
diff --git a/meta/packages/dbus/dbus-1.2.24/dbus-1.init b/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init
index 4abc4cbf7..4abc4cbf7 100644
--- a/meta/packages/dbus/dbus-1.2.24/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init
diff --git a/meta/packages/dbus/dbus-1.2.24/fix-install-daemon.patch b/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
index edb63a5fa..edb63a5fa 100644
--- a/meta/packages/dbus/dbus-1.2.24/fix-install-daemon.patch
+++ b/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
diff --git a/meta/packages/dbus/dbus-1.2.24/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch
index f5c22af12..f5c22af12 100644
--- a/meta/packages/dbus/dbus-1.2.24/tmpdir.patch
+++ b/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch
diff --git a/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch b/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch
index 306555768..306555768 100644
--- a/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch
+++ b/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch
diff --git a/meta/packages/dbus/dbus-glib-0.86/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch
index 32609b9b9..32609b9b9 100644
--- a/meta/packages/dbus/dbus-glib-0.86/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch
diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index 985c565e8..985c565e8 100644
--- a/meta/packages/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
diff --git a/meta/packages/dbus/dbus-glib_0.86.bb b/meta/recipes-core/dbus/dbus-glib_0.86.bb
index 000146ab7..000146ab7 100644
--- a/meta/packages/dbus/dbus-glib_0.86.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.86.bb
diff --git a/meta/packages/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 90a38e66a..90a38e66a 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
diff --git a/meta/packages/dbus/dbus_1.2.24.bb b/meta/recipes-core/dbus/dbus_1.2.24.bb
index 8e3e329fd..8e3e329fd 100644
--- a/meta/packages/dbus/dbus_1.2.24.bb
+++ b/meta/recipes-core/dbus/dbus_1.2.24.bb
diff --git a/meta/packages/dropbear/dropbear-0.52/configure.patch b/meta/recipes-core/dropbear/dropbear-0.52/configure.patch
index 8d11b23f1..8d11b23f1 100644
--- a/meta/packages/dropbear/dropbear-0.52/configure.patch
+++ b/meta/recipes-core/dropbear/dropbear-0.52/configure.patch
diff --git a/meta/packages/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1d78d5c59..1d78d5c59 100644
--- a/meta/packages/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
diff --git a/meta/packages/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
index 2ae361c63..2ae361c63 100644
--- a/meta/packages/dropbear/dropbear/allow-nopw.patch
+++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
diff --git a/meta/packages/dropbear/dropbear/fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch
index ba2b19d44..ba2b19d44 100644
--- a/meta/packages/dropbear/dropbear/fix-2kb-keys.patch
+++ b/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch
diff --git a/meta/packages/dropbear/dropbear/init b/meta/recipes-core/dropbear/dropbear/init
index e882bae68..e882bae68 100755
--- a/meta/packages/dropbear/dropbear/init
+++ b/meta/recipes-core/dropbear/dropbear/init
diff --git a/meta/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
index 75ba30656..75ba30656 100644
--- a/meta/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
+++ b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
diff --git a/meta/packages/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 51217ea39..51217ea39 100644
--- a/meta/packages/dropbear/dropbear_0.52.bb
+++ b/meta/recipes-core/dropbear/dropbear_0.52.bb
diff --git a/meta/packages/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
index 0999a8515..0999a8515 100644
--- a/meta/packages/eggdbus/eggdbus/gtk-doc.patch
+++ b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
diff --git a/meta/packages/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch
index 2b2cb4985..2b2cb4985 100644
--- a/meta/packages/eggdbus/eggdbus/marshal.patch
+++ b/meta/recipes-core/eggdbus/eggdbus/marshal.patch
diff --git a/meta/packages/eggdbus/eggdbus_0.6.bb b/meta/recipes-core/eggdbus/eggdbus_0.6.bb
index 3a0d0fed1..3a0d0fed1 100644
--- a/meta/packages/eggdbus/eggdbus_0.6.bb
+++ b/meta/recipes-core/eggdbus/eggdbus_0.6.bb
diff --git a/meta/packages/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
index 4d3e0613b..4d3e0613b 100644
--- a/meta/packages/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
diff --git a/meta/packages/eglibc/eglibc-2.12/armv4t-interworking.patch b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch
index 6ab306180..6ab306180 100644
--- a/meta/packages/eglibc/eglibc-2.12/armv4t-interworking.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch
diff --git a/meta/packages/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
index 99c3fef80..99c3fef80 100644
--- a/meta/packages/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
diff --git a/meta/packages/eglibc/eglibc-2.12/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf
index dfa65edb8..dfa65edb8 100644
--- a/meta/packages/eglibc/eglibc-2.12/etc/ld.so.conf
+++ b/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf
diff --git a/meta/packages/eglibc/eglibc-2.12/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk
index d2a28c2dc..d2a28c2dc 100644
--- a/meta/packages/eglibc/eglibc-2.12/generate-supported.mk
+++ b/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk
diff --git a/meta/packages/eglibc/eglibc-2.12/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
index 57835adcd..57835adcd 100644
--- a/meta/packages/eglibc/eglibc-2.12/shorten-build-commands.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
diff --git a/meta/packages/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index eb765df17..eb765df17 100644
--- a/meta/packages/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
diff --git a/meta/packages/eglibc/eglibc-initial_2.12.bb b/meta/recipes-core/eglibc/eglibc-initial_2.12.bb
index 787c76260..787c76260 100644
--- a/meta/packages/eglibc/eglibc-initial_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc-initial_2.12.bb
diff --git a/meta/packages/eglibc/eglibc-package.bbclass b/meta/recipes-core/eglibc/eglibc-package.bbclass
index 4e286afa8..4e286afa8 100644
--- a/meta/packages/eglibc/eglibc-package.bbclass
+++ b/meta/recipes-core/eglibc/eglibc-package.bbclass
diff --git a/meta/packages/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 66bb90e83..66bb90e83 100644
--- a/meta/packages/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
diff --git a/meta/packages/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index a21498070..a21498070 100644
--- a/meta/packages/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
diff --git a/meta/packages/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
index ff1578f47..ff1578f47 100644
--- a/meta/packages/expat/expat-2.0.1/autotools.patch
+++ b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
diff --git a/meta/packages/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 8c5010e48..8c5010e48 100644
--- a/meta/packages/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
diff --git a/meta/packages/expat/expat_2.0.1.bb b/meta/recipes-core/expat/expat_2.0.1.bb
index 9983fe583..9983fe583 100644
--- a/meta/packages/expat/expat_2.0.1.bb
+++ b/meta/recipes-core/expat/expat_2.0.1.bb
diff --git a/meta/packages/gettext/gettext-0.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.17/autotools.patch
index 9f16b1881..9f16b1881 100644
--- a/meta/packages/gettext/gettext-0.17/autotools.patch
+++ b/meta/recipes-core/gettext/gettext-0.17/autotools.patch
diff --git a/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
index 0f67cd0b2..0f67cd0b2 100644
--- a/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch
+++ b/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
diff --git a/meta/packages/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
index a02457fab..a02457fab 100644
--- a/meta/packages/gettext/gettext-0.17/m4fix.patch
+++ b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
diff --git a/meta/packages/gettext/gettext-0.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
index 111714b54..111714b54 100644
--- a/meta/packages/gettext/gettext-0.17/use_open_properly.patch
+++ b/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
diff --git a/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
index 7b3880bf7..7b3880bf7 100644
--- a/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch
+++ b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
diff --git a/meta/packages/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.17.bb
index c945891e2..c945891e2 100644
--- a/meta/packages/gettext/gettext_0.17.bb
+++ b/meta/recipes-core/gettext/gettext_0.17.bb
diff --git a/meta/packages/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
index 1676b3e25..1676b3e25 100644
--- a/meta/packages/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
diff --git a/meta/packages/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
index 3ba79b898..3ba79b898 100644
--- a/meta/packages/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
diff --git a/meta/packages/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
index 1f3920f03..1f3920f03 100644
--- a/meta/packages/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
diff --git a/meta/packages/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
index c44e49155..c44e49155 100644
--- a/meta/packages/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
diff --git a/meta/packages/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
index ccbbd2b35..ccbbd2b35 100644
--- a/meta/packages/glib-2.0/glib-2.0.inc
+++ b/meta/recipes-core/glib-2.0/glib-2.0.inc
diff --git a/meta/packages/glib-2.0/glib-2.0_2.24.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
index d8d1cc52d..d8d1cc52d 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.24.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
diff --git a/meta/packages/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 6e7f6a334..6e7f6a334 100644
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
diff --git a/meta/packages/glibc/glibc-2.10.1/arm-check-pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
index b9c72262f..b9c72262f 100644
--- a/meta/packages/glibc/glibc-2.10.1/arm-check-pf.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/arm-longlong.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
index 28aca83df..28aca83df 100644
--- a/meta/packages/glibc/glibc-2.10.1/arm-longlong.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
index 5c8062ece..5c8062ece 100644
--- a/meta/packages/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/arm-memcpy.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
index bc2b3dab8..bc2b3dab8 100644
--- a/meta/packages/glibc/glibc-2.10.1/arm-memcpy.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/dl-cache-libcmp.patch b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
index 2fedfa6db..2fedfa6db 100644
--- a/meta/packages/glibc/glibc-2.10.1/dl-cache-libcmp.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/etc/ld.so.conf b/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
index ddd777db2..ddd777db2 100644
--- a/meta/packages/glibc/glibc-2.10.1/etc/ld.so.conf
+++ b/meta/recipes-core/glibc/glibc-2.10.1/etc/ld.so.conf
diff --git a/meta/packages/glibc/glibc-2.10.1/fhs-linux-paths.patch b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
index 1f32f6d7f..1f32f6d7f 100644
--- a/meta/packages/glibc/glibc-2.10.1/fhs-linux-paths.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/generate-supported.mk b/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
index d2a28c2dc..d2a28c2dc 100644
--- a/meta/packages/glibc/glibc-2.10.1/generate-supported.mk
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generate-supported.mk
diff --git a/meta/packages/glibc/glibc-2.10.1/generic-bits_select.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
index 47e7dedc3..47e7dedc3 100644
--- a/meta/packages/glibc/glibc-2.10.1/generic-bits_select.h
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_select.h
diff --git a/meta/packages/glibc/glibc-2.10.1/generic-bits_time.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
index b3184d1de..b3184d1de 100644
--- a/meta/packages/glibc/glibc-2.10.1/generic-bits_time.h
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_time.h
diff --git a/meta/packages/glibc/glibc-2.10.1/generic-bits_types.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
index 65c8a9fe9..65c8a9fe9 100644
--- a/meta/packages/glibc/glibc-2.10.1/generic-bits_types.h
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_types.h
diff --git a/meta/packages/glibc/glibc-2.10.1/generic-bits_typesizes.h b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
index e9226c417..e9226c417 100644
--- a/meta/packages/glibc/glibc-2.10.1/generic-bits_typesizes.h
+++ b/meta/recipes-core/glibc/glibc-2.10.1/generic-bits_typesizes.h
diff --git a/meta/packages/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
index 09200dd43..09200dd43 100644
--- a/meta/packages/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
diff --git a/meta/packages/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
index a552cf0d1..a552cf0d1 100644
--- a/meta/packages/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
diff --git a/meta/packages/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
index 7eb17179b..7eb17179b 100644
--- a/meta/packages/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
diff --git a/meta/packages/glibc/glibc-2.10.1/glibc-check_pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
index 3cff6bbcf..3cff6bbcf 100644
--- a/meta/packages/glibc/glibc-2.10.1/glibc-check_pf.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/ldd-unbash.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
index 2fb8854b4..2fb8854b4 100644
--- a/meta/packages/glibc/glibc-2.10.1/ldd-unbash.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/ldsocache-varrun.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
index 9994d4f87..9994d4f87 100644
--- a/meta/packages/glibc/glibc-2.10.1/ldsocache-varrun.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/local-args6.diff b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
index 28c957f24..28c957f24 100644
--- a/meta/packages/glibc/glibc-2.10.1/local-args6.diff
+++ b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
diff --git a/meta/packages/glibc/glibc-2.10.1/march-i686.patch b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
index 04616032a..04616032a 100644
--- a/meta/packages/glibc/glibc-2.10.1/march-i686.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/nptl-crosscompile.patch b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
index 18a46ad4f..18a46ad4f 100644
--- a/meta/packages/glibc/glibc-2.10.1/nptl-crosscompile.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/nscd-init.patch b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
index 884609a5a..884609a5a 100644
--- a/meta/packages/glibc/glibc-2.10.1/nscd-init.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
diff --git a/meta/packages/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
index 1046efb2a..1046efb2a 100644
--- a/meta/packages/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
+++ b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
diff --git a/meta/packages/glibc/glibc-2.10.1/rulesfix.patch b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
index 67bfc9467..67bfc9467 100644
--- a/meta/packages/glibc/glibc-2.10.1/rulesfix.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
index 8d864db91..8d864db91 100644
--- a/meta/packages/glibc/glibc-initial.inc
+++ b/meta/recipes-core/glibc/glibc-initial.inc
diff --git a/meta/packages/glibc/glibc-initial_2.10.1.bb b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb
index d66297090..d66297090 100644
--- a/meta/packages/glibc/glibc-initial_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc-initial_2.10.1.bb
diff --git a/meta/packages/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 858bc522b..858bc522b 100644
--- a/meta/packages/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
diff --git a/meta/packages/glibc/glibc-stage.inc b/meta/recipes-core/glibc/glibc-stage.inc
index e69de29bb..e69de29bb 100644
--- a/meta/packages/glibc/glibc-stage.inc
+++ b/meta/recipes-core/glibc/glibc-stage.inc
diff --git a/meta/packages/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index ecaf593b2..ecaf593b2 100644
--- a/meta/packages/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
diff --git a/meta/packages/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index 2a118a4af..2a118a4af 100644
--- a/meta/packages/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
diff --git a/meta/packages/glibc/ldconfig-native-2.5/32and64bit.patch b/meta/recipes-core/glibc/ldconfig-native-2.5/32and64bit.patch
index 4f8d3a39c..4f8d3a39c 100644
--- a/meta/packages/glibc/ldconfig-native-2.5/32and64bit.patch
+++ b/meta/recipes-core/glibc/ldconfig-native-2.5/32and64bit.patch
diff --git a/meta/packages/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
index 693b35ced..693b35ced 100644
--- a/meta/packages/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
diff --git a/meta/packages/glibc/ldconfig-native-2.5/ldconfig.patch b/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig.patch
index d143a075f..d143a075f 100644
--- a/meta/packages/glibc/ldconfig-native-2.5/ldconfig.patch
+++ b/meta/recipes-core/glibc/ldconfig-native-2.5/ldconfig.patch
diff --git a/meta/packages/glibc/ldconfig-native_2.5.bb b/meta/recipes-core/glibc/ldconfig-native_2.5.bb
index d08787af6..d08787af6 100644
--- a/meta/packages/glibc/ldconfig-native_2.5.bb
+++ b/meta/recipes-core/glibc/ldconfig-native_2.5.bb
diff --git a/meta/packages/images/poky-image-base.bb b/meta/recipes-core/images/poky-image-base.bb
index d214642c4..d214642c4 100644
--- a/meta/packages/images/poky-image-base.bb
+++ b/meta/recipes-core/images/poky-image-base.bb
diff --git a/meta/packages/images/poky-image-directdisk.inc b/meta/recipes-core/images/poky-image-directdisk.inc
index 64144b9ab..64144b9ab 100644
--- a/meta/packages/images/poky-image-directdisk.inc
+++ b/meta/recipes-core/images/poky-image-directdisk.inc
diff --git a/meta/packages/images/poky-image-live.inc b/meta/recipes-core/images/poky-image-live.inc
index 7f8dd8fba..7f8dd8fba 100644
--- a/meta/packages/images/poky-image-live.inc
+++ b/meta/recipes-core/images/poky-image-live.inc
diff --git a/meta/packages/images/poky-image-minimal-directdisk.bb b/meta/recipes-core/images/poky-image-minimal-directdisk.bb
index e06846460..e06846460 100644
--- a/meta/packages/images/poky-image-minimal-directdisk.bb
+++ b/meta/recipes-core/images/poky-image-minimal-directdisk.bb
diff --git a/meta/packages/images/poky-image-minimal-initramfs.bb b/meta/recipes-core/images/poky-image-minimal-initramfs.bb
index ef7784b62..ef7784b62 100644
--- a/meta/packages/images/poky-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/poky-image-minimal-initramfs.bb
diff --git a/meta/packages/images/poky-image-minimal-live.bb b/meta/recipes-core/images/poky-image-minimal-live.bb
index 7d9aa5f15..7d9aa5f15 100644
--- a/meta/packages/images/poky-image-minimal-live.bb
+++ b/meta/recipes-core/images/poky-image-minimal-live.bb
diff --git a/meta/packages/images/poky-image-minimal-mtdutils.bb b/meta/recipes-core/images/poky-image-minimal-mtdutils.bb
index d786131d9..d786131d9 100644
--- a/meta/packages/images/poky-image-minimal-mtdutils.bb
+++ b/meta/recipes-core/images/poky-image-minimal-mtdutils.bb
diff --git a/meta/packages/images/poky-image-minimal.bb b/meta/recipes-core/images/poky-image-minimal.bb
index 44710a4ca..44710a4ca 100644
--- a/meta/packages/images/poky-image-minimal.bb
+++ b/meta/recipes-core/images/poky-image-minimal.bb
diff --git a/meta/packages/initrdscripts/files/init-boot.sh b/meta/recipes-core/initrdscripts/files/init-boot.sh
index 9d804fc3a..9d804fc3a 100644
--- a/meta/packages/initrdscripts/files/init-boot.sh
+++ b/meta/recipes-core/initrdscripts/files/init-boot.sh
diff --git a/meta/packages/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index ecd0a1b44..ecd0a1b44 100644
--- a/meta/packages/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
diff --git a/meta/packages/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index c96b1f47c..c96b1f47c 100644
--- a/meta/packages/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
diff --git a/meta/packages/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
index 04ce51faf..04ce51faf 100644
--- a/meta/packages/initrdscripts/initramfs-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
diff --git a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index ba36a5804..ba36a5804 100644
--- a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
diff --git a/meta/packages/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index b15621b66..b15621b66 100644
--- a/meta/packages/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
diff --git a/meta/packages/initscripts/initscripts-1.0/arm/alignment.sh b/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
index b577b9a03..b577b9a03 100644
--- a/meta/packages/initscripts/initscripts-1.0/arm/alignment.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/banner.sh b/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
index 9e2b09125..9e2b09125 100644
--- a/meta/packages/initscripts/initscripts-1.0/banner.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index bd11f9a2f..bd11f9a2f 100755
--- a/meta/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/checkfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
index 91897d4cb..91897d4cb 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
index 02697ce9b..02697ce9b 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/device_table.txt b/meta/recipes-core/initscripts/initscripts-1.0/device_table.txt
index a302c5aca..a302c5aca 100644
--- a/meta/packages/initscripts/initscripts-1.0/device_table.txt
+++ b/meta/recipes-core/initscripts/initscripts-1.0/device_table.txt
diff --git a/meta/packages/initscripts/initscripts-1.0/devpts b/meta/recipes-core/initscripts/initscripts-1.0/devpts
index 4a0978b40..4a0978b40 100644
--- a/meta/packages/initscripts/initscripts-1.0/devpts
+++ b/meta/recipes-core/initscripts/initscripts-1.0/devpts
diff --git a/meta/packages/initscripts/initscripts-1.0/devpts.sh b/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
index 18202adcc..18202adcc 100755
--- a/meta/packages/initscripts/initscripts-1.0/devpts.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/finish.sh b/meta/recipes-core/initscripts/initscripts-1.0/finish.sh
index 183a384fa..183a384fa 100755
--- a/meta/packages/initscripts/initscripts-1.0/finish.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/finish.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/functions b/meta/recipes-core/initscripts/initscripts-1.0/functions
index 689fd32b3..689fd32b3 100644
--- a/meta/packages/initscripts/initscripts-1.0/functions
+++ b/meta/recipes-core/initscripts/initscripts-1.0/functions
diff --git a/meta/packages/initscripts/initscripts-1.0/halt b/meta/recipes-core/initscripts/initscripts-1.0/halt
index 609b793b7..609b793b7 100755
--- a/meta/packages/initscripts/initscripts-1.0/halt
+++ b/meta/recipes-core/initscripts/initscripts-1.0/halt
diff --git a/meta/packages/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
index 4399ee7b1..4399ee7b1 100755
--- a/meta/packages/initscripts/initscripts-1.0/hostname.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/jornada6xx/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
index 9e2d3cfc8..9e2d3cfc8 100755
--- a/meta/packages/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/jornada6xx/checkroot.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/jornada7xx/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
index 9e2d3cfc8..9e2d3cfc8 100755
--- a/meta/packages/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/jornada7xx/checkroot.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/mountall.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
index 9d4f97b68..9d4f97b68 100755
--- a/meta/packages/initscripts/initscripts-1.0/mountall.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
index 46c58b16a..46c58b16a 100755
--- a/meta/packages/initscripts/initscripts-1.0/mountnfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/om-gta01/inittab b/meta/recipes-core/initscripts/initscripts-1.0/om-gta01/inittab
index 8d313b2a5..8d313b2a5 100644
--- a/meta/packages/initscripts/initscripts-1.0/om-gta01/inittab
+++ b/meta/recipes-core/initscripts/initscripts-1.0/om-gta01/inittab
diff --git a/meta/packages/initscripts/initscripts-1.0/openmn/extractfs b/meta/recipes-core/initscripts/initscripts-1.0/openmn/extractfs
index 7e57dedd2..7e57dedd2 100755
--- a/meta/packages/initscripts/initscripts-1.0/openmn/extractfs
+++ b/meta/recipes-core/initscripts/initscripts-1.0/openmn/extractfs
diff --git a/meta/packages/initscripts/initscripts-1.0/openmn/packages b/meta/recipes-core/initscripts/initscripts-1.0/openmn/packages
index 2566487d2..2566487d2 100755
--- a/meta/packages/initscripts/initscripts-1.0/openmn/packages
+++ b/meta/recipes-core/initscripts/initscripts-1.0/openmn/packages
diff --git a/meta/packages/initscripts/initscripts-1.0/openmn/umountfs b/meta/recipes-core/initscripts/initscripts-1.0/openmn/umountfs
index 399194109..399194109 100755
--- a/meta/packages/initscripts/initscripts-1.0/openmn/umountfs
+++ b/meta/recipes-core/initscripts/initscripts-1.0/openmn/umountfs
diff --git a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 1813fd124..1813fd124 100755
--- a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/reboot b/meta/recipes-core/initscripts/initscripts-1.0/reboot
index 4c55885ab..4c55885ab 100755
--- a/meta/packages/initscripts/initscripts-1.0/reboot
+++ b/meta/recipes-core/initscripts/initscripts-1.0/reboot
diff --git a/meta/packages/initscripts/initscripts-1.0/rmnologin.sh b/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
index 417efc245..417efc245 100755
--- a/meta/packages/initscripts/initscripts-1.0/rmnologin.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
index 75e43001b..75e43001b 100644
--- a/meta/packages/initscripts/initscripts-1.0/save-rtc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/sendsigs b/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
index 2b0f8f363..2b0f8f363 100755
--- a/meta/packages/initscripts/initscripts-1.0/sendsigs
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
diff --git a/meta/packages/initscripts/initscripts-1.0/single b/meta/recipes-core/initscripts/initscripts-1.0/single
index 0cad693f2..0cad693f2 100755
--- a/meta/packages/initscripts/initscripts-1.0/single
+++ b/meta/recipes-core/initscripts/initscripts-1.0/single
diff --git a/meta/packages/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
index be28bb35b..be28bb35b 100644
--- a/meta/packages/initscripts/initscripts-1.0/sysfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/umountfs b/meta/recipes-core/initscripts/initscripts-1.0/umountfs
index 5c6793dc9..5c6793dc9 100755
--- a/meta/packages/initscripts/initscripts-1.0/umountfs
+++ b/meta/recipes-core/initscripts/initscripts-1.0/umountfs
diff --git a/meta/packages/initscripts/initscripts-1.0/umountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
index a4fb821d9..a4fb821d9 100755
--- a/meta/packages/initscripts/initscripts-1.0/umountnfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
diff --git a/meta/packages/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom
index b6d807cf3..b6d807cf3 100755
--- a/meta/packages/initscripts/initscripts-1.0/urandom
+++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom
diff --git a/meta/packages/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index b2ae2794d..b2ae2794d 100644
--- a/meta/packages/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 0d79b53a8..0d79b53a8 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
diff --git a/meta/packages/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
index 2e4867aa7..2e4867aa7 100755
--- a/meta/packages/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
+++ b/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
diff --git a/meta/packages/jpeg/jpeg_8b.bb b/meta/recipes-core/jpeg/jpeg_8b.bb
index 53847e715..53847e715 100644
--- a/meta/packages/jpeg/jpeg_8b.bb
+++ b/meta/recipes-core/jpeg/jpeg_8b.bb
diff --git a/meta/packages/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 5aba6a787..5aba6a787 100644
--- a/meta/packages/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
diff --git a/meta/packages/libxml/libxml2/libxml-64bit.patch b/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
index fcb7d34fa..fcb7d34fa 100644
--- a/meta/packages/libxml/libxml2/libxml-64bit.patch
+++ b/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
diff --git a/meta/packages/libxml/libxml2_2.7.7.bb b/meta/recipes-core/libxml/libxml2_2.7.7.bb
index deb28b395..deb28b395 100644
--- a/meta/packages/libxml/libxml2_2.7.7.bb
+++ b/meta/recipes-core/libxml/libxml2_2.7.7.bb
diff --git a/meta/packages/netbase/netbase/colinux/interfaces b/meta/recipes-core/netbase/netbase/colinux/interfaces
index 0e495e164..0e495e164 100644
--- a/meta/packages/netbase/netbase/colinux/interfaces
+++ b/meta/recipes-core/netbase/netbase/colinux/interfaces
diff --git a/meta/packages/netbase/netbase/epia/interfaces b/meta/recipes-core/netbase/netbase/epia/interfaces
index 673618f63..673618f63 100644
--- a/meta/packages/netbase/netbase/epia/interfaces
+++ b/meta/recipes-core/netbase/netbase/epia/interfaces
diff --git a/meta/packages/netbase/netbase/hosts b/meta/recipes-core/netbase/netbase/hosts
index 2f332451b..2f332451b 100644
--- a/meta/packages/netbase/netbase/hosts
+++ b/meta/recipes-core/netbase/netbase/hosts
diff --git a/meta/packages/netbase/netbase/init b/meta/recipes-core/netbase/netbase/init
index 8a67e1cef..8a67e1cef 100644
--- a/meta/packages/netbase/netbase/init
+++ b/meta/recipes-core/netbase/netbase/init
diff --git a/meta/packages/netbase/netbase/interfaces b/meta/recipes-core/netbase/netbase/interfaces
index b06924fa9..b06924fa9 100644
--- a/meta/packages/netbase/netbase/interfaces
+++ b/meta/recipes-core/netbase/netbase/interfaces
diff --git a/meta/packages/netbase/netbase/mtx-1/interfaces b/meta/recipes-core/netbase/netbase/mtx-1/interfaces
index a7c6da575..a7c6da575 100644
--- a/meta/packages/netbase/netbase/mtx-1/interfaces
+++ b/meta/recipes-core/netbase/netbase/mtx-1/interfaces
diff --git a/meta/packages/netbase/netbase/nfsroot b/meta/recipes-core/netbase/netbase/nfsroot
index fc384a8ea..fc384a8ea 100644
--- a/meta/packages/netbase/netbase/nfsroot
+++ b/meta/recipes-core/netbase/netbase/nfsroot
diff --git a/meta/packages/netbase/netbase/nokia800/interfaces b/meta/recipes-core/netbase/netbase/nokia800/interfaces
index 16967763e..16967763e 100644
--- a/meta/packages/netbase/netbase/nokia800/interfaces
+++ b/meta/recipes-core/netbase/netbase/nokia800/interfaces
diff --git a/meta/packages/netbase/netbase/openmn/hosts b/meta/recipes-core/netbase/netbase/openmn/hosts
index 0205b98fc..0205b98fc 100644
--- a/meta/packages/netbase/netbase/openmn/hosts
+++ b/meta/recipes-core/netbase/netbase/openmn/hosts
diff --git a/meta/packages/netbase/netbase/openmn/interfaces b/meta/recipes-core/netbase/netbase/openmn/interfaces
index 9ebe9b8ff..9ebe9b8ff 100644
--- a/meta/packages/netbase/netbase/openmn/interfaces
+++ b/meta/recipes-core/netbase/netbase/openmn/interfaces
diff --git a/meta/packages/netbase/netbase/qemuarm/interfaces b/meta/recipes-core/netbase/netbase/qemuarm/interfaces
index f657944f0..f657944f0 100644
--- a/meta/packages/netbase/netbase/qemuarm/interfaces
+++ b/meta/recipes-core/netbase/netbase/qemuarm/interfaces
diff --git a/meta/packages/netbase/netbase/qemuarmv6/interfaces b/meta/recipes-core/netbase/netbase/qemuarmv6/interfaces
index f657944f0..f657944f0 100644
--- a/meta/packages/netbase/netbase/qemuarmv6/interfaces
+++ b/meta/recipes-core/netbase/netbase/qemuarmv6/interfaces
diff --git a/meta/packages/netbase/netbase/qemuarmv7/interfaces b/meta/recipes-core/netbase/netbase/qemuarmv7/interfaces
index f657944f0..f657944f0 100644
--- a/meta/packages/netbase/netbase/qemuarmv7/interfaces
+++ b/meta/recipes-core/netbase/netbase/qemuarmv7/interfaces
diff --git a/meta/packages/netbase/netbase/qemux86/interfaces b/meta/recipes-core/netbase/netbase/qemux86/interfaces
index 9b442355f..9b442355f 100644
--- a/meta/packages/netbase/netbase/qemux86/interfaces
+++ b/meta/recipes-core/netbase/netbase/qemux86/interfaces
diff --git a/meta/packages/netbase/netbase/tosa/interfaces b/meta/recipes-core/netbase/netbase/tosa/interfaces
index 0da716853..0da716853 100644
--- a/meta/packages/netbase/netbase/tosa/interfaces
+++ b/meta/recipes-core/netbase/netbase/tosa/interfaces
diff --git a/meta/packages/netbase/netbase/wrt54/interfaces b/meta/recipes-core/netbase/netbase/wrt54/interfaces
index 8b2852ac5..8b2852ac5 100644
--- a/meta/packages/netbase/netbase/wrt54/interfaces
+++ b/meta/recipes-core/netbase/netbase/wrt54/interfaces
diff --git a/meta/packages/netbase/netbase/xxs1500/interfaces b/meta/recipes-core/netbase/netbase/xxs1500/interfaces
index 23ccccd2d..23ccccd2d 100644
--- a/meta/packages/netbase/netbase/xxs1500/interfaces
+++ b/meta/recipes-core/netbase/netbase/xxs1500/interfaces
diff --git a/meta/packages/netbase/netbase_4.41.bb b/meta/recipes-core/netbase/netbase_4.41.bb
index 88b524ffd..88b524ffd 100644
--- a/meta/packages/netbase/netbase_4.41.bb
+++ b/meta/recipes-core/netbase/netbase_4.41.bb
diff --git a/meta/packages/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init
index 66c85e933..66c85e933 100755
--- a/meta/packages/psplash/files/psplash-init
+++ b/meta/recipes-core/psplash/files/psplash-init
diff --git a/meta/packages/psplash/psplash_svn.bb b/meta/recipes-core/psplash/psplash_svn.bb
index 1e53ef1f1..1e53ef1f1 100644
--- a/meta/packages/psplash/psplash_svn.bb
+++ b/meta/recipes-core/psplash/psplash_svn.bb
diff --git a/meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
index b9511f088..b9511f088 100644
--- a/meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
+++ b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
diff --git a/meta/packages/sysvinit/sysvinit-2.88dsf/install.patch b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
index 5978cea07..5978cea07 100644
--- a/meta/packages/sysvinit/sysvinit-2.88dsf/install.patch
+++ b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
diff --git a/meta/packages/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
index f8f07a050..f8f07a050 100755
--- a/meta/packages/sysvinit/sysvinit/bootlogd.init
+++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
diff --git a/meta/packages/sysvinit/sysvinit/inittab b/meta/recipes-core/sysvinit/sysvinit/inittab
index 6abbdf455..6abbdf455 100644
--- a/meta/packages/sysvinit/sysvinit/inittab
+++ b/meta/recipes-core/sysvinit/sysvinit/inittab
diff --git a/meta/packages/sysvinit/sysvinit/need b/meta/recipes-core/sysvinit/sysvinit/need
index 4d84bbeee..4d84bbeee 100644
--- a/meta/packages/sysvinit/sysvinit/need
+++ b/meta/recipes-core/sysvinit/sysvinit/need
diff --git a/meta/packages/sysvinit/sysvinit/postinst b/meta/recipes-core/sysvinit/sysvinit/postinst
index b6fe547fa..b6fe547fa 100644
--- a/meta/packages/sysvinit/sysvinit/postinst
+++ b/meta/recipes-core/sysvinit/sysvinit/postinst
diff --git a/meta/packages/sysvinit/sysvinit/prerm b/meta/recipes-core/sysvinit/sysvinit/prerm
index 704a29ffd..704a29ffd 100644
--- a/meta/packages/sysvinit/sysvinit/prerm
+++ b/meta/recipes-core/sysvinit/sysvinit/prerm
diff --git a/meta/packages/sysvinit/sysvinit/provide b/meta/recipes-core/sysvinit/sysvinit/provide
index c90cf3537..c90cf3537 100644
--- a/meta/packages/sysvinit/sysvinit/provide
+++ b/meta/recipes-core/sysvinit/sysvinit/provide
diff --git a/meta/packages/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
index dce31a5c9..dce31a5c9 100755
--- a/meta/packages/sysvinit/sysvinit/rc
+++ b/meta/recipes-core/sysvinit/sysvinit/rc
diff --git a/meta/packages/sysvinit/sysvinit/rcS b/meta/recipes-core/sysvinit/sysvinit/rcS
index 080b04f32..080b04f32 100755
--- a/meta/packages/sysvinit/sysvinit/rcS
+++ b/meta/recipes-core/sysvinit/sysvinit/rcS
diff --git a/meta/packages/sysvinit/sysvinit/rcS-default b/meta/recipes-core/sysvinit/sysvinit/rcS-default
index 7ad3c7bf8..7ad3c7bf8 100644
--- a/meta/packages/sysvinit/sysvinit/rcS-default
+++ b/meta/recipes-core/sysvinit/sysvinit/rcS-default
diff --git a/meta/packages/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index db3806454..db3806454 100644
--- a/meta/packages/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
diff --git a/meta/packages/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 9873c060c..9873c060c 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
diff --git a/meta/packages/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-poky-boot.bb
index 4143369cd..4143369cd 100644
--- a/meta/packages/tasks/task-poky-boot.bb
+++ b/meta/recipes-core/tasks/task-poky-boot.bb
diff --git a/meta/packages/tinylogin/tinylogin-1.4/add-system.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/add-system.patch
index 18b4e47ad..18b4e47ad 100644
--- a/meta/packages/tinylogin/tinylogin-1.4/add-system.patch
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/add-system.patch
diff --git a/meta/packages/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch
index 737ac423c..737ac423c 100644
--- a/meta/packages/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/adduser-empty_pwd.patch
diff --git a/meta/packages/tinylogin/tinylogin-1.4/cvs-20040608.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/cvs-20040608.patch
index 1142329a6..1142329a6 100644
--- a/meta/packages/tinylogin/tinylogin-1.4/cvs-20040608.patch
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/cvs-20040608.patch
diff --git a/meta/packages/tinylogin/tinylogin-1.4/remove-index.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/remove-index.patch
index fc35002ba..fc35002ba 100644
--- a/meta/packages/tinylogin/tinylogin-1.4/remove-index.patch
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/remove-index.patch
diff --git a/meta/packages/tinylogin/tinylogin_1.4.bb b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
index ad254bff6..ad254bff6 100644
--- a/meta/packages/tinylogin/tinylogin_1.4.bb
+++ b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
diff --git a/meta/packages/uclibc/files/armeb-kernel-stat.h.patch b/meta/recipes-core/uclibc/files/armeb-kernel-stat.h.patch
index 0440718ee..0440718ee 100644
--- a/meta/packages/uclibc/files/armeb-kernel-stat.h.patch
+++ b/meta/recipes-core/uclibc/files/armeb-kernel-stat.h.patch
diff --git a/meta/packages/uclibc/files/errno_values.h.patch b/meta/recipes-core/uclibc/files/errno_values.h.patch
index a1e39c181..a1e39c181 100644
--- a/meta/packages/uclibc/files/errno_values.h.patch
+++ b/meta/recipes-core/uclibc/files/errno_values.h.patch
diff --git a/meta/packages/uclibc/files/kernel-key-t-ipc.h.patch b/meta/recipes-core/uclibc/files/kernel-key-t-ipc.h.patch
index 4cc453047..4cc453047 100644
--- a/meta/packages/uclibc/files/kernel-key-t-ipc.h.patch
+++ b/meta/recipes-core/uclibc/files/kernel-key-t-ipc.h.patch
diff --git a/meta/packages/uclibc/files/nokernelheadercheck.patch b/meta/recipes-core/uclibc/files/nokernelheadercheck.patch
index 9f09fb2ac..9f09fb2ac 100644
--- a/meta/packages/uclibc/files/nokernelheadercheck.patch
+++ b/meta/recipes-core/uclibc/files/nokernelheadercheck.patch
diff --git a/meta/packages/uclibc/files/termios.h.patch b/meta/recipes-core/uclibc/files/termios.h.patch
index f7200ba39..f7200ba39 100644
--- a/meta/packages/uclibc/files/termios.h.patch
+++ b/meta/recipes-core/uclibc/files/termios.h.patch
diff --git a/meta/packages/uclibc/files/uClibc.distro b/meta/recipes-core/uclibc/files/uClibc.distro
index d87b891b4..d87b891b4 100644
--- a/meta/packages/uclibc/files/uClibc.distro
+++ b/meta/recipes-core/uclibc/files/uClibc.distro
diff --git a/meta/packages/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
index a9c7a4fb1..a9c7a4fb1 100644
--- a/meta/packages/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
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/akita/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
index e27931cf6..e27931cf6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/akita/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch
index e222668a6..e222668a6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm-linuxthreads.patch
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/arm/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm/uClibc.machine
index 898b73a33..898b73a33 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/arm/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/arm/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine
index 2d9f63e53..2d9f63e53 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armeb/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine
index 898b73a33..898b73a33 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv4t/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine
index ec0385bc0..ec0385bc0 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv5te/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine
index 85f70f70c..85f70f70c 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv6/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine
index 85f70f70c..85f70f70c 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/armv7a/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
index ec0385bc0..ec0385bc0 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/c7x0/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
index e27931cf6..e27931cf6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/cm-x270/uClibc.machine
diff --git a/meta/packages/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
index b9ff6710b..b9ff6710b 100644
--- a/meta/packages/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
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine
index e27931cf6..e27931cf6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/iwmmxt/uClibc.machine
diff --git a/meta/packages/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
index cfa68ce52..cfa68ce52 100644
--- a/meta/packages/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
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch
index f6f32cdd2..f6f32cdd2 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/linuxthreads-changes.patch
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine
index 5df15f94c..5df15f94c 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/netbook/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
index 898b73a33..898b73a33 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/om-gta01/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/pthread_atfork.patch b/meta/recipes-core/uclibc/uclibc-0.9.30.1/pthread_atfork.patch
index 92accc2a1..92accc2a1 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/pthread_atfork.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/pthread_atfork.patch
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine
index fafdd7584..fafdd7584 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemuarm/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine
index 44fec169c..44fec169c 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemumips/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine
index 44fec169c..44fec169c 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/qemux86/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
index e27931cf6..e27931cf6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/spitz/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.config b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.config
index e69de29bb..e69de29bb 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.config
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.config
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.distro b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.distro
index 042ea4c54..042ea4c54 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.distro
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t
index 898b73a33..898b73a33 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv4t
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te
index ec0385bc0..ec0385bc0 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.armv5te
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt
index e27931cf6..e27931cf6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.iwmmxt
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm
index 6e89444a6..6e89444a6 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/uClibc.machine.strongarm
diff --git a/meta/packages/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
index f3718431e..f3718431e 100644
--- a/meta/packages/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
diff --git a/meta/packages/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
index 7a89e6662..7a89e6662 100644
--- a/meta/packages/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
diff --git a/meta/packages/uclibc/uclibc-0.9.30.1/x86/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.30.1/x86/uClibc.machine
index 6cd19e851..6cd19e851 100644
--- a/meta/packages/uclibc/uclibc-0.9.30.1/x86/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-0.9.30.1/x86/uClibc.machine
diff --git a/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb b/meta/recipes-core/uclibc/uclibc-initial_0.9.30.1.bb
index 6d21d3a2c..6d21d3a2c 100644
--- a/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
+++ b/meta/recipes-core/uclibc/uclibc-initial_0.9.30.1.bb
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 18392b5c1..18392b5c1 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
diff --git a/meta/packages/uclibc/uclibc_0.9.30.1.bb b/meta/recipes-core/uclibc/uclibc_0.9.30.1.bb
index 6bdf153a2..6bdf153a2 100644
--- a/meta/packages/uclibc/uclibc_0.9.30.1.bb
+++ b/meta/recipes-core/uclibc/uclibc_0.9.30.1.bb
diff --git a/meta/packages/udev/files/50-hostap_cs.rules b/meta/recipes-core/udev/files/50-hostap_cs.rules
index efefdc58f..efefdc58f 100644
--- a/meta/packages/udev/files/50-hostap_cs.rules
+++ b/meta/recipes-core/udev/files/50-hostap_cs.rules
diff --git a/meta/packages/udev/files/akita/mount.blacklist b/meta/recipes-core/udev/files/akita/mount.blacklist
index c15b58229..c15b58229 100644
--- a/meta/packages/udev/files/akita/mount.blacklist
+++ b/meta/recipes-core/udev/files/akita/mount.blacklist
diff --git a/meta/packages/udev/files/c7x0/mount.blacklist b/meta/recipes-core/udev/files/c7x0/mount.blacklist
index c15b58229..c15b58229 100644
--- a/meta/packages/udev/files/c7x0/mount.blacklist
+++ b/meta/recipes-core/udev/files/c7x0/mount.blacklist
diff --git a/meta/packages/udev/files/devfs-udev.rules b/meta/recipes-core/udev/files/devfs-udev.rules
index 0ba1ad4e7..0ba1ad4e7 100644
--- a/meta/packages/udev/files/devfs-udev.rules
+++ b/meta/recipes-core/udev/files/devfs-udev.rules
diff --git a/meta/packages/udev/files/fix-alignment.patch b/meta/recipes-core/udev/files/fix-alignment.patch
index 8c7b8b5ac..8c7b8b5ac 100644
--- a/meta/packages/udev/files/fix-alignment.patch
+++ b/meta/recipes-core/udev/files/fix-alignment.patch
diff --git a/meta/packages/udev/files/init b/meta/recipes-core/udev/files/init
index 8cbab188f..8cbab188f 100755
--- a/meta/packages/udev/files/init
+++ b/meta/recipes-core/udev/files/init
diff --git a/meta/packages/udev/files/links.conf b/meta/recipes-core/udev/files/links.conf
index 8fff922db..8fff922db 100644
--- a/meta/packages/udev/files/links.conf
+++ b/meta/recipes-core/udev/files/links.conf
diff --git a/meta/packages/udev/files/local.rules b/meta/recipes-core/udev/files/local.rules
index 5f2efbeb0..5f2efbeb0 100644
--- a/meta/packages/udev/files/local.rules
+++ b/meta/recipes-core/udev/files/local.rules
diff --git a/meta/packages/udev/files/mount.blacklist b/meta/recipes-core/udev/files/mount.blacklist
index d3ebb1717..d3ebb1717 100644
--- a/meta/packages/udev/files/mount.blacklist
+++ b/meta/recipes-core/udev/files/mount.blacklist
diff --git a/meta/packages/udev/files/mount.sh b/meta/recipes-core/udev/files/mount.sh
index 53fefa368..53fefa368 100644
--- a/meta/packages/udev/files/mount.sh
+++ b/meta/recipes-core/udev/files/mount.sh
diff --git a/meta/packages/udev/files/network.sh b/meta/recipes-core/udev/files/network.sh
index 5016328df..5016328df 100644
--- a/meta/packages/udev/files/network.sh
+++ b/meta/recipes-core/udev/files/network.sh
diff --git a/meta/packages/udev/files/noasmlinkage.patch b/meta/recipes-core/udev/files/noasmlinkage.patch
index 0d8e854c0..0d8e854c0 100644
--- a/meta/packages/udev/files/noasmlinkage.patch
+++ b/meta/recipes-core/udev/files/noasmlinkage.patch
diff --git a/meta/packages/udev/files/permissions.rules b/meta/recipes-core/udev/files/permissions.rules
index 86d771276..86d771276 100644
--- a/meta/packages/udev/files/permissions.rules
+++ b/meta/recipes-core/udev/files/permissions.rules
diff --git a/meta/packages/udev/files/slugos/mount.blacklist b/meta/recipes-core/udev/files/slugos/mount.blacklist
index 210702f83..210702f83 100644
--- a/meta/packages/udev/files/slugos/mount.blacklist
+++ b/meta/recipes-core/udev/files/slugos/mount.blacklist
diff --git a/meta/packages/udev/files/spitz/mount.blacklist b/meta/recipes-core/udev/files/spitz/mount.blacklist
index aee308f9b..aee308f9b 100644
--- a/meta/packages/udev/files/spitz/mount.blacklist
+++ b/meta/recipes-core/udev/files/spitz/mount.blacklist
diff --git a/meta/packages/udev/files/tmpfs.patch b/meta/recipes-core/udev/files/tmpfs.patch
index 9d0d8b451..9d0d8b451 100644
--- a/meta/packages/udev/files/tmpfs.patch
+++ b/meta/recipes-core/udev/files/tmpfs.patch
diff --git a/meta/packages/udev/files/tosa/mount.blacklist b/meta/recipes-core/udev/files/tosa/mount.blacklist
index c15b58229..c15b58229 100644
--- a/meta/packages/udev/files/tosa/mount.blacklist
+++ b/meta/recipes-core/udev/files/tosa/mount.blacklist
diff --git a/meta/packages/udev/files/udev-cache b/meta/recipes-core/udev/files/udev-cache
index 77bbda6f1..77bbda6f1 100644
--- a/meta/packages/udev/files/udev-cache
+++ b/meta/recipes-core/udev/files/udev-cache
diff --git a/meta/packages/udev/files/udev.rules b/meta/recipes-core/udev/files/udev.rules
index 5c566f6ce..5c566f6ce 100644
--- a/meta/packages/udev/files/udev.rules
+++ b/meta/recipes-core/udev/files/udev.rules
diff --git a/meta/packages/udev/files/udev_network_queue.sh b/meta/recipes-core/udev/files/udev_network_queue.sh
index 05e08e9d1..05e08e9d1 100644
--- a/meta/packages/udev/files/udev_network_queue.sh
+++ b/meta/recipes-core/udev/files/udev_network_queue.sh
diff --git a/meta/packages/udev/files/udevsynthesize.patch b/meta/recipes-core/udev/files/udevsynthesize.patch
index 781118848..781118848 100644
--- a/meta/packages/udev/files/udevsynthesize.patch
+++ b/meta/recipes-core/udev/files/udevsynthesize.patch
diff --git a/meta/packages/udev/files/udevsynthesize.sh b/meta/recipes-core/udev/files/udevsynthesize.sh
index d58217c14..d58217c14 100644
--- a/meta/packages/udev/files/udevsynthesize.sh
+++ b/meta/recipes-core/udev/files/udevsynthesize.sh
diff --git a/meta/packages/udev/udev-092/arm_inotify_fix.patch b/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch
index 4bd0d4d9b..4bd0d4d9b 100644
--- a/meta/packages/udev/udev-092/arm_inotify_fix.patch
+++ b/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch
diff --git a/meta/packages/udev/udev-092/flags.patch b/meta/recipes-core/udev/udev-092/flags.patch
index 492a39881..492a39881 100644
--- a/meta/packages/udev/udev-092/flags.patch
+++ b/meta/recipes-core/udev/udev-092/flags.patch
diff --git a/meta/packages/udev/udev-092/init b/meta/recipes-core/udev/udev-092/init
index 5a60d52a9..5a60d52a9 100644
--- a/meta/packages/udev/udev-092/init
+++ b/meta/recipes-core/udev/udev-092/init
diff --git a/meta/packages/udev/udev-092/local.rules b/meta/recipes-core/udev/udev-092/local.rules
index 5b926018f..5b926018f 100644
--- a/meta/packages/udev/udev-092/local.rules
+++ b/meta/recipes-core/udev/udev-092/local.rules
diff --git a/meta/packages/udev/udev-092/permissions.rules b/meta/recipes-core/udev/udev-092/permissions.rules
index 8da35c309..8da35c309 100644
--- a/meta/packages/udev/udev-092/permissions.rules
+++ b/meta/recipes-core/udev/udev-092/permissions.rules
diff --git a/meta/packages/udev/udev-092/udev.rules b/meta/recipes-core/udev/udev-092/udev.rules
index 72be706e8..72be706e8 100644
--- a/meta/packages/udev/udev-092/udev.rules
+++ b/meta/recipes-core/udev/udev-092/udev.rules
diff --git a/meta/packages/udev/udev-115/flags.patch b/meta/recipes-core/udev/udev-115/flags.patch
index 13f20eb6a..13f20eb6a 100644
--- a/meta/packages/udev/udev-115/flags.patch
+++ b/meta/recipes-core/udev/udev-115/flags.patch
diff --git a/meta/packages/udev/udev-115/init b/meta/recipes-core/udev/udev-115/init
index c882c7560..c882c7560 100644
--- a/meta/packages/udev/udev-115/init
+++ b/meta/recipes-core/udev/udev-115/init
diff --git a/meta/packages/udev/udev-115/local.rules b/meta/recipes-core/udev/udev-115/local.rules
index 5b926018f..5b926018f 100644
--- a/meta/packages/udev/udev-115/local.rules
+++ b/meta/recipes-core/udev/udev-115/local.rules
diff --git a/meta/packages/udev/udev-115/noasmlinkage.patch b/meta/recipes-core/udev/udev-115/noasmlinkage.patch
index 5824d2959..5824d2959 100644
--- a/meta/packages/udev/udev-115/noasmlinkage.patch
+++ b/meta/recipes-core/udev/udev-115/noasmlinkage.patch
diff --git a/meta/packages/udev/udev-115/permissions.rules b/meta/recipes-core/udev/udev-115/permissions.rules
index 99e03b103..99e03b103 100644
--- a/meta/packages/udev/udev-115/permissions.rules
+++ b/meta/recipes-core/udev/udev-115/permissions.rules
diff --git a/meta/packages/udev/udev-115/udev.rules b/meta/recipes-core/udev/udev-115/udev.rules
index 4d29acac0..4d29acac0 100644
--- a/meta/packages/udev/udev-115/udev.rules
+++ b/meta/recipes-core/udev/udev-115/udev.rules
diff --git a/meta/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch
index 87cafcaa9..87cafcaa9 100644
--- a/meta/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
+++ b/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch
diff --git a/meta/packages/udev/udev-115/vol_id_ld.patch b/meta/recipes-core/udev/udev-115/vol_id_ld.patch
index 11126eef8..11126eef8 100644
--- a/meta/packages/udev/udev-115/vol_id_ld.patch
+++ b/meta/recipes-core/udev/udev-115/vol_id_ld.patch
diff --git a/meta/packages/udev/udev-124/flags.patch b/meta/recipes-core/udev/udev-124/flags.patch
index 13f20eb6a..13f20eb6a 100644
--- a/meta/packages/udev/udev-124/flags.patch
+++ b/meta/recipes-core/udev/udev-124/flags.patch
diff --git a/meta/packages/udev/udev-124/init b/meta/recipes-core/udev/udev-124/init
index 32ab370aa..32ab370aa 100644
--- a/meta/packages/udev/udev-124/init
+++ b/meta/recipes-core/udev/udev-124/init
diff --git a/meta/packages/udev/udev-124/local.rules b/meta/recipes-core/udev/udev-124/local.rules
index 5b926018f..5b926018f 100644
--- a/meta/packages/udev/udev-124/local.rules
+++ b/meta/recipes-core/udev/udev-124/local.rules
diff --git a/meta/packages/udev/udev-124/noasmlinkage.patch b/meta/recipes-core/udev/udev-124/noasmlinkage.patch
index d58a7ea4d..d58a7ea4d 100644
--- a/meta/packages/udev/udev-124/noasmlinkage.patch
+++ b/meta/recipes-core/udev/udev-124/noasmlinkage.patch
diff --git a/meta/packages/udev/udev-124/permissions.rules b/meta/recipes-core/udev/udev-124/permissions.rules
index 205b73329..205b73329 100644
--- a/meta/packages/udev/udev-124/permissions.rules
+++ b/meta/recipes-core/udev/udev-124/permissions.rules
diff --git a/meta/packages/udev/udev-124/run.rules b/meta/recipes-core/udev/udev-124/run.rules
index 75d71375b..75d71375b 100644
--- a/meta/packages/udev/udev-124/run.rules
+++ b/meta/recipes-core/udev/udev-124/run.rules
diff --git a/meta/packages/udev/udev-124/udev.rules b/meta/recipes-core/udev/udev-124/udev.rules
index a19d4a0bf..a19d4a0bf 100644
--- a/meta/packages/udev/udev-124/udev.rules
+++ b/meta/recipes-core/udev/udev-124/udev.rules
diff --git a/meta/packages/udev/udev-124/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch
index 518254246..518254246 100644
--- a/meta/packages/udev/udev-124/udevtrigger_add_devname_filtering.patch
+++ b/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch
diff --git a/meta/packages/udev/udev-124/vol_id_ld.patch b/meta/recipes-core/udev/udev-124/vol_id_ld.patch
index 11126eef8..11126eef8 100644
--- a/meta/packages/udev/udev-124/vol_id_ld.patch
+++ b/meta/recipes-core/udev/udev-124/vol_id_ld.patch
diff --git a/meta/packages/udev/udev-141/igep0020/local.rules b/meta/recipes-core/udev/udev-141/igep0020/local.rules
index db976d041..db976d041 100644
--- a/meta/packages/udev/udev-141/igep0020/local.rules
+++ b/meta/recipes-core/udev/udev-141/igep0020/local.rules
diff --git a/meta/packages/udev/udev-141/init b/meta/recipes-core/udev/udev-141/init
index eb5e50758..eb5e50758 100644
--- a/meta/packages/udev/udev-141/init
+++ b/meta/recipes-core/udev/udev-141/init
diff --git a/meta/packages/udev/udev-141/local.rules b/meta/recipes-core/udev/udev-141/local.rules
index dab319b43..dab319b43 100644
--- a/meta/packages/udev/udev-141/local.rules
+++ b/meta/recipes-core/udev/udev-141/local.rules
diff --git a/meta/packages/udev/udev-141/noasmlinkage.patch b/meta/recipes-core/udev/udev-141/noasmlinkage.patch
index 6f9fe948f..6f9fe948f 100644
--- a/meta/packages/udev/udev-141/noasmlinkage.patch
+++ b/meta/recipes-core/udev/udev-141/noasmlinkage.patch
diff --git a/meta/packages/udev/udev-141/permissions.rules b/meta/recipes-core/udev/udev-141/permissions.rules
index 205b73329..205b73329 100644
--- a/meta/packages/udev/udev-141/permissions.rules
+++ b/meta/recipes-core/udev/udev-141/permissions.rules
diff --git a/meta/packages/udev/udev-141/run.rules b/meta/recipes-core/udev/udev-141/run.rules
index 75d71375b..75d71375b 100644
--- a/meta/packages/udev/udev-141/run.rules
+++ b/meta/recipes-core/udev/udev-141/run.rules
diff --git a/meta/packages/udev/udev-141/udev.rules b/meta/recipes-core/udev/udev-141/udev.rules
index a19d4a0bf..a19d4a0bf 100644
--- a/meta/packages/udev/udev-141/udev.rules
+++ b/meta/recipes-core/udev/udev-141/udev.rules
diff --git a/meta/packages/udev/udev-141/unbreak.patch b/meta/recipes-core/udev/udev-141/unbreak.patch
index bb5988dca..bb5988dca 100644
--- a/meta/packages/udev/udev-141/unbreak.patch
+++ b/meta/recipes-core/udev/udev-141/unbreak.patch
diff --git a/meta/packages/udev/udev-145/enable-gudev.patch b/meta/recipes-core/udev/udev-145/enable-gudev.patch
index 45fd37311..45fd37311 100644
--- a/meta/packages/udev/udev-145/enable-gudev.patch
+++ b/meta/recipes-core/udev/udev-145/enable-gudev.patch
diff --git a/meta/packages/udev/udev-145/init b/meta/recipes-core/udev/udev-145/init
index eb5e50758..eb5e50758 100644
--- a/meta/packages/udev/udev-145/init
+++ b/meta/recipes-core/udev/udev-145/init
diff --git a/meta/packages/udev/udev-145/local.rules b/meta/recipes-core/udev/udev-145/local.rules
index dab319b43..dab319b43 100644
--- a/meta/packages/udev/udev-145/local.rules
+++ b/meta/recipes-core/udev/udev-145/local.rules
diff --git a/meta/packages/udev/udev-145/noasmlinkage.patch b/meta/recipes-core/udev/udev-145/noasmlinkage.patch
index 6f9fe948f..6f9fe948f 100644
--- a/meta/packages/udev/udev-145/noasmlinkage.patch
+++ b/meta/recipes-core/udev/udev-145/noasmlinkage.patch
diff --git a/meta/packages/udev/udev-145/permissions.rules b/meta/recipes-core/udev/udev-145/permissions.rules
index 205b73329..205b73329 100644
--- a/meta/packages/udev/udev-145/permissions.rules
+++ b/meta/recipes-core/udev/udev-145/permissions.rules
diff --git a/meta/packages/udev/udev-145/run.rules b/meta/recipes-core/udev/udev-145/run.rules
index 75d71375b..75d71375b 100644
--- a/meta/packages/udev/udev-145/run.rules
+++ b/meta/recipes-core/udev/udev-145/run.rules
diff --git a/meta/packages/udev/udev-145/udev.rules b/meta/recipes-core/udev/udev-145/udev.rules
index a19d4a0bf..a19d4a0bf 100644
--- a/meta/packages/udev/udev-145/udev.rules
+++ b/meta/recipes-core/udev/udev-145/udev.rules
diff --git a/meta/packages/udev/udev-145/unbreak.patch b/meta/recipes-core/udev/udev-145/unbreak.patch
index bb5988dca..bb5988dca 100644
--- a/meta/packages/udev/udev-145/unbreak.patch
+++ b/meta/recipes-core/udev/udev-145/unbreak.patch
diff --git a/meta/packages/udev/udev-158/init b/meta/recipes-core/udev/udev-158/init
index eb5e50758..eb5e50758 100644
--- a/meta/packages/udev/udev-158/init
+++ b/meta/recipes-core/udev/udev-158/init
diff --git a/meta/packages/udev/udev-158/local.rules b/meta/recipes-core/udev/udev-158/local.rules
index dab319b43..dab319b43 100644
--- a/meta/packages/udev/udev-158/local.rules
+++ b/meta/recipes-core/udev/udev-158/local.rules
diff --git a/meta/packages/udev/udev-158/permissions.rules b/meta/recipes-core/udev/udev-158/permissions.rules
index 205b73329..205b73329 100644
--- a/meta/packages/udev/udev-158/permissions.rules
+++ b/meta/recipes-core/udev/udev-158/permissions.rules
diff --git a/meta/packages/udev/udev-158/run.rules b/meta/recipes-core/udev/udev-158/run.rules
index 75d71375b..75d71375b 100644
--- a/meta/packages/udev/udev-158/run.rules
+++ b/meta/recipes-core/udev/udev-158/run.rules
diff --git a/meta/packages/udev/udev-158/udev.rules b/meta/recipes-core/udev/udev-158/udev.rules
index a19d4a0bf..a19d4a0bf 100644
--- a/meta/packages/udev/udev-158/udev.rules
+++ b/meta/recipes-core/udev/udev-158/udev.rules
diff --git a/meta/packages/udev/udev-extraconf_0.0.bb b/meta/recipes-core/udev/udev-extraconf_0.0.bb
index 34c8400dd..34c8400dd 100644
--- a/meta/packages/udev/udev-extraconf_0.0.bb
+++ b/meta/recipes-core/udev/udev-extraconf_0.0.bb
diff --git a/meta/packages/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index 87f963347..87f963347 100644
--- a/meta/packages/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
diff --git a/meta/packages/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 0afd817b8..0afd817b8 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
diff --git a/meta/packages/udev/udev_092.bb b/meta/recipes-core/udev/udev_092.bb
index 0e94d1f6c..0e94d1f6c 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/recipes-core/udev/udev_092.bb
diff --git a/meta/packages/udev/udev_115.bb b/meta/recipes-core/udev/udev_115.bb
index 9db8661b6..9db8661b6 100644
--- a/meta/packages/udev/udev_115.bb
+++ b/meta/recipes-core/udev/udev_115.bb
diff --git a/meta/packages/udev/udev_124.bb b/meta/recipes-core/udev/udev_124.bb
index ccfbbf701..ccfbbf701 100644
--- a/meta/packages/udev/udev_124.bb
+++ b/meta/recipes-core/udev/udev_124.bb
diff --git a/meta/packages/udev/udev_141.bb b/meta/recipes-core/udev/udev_141.bb
index 3893a98a2..3893a98a2 100644
--- a/meta/packages/udev/udev_141.bb
+++ b/meta/recipes-core/udev/udev_141.bb
diff --git a/meta/packages/udev/udev_145.bb b/meta/recipes-core/udev/udev_145.bb
index 91d8ce373..91d8ce373 100644
--- a/meta/packages/udev/udev_145.bb
+++ b/meta/recipes-core/udev/udev_145.bb
diff --git a/meta/packages/udev/udev_158.bb b/meta/recipes-core/udev/udev_158.bb
index daf8d37e5..daf8d37e5 100644
--- a/meta/packages/udev/udev_158.bb
+++ b/meta/recipes-core/udev/udev_158.bb
diff --git a/meta/packages/update-rc.d/update-rc.d/add-verbose.patch b/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
index 0f068308f..0f068308f 100644
--- a/meta/packages/update-rc.d/update-rc.d/add-verbose.patch
+++ b/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
diff --git a/meta/packages/update-rc.d/update-rc.d_0.7.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index 03ac5c1a2..03ac5c1a2 100644
--- a/meta/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
diff --git a/meta/packages/zlib/files/Makefile.am b/meta/recipes-core/zlib/files/Makefile.am
index b66d299d8..b66d299d8 100644
--- a/meta/packages/zlib/files/Makefile.am
+++ b/meta/recipes-core/zlib/files/Makefile.am
diff --git a/meta/packages/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac
index 4761b7ef2..4761b7ef2 100644
--- a/meta/packages/zlib/files/configure.ac
+++ b/meta/recipes-core/zlib/files/configure.ac
diff --git a/meta/packages/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb
index e6db69e3a..e6db69e3a 100644
--- a/meta/packages/zlib/zlib_1.2.5.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.5.bb
diff --git a/meta/packages/apt/apt-0.7.14/includes-fix.patch b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
index f4661648e..f4661648e 100644
--- a/meta/packages/apt/apt-0.7.14/includes-fix.patch
+++ b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
diff --git a/meta/packages/apt/apt-0.7.14/no-ko-translation.patch b/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch
index 5f3634b32..5f3634b32 100644
--- a/meta/packages/apt/apt-0.7.14/no-ko-translation.patch
+++ b/meta/recipes-devtools/apt/apt-0.7.14/no-ko-translation.patch
diff --git a/meta/packages/apt/apt-0.7.14/noconfigure.patch b/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch
index 682a96da2..682a96da2 100644
--- a/meta/packages/apt/apt-0.7.14/noconfigure.patch
+++ b/meta/recipes-devtools/apt/apt-0.7.14/noconfigure.patch
diff --git a/meta/packages/apt/apt-0.7.14/nodoc.patch b/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch
index db8cf9371..db8cf9371 100644
--- a/meta/packages/apt/apt-0.7.14/nodoc.patch
+++ b/meta/recipes-devtools/apt/apt-0.7.14/nodoc.patch
diff --git a/meta/packages/apt/apt-0.7.14/use-host.patch b/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch
index 894a69766..894a69766 100644
--- a/meta/packages/apt/apt-0.7.14/use-host.patch
+++ b/meta/recipes-devtools/apt/apt-0.7.14/use-host.patch
diff --git a/meta/packages/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index b16f99e93..b16f99e93 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
diff --git a/meta/packages/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
index 2f04b72ca..2f04b72ca 100644
--- a/meta/packages/apt/apt-native_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
diff --git a/meta/packages/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 9e104f12e..9e104f12e 100644
--- a/meta/packages/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
diff --git a/meta/packages/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 546683f9b..546683f9b 100644
--- a/meta/packages/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
diff --git a/meta/packages/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb
index 0ea9b4814..0ea9b4814 100644
--- a/meta/packages/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.7.14.bb
diff --git a/meta/packages/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 2bd9ddbfa..2bd9ddbfa 100644
--- a/meta/packages/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
diff --git a/meta/packages/apt/files/db_linking_hack.patch b/meta/recipes-devtools/apt/files/db_linking_hack.patch
index 3c8368b1e..3c8368b1e 100644
--- a/meta/packages/apt/files/db_linking_hack.patch
+++ b/meta/recipes-devtools/apt/files/db_linking_hack.patch
diff --git a/meta/packages/apt/files/environment.patch b/meta/recipes-devtools/apt/files/environment.patch
index 5bea1a013..5bea1a013 100644
--- a/meta/packages/apt/files/environment.patch
+++ b/meta/recipes-devtools/apt/files/environment.patch
diff --git a/meta/packages/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch
index 4e07c8f2d..4e07c8f2d 100644
--- a/meta/packages/apt/files/no-curl.patch
+++ b/meta/recipes-devtools/apt/files/no-curl.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch
index 596535b7d..596535b7d 100644
--- a/meta/packages/autoconf/autoconf-2.65/autoconf-x.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
index 1f18e04bb..1f18e04bb 100644
--- a/meta/packages/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
index fac7483bd..fac7483bd 100644
--- a/meta/packages/autoconf/autoconf-2.65/autoreconf-exclude.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch
index 587a82382..587a82382 100644
--- a/meta/packages/autoconf/autoconf-2.65/autoreconf-foreign.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
index 851d24330..851d24330 100644
--- a/meta/packages/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/autoreconf-include.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch
index 08646c10a..08646c10a 100644
--- a/meta/packages/autoconf/autoconf-2.65/autoreconf-include.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/config_site.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
index 8a90cd330..8a90cd330 100644
--- a/meta/packages/autoconf/autoconf-2.65/config_site.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/fix_path_xtra.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch
index bc735718c..bc735718c 100644
--- a/meta/packages/autoconf/autoconf-2.65/fix_path_xtra.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/fix_path_xtra.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch
index 5f0d055a4..5f0d055a4 100644
--- a/meta/packages/autoconf/autoconf-2.65/path_prog_fixes.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/path_prog_fixes.patch
diff --git a/meta/packages/autoconf/autoconf-2.65/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch
index e6f4096a9..e6f4096a9 100644
--- a/meta/packages/autoconf/autoconf-2.65/program_prefix.patch
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/program_prefix.patch
diff --git a/meta/packages/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index 8816a66d3..8816a66d3 100644
--- a/meta/packages/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
diff --git a/meta/packages/autoconf/autoconf_2.65.bb b/meta/recipes-devtools/autoconf/autoconf_2.65.bb
index 5adb9756d..5adb9756d 100644
--- a/meta/packages/autoconf/autoconf_2.65.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.65.bb
diff --git a/meta/packages/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index d68c45d4f..d68c45d4f 100644
--- a/meta/packages/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
diff --git a/meta/packages/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
index fb38442e3..fb38442e3 100644
--- a/meta/packages/automake/automake/path_prog_fixes.patch
+++ b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
diff --git a/meta/packages/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
index a78b6901f..a78b6901f 100644
--- a/meta/packages/automake/automake_1.11.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
diff --git a/meta/packages/binutils/binutils-2.20.1/110-arm-eabi-conf.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
index 2623301da..2623301da 100644
--- a/meta/packages/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
index dfe9b18e1..dfe9b18e1 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-libtool.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch
index 61517d1d4..61517d1d4 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-libtool.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-mips-pie.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
index c71f0ad4d..c71f0ad4d 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-mips-pie.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
index 8de04e0fe..8de04e0fe 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
index 04a7e61e2..04a7e61e2 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
index db838cf20..db838cf20 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
index 4cd9e2243..4cd9e2243 100644
--- a/meta/packages/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
diff --git a/meta/packages/binutils/binutils-2.20.1/libiberty_path_fix.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch
index 36a14d7a1..36a14d7a1 100644
--- a/meta/packages/binutils/binutils-2.20.1/libiberty_path_fix.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch
diff --git a/meta/packages/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index 4953bc2c3..4953bc2c3 100644
--- a/meta/packages/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
diff --git a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
index f4a7a0e61..f4a7a0e61 100644
--- a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index 4eeb6584c..4eeb6584c 100644
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
diff --git a/meta/packages/binutils/binutils-cross_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-cross_2.20.1.bb
index 8c7e4bc1a..8c7e4bc1a 100644
--- a/meta/packages/binutils/binutils-cross_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.20.1.bb
diff --git a/meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb b/meta/recipes-devtools/binutils/binutils-cross_csl-arm-2008q1.bb
index 8ab1e7f63..8ab1e7f63 100644
--- a/meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_csl-arm-2008q1.bb
diff --git a/meta/packages/binutils/binutils-crosssdk_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb
index f3bc5bfc2..f3bc5bfc2 100644
--- a/meta/packages/binutils/binutils-crosssdk_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb
diff --git a/meta/packages/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 7a352b5d3..7a352b5d3 100644
--- a/meta/packages/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
diff --git a/meta/packages/binutils/binutils_2.20.1.bb b/meta/recipes-devtools/binutils/binutils_2.20.1.bb
index d5cd985cc..d5cd985cc 100644
--- a/meta/packages/binutils/binutils_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.20.1.bb
diff --git a/meta/packages/binutils/binutils_csl-arm-2008q1.bb b/meta/recipes-devtools/binutils/binutils_csl-arm-2008q1.bb
index dd9b79830..dd9b79830 100644
--- a/meta/packages/binutils/binutils_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/binutils/binutils_csl-arm-2008q1.bb
diff --git a/meta/packages/binutils/files/better_file_error.patch b/meta/recipes-devtools/binutils/files/better_file_error.patch
index 38ef52966..38ef52966 100644
--- a/meta/packages/binutils/files/better_file_error.patch
+++ b/meta/recipes-devtools/binutils/files/better_file_error.patch
diff --git a/meta/packages/binutils/files/ld_makefile.patch b/meta/recipes-devtools/binutils/files/ld_makefile.patch
index c1d2ac1ec..c1d2ac1ec 100644
--- a/meta/packages/binutils/files/ld_makefile.patch
+++ b/meta/recipes-devtools/binutils/files/ld_makefile.patch
diff --git a/meta/packages/binutils/files/objdump_fix.patch b/meta/recipes-devtools/binutils/files/objdump_fix.patch
index 90ad732c0..90ad732c0 100644
--- a/meta/packages/binutils/files/objdump_fix.patch
+++ b/meta/recipes-devtools/binutils/files/objdump_fix.patch
diff --git a/meta/packages/binutils/files/plt32trunc.patch b/meta/recipes-devtools/binutils/files/plt32trunc.patch
index 4990f5dbb..4990f5dbb 100644
--- a/meta/packages/binutils/files/plt32trunc.patch
+++ b/meta/recipes-devtools/binutils/files/plt32trunc.patch
diff --git a/meta/packages/binutils/files/signed_char_fix.patch b/meta/recipes-devtools/binutils/files/signed_char_fix.patch
index b3709dabe..b3709dabe 100644
--- a/meta/packages/binutils/files/signed_char_fix.patch
+++ b/meta/recipes-devtools/binutils/files/signed_char_fix.patch
diff --git a/meta/packages/bison/bison/fix_cross_manpage_building.patch b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
index 850ec06aa..850ec06aa 100644
--- a/meta/packages/bison/bison/fix_cross_manpage_building.patch
+++ b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
diff --git a/meta/packages/bison/bison/m4.patch b/meta/recipes-devtools/bison/bison/m4.patch
index 9332354b5..9332354b5 100644
--- a/meta/packages/bison/bison/m4.patch
+++ b/meta/recipes-devtools/bison/bison/m4.patch
diff --git a/meta/packages/bison/bison_2.4.2.bb b/meta/recipes-devtools/bison/bison_2.4.2.bb
index 1d053cf5e..1d053cf5e 100644
--- a/meta/packages/bison/bison_2.4.2.bb
+++ b/meta/recipes-devtools/bison/bison_2.4.2.bb
diff --git a/meta/packages/cdrtools/cdrtools-native/glibc-conflict-rename.patch b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
index 0b9b892aa..0b9b892aa 100644
--- a/meta/packages/cdrtools/cdrtools-native/glibc-conflict-rename.patch
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch
diff --git a/meta/packages/cdrtools/cdrtools-native/no_usr_src.patch b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
index 0318d31a6..0318d31a6 100644
--- a/meta/packages/cdrtools/cdrtools-native/no_usr_src.patch
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch
diff --git a/meta/packages/cdrtools/cdrtools-native_2.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb
index 2421b2364..2421b2364 100644
--- a/meta/packages/cdrtools/cdrtools-native_2.01.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb
diff --git a/meta/packages/chrpath/chrpath_0.13.bb b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
index 38ae2f797..38ae2f797 100644
--- a/meta/packages/chrpath/chrpath_0.13.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.13.bb
diff --git a/meta/packages/cmake/cmake-native_2.8.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.2.bb
index 617572853..617572853 100644
--- a/meta/packages/cmake/cmake-native_2.8.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.2.bb
diff --git a/meta/packages/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 774384712..774384712 100644
--- a/meta/packages/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
diff --git a/meta/packages/desktop-file-utils/desktop-file-utils-native_0.15.bb b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
index 9603982ea..9603982ea 100644
--- a/meta/packages/desktop-file-utils/desktop-file-utils-native_0.15.bb
+++ b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
diff --git a/meta/packages/diffstat/diffstat_1.47.bb b/meta/recipes-devtools/diffstat/diffstat_1.47.bb
index 53d9c1b4c..53d9c1b4c 100644
--- a/meta/packages/diffstat/diffstat_1.47.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.47.bb
diff --git a/meta/packages/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
index cce2812b7..cce2812b7 100644
--- a/meta/packages/distcc/distcc_2.18.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
diff --git a/meta/packages/distcc/files/default b/meta/recipes-devtools/distcc/files/default
index 95290f848..95290f848 100644
--- a/meta/packages/distcc/files/default
+++ b/meta/recipes-devtools/distcc/files/default
diff --git a/meta/packages/distcc/files/distcc b/meta/recipes-devtools/distcc/files/distcc
index 513bc483e..513bc483e 100755
--- a/meta/packages/distcc/files/distcc
+++ b/meta/recipes-devtools/distcc/files/distcc
diff --git a/meta/packages/distcc/files/distcc-avahi.patch b/meta/recipes-devtools/distcc/files/distcc-avahi.patch
index 1702ea7ea..1702ea7ea 100644
--- a/meta/packages/distcc/files/distcc-avahi.patch
+++ b/meta/recipes-devtools/distcc/files/distcc-avahi.patch
diff --git a/meta/packages/distcc/files/distccmon-gnome.desktop b/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
index 7b5d85ce4..7b5d85ce4 100644
--- a/meta/packages/distcc/files/distccmon-gnome.desktop
+++ b/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
diff --git a/meta/packages/dosfstools/dosfstools-native_2.10.bb b/meta/recipes-devtools/dosfstools/dosfstools-native_2.10.bb
index 4853c154a..4853c154a 100644
--- a/meta/packages/dosfstools/dosfstools-native_2.10.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools-native_2.10.bb
diff --git a/meta/packages/dosfstools/dosfstools/2.6.20-syscall.patch b/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch
index 7cf2662d2..7cf2662d2 100644
--- a/meta/packages/dosfstools/dosfstools/2.6.20-syscall.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch
diff --git a/meta/packages/dosfstools/dosfstools/alignment_hack.patch b/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
index e15060a6f..e15060a6f 100644
--- a/meta/packages/dosfstools/dosfstools/alignment_hack.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
diff --git a/meta/packages/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
index 3ecafc324..3ecafc324 100644
--- a/meta/packages/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
diff --git a/meta/packages/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
index e70a3ead2..e70a3ead2 100644
--- a/meta/packages/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-msdos_fs-types.patch
diff --git a/meta/packages/dosfstools/dosfstools/include-linux-types.patch b/meta/recipes-devtools/dosfstools/dosfstools/include-linux-types.patch
index 4bbd4e76e..4bbd4e76e 100644
--- a/meta/packages/dosfstools/dosfstools/include-linux-types.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/include-linux-types.patch
diff --git a/meta/packages/dosfstools/dosfstools/mkdosfs-bootcode.patch b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
index 52be86284..52be86284 100644
--- a/meta/packages/dosfstools/dosfstools/mkdosfs-bootcode.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
diff --git a/meta/packages/dosfstools/dosfstools/mkdosfs-dir.patch b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
index 8f753b052..8f753b052 100644
--- a/meta/packages/dosfstools/dosfstools/mkdosfs-dir.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
diff --git a/meta/packages/dosfstools/dosfstools/msdos_fat12_undefined.patch b/meta/recipes-devtools/dosfstools/dosfstools/msdos_fat12_undefined.patch
index 4987aa301..4987aa301 100644
--- a/meta/packages/dosfstools/dosfstools/msdos_fat12_undefined.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/msdos_fat12_undefined.patch
diff --git a/meta/packages/dosfstools/dosfstools_2.10.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.10.bb
index 100044b75..100044b75 100644
--- a/meta/packages/dosfstools/dosfstools_2.10.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_2.10.bb
diff --git a/meta/packages/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
index a5f6e034d..a5f6e034d 100644
--- a/meta/packages/dosfstools/dosfstools_2.11.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 7a4a1a607..7a4a1a607 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
diff --git a/meta/packages/dpkg/dpkg/autofoo.patch b/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
index 691121e41..691121e41 100644
--- a/meta/packages/dpkg/dpkg/autofoo.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
diff --git a/meta/packages/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
index d09343c6e..d09343c6e 100644
--- a/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
diff --git a/meta/packages/dpkg/dpkg/nochroot.patch b/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
index 3a8beaebb..3a8beaebb 100644
--- a/meta/packages/dpkg/dpkg/nochroot.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
diff --git a/meta/packages/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index f5984fe14..f5984fe14 100644
--- a/meta/packages/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
diff --git a/meta/packages/dpkg/dpkg/noupdalt.patch b/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
index 023e99ae8..023e99ae8 100644
--- a/meta/packages/dpkg/dpkg/noupdalt.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/recipes-devtools/dpkg/dpkg_1.14.19.bb
index 1e54306c9..1e54306c9 100644
--- a/meta/packages/dpkg/dpkg_1.14.19.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.14.19.bb
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
index 4b0066847..4b0066847 100644
--- a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
index b0577e3bc..b0577e3bc 100644
--- a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch
index 528e319d8..528e319d8 100644
--- a/meta/packages/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch
diff --git a/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index a10717851..a10717851 100644
--- a/meta/packages/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
index 15c80478f..15c80478f 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
diff --git a/meta/packages/elfutils/elfutils-0.108/warnings.patch b/meta/recipes-devtools/elfutils/elfutils-0.108/warnings.patch
index 680e0441f..680e0441f 100644
--- a/meta/packages/elfutils/elfutils-0.108/warnings.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.108/warnings.patch
diff --git a/meta/packages/elfutils/elfutils-0.148/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff
index a309d1ba1..a309d1ba1 100644
--- a/meta/packages/elfutils/elfutils-0.148/arm_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/do-autoreconf.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff
index 41afa5ef3..41afa5ef3 100644
--- a/meta/packages/elfutils/elfutils-0.148/do-autoreconf.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/elf_additions.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff
index 59a082b6c..59a082b6c 100644
--- a/meta/packages/elfutils/elfutils-0.148/elf_additions.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/elfutils-fsize.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch
index 9cf9cef52..9cf9cef52 100644
--- a/meta/packages/elfutils/elfutils-0.148/elfutils-fsize.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch
diff --git a/meta/packages/elfutils/elfutils-0.148/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff
index 98353d5b4..98353d5b4 100644
--- a/meta/packages/elfutils/elfutils-0.148/hppa_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/i386_dis.h b/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h
index a5cc01f91..a5cc01f91 100644
--- a/meta/packages/elfutils/elfutils-0.148/i386_dis.h
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h
diff --git a/meta/packages/elfutils/elfutils-0.148/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff
index 4eb70baf7..4eb70baf7 100644
--- a/meta/packages/elfutils/elfutils-0.148/m68k_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff
index ffdff9076..ffdff9076 100644
--- a/meta/packages/elfutils/elfutils-0.148/mips_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff
index d3a724622..d3a724622 100644
--- a/meta/packages/elfutils/elfutils-0.148/redhat-portability.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/redhat-robustify.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff
index a186308f1..a186308f1 100644
--- a/meta/packages/elfutils/elfutils-0.148/redhat-robustify.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff
index 20f03b86d..20f03b86d 100644
--- a/meta/packages/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff
diff --git a/meta/packages/elfutils/elfutils-0.148/x86_64_dis.h b/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h
index a0198bed9..a0198bed9 100644
--- a/meta/packages/elfutils/elfutils-0.148/x86_64_dis.h
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h
diff --git a/meta/packages/elfutils/elfutils-0.89/warnings.patch b/meta/recipes-devtools/elfutils/elfutils-0.89/warnings.patch
index 2a1ea09a6..2a1ea09a6 100644
--- a/meta/packages/elfutils/elfutils-0.89/warnings.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.89/warnings.patch
diff --git a/meta/packages/elfutils/elfutils_0.108.bb b/meta/recipes-devtools/elfutils/elfutils_0.108.bb
index 67f34a0ac..67f34a0ac 100644
--- a/meta/packages/elfutils/elfutils_0.108.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.108.bb
diff --git a/meta/packages/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 18887e4b9..18887e4b9 100644
--- a/meta/packages/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
diff --git a/meta/packages/elfutils/elfutils_0.89.bb b/meta/recipes-devtools/elfutils/elfutils_0.89.bb
index 24cb37ad1..24cb37ad1 100644
--- a/meta/packages/elfutils/elfutils_0.89.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.89.bb
diff --git a/meta/packages/fakechroot/fakechroot/fix-readlink.patch b/meta/recipes-devtools/fakechroot/fakechroot/fix-readlink.patch
index 932156492..932156492 100644
--- a/meta/packages/fakechroot/fakechroot/fix-readlink.patch
+++ b/meta/recipes-devtools/fakechroot/fakechroot/fix-readlink.patch
diff --git a/meta/packages/fakechroot/fakechroot_2.9.bb b/meta/recipes-devtools/fakechroot/fakechroot_2.9.bb
index aea76366f..aea76366f 100644
--- a/meta/packages/fakechroot/fakechroot_2.9.bb
+++ b/meta/recipes-devtools/fakechroot/fakechroot_2.9.bb
diff --git a/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch b/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch
index ae18e8a28..ae18e8a28 100644
--- a/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch
+++ b/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch
diff --git a/meta/packages/fakeroot/fakeroot_1.14.4.bb b/meta/recipes-devtools/fakeroot/fakeroot_1.14.4.bb
index 4edeccfe6..4edeccfe6 100644
--- a/meta/packages/fakeroot/fakeroot_1.14.4.bb
+++ b/meta/recipes-devtools/fakeroot/fakeroot_1.14.4.bb
diff --git a/meta/packages/file/file/dump b/meta/recipes-devtools/file/file/dump
index 628ead86c..628ead86c 100644
--- a/meta/packages/file/file/dump
+++ b/meta/recipes-devtools/file/file/dump
diff --git a/meta/packages/file/file/filesystems b/meta/recipes-devtools/file/file/filesystems
index fd5073334..fd5073334 100644
--- a/meta/packages/file/file/filesystems
+++ b/meta/recipes-devtools/file/file/filesystems
diff --git a/meta/packages/file/file/ge-le.patch b/meta/recipes-devtools/file/file/ge-le.patch
index 7b7d8b60a..7b7d8b60a 100644
--- a/meta/packages/file/file/ge-le.patch
+++ b/meta/recipes-devtools/file/file/ge-le.patch
diff --git a/meta/packages/file/file/stringb-compat.patch b/meta/recipes-devtools/file/file/stringb-compat.patch
index 055e43e30..055e43e30 100644
--- a/meta/packages/file/file/stringb-compat.patch
+++ b/meta/recipes-devtools/file/file/stringb-compat.patch
diff --git a/meta/packages/file/file_5.04.bb b/meta/recipes-devtools/file/file_5.04.bb
index afc08162d..afc08162d 100644
--- a/meta/packages/file/file_5.04.bb
+++ b/meta/recipes-devtools/file/file_5.04.bb
diff --git a/meta/packages/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index da95a5e25..da95a5e25 100644
--- a/meta/packages/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
diff --git a/meta/packages/flex/flex_2.5.35.bb b/meta/recipes-devtools/flex/flex_2.5.35.bb
index eddaa4856..eddaa4856 100644
--- a/meta/packages/flex/flex_2.5.35.bb
+++ b/meta/recipes-devtools/flex/flex_2.5.35.bb
diff --git a/meta/packages/gcc/files/canadian-build-modules-configure.patch b/meta/recipes-devtools/gcc/files/canadian-build-modules-configure.patch
index 8aede105c..8aede105c 100644
--- a/meta/packages/gcc/files/canadian-build-modules-configure.patch
+++ b/meta/recipes-devtools/gcc/files/canadian-build-modules-configure.patch
diff --git a/meta/packages/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch b/meta/recipes-devtools/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
index 8a2a4c404..8a2a4c404 100644
--- a/meta/packages/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
+++ b/meta/recipes-devtools/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
diff --git a/meta/packages/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch b/meta/recipes-devtools/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch
index b3753364f..b3753364f 100644
--- a/meta/packages/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch
+++ b/meta/recipes-devtools/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch
diff --git a/meta/packages/gcc/files/gcc-posix-open-fix.patch b/meta/recipes-devtools/gcc/files/gcc-posix-open-fix.patch
index 99f813e86..99f813e86 100644
--- a/meta/packages/gcc/files/gcc-posix-open-fix.patch
+++ b/meta/recipes-devtools/gcc/files/gcc-posix-open-fix.patch
diff --git a/meta/packages/gcc/files/gcc4-mtune-compat.patch b/meta/recipes-devtools/gcc/files/gcc4-mtune-compat.patch
index 0da2811d3..0da2811d3 100644
--- a/meta/packages/gcc/files/gcc4-mtune-compat.patch
+++ b/meta/recipes-devtools/gcc/files/gcc4-mtune-compat.patch
diff --git a/meta/packages/gcc/files/gfortran-4.3.x.patch b/meta/recipes-devtools/gcc/files/gfortran-4.3.x.patch
index 0c42851ce..0c42851ce 100644
--- a/meta/packages/gcc/files/gfortran-4.3.x.patch
+++ b/meta/recipes-devtools/gcc/files/gfortran-4.3.x.patch
diff --git a/meta/packages/gcc/files/gfortran.patch b/meta/recipes-devtools/gcc/files/gfortran.patch
index 96905e5d7..96905e5d7 100644
--- a/meta/packages/gcc/files/gfortran.patch
+++ b/meta/recipes-devtools/gcc/files/gfortran.patch
diff --git a/meta/packages/gcc/files/pr22133-mingw-path-fixup.patch b/meta/recipes-devtools/gcc/files/pr22133-mingw-path-fixup.patch
index 429e9ffd0..429e9ffd0 100644
--- a/meta/packages/gcc/files/pr22133-mingw-path-fixup.patch
+++ b/meta/recipes-devtools/gcc/files/pr22133-mingw-path-fixup.patch
diff --git a/meta/packages/gcc/files/pr33281-mingw-host-fragment.patch b/meta/recipes-devtools/gcc/files/pr33281-mingw-host-fragment.patch
index e16fb4464..e16fb4464 100644
--- a/meta/packages/gcc/files/pr33281-mingw-host-fragment.patch
+++ b/meta/recipes-devtools/gcc/files/pr33281-mingw-host-fragment.patch
diff --git a/meta/packages/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch b/meta/recipes-devtools/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
index faf44c27f..faf44c27f 100644
--- a/meta/packages/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
+++ b/meta/recipes-devtools/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
diff --git a/meta/packages/gcc/gcc-4.3.3.inc b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
index 9b600a0f1..9b600a0f1 100644
--- a/meta/packages/gcc/gcc-4.3.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
diff --git a/meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/100-uclibc-conf.patch
index 0b799607e..0b799607e 100644
--- a/meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/100-uclibc-conf.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch
index 09c9bbecf..09c9bbecf 100644
--- a/meta/packages/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/103-uclibc-conf-noupstream.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/110-arm-eabi.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
index acebe5308..acebe5308 100644
--- a/meta/packages/gcc/gcc-4.3.3/110-arm-eabi.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/200-uclibc-locale.patch
index 70ba98eed..70ba98eed 100644
--- a/meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/200-uclibc-locale.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
index f39e65220..f39e65220 100644
--- a/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch
index 160ab35bb..160ab35bb 100644
--- a/meta/packages/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/204-uclibc-locale-wchar_fix.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
index 48eaa1d44..48eaa1d44 100644
--- a/meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/300-libstdc++-pic.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/300-libstdc++-pic.patch
index 89d03a85e..89d03a85e 100644
--- a/meta/packages/gcc/gcc-4.3.3/300-libstdc++-pic.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/300-libstdc++-pic.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/301-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/301-missing-execinfo_h.patch
index 0e2092f3f..0e2092f3f 100644
--- a/meta/packages/gcc/gcc-4.3.3/301-missing-execinfo_h.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/301-missing-execinfo_h.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/302-c99-snprintf.patch
index 02865865e..02865865e 100644
--- a/meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/302-c99-snprintf.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch
index 2ccc80d9b..2ccc80d9b 100644
--- a/meta/packages/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/303-c99-complex-ugly-hack.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/304-index_macro.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/304-index_macro.patch
index d8e476555..d8e476555 100644
--- a/meta/packages/gcc/gcc-4.3.3/304-index_macro.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/304-index_macro.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch
index 374b1f865..374b1f865 100644
--- a/meta/packages/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/305-libmudflap-susv3-legacy.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/306-libstdc++-namespace.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/306-libstdc++-namespace.patch
index 69587ca63..69587ca63 100644
--- a/meta/packages/gcc/gcc-4.3.3/306-libstdc++-namespace.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/306-libstdc++-namespace.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/307-locale_facets.patch
index 774fcfa2c..774fcfa2c 100644
--- a/meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/307-locale_facets.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch
index 0bf115c45..0bf115c45 100644
--- a/meta/packages/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/402-libbackend_dep_gcov-iov.h.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch
index 23fce7544..23fce7544 100644
--- a/meta/packages/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/602-sdk-libstdc++-includes.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/64bithack.patch
index f6931b85a..f6931b85a 100644
--- a/meta/packages/gcc/gcc-4.3.3/64bithack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/64bithack.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/740-sh-pr24836.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/740-sh-pr24836.patch
index 7992282cf..7992282cf 100644
--- a/meta/packages/gcc/gcc-4.3.3/740-sh-pr24836.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/740-sh-pr24836.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/800-arm-bigendian.patch
index f43394278..f43394278 100644
--- a/meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/800-arm-bigendian.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch
index 54490fc24..54490fc24 100644
--- a/meta/packages/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/801-arm-bigendian-eabi.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch
index 8fac37c4d..8fac37c4d 100644
--- a/meta/packages/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/904-flatten-switch-stmt-00.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-nolibfloat.patch
index c4897c033..c4897c033 100644
--- a/meta/packages/gcc/gcc-4.3.3/arm-nolibfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-nolibfloat.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-softfloat.patch
index 5e1edd920..5e1edd920 100644
--- a/meta/packages/gcc/gcc-4.3.3/arm-softfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-softfloat.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/arm-thumb-cache.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb-cache.patch
index fa63846c8..fa63846c8 100644
--- a/meta/packages/gcc/gcc-4.3.3/arm-thumb-cache.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb-cache.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/arm-thumb.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch
index 7b0b8b2dd..7b0b8b2dd 100644
--- a/meta/packages/gcc/gcc-4.3.3/arm-thumb.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/arm-thumb.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/cache-amnesia.patch
index fb4d1a26d..fb4d1a26d 100644
--- a/meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/cache-amnesia.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch
index 7bb888706..7bb888706 100644
--- a/meta/packages/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/arm-unbreak-eabi-armv4t.dpatch
diff --git a/meta/packages/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch
index 84c5ef2eb..84c5ef2eb 100644
--- a/meta/packages/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/gcc-ice-hack.dpatch
diff --git a/meta/packages/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch
index 70c9e8154..70c9e8154 100644
--- a/meta/packages/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/libstdc++-pic.dpatch
diff --git a/meta/packages/gcc/gcc-4.3.3/debian/pr30961.dpatch b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/pr30961.dpatch
index b20fdf5bf..b20fdf5bf 100644
--- a/meta/packages/gcc/gcc-4.3.3/debian/pr30961.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/debian/pr30961.dpatch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch
index 77655ad79..77655ad79 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-c++-builtin-redecl.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch
index 00d37bd7c..00d37bd7c 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-cpp-pragma.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch
index 2ad3b24d8..2ad3b24d8 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-i386-libgomp.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch
index 8e10979ce..8e10979ce 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ia64-libunwind.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch
index 63a1b50a7..63a1b50a7 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-debug-iface-type.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch
index f07ead8f2..f07ead8f2 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-java-nomulti.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch
index da85e556e..da85e556e 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-libgomp-speedup.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch
index e9ae1bc30..e9ae1bc30 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-ppc32-retaddr.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch
index 172bb8117..172bb8117 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr27898.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch
index f35696703..f35696703 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr32139.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch
index 9e9c90d27..9e9c90d27 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr33763.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch
index 6bf3f0d9d..6bf3f0d9d 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35440.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch
index 37b84275e..37b84275e 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-pr35751.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch
index e96ae6f13..e96ae6f13 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh251682.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch
index c894f83b4..c894f83b4 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh330771.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch
index 28e73b07c..28e73b07c 100644
--- a/meta/packages/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fedora/gcc43-rh341221.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch
index b3d38ad98..b3d38ad98 100644
--- a/meta/packages/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-cross-compile-hack.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/fortran-static-linking.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-static-linking.patch
index 3dd6321dc..3dd6321dc 100644
--- a/meta/packages/gcc/gcc-4.3.3/fortran-static-linking.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/fortran-static-linking.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
index d1df8b271..d1df8b271 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
index 81522a8f5..81522a8f5 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index f33e6c1ea..f33e6c1ea 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index 1d3936bc3..1d3936bc3 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-arm-frename-registers.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-arm-frename-registers.patch
index 280b90358..280b90358 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-arm-frename-registers.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-arm-frename-registers.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-flags-for-build.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-flags-for-build.patch
index 43a9d73dc..43a9d73dc 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-flags-for-build.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-flags-for-build.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-release-branch/PR-36500-fix-neon.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-release-branch/PR-36500-fix-neon.patch
index 971dfe7e2..971dfe7e2 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-release-branch/PR-36500-fix-neon.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc-release-branch/PR-36500-fix-neon.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc41-configure.in.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc41-configure.in.patch
index 3d33bcb97..3d33bcb97 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc41-configure.in.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc41-configure.in.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc43-build-id.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc43-build-id.patch
index 4e162e647..4e162e647 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc43-build-id.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc43-build-id.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch
index d49f2b985..d49f2b985 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gcc43-ppc64-ia64-GNU-stack.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/gfortran.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/gfortran.patch
index 96905e5d7..96905e5d7 100644
--- a/meta/packages/gcc/gcc-4.3.3/gfortran.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/gfortran.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/headerpath.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/headerpath.patch
index a3a6aff27..a3a6aff27 100644
--- a/meta/packages/gcc/gcc-4.3.3/headerpath.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/headerpath.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/intermask-bigendian.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/intermask-bigendian.patch
index fdff3d3d8..fdff3d3d8 100644
--- a/meta/packages/gcc/gcc-4.3.3/intermask-bigendian.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/intermask-bigendian.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/ldflags.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/ldflags.patch
index 9576f6077..9576f6077 100644
--- a/meta/packages/gcc/gcc-4.3.3/ldflags.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/ldflags.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/optional_libstdc.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/optional_libstdc.patch
index 0f74353a1..0f74353a1 100644
--- a/meta/packages/gcc/gcc-4.3.3/optional_libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/optional_libstdc.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/pr34130.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/pr34130.patch
index 415335f4b..415335f4b 100644
--- a/meta/packages/gcc/gcc-4.3.3/pr34130.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/pr34130.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/pr35942.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/pr35942.patch
index da610f518..da610f518 100644
--- a/meta/packages/gcc/gcc-4.3.3/pr35942.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/pr35942.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/sdk-libstdc++-includes.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/sdk-libstdc++-includes.patch
index 4377c2143..4377c2143 100644
--- a/meta/packages/gcc/gcc-4.3.3/sdk-libstdc++-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/sdk-libstdc++-includes.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/sh3-installfix-fixheaders.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/sh3-installfix-fixheaders.patch
index a06cd2e07..a06cd2e07 100644
--- a/meta/packages/gcc/gcc-4.3.3/sh3-installfix-fixheaders.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/sh3-installfix-fixheaders.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/sh_unwind.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/sh_unwind.patch
index 94921636b..94921636b 100644
--- a/meta/packages/gcc/gcc-4.3.3/sh_unwind.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/sh_unwind.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/sparseset_rule.patch
index 7c8113add..7c8113add 100644
--- a/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/sparseset_rule.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/unbreak-armv4t.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/unbreak-armv4t.patch
index b3399abfd..b3399abfd 100644
--- a/meta/packages/gcc/gcc-4.3.3/unbreak-armv4t.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/unbreak-armv4t.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/zecke-no-host-includes.patch
index 1f3b062fe..1f3b062fe 100644
--- a/meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/zecke-no-host-includes.patch
diff --git a/meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
index a7722cbfc..a7722cbfc 100644
--- a/meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
diff --git a/meta/packages/gcc/gcc-4.5.0.inc b/meta/recipes-devtools/gcc/gcc-4.5.0.inc
index 6ca2f98bc..6ca2f98bc 100644
--- a/meta/packages/gcc/gcc-4.5.0.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0.inc
diff --git a/meta/packages/gcc/gcc-4.5.0/100-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/100-uclibc-conf.patch
index 0b799607e..0b799607e 100644
--- a/meta/packages/gcc/gcc-4.5.0/100-uclibc-conf.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/100-uclibc-conf.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/103-uclibc-conf-noupstream.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/103-uclibc-conf-noupstream.patch
index f9d8ad925..f9d8ad925 100644
--- a/meta/packages/gcc/gcc-4.5.0/103-uclibc-conf-noupstream.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/103-uclibc-conf-noupstream.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/200-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/200-uclibc-locale.patch
index 32de11fc7..32de11fc7 100644
--- a/meta/packages/gcc/gcc-4.5.0/200-uclibc-locale.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/200-uclibc-locale.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/203-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/203-uclibc-locale-no__x.patch
index f39e65220..f39e65220 100644
--- a/meta/packages/gcc/gcc-4.5.0/203-uclibc-locale-no__x.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/203-uclibc-locale-no__x.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/204-uclibc-locale-wchar_fix.patch
index 160ab35bb..160ab35bb 100644
--- a/meta/packages/gcc/gcc-4.5.0/204-uclibc-locale-wchar_fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/204-uclibc-locale-wchar_fix.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/205-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/205-uclibc-locale-update.patch
index 48eaa1d44..48eaa1d44 100644
--- a/meta/packages/gcc/gcc-4.5.0/205-uclibc-locale-update.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/205-uclibc-locale-update.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/301-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/301-missing-execinfo_h.patch
index aaa5cee8c..aaa5cee8c 100644
--- a/meta/packages/gcc/gcc-4.5.0/301-missing-execinfo_h.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/301-missing-execinfo_h.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/302-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/302-c99-snprintf.patch
index 12be2da79..12be2da79 100644
--- a/meta/packages/gcc/gcc-4.5.0/302-c99-snprintf.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/302-c99-snprintf.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/303-c99-complex-ugly-hack.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/303-c99-complex-ugly-hack.patch
index 56aa78cdd..56aa78cdd 100644
--- a/meta/packages/gcc/gcc-4.5.0/303-c99-complex-ugly-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/303-c99-complex-ugly-hack.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/304-index_macro.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/304-index_macro.patch
index bbb656351..bbb656351 100644
--- a/meta/packages/gcc/gcc-4.5.0/304-index_macro.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/304-index_macro.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/305-libmudflap-susv3-legacy.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/305-libmudflap-susv3-legacy.patch
index f890acb81..f890acb81 100644
--- a/meta/packages/gcc/gcc-4.5.0/305-libmudflap-susv3-legacy.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/305-libmudflap-susv3-legacy.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/306-libstdc++-namespace.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/306-libstdc++-namespace.patch
index 75c740137..75c740137 100644
--- a/meta/packages/gcc/gcc-4.5.0/306-libstdc++-namespace.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/306-libstdc++-namespace.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/307-locale_facets.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/307-locale_facets.patch
index 774fcfa2c..774fcfa2c 100644
--- a/meta/packages/gcc/gcc-4.5.0/307-locale_facets.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/307-locale_facets.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/602-sdk-libstdc++-includes.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/602-sdk-libstdc++-includes.patch
index 23fce7544..23fce7544 100644
--- a/meta/packages/gcc/gcc-4.5.0/602-sdk-libstdc++-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/602-sdk-libstdc++-includes.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/64bithack.patch
index 067676ab6..067676ab6 100644
--- a/meta/packages/gcc/gcc-4.5.0/64bithack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/64bithack.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/740-sh-pr24836.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/740-sh-pr24836.patch
index d84889259..d84889259 100644
--- a/meta/packages/gcc/gcc-4.5.0/740-sh-pr24836.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/740-sh-pr24836.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/800-arm-bigendian.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/800-arm-bigendian.patch
index 77d02c3ab..77d02c3ab 100644
--- a/meta/packages/gcc/gcc-4.5.0/800-arm-bigendian.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/800-arm-bigendian.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/904-flatten-switch-stmt-00.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/904-flatten-switch-stmt-00.patch
index c4641dc63..c4641dc63 100644
--- a/meta/packages/gcc/gcc-4.5.0/904-flatten-switch-stmt-00.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/904-flatten-switch-stmt-00.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/arm-bswapsi2.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-bswapsi2.patch
index 7ac61a6d6..7ac61a6d6 100644
--- a/meta/packages/gcc/gcc-4.5.0/arm-bswapsi2.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-bswapsi2.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-nolibfloat.patch
index 99f2b20d5..99f2b20d5 100644
--- a/meta/packages/gcc/gcc-4.5.0/arm-nolibfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-nolibfloat.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-softfloat.patch
index 181d4fbf5..181d4fbf5 100644
--- a/meta/packages/gcc/gcc-4.5.0/arm-softfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-softfloat.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/arm-unbreak-eabi-armv4t.dpatch b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-unbreak-eabi-armv4t.dpatch
index 7bb888706..7bb888706 100644
--- a/meta/packages/gcc/gcc-4.5.0/arm-unbreak-eabi-armv4t.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/arm-unbreak-eabi-armv4t.dpatch
diff --git a/meta/packages/gcc/gcc-4.5.0/cache-amnesia.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/cache-amnesia.patch
index b889f9b6c..b889f9b6c 100644
--- a/meta/packages/gcc/gcc-4.5.0/cache-amnesia.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/cache-amnesia.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-c++-builtin-redecl.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-c++-builtin-redecl.patch
index a149eae98..a149eae98 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-c++-builtin-redecl.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-c++-builtin-redecl.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-cpp-pragma.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-cpp-pragma.patch
index 00d37bd7c..00d37bd7c 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-cpp-pragma.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-cpp-pragma.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-i386-libgomp.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-i386-libgomp.patch
index a588db28e..a588db28e 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-i386-libgomp.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-i386-libgomp.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-ia64-libunwind.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-ia64-libunwind.patch
index cad13d122..cad13d122 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-ia64-libunwind.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-ia64-libunwind.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-java-debug-iface-type.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-java-debug-iface-type.patch
index de14a5001..de14a5001 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-java-debug-iface-type.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-java-debug-iface-type.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-java-nomulti.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-java-nomulti.patch
index 3cb10f3c2..3cb10f3c2 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-java-nomulti.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-java-nomulti.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-libgomp-speedup.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-libgomp-speedup.patch
index da85e556e..da85e556e 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-libgomp-speedup.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-libgomp-speedup.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-ppc32-retaddr.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-ppc32-retaddr.patch
index 3de4158eb..3de4158eb 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-ppc32-retaddr.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-ppc32-retaddr.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-pr27898.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-pr27898.patch
index 172bb8117..172bb8117 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-pr27898.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-pr27898.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-pr32139.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-pr32139.patch
index f35696703..f35696703 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-pr32139.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-pr32139.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-pr33763.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-pr33763.patch
index 68c30650f..68c30650f 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-pr33763.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-pr33763.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-rh251682.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-rh251682.patch
index e96ae6f13..e96ae6f13 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-rh251682.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-rh251682.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-rh330771.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-rh330771.patch
index 4888ac47d..4888ac47d 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-rh330771.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-rh330771.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-rh341221.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-rh341221.patch
index 7e2801b99..7e2801b99 100644
--- a/meta/packages/gcc/gcc-4.5.0/fedora/gcc43-rh341221.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fedora/gcc43-rh341221.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch
index 348c77006..348c77006 100644
--- a/meta/packages/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/fortran-cross-compile-hack.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-4.0.2-e300c2c3.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.0.2-e300c2c3.patch
index d1df8b271..d1df8b271 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-4.0.2-e300c2c3.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.0.2-e300c2c3.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index f33e6c1ea..f33e6c1ea 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index af0b81ba4..af0b81ba4 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-4.5.0_to_svn_162697.patch.bz2 b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.5.0_to_svn_162697.patch.bz2
index d37a2c032..d37a2c032 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-4.5.0_to_svn_162697.patch.bz2
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-4.5.0_to_svn_162697.patch.bz2
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-arm-frename-registers.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-arm-frename-registers.patch
index 280b90358..280b90358 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-arm-frename-registers.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-arm-frename-registers.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-flags-for-build.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-flags-for-build.patch
index 51892855a..51892855a 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-flags-for-build.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-flags-for-build.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-ice-hack.dpatch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-ice-hack.dpatch
index 84c5ef2eb..84c5ef2eb 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-ice-hack.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-ice-hack.dpatch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-poison-system-directories.patch
index e68a2de2a..e68a2de2a 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-poison-system-directories.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-pr43698-arm-rev-instr.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-pr43698-arm-rev-instr.patch
index 61c883e1f..61c883e1f 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-pr43698-arm-rev-instr.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-pr43698-arm-rev-instr.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch
index 4f94fc9d6..4f94fc9d6 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/gcc_revert_base_version_to_4.5.0.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc_revert_base_version_to_4.5.0.patch
index 5f134ef33..5f134ef33 100644
--- a/meta/packages/gcc/gcc-4.5.0/gcc_revert_base_version_to_4.5.0.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/gcc_revert_base_version_to_4.5.0.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/libstdc++-emit-__cxa_end_cleanup-in-text.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/libstdc++-emit-__cxa_end_cleanup-in-text.patch
index ada36a591..ada36a591 100644
--- a/meta/packages/gcc/gcc-4.5.0/libstdc++-emit-__cxa_end_cleanup-in-text.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/libstdc++-emit-__cxa_end_cleanup-in-text.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/libstdc++-pic.dpatch b/meta/recipes-devtools/gcc/gcc-4.5.0/libstdc++-pic.dpatch
index 70c9e8154..70c9e8154 100644
--- a/meta/packages/gcc/gcc-4.5.0/libstdc++-pic.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/libstdc++-pic.dpatch
diff --git a/meta/packages/gcc/gcc-4.5.0/optional_libstdc.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/optional_libstdc.patch
index 0f74353a1..0f74353a1 100644
--- a/meta/packages/gcc/gcc-4.5.0/optional_libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/optional_libstdc.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/pr30961.dpatch b/meta/recipes-devtools/gcc/gcc-4.5.0/pr30961.dpatch
index b20fdf5bf..b20fdf5bf 100644
--- a/meta/packages/gcc/gcc-4.5.0/pr30961.dpatch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/pr30961.dpatch
diff --git a/meta/packages/gcc/gcc-4.5.0/pr35942.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/pr35942.patch
index da610f518..da610f518 100644
--- a/meta/packages/gcc/gcc-4.5.0/pr35942.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/pr35942.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/zecke-no-host-includes.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/zecke-no-host-includes.patch
index 4ccf35f62..4ccf35f62 100644
--- a/meta/packages/gcc/gcc-4.5.0/zecke-no-host-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/zecke-no-host-includes.patch
diff --git a/meta/packages/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch
index 4b827d639..4b827d639 100644
--- a/meta/packages/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.0/zecke-xgcc-cpp.patch
diff --git a/meta/packages/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 1e9c65e66..1e9c65e66 100644
--- a/meta/packages/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
diff --git a/meta/packages/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 5a55025ac..5a55025ac 100644
--- a/meta/packages/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
diff --git a/meta/packages/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
index 6051a7678..6051a7678 100644
--- a/meta/packages/gcc/gcc-configure-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
diff --git a/meta/packages/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index f9ad61d12..f9ad61d12 100644
--- a/meta/packages/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
index 0eb33adda..0eb33adda 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
diff --git a/meta/packages/gcc/gcc-configure-target.inc b/meta/recipes-devtools/gcc/gcc-configure-target.inc
index 2fd311491..2fd311491 100644
--- a/meta/packages/gcc/gcc-configure-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
diff --git a/meta/packages/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index a3b15c3dc..a3b15c3dc 100644
--- a/meta/packages/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb
index 981452b7a..981452b7a 100644
--- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.0.bb
index dd1941213..dd1941213 100644
--- a/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index f582de984..f582de984 100644
--- a/meta/packages/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb
index b2c257d9d..b2c257d9d 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-cross-initial_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.0.bb
index ef52845b0..ef52845b0 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index 06211033b..06211033b 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
diff --git a/meta/packages/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 72a42411b..72a42411b 100644
--- a/meta/packages/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb
index 10681dad4..10681dad4 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.0.bb
index deeee37c2..deeee37c2 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index 8a8f21a57..8a8f21a57 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
diff --git a/meta/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/meta/recipes-devtools/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index 6dbb19cec..6dbb19cec 100644
--- a/meta/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
diff --git a/meta/packages/gcc/gcc-cross-kernel.inc b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
index 534776276..534776276 100644
--- a/meta/packages/gcc/gcc-cross-kernel.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 5a796bcde..5a796bcde 100644
--- a/meta/packages/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
diff --git a/meta/packages/gcc/gcc-cross4.inc b/meta/recipes-devtools/gcc/gcc-cross4.inc
index ea20a24a0..ea20a24a0 100644
--- a/meta/packages/gcc/gcc-cross4.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross4.inc
diff --git a/meta/packages/gcc/gcc-cross_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross_4.3.3.bb
index 36f91d022..36f91d022 100644
--- a/meta/packages/gcc/gcc-cross_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-cross_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-cross_4.5.0.bb
index 8d28ab3e5..8d28ab3e5 100644
--- a/meta/packages/gcc/gcc-cross_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
index 11857b2c3..11857b2c3 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
diff --git a/meta/packages/gcc/gcc-crosssdk-initial.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
index eb8d27397..eb8d27397 100644
--- a/meta/packages/gcc/gcc-crosssdk-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb
index e804b4b01..e804b4b01 100644
--- a/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.0.bb
index c76e4074d..c76e4074d 100644
--- a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc
index ed5d5e838..ed5d5e838 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.3.3.bb
index 5f01473ad..5f01473ad 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.0.bb
index 42c498704..42c498704 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index 6e7d5a73f..6e7d5a73f 100644
--- a/meta/packages/gcc/gcc-crosssdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
diff --git a/meta/packages/gcc/gcc-crosssdk_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_4.3.3.bb
index 92a3f1138..92a3f1138 100644
--- a/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.0.bb
index 9e94c806d..9e94c806d 100644
--- a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.0.bb
diff --git a/meta/packages/gcc/gcc-csl-arm-2005q3.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
index fd2b3793d..fd2b3793d 100644
--- a/meta/packages/gcc/gcc-csl-arm-2005q3.inc
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
diff --git a/meta/packages/gcc/gcc-csl-arm-2008q1.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
index e84bd835d..e84bd835d 100644
--- a/meta/packages/gcc/gcc-csl-arm-2008q1.inc
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
diff --git a/meta/packages/gcc/gcc-csl-arm/15342.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/15342.patch
index d0f3e72d4..d0f3e72d4 100644
--- a/meta/packages/gcc/gcc-csl-arm/15342.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/15342.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
index c4897c033..c4897c033 100644
--- a/meta/packages/gcc/gcc-csl-arm/arm-nolibfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
index 5e1edd920..5e1edd920 100644
--- a/meta/packages/gcc/gcc-csl-arm/arm-softfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/cache-amnesia.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/cache-amnesia.patch
index ef7cd111c..ef7cd111c 100644
--- a/meta/packages/gcc/gcc-csl-arm/cache-amnesia.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/cache-amnesia.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/fortran-static-linking.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/fortran-static-linking.patch
index 3dd6321dc..3dd6321dc 100644
--- a/meta/packages/gcc/gcc-csl-arm/fortran-static-linking.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/fortran-static-linking.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch
index cf17da6a0..cf17da6a0 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
index e6cc42bb6..e6cc42bb6 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
index 74c1f2683..74c1f2683 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
index c84550330..c84550330 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
index b984605af..b984605af 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc34-arm-tune.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc34-arm-tune.patch
index cdb20bef9..cdb20bef9 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc34-arm-tune.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc34-arm-tune.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc41-configure.in.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
index 3d33bcb97..3d33bcb97 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc41-configure.in.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
index fa21b2655..fa21b2655 100644
--- a/meta/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/no-libfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/no-libfloat.patch
index e5d12cfb4..e5d12cfb4 100644
--- a/meta/packages/gcc/gcc-csl-arm/no-libfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/no-libfloat.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/pic-without-sl.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/pic-without-sl.patch
index 9a49794da..9a49794da 100644
--- a/meta/packages/gcc/gcc-csl-arm/pic-without-sl.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/pic-without-sl.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/pr34130.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/pr34130.patch
index 415335f4b..415335f4b 100644
--- a/meta/packages/gcc/gcc-csl-arm/pr34130.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/pr34130.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/zecke-no-host-includes.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
index 8b05cb73a..8b05cb73a 100644
--- a/meta/packages/gcc/gcc-csl-arm/zecke-no-host-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
diff --git a/meta/packages/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
index 921cab6e1..921cab6e1 100644
--- a/meta/packages/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index 4f902fa14..4f902fa14 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index 40a9ed0d7..40a9ed0d7 100644
--- a/meta/packages/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
diff --git a/meta/packages/gcc/gcc-package-sdk.inc b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
index 23b9a48eb..23b9a48eb 100644
--- a/meta/packages/gcc/gcc-package-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
diff --git a/meta/packages/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 3286da6a9..3286da6a9 100644
--- a/meta/packages/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
diff --git a/meta/packages/gcc/gcc-runtime_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.3.3.bb
index 543bf24b7..543bf24b7 100644
--- a/meta/packages/gcc/gcc-runtime_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.3.3.bb
diff --git a/meta/packages/gcc/gcc-runtime_4.5.0.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.5.0.bb
index 28bae5019..28bae5019 100644
--- a/meta/packages/gcc/gcc-runtime_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.5.0.bb
diff --git a/meta/packages/gcc/gcc_4.3.3.bb b/meta/recipes-devtools/gcc/gcc_4.3.3.bb
index a2ae0c0e9..a2ae0c0e9 100644
--- a/meta/packages/gcc/gcc_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.3.3.bb
diff --git a/meta/packages/gcc/gcc_4.5.0.bb b/meta/recipes-devtools/gcc/gcc_4.5.0.bb
index e133c5bac..e133c5bac 100644
--- a/meta/packages/gcc/gcc_4.5.0.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.0.bb
diff --git a/meta/packages/gcc/gcc_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
index 832167ca4..832167ca4 100644
--- a/meta/packages/gcc/gcc_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
diff --git a/meta/packages/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 16b653e46..16b653e46 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
diff --git a/meta/packages/gdb/gdb-cross-canadian_7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb
index 3adcdcc28..3adcdcc28 100644
--- a/meta/packages/gdb/gdb-cross-canadian_7.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb
diff --git a/meta/packages/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc
index 20db86b56..20db86b56 100644
--- a/meta/packages/gdb/gdb-cross.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross.inc
diff --git a/meta/packages/gdb/gdb-cross_7.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.1.bb
index 3e4ce6f68..3e4ce6f68 100644
--- a/meta/packages/gdb/gdb-cross_7.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.1.bb
diff --git a/meta/packages/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 0ddd90b19..0ddd90b19 100644
--- a/meta/packages/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
diff --git a/meta/packages/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
index 41395f936..41395f936 100644
--- a/meta/packages/gdb/gdb/gdbserver-cflags-last.diff
+++ b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
diff --git a/meta/packages/gdb/gdb/kill_arm_map_symbols.patch b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
index 177142192..177142192 100644
--- a/meta/packages/gdb/gdb/kill_arm_map_symbols.patch
+++ b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
diff --git a/meta/packages/gdb/gdb/libiberty-cross.patch b/meta/recipes-devtools/gdb/gdb/libiberty-cross.patch
index 0d1897f9e..0d1897f9e 100644
--- a/meta/packages/gdb/gdb/libiberty-cross.patch
+++ b/meta/recipes-devtools/gdb/gdb/libiberty-cross.patch
diff --git a/meta/packages/gdb/gdb/no-werror.patch b/meta/recipes-devtools/gdb/gdb/no-werror.patch
index 092607372..092607372 100644
--- a/meta/packages/gdb/gdb/no-werror.patch
+++ b/meta/recipes-devtools/gdb/gdb/no-werror.patch
diff --git a/meta/packages/gdb/gdb/sim-install-6.6.patch b/meta/recipes-devtools/gdb/gdb/sim-install-6.6.patch
index a39ceab01..a39ceab01 100644
--- a/meta/packages/gdb/gdb/sim-install-6.6.patch
+++ b/meta/recipes-devtools/gdb/gdb/sim-install-6.6.patch
diff --git a/meta/packages/gdb/gdb/sim-install.patch b/meta/recipes-devtools/gdb/gdb/sim-install.patch
index 3c88c4c05..3c88c4c05 100644
--- a/meta/packages/gdb/gdb/sim-install.patch
+++ b/meta/recipes-devtools/gdb/gdb/sim-install.patch
diff --git a/meta/packages/gdb/gdb/uclibc.patch b/meta/recipes-devtools/gdb/gdb/uclibc.patch
index 3d6b7ba18..3d6b7ba18 100644
--- a/meta/packages/gdb/gdb/uclibc.patch
+++ b/meta/recipes-devtools/gdb/gdb/uclibc.patch
diff --git a/meta/packages/gdb/gdb_7.1.bb b/meta/recipes-devtools/gdb/gdb_7.1.bb
index be40f3f12..be40f3f12 100644
--- a/meta/packages/gdb/gdb_7.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.1.bb
diff --git a/meta/packages/genext2fs/genext2fs.inc b/meta/recipes-devtools/genext2fs/genext2fs.inc
index 859e49b2e..859e49b2e 100644
--- a/meta/packages/genext2fs/genext2fs.inc
+++ b/meta/recipes-devtools/genext2fs/genext2fs.inc
diff --git a/meta/packages/genext2fs/genext2fs_1.4.1.bb b/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb
index 3c6f6ba07..3c6f6ba07 100644
--- a/meta/packages/genext2fs/genext2fs_1.4.1.bb
+++ b/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb
diff --git a/meta/packages/git/files/autotools.patch b/meta/recipes-devtools/git/files/autotools.patch
index 1c69c2281..1c69c2281 100644
--- a/meta/packages/git/files/autotools.patch
+++ b/meta/recipes-devtools/git/files/autotools.patch
diff --git a/meta/packages/git/git.inc b/meta/recipes-devtools/git/git.inc
index 5d72df59d..5d72df59d 100644
--- a/meta/packages/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
diff --git a/meta/packages/git/git_1.7.2.1.bb b/meta/recipes-devtools/git/git_1.7.2.1.bb
index 7f822f69b..7f822f69b 100644
--- a/meta/packages/git/git_1.7.2.1.bb
+++ b/meta/recipes-devtools/git/git_1.7.2.1.bb
diff --git a/meta/packages/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch
index 83c9eae36..83c9eae36 100644
--- a/meta/packages/gmp/gmp-4.2.1/disable-stdc.patch
+++ b/meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch
diff --git a/meta/packages/gmp/gmp.inc b/meta/recipes-devtools/gmp/gmp.inc
index 6b56f7e7c..6b56f7e7c 100644
--- a/meta/packages/gmp/gmp.inc
+++ b/meta/recipes-devtools/gmp/gmp.inc
diff --git a/meta/packages/gmp/gmp/amd64.patch b/meta/recipes-devtools/gmp/gmp/amd64.patch
index 67be9dd35..67be9dd35 100644
--- a/meta/packages/gmp/gmp/amd64.patch
+++ b/meta/recipes-devtools/gmp/gmp/amd64.patch
diff --git a/meta/packages/gmp/gmp/configure.patch b/meta/recipes-devtools/gmp/gmp/configure.patch
index ed0c02d86..ed0c02d86 100644
--- a/meta/packages/gmp/gmp/configure.patch
+++ b/meta/recipes-devtools/gmp/gmp/configure.patch
diff --git a/meta/packages/gmp/gmp/sh4-asmfix.patch b/meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch
index 1a01f6153..1a01f6153 100644
--- a/meta/packages/gmp/gmp/sh4-asmfix.patch
+++ b/meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch
diff --git a/meta/packages/gmp/gmp/use-includedir.patch b/meta/recipes-devtools/gmp/gmp/use-includedir.patch
index ee3891f80..ee3891f80 100644
--- a/meta/packages/gmp/gmp/use-includedir.patch
+++ b/meta/recipes-devtools/gmp/gmp/use-includedir.patch
diff --git a/meta/packages/gmp/gmp_4.2.1.bb b/meta/recipes-devtools/gmp/gmp_4.2.1.bb
index d70dcf266..d70dcf266 100644
--- a/meta/packages/gmp/gmp_4.2.1.bb
+++ b/meta/recipes-devtools/gmp/gmp_4.2.1.bb
diff --git a/meta/packages/gmp/gmp_5.0.1.bb b/meta/recipes-devtools/gmp/gmp_5.0.1.bb
index dd908bd7c..dd908bd7c 100644
--- a/meta/packages/gmp/gmp_5.0.1.bb
+++ b/meta/recipes-devtools/gmp/gmp_5.0.1.bb
diff --git a/meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
index f820cef1c..f820cef1c 100644
--- a/meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch
+++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
diff --git a/meta/packages/gnu-config/gnu-config/gnu-configize.in b/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
index be8580c8e..be8580c8e 100755
--- a/meta/packages/gnu-config/gnu-config/gnu-configize.in
+++ b/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
diff --git a/meta/packages/gnu-config/gnu-config/uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch
index 20a3b11f2..20a3b11f2 100644
--- a/meta/packages/gnu-config/gnu-config/uclibc.patch
+++ b/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch
diff --git a/meta/packages/gnu-config/gnu-config_20080123.bb b/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
index 66d027e93..66d027e93 100644
--- a/meta/packages/gnu-config/gnu-config_20080123.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
diff --git a/meta/packages/guilt/files/guilt-bash.patch b/meta/recipes-devtools/guilt/files/guilt-bash.patch
index d2058e8cf..d2058e8cf 100644
--- a/meta/packages/guilt/files/guilt-bash.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-bash.patch
diff --git a/meta/packages/guilt/files/guilt-import-commit.patch b/meta/recipes-devtools/guilt/files/guilt-import-commit.patch
index 78cc93e5d..78cc93e5d 100644
--- a/meta/packages/guilt/files/guilt-import-commit.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-import-commit.patch
diff --git a/meta/packages/guilt/files/guilt-init.patch b/meta/recipes-devtools/guilt/files/guilt-init.patch
index a06da5bf7..a06da5bf7 100644
--- a/meta/packages/guilt/files/guilt-init.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-init.patch
diff --git a/meta/packages/guilt/files/guilt-pop.patch b/meta/recipes-devtools/guilt/files/guilt-pop.patch
index c26b324cc..c26b324cc 100644
--- a/meta/packages/guilt/files/guilt-pop.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-pop.patch
diff --git a/meta/packages/guilt/files/guilt-push-no-series.patch b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch
index d40119c71..d40119c71 100644
--- a/meta/packages/guilt/files/guilt-push-no-series.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch
diff --git a/meta/packages/guilt/files/guilt-push.patch b/meta/recipes-devtools/guilt/files/guilt-push.patch
index 218432959..218432959 100644
--- a/meta/packages/guilt/files/guilt-push.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-push.patch
diff --git a/meta/packages/guilt/files/guilt-set-git_exec_path.patch b/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch
index 92e75f29e..92e75f29e 100644
--- a/meta/packages/guilt/files/guilt-set-git_exec_path.patch
+++ b/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch
diff --git a/meta/packages/guilt/files/guilt.patch b/meta/recipes-devtools/guilt/files/guilt.patch
index a3352cf81..a3352cf81 100644
--- a/meta/packages/guilt/files/guilt.patch
+++ b/meta/recipes-devtools/guilt/files/guilt.patch
diff --git a/meta/packages/guilt/files/improve_auto_header_gen.patch b/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
index b98ec5e9f..b98ec5e9f 100644
--- a/meta/packages/guilt/files/improve_auto_header_gen.patch
+++ b/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
diff --git a/meta/packages/guilt/files/make_git_commands_conditional.patch b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch
index b6d40dbc9..b6d40dbc9 100644
--- a/meta/packages/guilt/files/make_git_commands_conditional.patch
+++ b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch
diff --git a/meta/packages/guilt/files/optional_head_check.patch b/meta/recipes-devtools/guilt/files/optional_head_check.patch
index 368d63b6a..368d63b6a 100644
--- a/meta/packages/guilt/files/optional_head_check.patch
+++ b/meta/recipes-devtools/guilt/files/optional_head_check.patch
diff --git a/meta/packages/guilt/files/uninstall_force.patch b/meta/recipes-devtools/guilt/files/uninstall_force.patch
index 8c9067dd4..8c9067dd4 100644
--- a/meta/packages/guilt/files/uninstall_force.patch
+++ b/meta/recipes-devtools/guilt/files/uninstall_force.patch
diff --git a/meta/packages/guilt/guilt-native_0.33.bb b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
index 62d91f695..62d91f695 100644
--- a/meta/packages/guilt/guilt-native_0.33.bb
+++ b/meta/recipes-devtools/guilt/guilt-native_0.33.bb
diff --git a/meta/packages/icon-naming-utils/icon-naming-utils-native_0.8.7.bb b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils-native_0.8.7.bb
index ef41c538a..ef41c538a 100644
--- a/meta/packages/icon-naming-utils/icon-naming-utils-native_0.8.7.bb
+++ b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils-native_0.8.7.bb
diff --git a/meta/packages/libtool/libtool-cross_2.2.10.bb b/meta/recipes-devtools/libtool/libtool-cross_2.2.10.bb
index 23135f7ed..23135f7ed 100644
--- a/meta/packages/libtool/libtool-cross_2.2.10.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.2.10.bb
diff --git a/meta/packages/libtool/libtool-native_2.2.10.bb b/meta/recipes-devtools/libtool/libtool-native_2.2.10.bb
index 322da4a99..322da4a99 100644
--- a/meta/packages/libtool/libtool-native_2.2.10.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.2.10.bb
diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.10.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.2.10.bb
index e972d9ef3..e972d9ef3 100644
--- a/meta/packages/libtool/libtool-nativesdk_2.2.10.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.2.10.bb
diff --git a/meta/packages/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc
index c94dadd0a..c94dadd0a 100644
--- a/meta/packages/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool.inc
diff --git a/meta/packages/libtool/libtool/cross_compile.patch b/meta/recipes-devtools/libtool/libtool/cross_compile.patch
index fc1f4b6fb..fc1f4b6fb 100644
--- a/meta/packages/libtool/libtool/cross_compile.patch
+++ b/meta/recipes-devtools/libtool/libtool/cross_compile.patch
diff --git a/meta/packages/libtool/libtool/prefix-manpage-fix.patch b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
index 47286699f..47286699f 100644
--- a/meta/packages/libtool/libtool/prefix-manpage-fix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
diff --git a/meta/packages/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index d008608a4..d008608a4 100644
--- a/meta/packages/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
diff --git a/meta/packages/libtool/libtool/trailingslash.patch b/meta/recipes-devtools/libtool/libtool/trailingslash.patch
index 313c26291..313c26291 100644
--- a/meta/packages/libtool/libtool/trailingslash.patch
+++ b/meta/recipes-devtools/libtool/libtool/trailingslash.patch
diff --git a/meta/packages/libtool/libtool_2.2.10.bb b/meta/recipes-devtools/libtool/libtool_2.2.10.bb
index 9eaec2da6..9eaec2da6 100644
--- a/meta/packages/libtool/libtool_2.2.10.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.2.10.bb
diff --git a/meta/packages/m4/m4-native_1.4.13.bb b/meta/recipes-devtools/m4/m4-native_1.4.13.bb
index fa871b38a..fa871b38a 100644
--- a/meta/packages/m4/m4-native_1.4.13.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.13.bb
diff --git a/meta/packages/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch
index 22103876e..22103876e 100644
--- a/meta/packages/m4/m4/ac_config_links.patch
+++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch
diff --git a/meta/packages/m4/m4/make.patch b/meta/recipes-devtools/m4/m4/make.patch
index 3577b0b7d..3577b0b7d 100644
--- a/meta/packages/m4/m4/make.patch
+++ b/meta/recipes-devtools/m4/m4/make.patch
diff --git a/meta/packages/m4/m4_1.4.13.bb b/meta/recipes-devtools/m4/m4_1.4.13.bb
index 32d153ea1..32d153ea1 100644
--- a/meta/packages/m4/m4_1.4.13.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.13.bb
diff --git a/meta/packages/make/files/SCCS.patch b/meta/recipes-devtools/make/files/SCCS.patch
index c998e118e..c998e118e 100644
--- a/meta/packages/make/files/SCCS.patch
+++ b/meta/recipes-devtools/make/files/SCCS.patch
diff --git a/meta/packages/make/make.inc b/meta/recipes-devtools/make/make.inc
index 23629d37b..23629d37b 100644
--- a/meta/packages/make/make.inc
+++ b/meta/recipes-devtools/make/make.inc
diff --git a/meta/packages/make/make_3.81.bb b/meta/recipes-devtools/make/make_3.81.bb
index 797d26b3b..797d26b3b 100644
--- a/meta/packages/make/make_3.81.bb
+++ b/meta/recipes-devtools/make/make_3.81.bb
diff --git a/meta/packages/makedevs/makedevs-1.0.0/makedevs.c b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
index c7ad722f2..c7ad722f2 100644
--- a/meta/packages/makedevs/makedevs-1.0.0/makedevs.c
+++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
diff --git a/meta/packages/makedevs/makedevs_1.0.0.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.0.bb
index 5db2d9b14..5db2d9b14 100644
--- a/meta/packages/makedevs/makedevs_1.0.0.bb
+++ b/meta/recipes-devtools/makedevs/makedevs_1.0.0.bb
diff --git a/meta/packages/mpfr/mpfr.inc b/meta/recipes-devtools/mpfr/mpfr.inc
index dbb859fe3..dbb859fe3 100644
--- a/meta/packages/mpfr/mpfr.inc
+++ b/meta/recipes-devtools/mpfr/mpfr.inc
diff --git a/meta/packages/mpfr/mpfr_3.0.0.bb b/meta/recipes-devtools/mpfr/mpfr_3.0.0.bb
index 188a5d95c..188a5d95c 100644
--- a/meta/packages/mpfr/mpfr_3.0.0.bb
+++ b/meta/recipes-devtools/mpfr/mpfr_3.0.0.bb
diff --git a/meta/packages/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch
index fb776fddc..fb776fddc 100644
--- a/meta/packages/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-exclusion-to-mkfs-jffs2-git-2.patch
diff --git a/meta/packages/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch b/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch
index 64f25f79e..64f25f79e 100644
--- a/meta/packages/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils-1.3.1/add-oobsize-64-and-writesize-4096-as-normal-nand.patch
diff --git a/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
index 555565449..555565449 100644
--- a/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
diff --git a/meta/packages/mtd/mtd-utils/fix-ignoreerrors-git.patch b/meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch
index bec60a18c..bec60a18c 100644
--- a/meta/packages/mtd/mtd-utils/fix-ignoreerrors-git.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch
diff --git a/meta/packages/mtd/mtd-utils/remove-ubi.patch b/meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch
index 4928db00b..4928db00b 100644
--- a/meta/packages/mtd/mtd-utils/remove-ubi.patch
+++ b/meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch
diff --git a/meta/packages/mtd/mtd-utils_1.1.0+git.bb b/meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb
index 12e1c75e3..12e1c75e3 100644
--- a/meta/packages/mtd/mtd-utils_1.1.0+git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb
diff --git a/meta/packages/mtd/mtd-utils_1.3.1.bb b/meta/recipes-devtools/mtd/mtd-utils_1.3.1.bb
index faa2332a2..faa2332a2 100644
--- a/meta/packages/mtd/mtd-utils_1.3.1.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.3.1.bb
diff --git a/meta/packages/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
index 35fae44ab..35fae44ab 100644
--- a/meta/packages/mtools/mtools/mtools-makeinfo.patch
+++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
diff --git a/meta/packages/mtools/mtools/mtools.patch b/meta/recipes-devtools/mtools/mtools/mtools.patch
index 2abf53473..2abf53473 100644
--- a/meta/packages/mtools/mtools/mtools.patch
+++ b/meta/recipes-devtools/mtools/mtools/mtools.patch
diff --git a/meta/packages/mtools/mtools/no-x11.patch b/meta/recipes-devtools/mtools/mtools/no-x11.patch
index 300f43f00..300f43f00 100644
--- a/meta/packages/mtools/mtools/no-x11.patch
+++ b/meta/recipes-devtools/mtools/mtools/no-x11.patch
diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index 932d88f2a..932d88f2a 100644
--- a/meta/packages/mtools/mtools_3.9.9.bb
+++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
diff --git a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
index e4a548156..e4a548156 100644
--- a/meta/packages/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index f3b6f1f4c..f3b6f1f4c 100644
--- a/meta/packages/opkg-utils/opkg-utils_svn.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
diff --git a/meta/packages/opkg/opkg-0.1.8/add_vercmp.patch b/meta/recipes-devtools/opkg/opkg-0.1.8/add_vercmp.patch
index 540be8395..540be8395 100644
--- a/meta/packages/opkg/opkg-0.1.8/add_vercmp.patch
+++ b/meta/recipes-devtools/opkg/opkg-0.1.8/add_vercmp.patch
diff --git a/meta/packages/opkg/opkg-0.1.8/headerfix.patch b/meta/recipes-devtools/opkg/opkg-0.1.8/headerfix.patch
index d0711ecd0..d0711ecd0 100644
--- a/meta/packages/opkg/opkg-0.1.8/headerfix.patch
+++ b/meta/recipes-devtools/opkg/opkg-0.1.8/headerfix.patch
diff --git a/meta/packages/opkg/opkg-0.1.8/opkg_unarchive.patch b/meta/recipes-devtools/opkg/opkg-0.1.8/opkg_unarchive.patch
index 4b1244815..4b1244815 100644
--- a/meta/packages/opkg/opkg-0.1.8/opkg_unarchive.patch
+++ b/meta/recipes-devtools/opkg/opkg-0.1.8/opkg_unarchive.patch
diff --git a/meta/packages/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb
index 79c741d7b..79c741d7b 100644
--- a/meta/packages/opkg/opkg-collateral.bb
+++ b/meta/recipes-devtools/opkg/opkg-collateral.bb
diff --git a/meta/packages/opkg/opkg-collateral/dest b/meta/recipes-devtools/opkg/opkg-collateral/dest
index 088ca403d..088ca403d 100644
--- a/meta/packages/opkg/opkg-collateral/dest
+++ b/meta/recipes-devtools/opkg/opkg-collateral/dest
diff --git a/meta/packages/opkg/opkg-collateral/lists b/meta/recipes-devtools/opkg/opkg-collateral/lists
index 3c524f8c7..3c524f8c7 100644
--- a/meta/packages/opkg/opkg-collateral/lists
+++ b/meta/recipes-devtools/opkg/opkg-collateral/lists
diff --git a/meta/packages/opkg/opkg-collateral/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
index 51623f4d5..51623f4d5 100644
--- a/meta/packages/opkg/opkg-collateral/opkg.conf.comments
+++ b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
diff --git a/meta/packages/opkg/opkg-collateral/src b/meta/recipes-devtools/opkg/opkg-collateral/src
index e69de29bb..e69de29bb 100644
--- a/meta/packages/opkg/opkg-collateral/src
+++ b/meta/recipes-devtools/opkg/opkg-collateral/src
diff --git a/meta/packages/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
index 9e27e9343..9e27e9343 100644
--- a/meta/packages/opkg/opkg-config-base_1.0.bb
+++ b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
diff --git a/meta/packages/opkg/opkg-nogpg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg-nogpg_0.1.8.bb
index 259a60ebc..259a60ebc 100644
--- a/meta/packages/opkg/opkg-nogpg_0.1.8.bb
+++ b/meta/recipes-devtools/opkg/opkg-nogpg_0.1.8.bb
diff --git a/meta/packages/opkg/opkg-nogpg_svn.bb b/meta/recipes-devtools/opkg/opkg-nogpg_svn.bb
index aa16b551f..aa16b551f 100644
--- a/meta/packages/opkg/opkg-nogpg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg-nogpg_svn.bb
diff --git a/meta/packages/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index add1563c4..add1563c4 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
diff --git a/meta/packages/opkg/opkg/add_vercmp.patch b/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
index 540be8395..540be8395 100644
--- a/meta/packages/opkg/opkg/add_vercmp.patch
+++ b/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
diff --git a/meta/packages/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch
index d0711ecd0..d0711ecd0 100644
--- a/meta/packages/opkg/opkg/headerfix.patch
+++ b/meta/recipes-devtools/opkg/opkg/headerfix.patch
diff --git a/meta/packages/opkg/opkg/logfix.patch b/meta/recipes-devtools/opkg/opkg/logfix.patch
index da06f00bd..da06f00bd 100644
--- a/meta/packages/opkg/opkg/logfix.patch
+++ b/meta/recipes-devtools/opkg/opkg/logfix.patch
diff --git a/meta/packages/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
index 4eb3ff9a1..4eb3ff9a1 100644
--- a/meta/packages/opkg/opkg_0.1.8.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 518c76735..518c76735 100644
--- a/meta/packages/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
diff --git a/meta/packages/patch/patch-2.5.9/2.5.9.patch b/meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch
index 7b64ecdd4..7b64ecdd4 100644
--- a/meta/packages/patch/patch-2.5.9/2.5.9.patch
+++ b/meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch
diff --git a/meta/packages/patch/patch-2.5.9/debian.patch b/meta/recipes-devtools/patch/patch-2.5.9/debian.patch
index 460185827..460185827 100644
--- a/meta/packages/patch/patch-2.5.9/debian.patch
+++ b/meta/recipes-devtools/patch/patch-2.5.9/debian.patch
diff --git a/meta/packages/patch/patch-2.5.9/global-reject-file.diff b/meta/recipes-devtools/patch/patch-2.5.9/global-reject-file.diff
index 66065fcbf..66065fcbf 100644
--- a/meta/packages/patch/patch-2.5.9/global-reject-file.diff
+++ b/meta/recipes-devtools/patch/patch-2.5.9/global-reject-file.diff
diff --git a/meta/packages/patch/patch-2.5.9/install.patch b/meta/recipes-devtools/patch/patch-2.5.9/install.patch
index c959189f3..c959189f3 100644
--- a/meta/packages/patch/patch-2.5.9/install.patch
+++ b/meta/recipes-devtools/patch/patch-2.5.9/install.patch
diff --git a/meta/packages/patch/patch-2.5.9/unified-reject-files.diff b/meta/recipes-devtools/patch/patch-2.5.9/unified-reject-files.diff
index 6bfa00dd7..6bfa00dd7 100644
--- a/meta/packages/patch/patch-2.5.9/unified-reject-files.diff
+++ b/meta/recipes-devtools/patch/patch-2.5.9/unified-reject-files.diff
diff --git a/meta/packages/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 4ce51703a..4ce51703a 100644
--- a/meta/packages/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
diff --git a/meta/packages/patch/patch_2.5.9.bb b/meta/recipes-devtools/patch/patch_2.5.9.bb
index ff485546f..ff485546f 100644
--- a/meta/packages/patch/patch_2.5.9.bb
+++ b/meta/recipes-devtools/patch/patch_2.5.9.bb
diff --git a/meta/packages/pax-utils/pax-utils_0.2.1.bb b/meta/recipes-devtools/pax-utils/pax-utils_0.2.1.bb
index f450f32f1..f450f32f1 100644
--- a/meta/packages/pax-utils/pax-utils_0.2.1.bb
+++ b/meta/recipes-devtools/pax-utils/pax-utils_0.2.1.bb
diff --git a/meta/packages/perl/files/Configure-multilib.patch b/meta/recipes-devtools/perl/files/Configure-multilib.patch
index d3948a92c..d3948a92c 100644
--- a/meta/packages/perl/files/Configure-multilib.patch
+++ b/meta/recipes-devtools/perl/files/Configure-multilib.patch
diff --git a/meta/packages/perl/files/letgcc-find-errno.patch b/meta/recipes-devtools/perl/files/letgcc-find-errno.patch
index 24722ee96..24722ee96 100644
--- a/meta/packages/perl/files/letgcc-find-errno.patch
+++ b/meta/recipes-devtools/perl/files/letgcc-find-errno.patch
diff --git a/meta/packages/perl/files/libperl-5.8.3-create-libperl-soname.patch b/meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch
index 6b34ec231..6b34ec231 100644
--- a/meta/packages/perl/files/libperl-5.8.3-create-libperl-soname.patch
+++ b/meta/recipes-devtools/perl/files/libperl-5.8.3-create-libperl-soname.patch
diff --git a/meta/packages/perl/files/perl-5.8.8-gcc-4.2.patch b/meta/recipes-devtools/perl/files/perl-5.8.8-gcc-4.2.patch
index 653a4758f..653a4758f 100644
--- a/meta/packages/perl/files/perl-5.8.8-gcc-4.2.patch
+++ b/meta/recipes-devtools/perl/files/perl-5.8.8-gcc-4.2.patch
diff --git a/meta/packages/perl/libxml-parser-perl-native_2.36.bb b/meta/recipes-devtools/perl/libxml-parser-perl-native_2.36.bb
index 6ba56b3b8..6ba56b3b8 100644
--- a/meta/packages/perl/libxml-parser-perl-native_2.36.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl-native_2.36.bb
diff --git a/meta/packages/perl/libxml-parser-perl_2.36.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.36.bb
index 818840504..818840504 100644
--- a/meta/packages/perl/libxml-parser-perl_2.36.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.36.bb
diff --git a/meta/packages/perl/libxml-simple-perl-native_2.18.bb b/meta/recipes-devtools/perl/libxml-simple-perl-native_2.18.bb
index bfdfc3de4..bfdfc3de4 100644
--- a/meta/packages/perl/libxml-simple-perl-native_2.18.bb
+++ b/meta/recipes-devtools/perl/libxml-simple-perl-native_2.18.bb
diff --git a/meta/packages/perl/libxml-simple-perl_2.18.bb b/meta/recipes-devtools/perl/libxml-simple-perl_2.18.bb
index 6cab76bf1..6cab76bf1 100644
--- a/meta/packages/perl/libxml-simple-perl_2.18.bb
+++ b/meta/recipes-devtools/perl/libxml-simple-perl_2.18.bb
diff --git a/meta/packages/perl/perl-5.8.8/09_fix_installperl.patch b/meta/recipes-devtools/perl/perl-5.8.8/09_fix_installperl.patch
index f550537d0..f550537d0 100644
--- a/meta/packages/perl/perl-5.8.8/09_fix_installperl.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/09_fix_installperl.patch
diff --git a/meta/packages/perl/perl-5.8.8/52_debian_extutils_hacks.patch b/meta/recipes-devtools/perl/perl-5.8.8/52_debian_extutils_hacks.patch
index 8a964f933..8a964f933 100644
--- a/meta/packages/perl/perl-5.8.8/52_debian_extutils_hacks.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/52_debian_extutils_hacks.patch
diff --git a/meta/packages/perl/perl-5.8.8/53_debian_mod_paths.patch b/meta/recipes-devtools/perl/perl-5.8.8/53_debian_mod_paths.patch
index df74bc598..df74bc598 100644
--- a/meta/packages/perl/perl-5.8.8/53_debian_mod_paths.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/53_debian_mod_paths.patch
diff --git a/meta/packages/perl/perl-5.8.8/54_debian_perldoc-r.patch b/meta/recipes-devtools/perl/perl-5.8.8/54_debian_perldoc-r.patch
index 432cd857a..432cd857a 100644
--- a/meta/packages/perl/perl-5.8.8/54_debian_perldoc-r.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/54_debian_perldoc-r.patch
diff --git a/meta/packages/perl/perl-5.8.8/58_debian_cpan_config_path.patch b/meta/recipes-devtools/perl/perl-5.8.8/58_debian_cpan_config_path.patch
index b38c70c51..b38c70c51 100644
--- a/meta/packages/perl/perl-5.8.8/58_debian_cpan_config_path.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/58_debian_cpan_config_path.patch
diff --git a/meta/packages/perl/perl-5.8.8/60_debian_libnet_config_path.patch b/meta/recipes-devtools/perl/perl-5.8.8/60_debian_libnet_config_path.patch
index 7842ce115..7842ce115 100644
--- a/meta/packages/perl/perl-5.8.8/60_debian_libnet_config_path.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/60_debian_libnet_config_path.patch
diff --git a/meta/packages/perl/perl-5.8.8/62_debian_cpan_definstalldirs.patch b/meta/recipes-devtools/perl/perl-5.8.8/62_debian_cpan_definstalldirs.patch
index 682061dd8..682061dd8 100644
--- a/meta/packages/perl/perl-5.8.8/62_debian_cpan_definstalldirs.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/62_debian_cpan_definstalldirs.patch
diff --git a/meta/packages/perl/perl-5.8.8/64_debian_enc2xs_inc.patch b/meta/recipes-devtools/perl/perl-5.8.8/64_debian_enc2xs_inc.patch
index c207a9380..c207a9380 100644
--- a/meta/packages/perl/perl-5.8.8/64_debian_enc2xs_inc.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/64_debian_enc2xs_inc.patch
diff --git a/meta/packages/perl/perl-5.8.8/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch
index ab9c4b7d6..ab9c4b7d6 100644
--- a/meta/packages/perl/perl-5.8.8/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch
diff --git a/meta/packages/perl/perl-5.8.8/Makefile.patch b/meta/recipes-devtools/perl/perl-5.8.8/Makefile.patch
index ed494b328..ed494b328 100644
--- a/meta/packages/perl/perl-5.8.8/Makefile.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/Makefile.patch
diff --git a/meta/packages/perl/perl-5.8.8/asm-pageh-fix.patch b/meta/recipes-devtools/perl/perl-5.8.8/asm-pageh-fix.patch
index 41f3b1d23..41f3b1d23 100644
--- a/meta/packages/perl/perl-5.8.8/asm-pageh-fix.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/asm-pageh-fix.patch
diff --git a/meta/packages/perl/perl-5.8.8/config.sh b/meta/recipes-devtools/perl/perl-5.8.8/config.sh
index 8d1f904f2..8d1f904f2 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh
diff --git a/meta/packages/perl/perl-5.8.8/config.sh-32 b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-32
index e22d71d8e..e22d71d8e 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh-32
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-32
diff --git a/meta/packages/perl/perl-5.8.8/config.sh-32-be b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-32-be
index a59a9abb5..a59a9abb5 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh-32-be
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-32-be
diff --git a/meta/packages/perl/perl-5.8.8/config.sh-32-le b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-32-le
index 10e422656..10e422656 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh-32-le
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-32-le
diff --git a/meta/packages/perl/perl-5.8.8/config.sh-64 b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-64
index 6e58fa71a..6e58fa71a 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh-64
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-64
diff --git a/meta/packages/perl/perl-5.8.8/config.sh-64-be b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-64-be
index c08ce3c43..c08ce3c43 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh-64-be
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-64-be
diff --git a/meta/packages/perl/perl-5.8.8/config.sh-64-le b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-64-le
index 277d2a9be..277d2a9be 100644
--- a/meta/packages/perl/perl-5.8.8/config.sh-64-le
+++ b/meta/recipes-devtools/perl/perl-5.8.8/config.sh-64-le
diff --git a/meta/packages/perl/perl-5.8.8/generate-sh.patch b/meta/recipes-devtools/perl/perl-5.8.8/generate-sh.patch
index ceb74196d..ceb74196d 100644
--- a/meta/packages/perl/perl-5.8.8/generate-sh.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/generate-sh.patch
diff --git a/meta/packages/perl/perl-5.8.8/installperl.patch b/meta/recipes-devtools/perl/perl-5.8.8/installperl.patch
index ff52bc3a9..ff52bc3a9 100644
--- a/meta/packages/perl/perl-5.8.8/installperl.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/installperl.patch
diff --git a/meta/packages/perl/perl-5.8.8/makedepend-dash.patch b/meta/recipes-devtools/perl/perl-5.8.8/makedepend-dash.patch
index 1f1547437..1f1547437 100644
--- a/meta/packages/perl/perl-5.8.8/makedepend-dash.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/makedepend-dash.patch
diff --git a/meta/packages/perl/perl-5.8.8/native-no-gdbminc.patch b/meta/recipes-devtools/perl/perl-5.8.8/native-no-gdbminc.patch
index f00fa2cc1..f00fa2cc1 100644
--- a/meta/packages/perl/perl-5.8.8/native-no-gdbminc.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/native-no-gdbminc.patch
diff --git a/meta/packages/perl/perl-5.8.8/native-nopacklist.patch b/meta/recipes-devtools/perl/perl-5.8.8/native-nopacklist.patch
index a0ba269e0..a0ba269e0 100644
--- a/meta/packages/perl/perl-5.8.8/native-nopacklist.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/native-nopacklist.patch
diff --git a/meta/packages/perl/perl-5.8.8/native-perlinc.patch b/meta/recipes-devtools/perl/perl-5.8.8/native-perlinc.patch
index 6dc4b9538..6dc4b9538 100644
--- a/meta/packages/perl/perl-5.8.8/native-perlinc.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/native-perlinc.patch
diff --git a/meta/packages/perl/perl-5.8.8/native-ssp.patch b/meta/recipes-devtools/perl/perl-5.8.8/native-ssp.patch
index 1c825f50d..1c825f50d 100644
--- a/meta/packages/perl/perl-5.8.8/native-ssp.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/native-ssp.patch
diff --git a/meta/packages/perl/perl-5.8.8/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.8.8/perl-configpm-switch.patch
index ac519a027..ac519a027 100644
--- a/meta/packages/perl/perl-5.8.8/perl-configpm-switch.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/perl-configpm-switch.patch
diff --git a/meta/packages/perl/perl-5.8.8/perl-configure.sh b/meta/recipes-devtools/perl/perl-5.8.8/perl-configure.sh
index 9800394b6..9800394b6 100755
--- a/meta/packages/perl/perl-5.8.8/perl-configure.sh
+++ b/meta/recipes-devtools/perl/perl-5.8.8/perl-configure.sh
diff --git a/meta/packages/perl/perl-5.8.8/perl-dynloader.patch b/meta/recipes-devtools/perl/perl-5.8.8/perl-dynloader.patch
index e2dc774d5..e2dc774d5 100644
--- a/meta/packages/perl/perl-5.8.8/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/perl-dynloader.patch
diff --git a/meta/packages/perl/perl-5.8.8/perl-moreconfig.patch b/meta/recipes-devtools/perl/perl-5.8.8/perl-moreconfig.patch
index 590c72536..590c72536 100644
--- a/meta/packages/perl/perl-5.8.8/perl-moreconfig.patch
+++ b/meta/recipes-devtools/perl/perl-5.8.8/perl-moreconfig.patch
diff --git a/meta/packages/perl/perl-native_5.8.8.bb b/meta/recipes-devtools/perl/perl-native_5.8.8.bb
index 534b6700d..534b6700d 100644
--- a/meta/packages/perl/perl-native_5.8.8.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.8.8.bb
diff --git a/meta/packages/perl/perl-rdepends_5.8.8.inc b/meta/recipes-devtools/perl/perl-rdepends_5.8.8.inc
index 1ce5ad037..1ce5ad037 100644
--- a/meta/packages/perl/perl-rdepends_5.8.8.inc
+++ b/meta/recipes-devtools/perl/perl-rdepends_5.8.8.inc
diff --git a/meta/packages/perl/perl-rprovides.inc b/meta/recipes-devtools/perl/perl-rprovides.inc
index 637c99315..637c99315 100644
--- a/meta/packages/perl/perl-rprovides.inc
+++ b/meta/recipes-devtools/perl/perl-rprovides.inc
diff --git a/meta/packages/perl/perl_5.8.8.bb b/meta/recipes-devtools/perl/perl_5.8.8.bb
index 506070537..506070537 100644
--- a/meta/packages/perl/perl_5.8.8.bb
+++ b/meta/recipes-devtools/perl/perl_5.8.8.bb
diff --git a/meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch
index 97895387f..97895387f 100644
--- a/meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch
diff --git a/meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
index 1329e7f21..1329e7f21 100644
--- a/meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
diff --git a/meta/packages/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index c0e748173..c0e748173 100644
--- a/meta/packages/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
diff --git a/meta/packages/pkgconfig/pkgconfig/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
index 97895387f..97895387f 100644
--- a/meta/packages/pkgconfig/pkgconfig/autofoo.patch
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/autofoo.patch
diff --git a/meta/packages/pkgconfig/pkgconfig/disable-legacy.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
index fea2d3d50..fea2d3d50 100644
--- a/meta/packages/pkgconfig/pkgconfig/disable-legacy.patch
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
diff --git a/meta/packages/pkgconfig/pkgconfig/glibconfig-sysdefs.h b/meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h
index 1329e7f21..1329e7f21 100644
--- a/meta/packages/pkgconfig/pkgconfig/glibconfig-sysdefs.h
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/glibconfig-sysdefs.h
diff --git a/meta/packages/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index 09b28a5bd..09b28a5bd 100644
--- a/meta/packages/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
diff --git a/meta/packages/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index 73acb9e14..73acb9e14 100644
--- a/meta/packages/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
diff --git a/meta/packages/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf
index c5a4f4adc..c5a4f4adc 100644
--- a/meta/packages/prelink/prelink/prelink.conf
+++ b/meta/recipes-devtools/prelink/prelink/prelink.conf
diff --git a/meta/packages/prelink/prelink/prelink.cron.daily b/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
index 0b3c07322..0b3c07322 100644
--- a/meta/packages/prelink/prelink/prelink.cron.daily
+++ b/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
diff --git a/meta/packages/prelink/prelink/prelink.default b/meta/recipes-devtools/prelink/prelink/prelink.default
index 901258ed2..901258ed2 100644
--- a/meta/packages/prelink/prelink/prelink.default
+++ b/meta/recipes-devtools/prelink/prelink/prelink.default
diff --git a/meta/packages/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 06078ed68..06078ed68 100644
--- a/meta/packages/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
diff --git a/meta/packages/pseudo/pseudo/static_sqlite.patch b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
index 0a2fa28d7..0a2fa28d7 100644
--- a/meta/packages/pseudo/pseudo/static_sqlite.patch
+++ b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
diff --git a/meta/packages/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 4cb483ea6..4cb483ea6 100644
--- a/meta/packages/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
diff --git a/meta/packages/python/fix-path.inc b/meta/recipes-devtools/python/fix-path.inc
index 0738c59ad..0738c59ad 100644
--- a/meta/packages/python/fix-path.inc
+++ b/meta/recipes-devtools/python/fix-path.inc
diff --git a/meta/packages/python/python-2.6-manifest.inc b/meta/recipes-devtools/python/python-2.6-manifest.inc
index cee12c866..cee12c866 100644
--- a/meta/packages/python/python-2.6-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.6-manifest.inc
diff --git a/meta/packages/python/python-dbus_0.83.1.bb b/meta/recipes-devtools/python/python-dbus_0.83.1.bb
index b30e82be6..b30e82be6 100644
--- a/meta/packages/python/python-dbus_0.83.1.bb
+++ b/meta/recipes-devtools/python/python-dbus_0.83.1.bb
diff --git a/meta/packages/python/python-gst/python-path.patch b/meta/recipes-devtools/python/python-gst/python-path.patch
index af5badd4d..af5badd4d 100644
--- a/meta/packages/python/python-gst/python-path.patch
+++ b/meta/recipes-devtools/python/python-gst/python-path.patch
diff --git a/meta/packages/python/python-gst_0.10.18.bb b/meta/recipes-devtools/python/python-gst_0.10.18.bb
index 9de07b3c4..9de07b3c4 100644
--- a/meta/packages/python/python-gst_0.10.18.bb
+++ b/meta/recipes-devtools/python/python-gst_0.10.18.bb
diff --git a/meta/packages/python/python-imaging/path.patch b/meta/recipes-devtools/python/python-imaging/path.patch
index 264dcc09b..264dcc09b 100644
--- a/meta/packages/python/python-imaging/path.patch
+++ b/meta/recipes-devtools/python/python-imaging/path.patch
diff --git a/meta/packages/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index 98120432a..98120432a 100644
--- a/meta/packages/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
diff --git a/meta/packages/python/python-iniparse-native_0.3.2.bb b/meta/recipes-devtools/python/python-iniparse-native_0.3.2.bb
index 41aa13d97..41aa13d97 100644
--- a/meta/packages/python/python-iniparse-native_0.3.2.bb
+++ b/meta/recipes-devtools/python/python-iniparse-native_0.3.2.bb
diff --git a/meta/packages/python/python-iniparse_0.3.2.bb b/meta/recipes-devtools/python/python-iniparse_0.3.2.bb
index 27a38f424..27a38f424 100644
--- a/meta/packages/python/python-iniparse_0.3.2.bb
+++ b/meta/recipes-devtools/python/python-iniparse_0.3.2.bb
diff --git a/meta/packages/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch b/meta/recipes-devtools/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
index 2559e3a0e..2559e3a0e 100644
--- a/meta/packages/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
diff --git a/meta/packages/python/python-native-2.6.5/04-default-is-optimized.patch b/meta/recipes-devtools/python/python-native-2.6.5/04-default-is-optimized.patch
index 5131e0ba6..5131e0ba6 100644
--- a/meta/packages/python/python-native-2.6.5/04-default-is-optimized.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/04-default-is-optimized.patch
diff --git a/meta/packages/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch b/meta/recipes-devtools/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch
index f5e852a11..f5e852a11 100644
--- a/meta/packages/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/10-distutils-fix-swig-parameter.patch
diff --git a/meta/packages/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch b/meta/recipes-devtools/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch
index 8354e266f..8354e266f 100644
--- a/meta/packages/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/11-distutils-never-modify-shebang-line.patch
diff --git a/meta/packages/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
index aa4393679..aa4393679 100644
--- a/meta/packages/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/12-distutils-prefix-is-inside-staging-area.patch
diff --git a/meta/packages/python/python-native-2.6.5/debug.patch b/meta/recipes-devtools/python/python-native-2.6.5/debug.patch
index beb3adc6d..beb3adc6d 100644
--- a/meta/packages/python/python-native-2.6.5/debug.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/debug.patch
diff --git a/meta/packages/python/python-native-2.6.5/nohostlibs.patch b/meta/recipes-devtools/python/python-native-2.6.5/nohostlibs.patch
index 7020f3c2a..7020f3c2a 100644
--- a/meta/packages/python/python-native-2.6.5/nohostlibs.patch
+++ b/meta/recipes-devtools/python/python-native-2.6.5/nohostlibs.patch
diff --git a/meta/packages/python/python-native-2.6.5/sitecustomize.py b/meta/recipes-devtools/python/python-native-2.6.5/sitecustomize.py
index 273901898..273901898 100644
--- a/meta/packages/python/python-native-2.6.5/sitecustomize.py
+++ b/meta/recipes-devtools/python/python-native-2.6.5/sitecustomize.py
diff --git a/meta/packages/python/python-native_2.6.5.bb b/meta/recipes-devtools/python/python-native_2.6.5.bb
index cb95e4b96..cb95e4b96 100644
--- a/meta/packages/python/python-native_2.6.5.bb
+++ b/meta/recipes-devtools/python/python-native_2.6.5.bb
diff --git a/meta/packages/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
index 1ff603875..1ff603875 100644
--- a/meta/packages/python/python-pycairo_1.8.10.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
diff --git a/meta/packages/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
index b7c5ab9c9..b7c5ab9c9 100644
--- a/meta/packages/python/python-pycurl/no-static-link.patch
+++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
diff --git a/meta/packages/python/python-pycurl_7.19.0.bb b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
index 1a0476726..1a0476726 100644
--- a/meta/packages/python/python-pycurl_7.19.0.bb
+++ b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
diff --git a/meta/packages/python/python-pygobject-native_2.21.1.bb b/meta/recipes-devtools/python/python-pygobject-native_2.21.1.bb
index d3602277a..d3602277a 100644
--- a/meta/packages/python/python-pygobject-native_2.21.1.bb
+++ b/meta/recipes-devtools/python/python-pygobject-native_2.21.1.bb
diff --git a/meta/packages/python/python-pygobject/generate-constants.patch b/meta/recipes-devtools/python/python-pygobject/generate-constants.patch
index 57a938062..57a938062 100644
--- a/meta/packages/python/python-pygobject/generate-constants.patch
+++ b/meta/recipes-devtools/python/python-pygobject/generate-constants.patch
diff --git a/meta/packages/python/python-pygobject_2.21.1.bb b/meta/recipes-devtools/python/python-pygobject_2.21.1.bb
index b815e4c0f..b815e4c0f 100644
--- a/meta/packages/python/python-pygobject_2.21.1.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.21.1.bb
diff --git a/meta/packages/python/python-pygtk/acinclude.m4 b/meta/recipes-devtools/python/python-pygtk/acinclude.m4
index 53518fb2e..53518fb2e 100644
--- a/meta/packages/python/python-pygtk/acinclude.m4
+++ b/meta/recipes-devtools/python/python-pygtk/acinclude.m4
diff --git a/meta/packages/python/python-pygtk/fix-gtkunixprint.patch b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
index dca19ce5e..dca19ce5e 100644
--- a/meta/packages/python/python-pygtk/fix-gtkunixprint.patch
+++ b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
diff --git a/meta/packages/python/python-pygtk/nodocs.patch b/meta/recipes-devtools/python/python-pygtk/nodocs.patch
index c3581043c..c3581043c 100644
--- a/meta/packages/python/python-pygtk/nodocs.patch
+++ b/meta/recipes-devtools/python/python-pygtk/nodocs.patch
diff --git a/meta/packages/python/python-pygtk/prevent_to_get_display_during_import.patch b/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
index 9340f8244..9340f8244 100644
--- a/meta/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
+++ b/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
diff --git a/meta/packages/python/python-pygtk/python-pygtk2/acinclude.m4 b/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4
index 53518fb2e..53518fb2e 100644
--- a/meta/packages/python/python-pygtk/python-pygtk2/acinclude.m4
+++ b/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4
diff --git a/meta/packages/python/python-pygtk_2.17.0.bb b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
index ef63b5103..ef63b5103 100644
--- a/meta/packages/python/python-pygtk_2.17.0.bb
+++ b/meta/recipes-devtools/python/python-pygtk_2.17.0.bb
diff --git a/meta/packages/python/python-pyrex-native_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
index 90b6b1683..90b6b1683 100644
--- a/meta/packages/python/python-pyrex-native_0.9.9.bb
+++ b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
diff --git a/meta/packages/python/python-pyrex/pyrex-fix-optimized-mode.patch b/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
index a1f5bb29b..a1f5bb29b 100644
--- a/meta/packages/python/python-pyrex/pyrex-fix-optimized-mode.patch
+++ b/meta/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
diff --git a/meta/packages/python/python-pyrex_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
index 6c57af50d..6c57af50d 100644
--- a/meta/packages/python/python-pyrex_0.9.9.bb
+++ b/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
diff --git a/meta/packages/python/python-scons-native_1.3.0.bb b/meta/recipes-devtools/python/python-scons-native_1.3.0.bb
index a4bcd4258..a4bcd4258 100644
--- a/meta/packages/python/python-scons-native_1.3.0.bb
+++ b/meta/recipes-devtools/python/python-scons-native_1.3.0.bb
diff --git a/meta/packages/python/python-scons_1.3.0.bb b/meta/recipes-devtools/python/python-scons_1.3.0.bb
index f5d11eb92..f5d11eb92 100644
--- a/meta/packages/python/python-scons_1.3.0.bb
+++ b/meta/recipes-devtools/python/python-scons_1.3.0.bb
diff --git a/meta/packages/python/python-urlgrabber-native_3.9.1.bb b/meta/recipes-devtools/python/python-urlgrabber-native_3.9.1.bb
index ff8f02ecd..ff8f02ecd 100644
--- a/meta/packages/python/python-urlgrabber-native_3.9.1.bb
+++ b/meta/recipes-devtools/python/python-urlgrabber-native_3.9.1.bb
diff --git a/meta/packages/python/python-urlgrabber/urlgrabber-3.0.0-cleanup.patch b/meta/recipes-devtools/python/python-urlgrabber/urlgrabber-3.0.0-cleanup.patch
index 7a1ee059d..7a1ee059d 100644
--- a/meta/packages/python/python-urlgrabber/urlgrabber-3.0.0-cleanup.patch
+++ b/meta/recipes-devtools/python/python-urlgrabber/urlgrabber-3.0.0-cleanup.patch
diff --git a/meta/packages/python/python-urlgrabber/urlgrabber-HEAD.patch b/meta/recipes-devtools/python/python-urlgrabber/urlgrabber-HEAD.patch
index 90180d29a..90180d29a 100644
--- a/meta/packages/python/python-urlgrabber/urlgrabber-HEAD.patch
+++ b/meta/recipes-devtools/python/python-urlgrabber/urlgrabber-HEAD.patch
diff --git a/meta/packages/python/python-urlgrabber/urlgrabber-reset.patch b/meta/recipes-devtools/python/python-urlgrabber/urlgrabber-reset.patch
index b63e7c33a..b63e7c33a 100644
--- a/meta/packages/python/python-urlgrabber/urlgrabber-reset.patch
+++ b/meta/recipes-devtools/python/python-urlgrabber/urlgrabber-reset.patch
diff --git a/meta/packages/python/python-urlgrabber_3.9.1.bb b/meta/recipes-devtools/python/python-urlgrabber_3.9.1.bb
index 9f3a4cc6a..9f3a4cc6a 100644
--- a/meta/packages/python/python-urlgrabber_3.9.1.bb
+++ b/meta/recipes-devtools/python/python-urlgrabber_3.9.1.bb
diff --git a/meta/packages/python/python.inc b/meta/recipes-devtools/python/python.inc
index 682bd5a2d..682bd5a2d 100644
--- a/meta/packages/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
diff --git a/meta/packages/python/python/00-fix-bindir-libdir-for-cross.patch b/meta/recipes-devtools/python/python/00-fix-bindir-libdir-for-cross.patch
index 2559e3a0e..2559e3a0e 100644
--- a/meta/packages/python/python/00-fix-bindir-libdir-for-cross.patch
+++ b/meta/recipes-devtools/python/python/00-fix-bindir-libdir-for-cross.patch
diff --git a/meta/packages/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
index e89faa4fb..e89faa4fb 100644
--- a/meta/packages/python/python/01-use-proper-tools-for-cross-build.patch
+++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
diff --git a/meta/packages/python/python/02-remove-test-for-cross.patch b/meta/recipes-devtools/python/python/02-remove-test-for-cross.patch
index b1c0bfb85..b1c0bfb85 100644
--- a/meta/packages/python/python/02-remove-test-for-cross.patch
+++ b/meta/recipes-devtools/python/python/02-remove-test-for-cross.patch
diff --git a/meta/packages/python/python/03-fix-tkinter-detection.patch b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
index a1a385a07..a1a385a07 100644
--- a/meta/packages/python/python/03-fix-tkinter-detection.patch
+++ b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
diff --git a/meta/packages/python/python/04-default-is-optimized.patch b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
index 805f4f696..805f4f696 100644
--- a/meta/packages/python/python/04-default-is-optimized.patch
+++ b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
diff --git a/meta/packages/python/python/05-enable-ctypes-cross-build.patch b/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
index 58b807806..58b807806 100644
--- a/meta/packages/python/python/05-enable-ctypes-cross-build.patch
+++ b/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
diff --git a/meta/packages/python/python/99-ignore-optimization-flag.patch b/meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch
index 02dc44c84..02dc44c84 100644
--- a/meta/packages/python/python/99-ignore-optimization-flag.patch
+++ b/meta/recipes-devtools/python/python/99-ignore-optimization-flag.patch
diff --git a/meta/packages/python/python/sitecustomize.py b/meta/recipes-devtools/python/python/sitecustomize.py
index 273901898..273901898 100644
--- a/meta/packages/python/python/sitecustomize.py
+++ b/meta/recipes-devtools/python/python/sitecustomize.py
diff --git a/meta/packages/python/python_2.6.5.bb b/meta/recipes-devtools/python/python_2.6.5.bb
index 9658fd48d..9658fd48d 100644
--- a/meta/packages/python/python_2.6.5.bb
+++ b/meta/recipes-devtools/python/python_2.6.5.bb
diff --git a/meta/packages/python/yum-metadata-parser-native_1.1.4.bb b/meta/recipes-devtools/python/yum-metadata-parser-native_1.1.4.bb
index 0a44b99e2..0a44b99e2 100644
--- a/meta/packages/python/yum-metadata-parser-native_1.1.4.bb
+++ b/meta/recipes-devtools/python/yum-metadata-parser-native_1.1.4.bb
diff --git a/meta/packages/python/yum-metadata-parser_1.1.4.bb b/meta/recipes-devtools/python/yum-metadata-parser_1.1.4.bb
index 2e404a2bb..2e404a2bb 100644
--- a/meta/packages/python/yum-metadata-parser_1.1.4.bb
+++ b/meta/recipes-devtools/python/yum-metadata-parser_1.1.4.bb
diff --git a/meta/packages/qemu/qemu-0.12.4/fix-dirent.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-dirent.patch
index 8bbfa0e88..8bbfa0e88 100644
--- a/meta/packages/qemu/qemu-0.12.4/fix-dirent.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-dirent.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-nogl.patch
index 528b6f0d1..528b6f0d1 100644
--- a/meta/packages/qemu/qemu-0.12.4/fix-nogl.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/fix-nogl.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/glflags.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/glflags.patch
index 0a27c2dee..0a27c2dee 100644
--- a/meta/packages/qemu/qemu-0.12.4/glflags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/glflags.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/init-info.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/init-info.patch
index 8ba7d8ff4..8ba7d8ff4 100644
--- a/meta/packages/qemu/qemu-0.12.4/init-info.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/init-info.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/linker-flags.patch
index 7b33aa484..7b33aa484 100644
--- a/meta/packages/qemu/qemu-0.12.4/linker-flags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/linker-flags.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/no-strip.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/no-strip.patch
index 8a95a688b..8a95a688b 100644
--- a/meta/packages/qemu/qemu-0.12.4/no-strip.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/no-strip.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/powerpc_rom.bin b/meta/recipes-devtools/qemu/qemu-0.12.4/powerpc_rom.bin
index c4044296c..c4044296c 100644
--- a/meta/packages/qemu/qemu-0.12.4/powerpc_rom.bin
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/powerpc_rom.bin
diff --git a/meta/packages/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch
index ab3147621..ab3147621 100644
--- a/meta/packages/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-git-qemugl-host.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/qemu-ppc-hack.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-ppc-hack.patch
index 3ed227ec3..3ed227ec3 100644
--- a/meta/packages/qemu/qemu-0.12.4/qemu-ppc-hack.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-ppc-hack.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-vmware-vga-depth.patch
index 43071868f..43071868f 100644
--- a/meta/packages/qemu/qemu-0.12.4/qemu-vmware-vga-depth.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-vmware-vga-depth.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch
index 43acc361a..43acc361a 100644
--- a/meta/packages/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/qemugl-allow-glxcontext-release.patch
diff --git a/meta/packages/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch
index 7727a39f3..7727a39f3 100644
--- a/meta/packages/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.12.4/workaround_bad_futex_headers.patch
diff --git a/meta/packages/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
index 19fb6f4ff..19fb6f4ff 100644
--- a/meta/packages/qemu/qemu-helper-native_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
diff --git a/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
index 473411db9..473411db9 100644
--- a/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
diff --git a/meta/packages/qemu/qemu-helper/raw2flash.c b/meta/recipes-devtools/qemu/qemu-helper/raw2flash.c
index 19faf629b..19faf629b 100644
--- a/meta/packages/qemu/qemu-helper/raw2flash.c
+++ b/meta/recipes-devtools/qemu/qemu-helper/raw2flash.c
diff --git a/meta/packages/qemu/qemu-helper/tunctl.c b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
index 16e24a2ad..16e24a2ad 100644
--- a/meta/packages/qemu/qemu-helper/tunctl.c
+++ b/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
diff --git a/meta/packages/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 5425aaf4a..5425aaf4a 100644
--- a/meta/packages/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
diff --git a/meta/packages/qemu/qemu_0.12.4.bb b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
index c253b03a2..c253b03a2 100644
--- a/meta/packages/qemu/qemu_0.12.4.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.12.4.bb
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index 00b361063..00b361063 100644
--- a/meta/packages/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
diff --git a/meta/packages/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc
index 7efea0213..7efea0213 100644
--- a/meta/packages/quilt/quilt-native.inc
+++ b/meta/recipes-devtools/quilt/quilt-native.inc
diff --git a/meta/packages/quilt/quilt-native_0.48.bb b/meta/recipes-devtools/quilt/quilt-native_0.48.bb
index d1dd57619..d1dd57619 100644
--- a/meta/packages/quilt/quilt-native_0.48.bb
+++ b/meta/recipes-devtools/quilt/quilt-native_0.48.bb
diff --git a/meta/packages/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index e5e0a4fec..e5e0a4fec 100644
--- a/meta/packages/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
diff --git a/meta/packages/quilt/quilt/aclocal.patch b/meta/recipes-devtools/quilt/quilt/aclocal.patch
index 15b174c6d..15b174c6d 100644
--- a/meta/packages/quilt/quilt/aclocal.patch
+++ b/meta/recipes-devtools/quilt/quilt/aclocal.patch
diff --git a/meta/packages/quilt/quilt/install.patch b/meta/recipes-devtools/quilt/quilt/install.patch
index 0b1e58d02..0b1e58d02 100644
--- a/meta/packages/quilt/quilt/install.patch
+++ b/meta/recipes-devtools/quilt/quilt/install.patch
diff --git a/meta/packages/quilt/quilt/non-gnu.patch b/meta/recipes-devtools/quilt/quilt/non-gnu.patch
index c1cbfb398..c1cbfb398 100644
--- a/meta/packages/quilt/quilt/non-gnu.patch
+++ b/meta/recipes-devtools/quilt/quilt/non-gnu.patch
diff --git a/meta/packages/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb
index 5db67b24a..5db67b24a 100644
--- a/meta/packages/quilt/quilt_0.48.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.48.bb
diff --git a/meta/packages/rpm/rpm/perfile_rpmdeps.sh b/meta/recipes-devtools/rpm/rpm/perfile_rpmdeps.sh
index b72c9f026..b72c9f026 100755
--- a/meta/packages/rpm/rpm/perfile_rpmdeps.sh
+++ b/meta/recipes-devtools/rpm/rpm/perfile_rpmdeps.sh
diff --git a/meta/packages/rpm/rpm/remove-compiled-tests.patch b/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
index 69b7130b9..69b7130b9 100644
--- a/meta/packages/rpm/rpm/remove-compiled-tests.patch
+++ b/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
diff --git a/meta/packages/rpm/rpm_5.1.10.bb b/meta/recipes-devtools/rpm/rpm_5.1.10.bb
index a7097f760..a7097f760 100644
--- a/meta/packages/rpm/rpm_5.1.10.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.1.10.bb
diff --git a/meta/packages/rsync/files/acinclude.m4 b/meta/recipes-devtools/rsync/files/acinclude.m4
index 735b41dec..735b41dec 100644
--- a/meta/packages/rsync/files/acinclude.m4
+++ b/meta/recipes-devtools/rsync/files/acinclude.m4
diff --git a/meta/packages/rsync/files/rsyncd.conf b/meta/recipes-devtools/rsync/files/rsyncd.conf
index 845f5b33f..845f5b33f 100644
--- a/meta/packages/rsync/files/rsyncd.conf
+++ b/meta/recipes-devtools/rsync/files/rsyncd.conf
diff --git a/meta/packages/rsync/rsync.inc b/meta/recipes-devtools/rsync/rsync.inc
index fdc7e37cf..fdc7e37cf 100644
--- a/meta/packages/rsync/rsync.inc
+++ b/meta/recipes-devtools/rsync/rsync.inc
diff --git a/meta/packages/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
index 43379829e..43379829e 100644
--- a/meta/packages/rsync/rsync_2.6.9.bb
+++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
diff --git a/meta/packages/rsync/rsync_3.0.7.bb b/meta/recipes-devtools/rsync/rsync_3.0.7.bb
index 3a1e48a61..3a1e48a61 100644
--- a/meta/packages/rsync/rsync_3.0.7.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.0.7.bb
diff --git a/meta/packages/shasum/files/main.c b/meta/recipes-devtools/shasum/files/main.c
index 0748a94f3..0748a94f3 100644
--- a/meta/packages/shasum/files/main.c
+++ b/meta/recipes-devtools/shasum/files/main.c
diff --git a/meta/packages/shasum/files/mhash_sha256.h b/meta/recipes-devtools/shasum/files/mhash_sha256.h
index 46090c5f3..46090c5f3 100644
--- a/meta/packages/shasum/files/mhash_sha256.h
+++ b/meta/recipes-devtools/shasum/files/mhash_sha256.h
diff --git a/meta/packages/shasum/files/sha256.c b/meta/recipes-devtools/shasum/files/sha256.c
index e2ee2c6b4..e2ee2c6b4 100644
--- a/meta/packages/shasum/files/sha256.c
+++ b/meta/recipes-devtools/shasum/files/sha256.c
diff --git a/meta/packages/shasum/shasum-native.bb b/meta/recipes-devtools/shasum/shasum-native.bb
index d39a6c386..d39a6c386 100644
--- a/meta/packages/shasum/shasum-native.bb
+++ b/meta/recipes-devtools/shasum/shasum-native.bb
diff --git a/meta/packages/shasum/shasum.inc b/meta/recipes-devtools/shasum/shasum.inc
index d5f1e8b92..d5f1e8b92 100644
--- a/meta/packages/shasum/shasum.inc
+++ b/meta/recipes-devtools/shasum/shasum.inc
diff --git a/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch
index a1c60654c..a1c60654c 100644
--- a/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch
+++ b/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch
diff --git a/meta/packages/subversion/subversion-1.5.5/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch
index 08343b09e..08343b09e 100644
--- a/meta/packages/subversion/subversion-1.5.5/libtool2.patch
+++ b/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch
diff --git a/meta/packages/subversion/subversion-1.5.5/neon-detection.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch
index b567d5c05..b567d5c05 100644
--- a/meta/packages/subversion/subversion-1.5.5/neon-detection.patch
+++ b/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch
diff --git a/meta/packages/subversion/subversion_1.5.5.bb b/meta/recipes-devtools/subversion/subversion_1.5.5.bb
index 8adac8a6f..8adac8a6f 100644
--- a/meta/packages/subversion/subversion_1.5.5.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.5.5.bb
diff --git a/meta/packages/syslinux/files/cross-build.patch b/meta/recipes-devtools/syslinux/files/cross-build.patch
index c90c7afba..c90c7afba 100644
--- a/meta/packages/syslinux/files/cross-build.patch
+++ b/meta/recipes-devtools/syslinux/files/cross-build.patch
diff --git a/meta/packages/syslinux/syslinux_3.86.bb b/meta/recipes-devtools/syslinux/syslinux_3.86.bb
index 5edbd2408..5edbd2408 100644
--- a/meta/packages/syslinux/syslinux_3.86.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_3.86.bb
diff --git a/meta/packages/tcltk/tcl/fix-configure.patch b/meta/recipes-devtools/tcltk/tcl/fix-configure.patch
index 8b2654bae..8b2654bae 100644
--- a/meta/packages/tcltk/tcl/fix-configure.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix-configure.patch
diff --git a/meta/packages/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index b2d98c131..b2d98c131 100644
--- a/meta/packages/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
diff --git a/meta/packages/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index 9cb816da5..9cb816da5 100644
--- a/meta/packages/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
diff --git a/meta/packages/tcltk/tcl_8.5.8.bb b/meta/recipes-devtools/tcltk/tcl_8.5.8.bb
index 880340067..880340067 100644
--- a/meta/packages/tcltk/tcl_8.5.8.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.8.bb
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/001-2.2b47-2.2b51.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/001-2.2b47-2.2b51.patch
index 886ce92b3..886ce92b3 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/001-2.2b47-2.2b51.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/001-2.2b47-2.2b51.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/002-destdir.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/002-destdir.patch
index 938833267..938833267 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/002-destdir.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/002-destdir.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/003-manpages.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/003-manpages.patch
index a17a8dcf5..a17a8dcf5 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/003-manpages.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/003-manpages.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/004-strsignal.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/004-strsignal.patch
index 3ac4ed740..3ac4ed740 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/004-strsignal.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/004-strsignal.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/005-sys-time.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/005-sys-time.patch
index c21fb05e8..c21fb05e8 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/005-sys-time.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/005-sys-time.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/006-reiserfs.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/006-reiserfs.patch
index abdc67476..abdc67476 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/006-reiserfs.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/006-reiserfs.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/007-map.patch
index 89baabe1c..89baabe1c 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/007-map.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/008-configure.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/008-configure.patch
index a6d45993e..a6d45993e 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/008-configure.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/008-configure.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/009-multirw.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/009-multirw.patch
index 65b0b9eee..65b0b9eee 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/009-multirw.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/009-multirw.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/010-realpath.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/010-realpath.patch
index c3b5d5815..c3b5d5815 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/010-realpath.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/010-realpath.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/011-fno-strict-aliasing.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/011-fno-strict-aliasing.patch
index 695b8c7d1..695b8c7d1 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/011-fno-strict-aliasing.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/011-fno-strict-aliasing.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/012-nostrip.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/012-nostrip.patch
index a815ee437..a815ee437 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/012-nostrip.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/012-nostrip.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/013-mntpathlen.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/013-mntpathlen.patch
index 1f10d3c94..1f10d3c94 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/013-mntpathlen.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/013-mntpathlen.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/014-uninitialized.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/014-uninitialized.patch
index 233c08a2f..233c08a2f 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/014-uninitialized.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/014-uninitialized.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/015-setattr.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/015-setattr.patch
index cbfb8e821..cbfb8e821 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/015-setattr.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/015-setattr.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/016-makefile.in.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/016-makefile.in.patch
index 634ce4609..634ce4609 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/016-makefile.in.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/016-makefile.in.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/017-wrs-dynamic-rpc.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/017-wrs-dynamic-rpc.patch
index 18e12de78..18e12de78 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/017-wrs-dynamic-rpc.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/017-wrs-dynamic-rpc.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/018-remove-tcp-wrappers.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/018-remove-tcp-wrappers.patch
index 95ecdee61..95ecdee61 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/018-remove-tcp-wrappers.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/018-remove-tcp-wrappers.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/019-pid-before-fork.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/019-pid-before-fork.patch
index 960ca8e47..960ca8e47 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/019-pid-before-fork.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/019-pid-before-fork.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/020-undefined-chmod-fix.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/020-undefined-chmod-fix.patch
index 0f1108c21..0f1108c21 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/020-undefined-chmod-fix.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/020-undefined-chmod-fix.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/021-nolibwrap.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/021-nolibwrap.patch
index c0901fadc..c0901fadc 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/021-nolibwrap.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/021-nolibwrap.patch
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/022-add-close-on-exec-descriptors.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/022-add-close-on-exec-descriptors.patch
index 011ae74cd..011ae74cd 100644
--- a/meta/packages/unfs-server/unfs-server-2.2beta47/022-add-close-on-exec-descriptors.patch
+++ b/meta/recipes-devtools/unfs-server/unfs-server-2.2beta47/022-add-close-on-exec-descriptors.patch
diff --git a/meta/packages/unfs-server/unfs-server_2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
index ecba4525a..ecba4525a 100644
--- a/meta/packages/unfs-server/unfs-server_2.2beta47.bb
+++ b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
diff --git a/meta/packages/unifdef/files/unifdef.c b/meta/recipes-devtools/unifdef/files/unifdef.c
index 5cbac1560..5cbac1560 100644
--- a/meta/packages/unifdef/files/unifdef.c
+++ b/meta/recipes-devtools/unifdef/files/unifdef.c
diff --git a/meta/packages/unifdef/unifdef-native_2.6.18+git.bb b/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb
index d879782b2..d879782b2 100644
--- a/meta/packages/unifdef/unifdef-native_2.6.18+git.bb
+++ b/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
index 106fa25e1..106fa25e1 100644
--- a/meta/packages/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
index 5d38d5d36..5d38d5d36 100644
--- a/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
diff --git a/meta/packages/valgrind/valgrind/fix_issue_caused_by_ccache.patch b/meta/recipes-devtools/valgrind/valgrind/fix_issue_caused_by_ccache.patch
index a5c273c45..a5c273c45 100644
--- a/meta/packages/valgrind/valgrind/fix_issue_caused_by_ccache.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/fix_issue_caused_by_ccache.patch
diff --git a/meta/packages/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2 b/meta/recipes-devtools/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2
index 66b3698f2..66b3698f2 100644
--- a/meta/packages/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2
+++ b/meta/recipes-devtools/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2
diff --git a/meta/packages/valgrind/valgrind_3.5.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.5.0.bb
index c1a73f878..c1a73f878 100644
--- a/meta/packages/valgrind/valgrind_3.5.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.5.0.bb
diff --git a/meta/packages/at/at-3.1.10.2/configure.patch b/meta/recipes-extended/at/at-3.1.10.2/configure.patch
index f6720111d..f6720111d 100644
--- a/meta/packages/at/at-3.1.10.2/configure.patch
+++ b/meta/recipes-extended/at/at-3.1.10.2/configure.patch
diff --git a/meta/packages/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch
index 6ab528d0b..6ab528d0b 100644
--- a/meta/packages/at/at-3.1.12/configure.patch
+++ b/meta/recipes-extended/at/at-3.1.12/configure.patch
diff --git a/meta/packages/at/at.inc b/meta/recipes-extended/at/at.inc
index 64ae9c2b6..64ae9c2b6 100644
--- a/meta/packages/at/at.inc
+++ b/meta/recipes-extended/at/at.inc
diff --git a/meta/packages/at/at_3.1.10.2.bb b/meta/recipes-extended/at/at_3.1.10.2.bb
index ff4cf489b..ff4cf489b 100644
--- a/meta/packages/at/at_3.1.10.2.bb
+++ b/meta/recipes-extended/at/at_3.1.10.2.bb
diff --git a/meta/packages/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index 141168dc9..141168dc9 100644
--- a/meta/packages/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
diff --git a/meta/packages/at/files/nonrootinstall.patch b/meta/recipes-extended/at/files/nonrootinstall.patch
index f760e85ae..f760e85ae 100644
--- a/meta/packages/at/files/nonrootinstall.patch
+++ b/meta/recipes-extended/at/files/nonrootinstall.patch
diff --git a/meta/packages/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch
index 7d3d91a19..7d3d91a19 100644
--- a/meta/packages/at/files/use-ldflags.patch
+++ b/meta/recipes-extended/at/files/use-ldflags.patch
diff --git a/meta/packages/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 42e89180d..42e89180d 100644
--- a/meta/packages/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
diff --git a/meta/packages/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb
index ee563d626..ee563d626 100644
--- a/meta/packages/bash/bash_3.2.48.bb
+++ b/meta/recipes-extended/bash/bash_3.2.48.bb
diff --git a/meta/packages/bash/bash_4.1.bb b/meta/recipes-extended/bash/bash_4.1.bb
index 6f0ced757..6f0ced757 100644
--- a/meta/packages/bash/bash_4.1.bb
+++ b/meta/recipes-extended/bash/bash_4.1.bb
diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
new file mode 100644
index 000000000..eaef5f3f3
--- /dev/null
+++ b/meta/recipes-extended/bc/bc_1.06.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "An arbitrary precision calculator language."
+HOMEPAGE = "http://www.gnu.org/software/bc/bc.html"
+BUGTRACKER = ""
+
+LICENSE = "GPLv2+ & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
+                    file://bc/bcdefs.h;endline=31;md5=46dffdaf10a99728dd8ce358e45d46d8 \
+                    file://dc/dc.h;endline=25;md5=2f9c558cdd80e31b4d904e48c2374328 \
+                    file://lib/number.c;endline=31;md5=99434a0898abca7784acfd36b8191199"
+
+SECTION = "base"
+DEPENDS = "flex"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
+
+inherit autotools
diff --git a/meta/recipes-extended/byacc/byacc.inc b/meta/recipes-extended/byacc/byacc.inc
new file mode 100644
index 000000000..c6a5e38f7
--- /dev/null
+++ b/meta/recipes-extended/byacc/byacc.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Berkeley Yacc"
+SECTION = "devel"
+LICENSE = "public domain"
+
+SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz"
+EXTRA_OECONF += "--program-transform-name='s,^,b,'"
+
+BBCLASSEXTEND = "native"
+
+inherit autotools
+
+do_configure() {
+	oe_runconf
+}
diff --git a/meta/recipes-extended/byacc/byacc_20100610.bb b/meta/recipes-extended/byacc/byacc_20100610.bb
new file mode 100644
index 000000000..48d0e4e42
--- /dev/null
+++ b/meta/recipes-extended/byacc/byacc_20100610.bb
@@ -0,0 +1,6 @@
+PR = "r0"
+
+require byacc.inc
+
+SRC_URI[md5sum] = "b9715b9a2867c221176b597e8f73cbc9"
+SRC_URI[sha256sum] = "1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575"
diff --git a/meta/packages/cpio/cpio-2.8/m4extensions.patch b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
index 648c725bb..648c725bb 100644
--- a/meta/packages/cpio/cpio-2.8/m4extensions.patch
+++ b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
diff --git a/meta/packages/cpio/cpio-2.8/statdef.patch b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
index dfa0d9150..dfa0d9150 100644
--- a/meta/packages/cpio/cpio-2.8/statdef.patch
+++ b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
diff --git a/meta/packages/cpio/cpio_2.8.bb b/meta/recipes-extended/cpio/cpio_2.8.bb
index be9a64735..be9a64735 100644
--- a/meta/packages/cpio/cpio_2.8.bb
+++ b/meta/recipes-extended/cpio/cpio_2.8.bb
diff --git a/meta/packages/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index b571986ef..b571986ef 100644
--- a/meta/packages/cpio/cpio_v2.inc
+++ b/meta/recipes-extended/cpio/cpio_v2.inc
diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.16.bb b/meta/recipes-extended/cracklib/cracklib_2.8.16.bb
new file mode 100644
index 000000000..9789737f9
--- /dev/null
+++ b/meta/recipes-extended/cracklib/cracklib_2.8.16.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A pro-active password checker library"
+HOMEPAGE = "http://sourceforge.net/projects/cracklib"
+
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
+
+DEPENDS = ""
+PR ="r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz"
+
+inherit autotools gettext
diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb b/meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb
new file mode 100644
index 000000000..9c03eece5
--- /dev/null
+++ b/meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "cwautomacros"
+SECTION = "base"
+HOMEPAGE = "http://cwautomacros.berlios.de/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a"
+
+SRC_URI = http://download.berlios.de/cwautomacros/cwautomacros-${PV}.tar.bz2
+
+PR = "r0"
+
+do_install() {
+	oe_runmake CWAUTOMACROSPREFIX=${D}${prefix} install
+}
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch
new file mode 100644
index 000000000..a65c433d5
--- /dev/null
+++ b/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch
@@ -0,0 +1,43 @@
+http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
+
+2007-04-16  Mike Frysinger  <vapier@gentoo.org>
+
+	* Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can
+	  override if they so choose.
+	* Only set CFLAGS/CXXFLAGS if user did not specify any.
+
+ed had already taken GPLv3 when this patch out, so it should be GPLv3.
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Index: ed-1.4/configure
+===================================================================
+--- ed-1.4.orig/configure	2009-07-10 19:54:33.000000000 +0800
++++ ed-1.4/configure	2010-08-05 17:41:51.000000000 +0800
+@@ -26,12 +26,6 @@
+ mandir='$(datadir)/man'
+ sysconfdir='$(prefix)/etc'
+ program_prefix=
+-CC=
+-CXX=
+-CPPFLAGS=
+-CFLAGS='-Wall -W -O2'
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
+ 
+ # Loop over all args
+ while [ x"$1" != x ] ; do
+@@ -111,6 +105,14 @@
+ 	esac
+ done
+ 
++# Defaults if the user did not select any
++if [ x"${CFLAGS+set}" != xset ] ; then
++	CFLAGS='-Wall -W -O2'
++fi
++if [ x"${CXXFLAGS+set}" != xset ] ; then
++	CXXFLAGS='-Wall -W -O2'
++fi
++
+ # Find the source files, if location was not specified.
+ srcdirtext=
+ if [ x"${srcdir}" = x ] ; then
diff --git a/meta/recipes-extended/ed/ed_0.5.bb b/meta/recipes-extended/ed/ed_0.5.bb
new file mode 100644
index 000000000..e14bf0e5a
--- /dev/null
+++ b/meta/recipes-extended/ed/ed_0.5.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "GNU ed is a line-oriented text editor"
+HOMEPAGE = "http://www.gnu.org/software/ed/"
+SECTION = "base"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6ddd5335ef96fb858a138230af773710 \
+                    file://main.c;beginline=1;endline=17;md5=36d4b85e5ae9028e918d1cc775c2475e"
+
+PR = "r0"
+SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/ed/ed-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/meta/recipes-extended/ed/ed_1.4.bb b/meta/recipes-extended/ed/ed_1.4.bb
new file mode 100644
index 000000000..0243769e9
--- /dev/null
+++ b/meta/recipes-extended/ed/ed_1.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "a line-oriented text editor"
+HOMEPAGE = "http://www.gnu.org/software/ed/"
+BUGTRACKER = ""
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+                    file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \
+                    file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b"
+
+SECTION = "base"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \
+           file://ed-1.2-build.patch"
+
+do_configure() {
+	${S}/configure
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/meta/recipes-extended/ethtool/ethtool_2.6.34.bb b/meta/recipes-extended/ethtool/ethtool_2.6.34.bb
new file mode 100644
index 000000000..9658f630a
--- /dev/null
+++ b/meta/recipes-extended/ethtool/ethtool_2.6.34.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces."
+HOMEPAGE = "http://sourceforge.net/projects/gkernel/"
+SECTION = "console/network"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://ethtool.c;firstline=4;endline=16;md5=6db6b005b8390ea76cb85a2c7bda8e6b"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/ethtool-${PV}.tar.gz"
+
+inherit autotools
diff --git a/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch b/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch
new file mode 100644
index 000000000..b8aacfb23
--- /dev/null
+++ b/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch
@@ -0,0 +1,54 @@
+--- /tmp/configure.in	2007-04-30 13:08:49.000000000 +0200
++++ gamin-0.1.8/configure.in	2007-04-30 13:10:53.285251000 +0200
+@@ -354,51 +354,6 @@
+     AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure])
+ fi
+ 
+-#### Abstract sockets
+-
+-AC_MSG_CHECKING(abstract socket namespace)
+-AC_LANG_PUSH(C)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdio.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <errno.h>
+-]],
+-[[
+-  int listen_fd;
+-  struct sockaddr_un addr;
+-  
+-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
+-  
+-  if (listen_fd < 0)
+-    {
+-      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
+-      exit (1);
+-    }
+-
+-  memset (&addr, '\0', sizeof (addr));
+-  addr.sun_family = AF_UNIX;
+-  strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
+-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
+-  
+-  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
+-    {
+-       fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", 
+-                strerror (errno));
+-       exit (1);
+-    }
+-  else 
+-    exit (0);
+-]])],
+-              [have_abstract_sockets=yes],
+-              [have_abstract_sockets=no])
+-AC_LANG_POP(C)
+-AC_MSG_RESULT($have_abstract_sockets)
+-
+ if test x$enable_abstract_sockets = xyes; then
+     if test x$have_abstract_sockets = xno; then
+ 	AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb
new file mode 100644
index 000000000..21f1da434
--- /dev/null
+++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Gamin is a file and directory monitoring system defined to \
+be a subset of the FAM (File Alteration Monitor) system."
+HOMEPAGE = "http://people.gnome.org/~veillard/gamin/"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62"
+
+DEPENDS = "glib-2.0"
+PROVIDES = "fam"
+PR = "r2"
+
+SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
+           file://no-abstract-sockets.patch"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python"
+
+PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg"
+FILES_${PN} = "${libexecdir}"
+FILES_${PN}-dbg = "${libexecdir}/.debug"
+FILES_lib${PN} = "${libdir}/lib*.so.*"
+FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
+                      ${libdir}/lib*.a ${libdir}/lib*.so"
+FILES_lib${PN}-dbg = "${libdir}/.debug/"
+
+RDEPENDS_lib${PN} = "${PN}"
+
+LEAD_SONAME = "libgamin-1.so"
+
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
new file mode 100644
index 000000000..4bfa23d2e
--- /dev/null
+++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "A program that you can use to select particular records in a \
+file and perform operations upon them."
+HOMEPAGE = "www.gnu.org/software/gawk"
+BUGTRACKER  = "bug-gawk@gnu.org"
+SECTION = "console/utils"
+
+# gawk <= 3.1.5: GPLv2
+# gawk >= 3.1.6: GPLv3
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+RDEPENDS_gawk += "gawk-common"
+RDEPENDS_pgawk += "gawk-common"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
+
+inherit autotools gettext update-alternatives
+
+PACKAGES += "gawk-common pgawk"
+
+FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
+FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
+FILES_pgawk = "${bindir}/pgawk*"
+FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
+
+ALTERNATIVE_NAME = "awk"
+ALTERNATIVE_PATH = "gawk"
+ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/poky-image-basic.bb
new file mode 100644
index 000000000..537a6e412
--- /dev/null
+++ b/meta/recipes-extended/images/poky-image-basic.bb
@@ -0,0 +1,8 @@
+IMAGE_FEATURES += "apps-console-core "
+
+IMAGE_INSTALL = "\
+    ${POKY_BASE_INSTALL} \
+    task-poky-basic \
+    "
+
+inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/poky-image-lsb.bb
new file mode 100644
index 000000000..8424d91bb
--- /dev/null
+++ b/meta/recipes-extended/images/poky-image-lsb.bb
@@ -0,0 +1,9 @@
+IMAGE_FEATURES += "apps-console-core "
+
+IMAGE_INSTALL = "\
+    ${POKY_BASE_INSTALL} \
+    task-poky-basic \
+    task-poky-lsb \
+    "
+
+inherit poky-image
diff --git a/meta/recipes-extended/iptables/iptables_1.4.8.bb b/meta/recipes-extended/iptables/iptables_1.4.8.bb
new file mode 100644
index 000000000..ad707d30b
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables_1.4.8.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "iptables is the userspace command line program used to configure the Linux 2.4.x and 2.6.x IPv4 packet filtering ruleset"
+HOMEPAGE = "http://www.netfilter.org/"
+BUGTRACKER = "http://bugzilla.netfilter.org/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
+                    file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
+
+PR = "r0"
+
+RRECOMMENDS_${PN} = "kernel-module-x-tables \
+                     kernel-module-ip-tables \
+                     kernel-module-iptable-filter \
+                     kernel-module-iptable-nat \
+                     kernel-module-nf-defrag-ipv4 \
+                     kernel-module-nf-conntrack \
+                     kernel-module-nf-conntrack-ipv4 \
+                     kernel-module-nf-nat \
+                     kernel-module-ipt-masquerade"
+FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug"
+
+SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
+                ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
+
+do_configure_prepend() {
+	# they are all libtool m4 files
+	rm -rf ${S}/m4
+}
diff --git a/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff b/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff
new file mode 100644
index 000000000..98aae0d45
--- /dev/null
+++ b/meta/recipes-extended/iputils/files/debian/CVE-2010-2529.diff
@@ -0,0 +1,22 @@
+Index: trunk/ping.c
+===================================================================
+--- trunk.orig/ping.c	2010-07-23 21:26:53.000000000 -0700
++++ trunk/ping.c	2010-07-23 21:28:27.000000000 -0700
+@@ -1059,7 +1059,7 @@
+ 				i = j;
+ 			i -= IPOPT_MINOFF;
+ 			if (i <= 0)
+-				continue;
++				break;
+ 			if (i == old_rrlen
+ 			    && !strncmp((char *)cp, old_rr, i)
+ 			    && !(options & F_FLOOD)) {
+@@ -1096,7 +1096,7 @@
+ 				i = j;
+ 			i -= 5;
+ 			if (i <= 0)
+-				continue;
++				break;
+ 			flags = *++cp;
+ 			printf("\nTS: ");
+ 			cp++;
diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
new file mode 100644
index 000000000..86bbf0d39
--- /dev/null
+++ b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
@@ -0,0 +1,41 @@
+Index: trunk/ping.c
+===================================================================
+--- trunk.orig/ping.c	2010-05-07 23:13:54.000000000 -0700
++++ trunk/ping.c	2010-05-07 23:23:22.000000000 -0700
+@@ -883,9 +883,36 @@
+ 		case ICMP_SR_FAILED:
+ 			printf("Source Route Failed\n");
+ 			break;
++		case ICMP_NET_UNKNOWN:
++			printf("Destination Net Unknown\n");
++			break;
++		case ICMP_HOST_UNKNOWN:
++			printf("Destination Host Unknown\n");
++			break;
++		case ICMP_HOST_ISOLATED:
++			printf("Source Host Isolated\n");
++			break;
++		case ICMP_NET_ANO:
++			printf("Destination Net Prohibited\n");
++			break;
++		case ICMP_HOST_ANO:
++			printf("Destination Host Prohibited\n");
++			break;
++		case ICMP_NET_UNR_TOS:
++			printf("Destination Net Unreachable for Type of Service\n");
++			break;
++		case ICMP_HOST_UNR_TOS:
++			printf("Destination Host Unreachable for Type of Service\n");
++			break;
+ 		case ICMP_PKT_FILTERED:
+ 			printf("Packet filtered\n");
+ 			break;
++		case ICMP_PREC_VIOLATION:
++			printf("Precedence Violation\n");
++			break;
++		case ICMP_PREC_CUTOFF:
++			printf("Precedence Cutoff\n");
++			break;
+ 		default:
+ 			printf("Dest Unreachable, Bad Code: %d\n", code);
+ 			break;
diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
new file mode 100644
index 000000000..9f05769f7
--- /dev/null
+++ b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
@@ -0,0 +1,24 @@
+Index: trunk/arping.c
+===================================================================
+--- trunk.orig/arping.c	2010-05-07 23:13:52.000000000 -0700
++++ trunk/arping.c	2010-05-07 23:41:16.000000000 -0700
+@@ -182,12 +182,17 @@
+ 	if (start.tv_sec==0)
+ 		start = tv;
+ 
+-	if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))
++	if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)
+ 		finish();
+ 
+-	if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
++	if ((!timeout) && (count == 0))
++		finish();
++
++	if ( count!=0  && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) {
+ 		send_pack(s, src, dst,
+ 			  (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he);
++		if (count >= 0)
++		    count--;
+ 		if (count == 0 && unsolicited)
+ 			finish();
+ 	}
diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
new file mode 100644
index 000000000..2a924258d
--- /dev/null
+++ b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
@@ -0,0 +1,14 @@
+Index: trunk/ping_common.c
+===================================================================
+--- trunk.orig/ping_common.c	2010-05-07 23:13:51.000000000 -0700
++++ trunk/ping_common.c	2010-05-07 23:22:33.000000000 -0700
+@@ -872,7 +872,8 @@
+ 		printf("%spipe %d", comma, pipesize);
+ 		comma = ", ";
+ 	}
+-	if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
++	if (ntransmitted > 1 && nreceived &&
++		(!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
+ 		int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
+ 		printf("%sipg/ewma %d.%03d/%d.%03d ms",
+ 		       comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff
new file mode 100644
index 000000000..b5e907a8d
--- /dev/null
+++ b/meta/recipes-extended/iputils/files/debian/targets.diff
@@ -0,0 +1,13 @@
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile	2010-05-07 23:43:00.000000000 -0700
++++ trunk/Makefile	2010-05-07 23:47:10.000000000 -0700
+@@ -16,7 +16,7 @@
+ CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
+ CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
+ 
+-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
++IPV4_TARGETS=tracepath ping arping clockdiff
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+ 
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
new file mode 100644
index 000000000..7e6c97c14
--- /dev/null
+++ b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
@@ -0,0 +1,29 @@
+Index: trunk/tracepath.c
+===================================================================
+--- trunk.orig/tracepath.c	2010-05-07 23:13:52.000000000 -0700
++++ trunk/tracepath.c	2010-05-07 23:24:09.000000000 -0700
+@@ -338,9 +338,9 @@
+ 		base_port = atoi(p+1);
+ 	} else
+ 		base_port = 44444;
+-	he = gethostbyname(argv[0]);
++	he = gethostbyname2(argv[0], AF_INET);
+ 	if (he == NULL) {
+-		herror("gethostbyname");
++		herror("gethostbyname2");
+ 		exit(1);
+ 	}
+ 	memcpy(&target.sin_addr, he->h_addr, 4);
+Index: trunk/ping.c
+===================================================================
+--- trunk.orig/ping.c	2010-05-07 23:23:22.000000000 -0700
++++ trunk/ping.c	2010-05-07 23:24:09.000000000 -0700
+@@ -250,7 +250,7 @@
+ 			if (argc == 1)
+ 				options |= F_NUMERIC;
+ 		} else {
+-			hp = gethostbyname(target);
++			hp = gethostbyname2(target, AF_INET);
+ 			if (!hp) {
+ 				fprintf(stderr, "ping: unknown host %s\n", target);
+ 				exit(2);
diff --git a/meta/recipes-extended/iputils/iputils_s20100418.bb b/meta/recipes-extended/iputils/iputils_s20100418.bb
new file mode 100644
index 000000000..3f793eca5
--- /dev/null
+++ b/meta/recipes-extended/iputils/iputils_s20100418.bb
@@ -0,0 +1,78 @@
+DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
+tracepath, tracepath6, ping, ping6 and arping."
+HOMEPAGE = "http://www.skbuff.net/iputils"
+SECTION = "console/network"
+
+LICENSE = "BSD & GPLv2+"
+
+DEPENDS = "sysfsutils openssl"
+
+PR = "r0"
+
+SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \
+           file://debian/fix-dead-host-ping-stats.diff \
+           file://debian/add-icmp-return-codes.diff \
+           file://debian/use_gethostbyname2.diff \
+           file://debian/targets.diff \
+           file://debian/fix-arping-timeouts.diff \
+           file://debian/CVE-2010-2529.diff \
+          "
+
+# man is not compiled here, since it requires docbook-utils-native
+# which is not available in poky
+
+do_compile () {
+	oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}" all
+}
+
+do_install () {
+	install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8
+	# SUID root programs
+	install -m 4555 ping ${D}${base_bindir}/ping.${PN}
+	install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN}
+	install -m 4555 traceroute6 ${D}${base_bindir}/
+	# Other programgs
+	for i in arping tracepath tracepath6; do
+	  install -m 0755 $i ${D}${base_bindir}/
+	done
+	# Manual pages for things we build packages for
+#	for i in tracepath.8 traceroute6.8 ping.8 arping.8; do
+#	  install -m 0644 doc/$i ${D}${mandir}/man8/ || true
+#	done
+}
+
+# Busybox also provides ping and ping6, so use update-alternatives
+# Also fixup SUID bit for applications that need it
+pkg_postinst_${PN}-ping () {
+	chmod 4555 ${base_bindir}/ping.${PN}
+	update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100
+}
+pkg_prerm_${PN}-ping () {
+	update-alternatives --remove ping ping.${PN}
+}
+
+pkg_postinst_${PN}-ping6 () {
+	chmod 4555 ${base_bindir}/ping6.${PN}
+	update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100
+}
+pkg_prerm_${PN}-ping6 () {
+	update-alternatives --remove ping6 ping6.${PN}
+}
+
+pkg_postinst_${PN}-traceroute6 () {
+	chmod 4555 ${base_bindir}/traceroute6
+}
+
+PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
+
+ALLOW_EMPTY_${PN} = "1"
+RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
+
+FILES_${PN}	= ""
+FILES_${PN}-ping = "${base_bindir}/ping.${PN}"
+FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}"
+FILES_${PN}-arping = "${base_bindir}/arping"
+FILES_${PN}-tracepath = "${base_bindir}/tracepath"
+FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6"
+FILES_${PN}-traceroute6	= "${base_bindir}/traceroute6"
+FILES_${PN}-doc	= "${mandir}/man8"
diff --git a/meta/packages/less/less_436.bb b/meta/recipes-extended/less/less_436.bb
index 872a127f4..872a127f4 100644
--- a/meta/packages/less/less_436.bb
+++ b/meta/recipes-extended/less/less_436.bb
diff --git a/meta/recipes-extended/libuser/libuser-0.56.16/disable-sgml-doc.patch b/meta/recipes-extended/libuser/libuser-0.56.16/disable-sgml-doc.patch
new file mode 100644
index 000000000..a2017c572
--- /dev/null
+++ b/meta/recipes-extended/libuser/libuser-0.56.16/disable-sgml-doc.patch
@@ -0,0 +1,18 @@
+Disable generating docs from sgml, which requries linuxdoc-tools.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: libuser-0.56.16/docs/Makefile.am
+===================================================================
+--- libuser-0.56.16.orig/docs/Makefile.am	2010-08-12 13:29:43.000000000 +0800
++++ libuser-0.56.16/docs/Makefile.am	2010-08-12 13:29:51.000000000 +0800
+@@ -14,8 +14,8 @@
+ 
+ sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
+ 	[ -d sgml ] || mkdir sgml
+-	cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
++#	cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
+ 
+ sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
+ 	[ -d sgml ] || mkdir sgml
+-	cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
++#	cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
diff --git a/meta/recipes-extended/libuser/libuser_0.56.16.bb b/meta/recipes-extended/libuser/libuser_0.56.16.bb
new file mode 100644
index 000000000..d72430ec0
--- /dev/null
+++ b/meta/recipes-extended/libuser/libuser_0.56.16.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user and group accounts"
+HOMEPAGE = "https://fedorahosted.org/libuser/"
+BUGTRACKER = "https://fedorahosted.org/libuser/newticket"
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+                    file://lib/user.h;endline=19;md5=9bc141f2e0d3e8b97ecdc945b2ed1ec7 \
+                    file://samples/testuser.c;endline=19;md5=61e8c05bd37ce1cba5590071f6e17500"
+
+SECTION = "base"
+
+SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
+           file://disable-sgml-doc.patch;patch=1"
+PR = "r0"
+
+DEPENDS = "gettext libpam glib-2.0 xz-native"
+
+EXTRA_OECONF += "--disable-gtk-doc --without-python"
+
+inherit autotools
diff --git a/meta/recipes-extended/minicom/minicom-2.3/gcc4-scope.patch b/meta/recipes-extended/minicom/minicom-2.3/gcc4-scope.patch
new file mode 100644
index 000000000..5bd47bd35
--- /dev/null
+++ b/meta/recipes-extended/minicom/minicom-2.3/gcc4-scope.patch
@@ -0,0 +1,44 @@
+--- minicom-2.1/src/window.c.orig	2006-06-14 17:49:53.000000000 +0200
++++ minicom-2.1/src/window.c	2006-06-14 17:50:14.000000000 +0200
+@@ -62,7 +62,7 @@
+ static char *CS, *SF, *SR, *VB, *BL;
+ static char *VE, *VI, *KS, *KE;
+ static char *CD, *CL, *IC, *DC;
+-static char *BC, *CR, *NL;
++static char *mcBC, *CR, *NL;
+ #if ST_LINE
+ static char *TS, *FS, *DS;
+ #endif
+@@ -322,8 +322,8 @@
+   else if (NL != CNULL && x == 0 && x == curx && y == cury + 1)
+ 	outstr(NL);
+ #endif
+-  else if (BC != CNULL && y == cury && x == curx - 1)
+-  	outstr(BC);
++  else if (mcBC != CNULL && y == cury && x == curx - 1)
++  	outstr(mcBC);
+   else	
+   	outstr(tgoto(CM, x, y));
+   curx = x;
+@@ -1918,7 +1918,7 @@
+   CL = tgetstr("cl", &_tptr);
+   IC = tgetstr("ic", &_tptr);
+   DC = tgetstr("dc", &_tptr);
+-  BC = tgetstr("bc", &_tptr);
++  mcBC = tgetstr("bc", &_tptr);
+   CR = tgetstr("cr", &_tptr);
+   NL = tgetstr("nl", &_tptr);
+   AC = tgetstr("ac", &_tptr);
+@@ -1967,10 +1967,10 @@
+   _has_am = tgetflag("am");
+   _mv_standout = tgetflag("ms");
+   if (tgetflag("bs")) {
+-    if (BC == CNULL) BC = "\b";
++    if (mcBC == CNULL) mcBC = "\b";
+   } 
+   else
+-    BC = CNULL;	
++    mcBC = CNULL;	
+ 
+   /* Special IBM box-drawing characters */
+   D_UL  = 201;
diff --git a/meta/recipes-extended/minicom/minicom-2.3/rename-conflicting-functions.patch b/meta/recipes-extended/minicom/minicom-2.3/rename-conflicting-functions.patch
new file mode 100644
index 000000000..c34420326
--- /dev/null
+++ b/meta/recipes-extended/minicom/minicom-2.3/rename-conflicting-functions.patch
@@ -0,0 +1,13 @@
+--- minicom-2.3/src/minicom.c-orig	2009-06-08 14:49:07.000000000 +0200
++++ minicom-2.3/src/minicom.c	2009-06-08 14:50:23.000000000 +0200
+@@ -63,6 +63,10 @@
+ }
+ #endif /*DEBUG*/
+ 
++#ifdef __USE_GNU
++#define getline minicom_getline
++#endif
++
+ /*
+  * Sub - menu's.
+  */
diff --git a/meta/recipes-extended/minicom/minicom_2.3.bb b/meta/recipes-extended/minicom/minicom_2.3.bb
new file mode 100644
index 000000000..a114e30c9
--- /dev/null
+++ b/meta/recipes-extended/minicom/minicom_2.3.bb
@@ -0,0 +1,17 @@
+SECTION = "console/network"
+DEPENDS = "ncurses"
+LICENSE = "GPL"
+SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
+	file://rename-conflicting-functions.patch \
+	"
+
+#	file://gcc4-scope.patch;patch=1 \
+
+inherit autotools gettext
+
+do_install() {
+	for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done
+}
+
+SRC_URI[md5sum] = "0ebe7a91898384ca906787cc4e2c3f25"
+SRC_URI[sha256sum] = "2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb"
diff --git a/meta/recipes-extended/mktemp/files/disable-strip.patch b/meta/recipes-extended/mktemp/files/disable-strip.patch
new file mode 100644
index 000000000..d6bc528a2
--- /dev/null
+++ b/meta/recipes-extended/mktemp/files/disable-strip.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 37b3cc9..f1026f3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -95,7 +95,7 @@ install-dirs:
+ 	    $(DESTDIR)$(mandir)/man1
+ 
+ install-binaries: $(PROG)
+-	$(INSTALL) -m 0555 -s $(PROG) $(DESTDIR)$(bindir)/$(PROG)
++	$(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
+ 
+ install-man:
+ 	$(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
new file mode 100644
index 000000000..a34827450
--- /dev/null
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Allow safe temporary file creation from shell scripts."
+HOMEPAGE = "http://www.mktemp.org/"
+BUGTRACKER = "http://www.mktemp.org/bugs"
+SECTION = "console/utils"
+LICENSE = "ISC style"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${P}.tar.gz \
+        file://disable-strip.patch \
+        "
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "--with-libc"
+
+do_install_append () {
+	mkdir ${D}${base_bindir}
+	mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp.${PN}
+}
+
+ALTERNATIVE_NAME = "mktemp"
+ALTERNATIVE_LINK = "${base_bindir}/mktemp"
+ALTERNATIVE_PATH = "${base_bindir}/mktemp.${PN}"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h
new file mode 100644
index 000000000..92c527a51
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.h
@@ -0,0 +1,75 @@
+/*
+* config.h	Automatically generated configuration includefile
+*
+* NET-TOOLS	A collection of programs that form the base set of the
+*		NET-3 Networking Distribution for the LINUX operating
+*		system.
+*
+*		DO  NOT  EDIT  DIRECTLY
+*
+*/
+
+/* 
+ * 
+ * Internationalization
+ * 
+ * The net-tools package has currently been translated to French,
+ * German and Brazilian Portugese.  Other translations are, of
+ * course, welcome.  Answer `n' here if you have no support for
+ * internationalization on your system.
+ * 
+ */
+#define I18N 1
+
+/* 
+ * 
+ * Protocol Families.
+ * 
+ */
+#define HAVE_AFUNIX 1
+#define HAVE_AFINET 1
+#define HAVE_AFINET6 1
+#define HAVE_AFIPX 0
+#define HAVE_AFATALK 0
+#define HAVE_AFAX25 0
+#define HAVE_AFNETROM 1
+#define HAVE_AFROSE 0
+#define HAVE_AFX25 0
+#define HAVE_AFECONET 0
+#define HAVE_AFDECnet 0
+#define HAVE_AFASH 0
+
+/* 
+ * 
+ * Device Hardware types.
+ * 
+ */
+#define HAVE_HWETHER 1
+#define HAVE_HWARC 1
+#define HAVE_HWSLIP 1
+#define HAVE_HWPPP 1
+#define HAVE_HWTUNNEL 1
+#define HAVE_HWSTRIP 1
+#define HAVE_HWTR 1
+#define HAVE_HWAX25 0
+#define HAVE_HWROSE 0
+#define HAVE_HWNETROM 1
+#define HAVE_HWX25 0
+#define HAVE_HWFR 1
+#define HAVE_HWSIT 0
+#define HAVE_HWFDDI 0
+#define HAVE_HWHIPPI 0
+#define HAVE_HWASH 0
+#define HAVE_HWHDLCLAPB 0
+#define HAVE_HWIRDA 1
+#define HAVE_HWEC 0
+#define HAVE_HWIB 0
+
+/* 
+ * 
+ * Other Features.
+ * 
+ */
+#define HAVE_FW_MASQUERADE 1
+#define HAVE_IP_TOOLS 1
+#define HAVE_MII 1
diff --git a/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.make b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.make
new file mode 100644
index 000000000..ec516f27e
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools-1.60-23/net-tools-config.make
@@ -0,0 +1,36 @@
+I18N=1
+HAVE_AFUNIX=1
+HAVE_AFINET=1
+HAVE_AFINET6=1
+# HAVE_AFIPX=0
+# HAVE_AFATALK=0
+# HAVE_AFAX25=0
+HAVE_AFNETROM=1
+# HAVE_AFROSE=0
+# HAVE_AFX25=0
+# HAVE_AFECONET=0
+# HAVE_AFDECnet=0
+# HAVE_AFASH=0
+HAVE_HWETHER=1
+HAVE_HWARC=1
+HAVE_HWSLIP=1
+HAVE_HWPPP=1
+HAVE_HWTUNNEL=1
+HAVE_HWSTRIP=1
+HAVE_HWTR=1
+# HAVE_HWAX25=0
+# HAVE_HWROSE=0
+HAVE_HWNETROM=1
+# HAVE_HWX25=0
+HAVE_HWFR=1
+# HAVE_HWSIT=0
+# HAVE_HWFDDI=0
+# HAVE_HWHIPPI=0
+# HAVE_HWASH=0
+# HAVE_HWHDLCLAPB=0
+HAVE_HWIRDA=1
+# HAVE_HWEC=0
+# HAVE_HWIB=0
+HAVE_FW_MASQUERADE=1
+HAVE_IP_TOOLS=1
+HAVE_MII=1
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
new file mode 100644
index 000000000..031169c06
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -0,0 +1,77 @@
+SUMMARY="A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system"
+HOMEPAGE = "http://net-tools.berlios.de/"
+BUGTRACKER = "http://bugs.debian.org/net-tools"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
+                    file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/n/net-tools/net-tools_1.60.orig.tar.gz \
+           ftp://ftp.debian.org/debian/pool/main/n/net-tools/${PN}_${PV}.diff.gz;apply=no \
+           file://net-tools-config.h \
+           file://net-tools-config.make" 
+
+S = "${WORKDIR}/net-tools-1.60"
+
+inherit gettext
+
+# The Makefile is lame, no parallel build
+PARALLEL_MAKE = ""
+
+# Unlike other Debian packages, net-tools *.diff.gz contains another series of
+# patches maintained by quilt. So manually apply them before applying other local
+# patches. Also remove all temp files before leaving, because do_patch() will pop 
+# up all previously applied patches in the start
+nettools_do_patch() {
+	cd ${S}
+	patch -p1 < ${WORKDIR}/${PN}_${PV}.diff
+	QUILT_PATCHES=${S}/debian/patches quilt push -a
+	rm -rf ${S}/patches ${S}/.pc
+}
+
+# We invoke base do_patch at end, to incorporate any local patch
+python do_patch() {
+	bb.build.exec_func('nettools_do_patch', d)
+	bb.build.exec_func('patch_do_patch', d)
+}
+
+do_configure() {
+	# net-tools has its own config mechanism requiring "make config"
+	# we pre-generate desired options and copy to source directory instead
+	cp ${WORKDIR}/net-tools-config.h    ${S}/config.h
+	cp ${WORKDIR}/net-tools-config.make ${S}/config.make
+}
+
+do_compile() {
+	# net-tools use COPTS/LOPTS to allow adding custom options
+	export COPTS="$CFLAGS"
+	export LOPTS="$LDFLAGS"
+	unset CFLAGS
+	unset LDFLAGS
+
+	oe_runmake
+}
+
+do_install() {
+	oe_runmake 'BASEDIR=${D}' install
+
+	for app in ${D}/${base_sbindir}/* ${D}/${base_bindir}/*; do
+		mv $app $app.${PN}
+	done
+}
+
+pkg_postinst_${PN} () {
+	for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach ; do
+		update-alternatives --install ${base_sbindir}/$app $app $app.${PN} 100
+	done
+
+	for app in dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do
+		update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
+	done
+}
+
+pkg_prerm_${PN} () {
+	for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do
+		update-alternatives --remove $app $app.${PN}
+	done
+}
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb
new file mode 100644
index 000000000..32804ba0c
--- /dev/null
+++ b/meta/recipes-extended/pax/pax_3.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool"
+HOMEPAGE = "http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
+BUGTRACKER = "http://www.openbsd.org/query-pr.html"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \
+                    file://src/pax.h;endline=40;md5=309d3e241c1d82069228e5a51e9b8d60 \
+                    file://src/cpio.h;endline=40;md5=c3b4bbff6133a83387968617bbae8ac4 \
+                    file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053"
+
+SECTION = "base"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.21.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.21.bb
new file mode 100644
index 000000000..3292ee338
--- /dev/null
+++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.21.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Convert::ASN1 - ASN.1 Encode/Decode library"
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz"
+
+S = "${WORKDIR}/Convert-ASN1-${PV}"
+
+inherit cpan
+
+BBCLASSEXTEND="native"
+
+PACKAGE_ARCH = "all"
diff --git a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
new file mode 100644
index 000000000..84406adfb
--- /dev/null
+++ b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "TimeDate - parser for absolute times"
+SECTION = "libs"
+# You can redistribute it and/or modify it under the same terms as Perl itself.
+LICENSE = "Artistic|GPL"
+PR = "r2"
+
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz"
+
+S = "${WORKDIR}/TimeDate-${PV}"
+
+inherit cpan
+
+BBCLASSEXTEND="native"
+
+RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local"
+PACKAGE_ARCH = "all"
+
+SRC_URI[md5sum] = "7da7452bce4c684e4238e6d09b390200"
+SRC_URI[sha256sum] = "f8251a791f6692c69952b4af697c01df93981ad1ab133279d034656a03cd3755"
diff --git a/meta/recipes-extended/procps/procps-3.2.7/install.patch b/meta/recipes-extended/procps/procps-3.2.7/install.patch
new file mode 100644
index 000000000..9f1ef6915
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/install.patch
@@ -0,0 +1,27 @@
+--- procps-3.2.5.virgin/Makefile	2005-01-26 05:55:26.000000000 +0100
++++ procps-3.2.5/Makefile	2005-08-03 04:55:26.346984488 +0200
+@@ -30,7 +30,10 @@
+ install  := install -D --owner 0 --group 0
+ 
+ # Lame x86-64 /lib64 and /usr/lib64 abomination:
+-lib64    := lib$(shell [ -d /lib64 ] && echo 64)
++# lib64    := lib$(shell [ -d /lib64 ] && echo 64)
++
++# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
++lib64      := lib
+ 
+ usr/bin                  := $(DESTDIR)/usr/bin/
+ bin                      := $(DESTDIR)/bin/
+@@ -211,10 +214,10 @@
+ ###### install
+ 
+ $(BINFILES) : all
+-	$(install) --mode a=rx $(notdir $@) $@
++	$(install) -m 555 $(notdir $@) $@
+ 
+ $(MANFILES) : all
+-	$(install) --mode a=r $(notdir $@) $@
++	$(install) -m 444 $(notdir $@) $@
+ 
+ install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
+ 	cd $(usr/bin) && $(ln_f) skill snice
diff --git a/meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch b/meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch
new file mode 100644
index 000000000..dcd66163a
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch
@@ -0,0 +1,13 @@
+diff --git a/pwdx.c b/pwdx.c
+index cb96a52..29ebce2 100644
+--- a/pwdx.c
++++ b/pwdx.c
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <regex.h>
+-#include <limits.h>
++#include <linux/limits.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
diff --git a/meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch b/meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch
new file mode 100644
index 000000000..8e9e1ebfe
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch
@@ -0,0 +1,22 @@
+Index: procps-3.2.1/proc/devname.c
+===================================================================
+--- procps-3.2.1.orig/proc/devname.c	2004-03-18 05:43:50.000000000 +1100
++++ procps-3.2.1/proc/devname.c	2005-04-02 10:40:17.462138000 +1000
+@@ -227,7 +227,7 @@
+ 
+ /* number --> name */
+ unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) {
+-  static char buf[PAGE_SIZE];
++  static char buf[4096];
+   char *restrict tmp = buf;
+   unsigned dev = dev_t_dev;
+   unsigned i = 0;
+@@ -249,7 +249,7 @@
+   if((flags&ABBREV_TTY) && !strncmp(tmp,"tty",  3) && tmp[3]) tmp += 3;
+   if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4;
+   /* gotta check before we chop or we may chop someone else's memory */
+-  if(chop + (unsigned long)(tmp-buf) <= sizeof buf)
++  if(chop + (unsigned long)(tmp-buf) < sizeof buf)
+     tmp[chop] = '\0';
+   /* replace non-ASCII characters with '?' and return the number of chars */
+   for(;;){
diff --git a/meta/recipes-extended/procps/procps-3.2.7/procmodule.patch b/meta/recipes-extended/procps/procps-3.2.7/procmodule.patch
new file mode 100644
index 000000000..fabfabaa5
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/procmodule.patch
@@ -0,0 +1,36 @@
+*** procps-3.2.5/proc/module.mk.orig	Sun Jul 24 11:53:49 2005
+--- procps-3.2.5/proc/module.mk	Sun Jul 24 11:54:32 2005
+***************
+*** 96,102 ****
+  #################### install rules ###########################
+  
+  $(lib)$(SOFILE) : proc/$(SONAME)
+! 	$(install) --mode a=rx $< $@
+  
+  ifneq ($(SOLINK),$(SOFILE))
+  .PHONY: $(lib)$(SOLINK)
+--- 96,102 ----
+  #################### install rules ###########################
+  
+  $(lib)$(SOFILE) : proc/$(SONAME)
+! 	$(install) -m 555 $< $@
+  
+  ifneq ($(SOLINK),$(SOFILE))
+  .PHONY: $(lib)$(SOLINK)
+***************
+*** 115,121 ****
+  	$(ldconfig)
+  
+  $(usr/lib)$(ANAME) : proc/$(ANAME)
+! 	$(install) --mode a=r $< $@
+  
+  # Junk anyway... supposed to go in /usr/include/$(NAME)
+  #INSTALL += $(addprefix $(include),$(HDRFILES))
+--- 115,121 ----
+  	$(ldconfig)
+  
+  $(usr/lib)$(ANAME) : proc/$(ANAME)
+! 	$(install) -m 444 $< $@
+  
+  # Junk anyway... supposed to go in /usr/include/$(NAME)
+  #INSTALL += $(addprefix $(include),$(HDRFILES))
diff --git a/meta/recipes-extended/procps/procps-3.2.7/procps.init b/meta/recipes-extended/procps/procps-3.2.7/procps.init
new file mode 100644
index 000000000..739dcf4be
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/procps.init
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+SYSCTL_CONF="/etc/sysctl.conf"
+if [ -f "${SYSCTL_CONF}" ]; then
+	/sbin/sysctl -q -p "${SYSCTL_CONF}"
+fi
diff --git a/meta/recipes-extended/procps/procps-3.2.7/psmodule.patch b/meta/recipes-extended/procps/procps-3.2.7/psmodule.patch
new file mode 100644
index 000000000..f298c1c1c
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/psmodule.patch
@@ -0,0 +1,21 @@
+*** procps-3.2.5/ps/module.mk.orig	Sun Jul 24 11:54:40 2005
+--- procps-3.2.5/ps/module.mk	Sun Jul 24 11:55:02 2005
+***************
+*** 33,40 ****
+  
+  
+  $(bin)ps: ps/ps
+! 	$(install) --mode a=rx $< $@
+  
+  $(man1)ps.1 : ps/ps.1
+! 	$(install) --mode a=r $< $@
+  	-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
+--- 33,40 ----
+  
+  
+  $(bin)ps: ps/ps
+! 	$(install) -m 555 $< $@
+  
+  $(man1)ps.1 : ps/ps.1
+! 	$(install) -m 444 $< $@
+  	-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
diff --git a/meta/recipes-extended/procps/procps-3.2.7/sysctl.conf b/meta/recipes-extended/procps/procps-3.2.7/sysctl.conf
new file mode 100644
index 000000000..34e7488bf
--- /dev/null
+++ b/meta/recipes-extended/procps/procps-3.2.7/sysctl.conf
@@ -0,0 +1,64 @@
+# This configuration file is taken from Debian.
+#
+# /etc/sysctl.conf - Configuration file for setting system variables
+# See sysctl.conf (5) for information.
+#
+
+#kernel.domainname = example.com
+
+# Uncomment the following to stop low-level messages on console
+#kernel.printk = 4 4 1 7
+
+##############################################################3
+# Functions previously found in netbase
+#
+
+# Uncomment the next two lines to enable Spoof protection (reverse-path filter)
+# Turn on Source Address Verification in all interfaces to
+# prevent some spoofing attacks
+net.ipv4.conf.default.rp_filter=1
+net.ipv4.conf.all.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.ip_forward=1
+
+# Uncomment the next line to enable packet forwarding for IPv6
+#net.ipv6.conf.all.forwarding=1
+
+
+###################################################################
+# Additional settings - these settings can improve the network
+# security of the host and prevent against some network attacks
+# including spoofing attacks and man in the middle attacks through
+# redirection. Some network environments, however, require that these
+# settings are disabled so review and enable them as needed.
+#
+# Ignore ICMP broadcasts
+#net.ipv4.icmp_echo_ignore_broadcasts = 1
+#
+# Ignore bogus ICMP errors
+#net.ipv4.icmp_ignore_bogus_error_responses = 1
+#
+# Do not accept ICMP redirects (prevent MITM attacks)
+#net.ipv4.conf.all.accept_redirects = 0
+#net.ipv6.conf.all.accept_redirects = 0
+# _or_
+# Accept ICMP redirects only for gateways listed in our default
+# gateway list (enabled by default)
+# net.ipv4.conf.all.secure_redirects = 1
+#
+# Do not send ICMP redirects (we are not a router)
+#net.ipv4.conf.all.send_redirects = 0
+#
+# Do not accept IP source route packets (we are not a router)
+#net.ipv4.conf.all.accept_source_route = 0
+#net.ipv6.conf.all.accept_source_route = 0
+#
+# Log Martian Packets
+#net.ipv4.conf.all.log_martians = 1
+#
+
+#kernel.shmmax = 141762560
diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
new file mode 100644
index 000000000..2de32d2c8
--- /dev/null
+++ b/meta/recipes-extended/procps/procps.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Procps is the package that has a bunch \
+of small useful utilities that give information \
+about processes using the /proc filesystem. The package \
+includes the programs ps, top, vmstat, w, kill, and skill."
+HOMEPAGE = "http://procps.sf.net"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+FILES_${PN} += "${base_libdir}/libproc-*.so"
+
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
+           file://install.patch;patch=1"
+
+inherit autotools
diff --git a/meta/recipes-extended/procps/procps_3.2.7.bb b/meta/recipes-extended/procps/procps_3.2.7.bb
new file mode 100644
index 000000000..6da975adc
--- /dev/null
+++ b/meta/recipes-extended/procps/procps_3.2.7.bb
@@ -0,0 +1,64 @@
+require procps.inc
+
+PR = "r8"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "procps.sh"
+INITSCRIPT_PARAMS = "start 30 S ."
+
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1 \
+	    file://linux-limits.patch;patch=1 \
+	    file://sysctl.conf \
+	    file://procps.init \
+	    "
+
+FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
+	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
+	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
+	 ${base_sbindir}/sysctl.${PN}"
+
+CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
+
+EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
+                CPPFLAGS=-I${STAGING_INCDIR} \
+                LDFLAGS="${LDFLAGS}" \
+                CURSES=-lncurses \
+                install='install -D' \
+                ldconfig=echo"
+
+do_install_append () {
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh
+
+	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
+	mv ${D}${bindir}/top ${D}${bindir}/top.${PN}
+	mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN}
+	mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN}
+	mv ${D}${bindir}/free ${D}${bindir}/free.${PN}
+	mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN}
+	mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN}
+}
+
+pkg_postinst() {
+	update-alternatives --install ${bindir}/top top top.${PN} 90
+	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90
+	update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90
+	update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90
+	update-alternatives --install ${bindir}/free free free.${PN} 90
+	update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90
+	update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90
+}
+
+pkg_postrm() {
+	update-alternatives --remove top top.${PN}
+	update-alternatives --remove ps ps.${PN}
+	update-alternatives --remove uptime uptime.${PN}
+	update-alternatives --remove kill kill.${PN}
+	update-alternatives --remove free free.${PN}
+	update-alternatives --remove sysctl sysctl.${PN}
+	update-alternatives --remove pkill pkill.${PN}
+}
diff --git a/meta/recipes-extended/quota/quota_3.17.bb b/meta/recipes-extended/quota/quota_3.17.bb
new file mode 100644
index 000000000..495e3072c
--- /dev/null
+++ b/meta/recipes-extended/quota/quota_3.17.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "display disk usage and limits"
+SECTION = "base"
+HOMEPAGE = "http://sourceforge.net/projects/linuxquota/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136"
+LICENSE = "BSD & GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad24027f0651028ec \
+                    file://rquota_server.c;beginline=1;endline=20;md5=91cf52a9aa19e13c2797bd2bf785d7c4 \
+                    file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
+PR = "r0"
+
+SRC_URI = "http://downloads.sourceforge.net/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz"
+
+S = ${WORKDIR}/quota-tools
+
+inherit autotools
+
+do_install() {
+	oe_runmake prefix=${D}${prefix} install
+}
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed b/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed
new file mode 100644
index 000000000..0a1f3be4a
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed
@@ -0,0 +1,32 @@
+/^FAILLOG_ENAB/b comment
+/^LASTLOG_ENAB/b comment
+/^MAIL_CHECK_ENAB/b comment
+/^OBSCURE_CHECKS_ENAB/b comment
+/^PORTTIME_CHECKS_ENAB/b comment
+/^QUOTAS_ENAB/b comment
+/^MOTD_FILE/b comment
+/^FTMP_FILE/b comment
+/^NOLOGINS_FILE/b comment
+/^ENV_HZ/b comment
+/^ENV_TZ/b comment
+/^PASS_MIN_LEN/b comment
+/^SU_WHEEL_ONLY/b comment
+/^CRACKLIB_DICTPATH/b comment
+/^PASS_CHANGE_TRIES/b comment
+/^PASS_ALWAYS_WARN/b comment
+/^PASS_MAX_LEN/b comment
+/^PASS_MIN_LEN/b comment
+/^CHFN_AUTH/b comment
+/^CHSH_AUTH/b comment
+/^ISSUE_FILE/b comment
+/^LOGIN_STRING/b comment
+/^ULIMIT/b comment
+/^ENVIRON_FILE/b comment
+
+b exit
+
+: comment
+  s:^:#:
+
+: exit
+
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn
new file mode 100644
index 000000000..baf7698bb
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn
@@ -0,0 +1,14 @@
+#
+# The PAM configuration file for the Shadow `chfn' service
+#
+
+# This allows root to change user infomation without being
+# prompted for a password
+auth		sufficient	pam_rootok.so
+
+# The standard Unix authentication modules, used with
+# NIS (man nsswitch) as well as normal /etc/passwd and
+# /etc/shadow entries.
+auth       include      common-auth
+account    include      common-account
+session    include      common-session
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd
new file mode 100644
index 000000000..9e3efa68b
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd
@@ -0,0 +1,4 @@
+# The PAM configuration file for the Shadow 'chpasswd' service
+#
+
+password   include      common-password
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh
new file mode 100644
index 000000000..8fb169f64
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh
@@ -0,0 +1,19 @@
+#
+# The PAM configuration file for the Shadow `chsh' service
+#
+
+# This will not allow a user to change their shell unless
+# their current one is listed in /etc/shells. This keeps
+# accounts with special shells from changing them.
+auth       required   pam_shells.so
+
+# This allows root to change user shell without being
+# prompted for a password
+auth		sufficient	pam_rootok.so
+
+# The standard Unix authentication modules, used with
+# NIS (man nsswitch) as well as normal /etc/passwd and
+# /etc/shadow entries.
+auth       include      common-auth
+account    include      common-account
+session    include      common-session
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login
new file mode 100644
index 000000000..e41eb04ec
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login
@@ -0,0 +1,91 @@
+#
+# The PAM configuration file for the Shadow `login' service
+#
+
+# Enforce a minimal delay in case of failure (in microseconds).
+# (Replaces the `FAIL_DELAY' setting from login.defs)
+# Note that other modules may require another minimal delay. (for example,
+# to disable any delay, you should add the nodelay option to pam_unix)
+auth       optional   pam_faildelay.so  delay=3000000
+
+# Outputs an issue file prior to each login prompt (Replaces the
+# ISSUE_FILE option from login.defs). Uncomment for use
+# auth       required   pam_issue.so issue=/etc/issue
+
+# Disallows root logins except on tty's listed in /etc/securetty
+# (Replaces the `CONSOLE' setting from login.defs)
+# Note that it is included as a "requisite" module. No password prompts will
+# be displayed if this module fails to avoid having the root password
+# transmitted on unsecure ttys.
+# You can change it to a "required" module if you think it permits to
+# guess valid user names of your system (invalid user names are considered
+# as possibly being root).
+auth       [success=ok ignore=ignore user_unknown=ignore default=die]  pam_securetty.so
+
+# Disallows other than root logins when /etc/nologin exists
+# (Replaces the `NOLOGINS_FILE' option from login.defs)
+auth       requisite  pam_nologin.so
+
+# SELinux needs to be the first session rule. This ensures that any 
+# lingering context has been cleared. Without out this it is possible 
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Standard Un*x authentication.
+auth       include      common-auth
+
+# This allows certain extra groups to be granted to a user
+# based on things like time of day, tty, service, and user.
+# Please edit /etc/security/group.conf to fit your needs
+# (Replaces the `CONSOLE_GROUPS' option in login.defs)
+auth       optional   pam_group.so
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restrainst on logins.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# Uncomment and edit /etc/security/access.conf if you need to
+# set access limits.
+# (Replaces /etc/login.access file)
+# account  required       pam_access.so
+
+# Sets up user limits according to /etc/security/limits.conf
+# (Replaces the use of /etc/limits in old login)
+session    required   pam_limits.so
+
+# Prints the last login info upon succesful login
+# (Replaces the `LASTLOG_ENAB' option from login.defs)
+session    optional   pam_lastlog.so
+
+# Prints the motd upon succesful login
+# (Replaces the `MOTD_FILE' option in login.defs)
+session    optional   pam_motd.so
+
+# Prints the status of the user's mailbox upon succesful login
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
+
+# Standard Un*x account and session
+account    include      common-account
+password   include      common-password
+session    include      common-session
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers
new file mode 100644
index 000000000..4aa3dde48
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers
@@ -0,0 +1,4 @@
+# The PAM configuration file for the Shadow 'newusers' service
+#
+
+password   include      common-password
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd
new file mode 100644
index 000000000..f53499243
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd
@@ -0,0 +1,5 @@
+#
+# The PAM configuration file for the Shadow `passwd' service
+#
+
+password   include      common-password
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su
new file mode 100644
index 000000000..8e35137f3
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su
@@ -0,0 +1,60 @@
+#
+# The PAM configuration file for the Shadow `su' service
+#
+
+# This allows root to su without passwords (normal operation)
+auth       sufficient pam_rootok.so
+
+# Uncomment this to force users to be a member of group root
+# before they can use `su'. You can also add "group=foo"
+# to the end of this line if you want to use a group other
+# than the default "root" (but this may have side effect of
+# denying "root" user, unless she's a member of "foo" or explicitly
+# permitted earlier by e.g. "sufficient pam_rootok.so").
+# (Replaces the `SU_WHEEL_ONLY' option from login.defs)
+# auth       required   pam_wheel.so
+
+# Uncomment this if you want wheel members to be able to
+# su without a password.
+# auth       sufficient pam_wheel.so trust
+
+# Uncomment this if you want members of a specific group to not
+# be allowed to use su at all.
+# auth       required   pam_wheel.so deny group=nosu
+
+# Uncomment and edit /etc/security/time.conf if you need to set
+# time restrainst on su usage.
+# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
+# as well as /etc/porttime)
+# account    requisite  pam_time.so
+
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
+# file /etc/security/pam_env.conf.
+# 
+# parsing /etc/environment needs "readenv=1"
+session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
+
+# Defines the MAIL environment variable
+# However, userdel also needs MAIL_DIR and MAIL_FILE variables
+# in /etc/login.defs to make sure that removing a user 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+#
+# "nopen" stands to avoid reporting new mail when su'ing to another user
+session    optional   pam_mail.so nopen
+
+# Sets up user limits, please uncomment and read /etc/security/limits.conf
+# to enable this functionality.
+# (Replaces the use of /etc/limits in old login)
+# session    required   pam_limits.so
+
+# The standard Unix authentication modules, used with
+# NIS (man nsswitch) as well as normal /etc/passwd and
+# /etc/shadow entries.
+auth       include      common-auth
+account    include      common-account
+session    include      common-session
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty b/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty
new file mode 100644
index 000000000..28fa0afb7
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty
@@ -0,0 +1,206 @@
+# /etc/securetty: list of terminals on which root is allowed to login.
+# See securetty(5) and login(1).
+console
+
+# Standard serial ports
+ttyS0
+ttyS1
+ttyS2
+ttyS3
+
+# Samsung ARM SoCs
+ttySAC0
+ttySAC1
+ttySAC2
+ttySAC3
+
+# TI OMAP SoCs
+ttyO0
+ttyO1
+ttyO2
+ttyO3
+
+# USB dongles
+ttyUSB0
+ttyUSB1
+ttyUSB2
+
+# PowerMac
+ttyPZ0
+ttyPZ1
+ttyPZ2
+ttyPZ3
+
+# Embedded MPC platforms
+ttyPSC0
+ttyPSC1
+ttyPSC2
+ttyPSC3
+ttyPSC4
+ttyPSC5
+
+# PA-RISC mux ports
+ttyB0
+ttyB1
+
+# Standard hypervisor virtual console
+hvc0
+
+# Oldstyle Xen console
+xvc0
+
+# Standard consoles
+tty1
+tty2
+tty3
+tty4
+tty5
+tty6
+tty7
+tty8
+tty9
+tty10
+tty11
+tty12
+tty13
+tty14
+tty15
+tty16
+tty17
+tty18
+tty19
+tty20
+tty21
+tty22
+tty23
+tty24
+tty25
+tty26
+tty27
+tty28
+tty29
+tty30
+tty31
+tty32
+tty33
+tty34
+tty35
+tty36
+tty37
+tty38
+tty39
+tty40
+tty41
+tty42
+tty43
+tty44
+tty45
+tty46
+tty47
+tty48
+tty49
+tty50
+tty51
+tty52
+tty53
+tty54
+tty55
+tty56
+tty57
+tty58
+tty59
+tty60
+tty61
+tty62
+tty63
+
+# Local X displays (allows empty passwords with pam_unix's nullok_secure)
+:0
+:0.0
+:0.1
+:1
+:1.0
+:1.1
+:2
+:2.0
+:2.1
+:3
+:3.0
+:3.1
+
+# Embedded Freescale i.MX ports
+ttymxc0
+ttymxc1
+ttymxc2
+ttymxc3
+ttymxc4
+ttymxc5
+
+# Standard serial ports, with devfs
+tts/0
+tts/1
+
+# Standard consoles, with devfs
+vc/1
+vc/2
+vc/3
+vc/4
+vc/5
+vc/6
+vc/7
+vc/8
+vc/9
+vc/10
+vc/11
+vc/12
+vc/13
+vc/14
+vc/15
+vc/16
+vc/17
+vc/18
+vc/19
+vc/20
+vc/21
+vc/22
+vc/23
+vc/24
+vc/25
+vc/26
+vc/27
+vc/28
+vc/29
+vc/30
+vc/31
+vc/32
+vc/33
+vc/34
+vc/35
+vc/36
+vc/37
+vc/38
+vc/39
+vc/40
+vc/41
+vc/42
+vc/43
+vc/44
+vc/45
+vc/46
+vc/47
+vc/48
+vc/49
+vc/50
+vc/51
+vc/52
+vc/53
+vc/54
+vc/55
+vc/56
+vc/57
+vc/58
+vc/59
+vc/60
+vc/61
+vc/62
+vc/63
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch
new file mode 100644
index 000000000..7a2ff2e24
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch
@@ -0,0 +1,23 @@
+# commit message copied from openembedded:
+#    commit 246c80637b135f3a113d319b163422f98174ee6c
+#    Author: Khem Raj <raj.khem@gmail.com>
+#    Date:   Wed Jun 9 13:37:03 2010 -0700
+#
+#    shadow-4.1.4.2: Add patches to support dots in login id.
+#    
+#    Signed-off-by: Khem Raj <raj.khem@gmail.com>
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
+
+Index: shadow-4.1.4.2/libmisc/chkname.c
+===================================================================
+--- shadow-4.1.4.2.orig/libmisc/chkname.c	2009-04-28 12:14:04.000000000 -0700
++++ shadow-4.1.4.2/libmisc/chkname.c	2010-06-03 17:43:20.638973857 -0700
+@@ -61,6 +61,7 @@ static bool is_valid_name (const char *n
+ 		      ( ('0' <= *name) && ('9' >= *name) ) ||
+ 		      ('_' == *name) ||
+ 		      ('-' == *name) ||
++		      ('.' == *name) ||
+ 		      ( ('$' == *name) && ('\0' == *(name + 1)) )
+ 		     )) {
+ 			return false;
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch
new file mode 100644
index 000000000..124065c7f
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch
@@ -0,0 +1,27 @@
+# commit message copied from openembedded:
+#    commit 246c80637b135f3a113d319b163422f98174ee6c
+#    Author: Khem Raj <raj.khem@gmail.com>
+#    Date:   Wed Jun 9 13:37:03 2010 -0700
+#
+#    shadow-4.1.4.2: Add patches to support dots in login id.
+#    
+#    Signed-off-by: Khem Raj <raj.khem@gmail.com>
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
+
+http://bugs.gentoo.org/283725
+https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480
+
+Index: shadow-4.1.4.2/libmisc/env.c
+===================================================================
+--- shadow-4.1.4.2.orig/libmisc/env.c	2009-04-27 13:07:56.000000000 -0700
++++ shadow-4.1.4.2/libmisc/env.c	2010-06-03 17:44:51.456408474 -0700
+@@ -251,7 +251,7 @@ void sanitize_env (void)
+ 			if (strncmp (*cur, *bad, strlen (*bad)) != 0) {
+ 				continue;
+ 			}
+-			if (strchr (*cur, '/') != NULL) {
++			if (strchr (*cur, '/') == NULL) {
+ 				continue;	/* OK */
+ 			}
+ 			for (move = cur; NULL != *move; move++) {
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch
new file mode 100644
index 000000000..6682fe807
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch
@@ -0,0 +1,32 @@
+# commit message copied from openembedded:
+#    commit 246c80637b135f3a113d319b163422f98174ee6c
+#    Author: Khem Raj <raj.khem@gmail.com>
+#    Date:   Wed Jun 9 13:37:03 2010 -0700
+#
+#    shadow-4.1.4.2: Add patches to support dots in login id.
+#    
+#    Signed-off-by: Khem Raj <raj.khem@gmail.com>
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
+
+http://bugs.gentoo.org/300790
+http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html
+
+2009-11-05  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* NEWS, src/groupmod.c: Fixed groupmod when configured with
+	--enable-account-tools-setuid.
+
+Index: shadow-4.1.4.2/src/groupmod.c
+===================================================================
+--- shadow-4.1.4.2.orig/src/groupmod.c	2009-06-05 15:16:58.000000000 -0700
++++ shadow-4.1.4.2/src/groupmod.c	2010-06-03 17:45:43.828952613 -0700
+@@ -720,7 +720,7 @@ int main (int argc, char **argv)
+ 	{
+ 		struct passwd *pampw;
+ 		pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
+-		if (NULL == pamh) {
++		if (NULL == pampw) {
+ 			fprintf (stderr,
+ 			         _("%s: Cannot determine your user name.\n"),
+ 			         Prog);
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch
new file mode 100644
index 000000000..f67251c84
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch
@@ -0,0 +1,27 @@
+# commit message copied from openembedded:
+#    commit 246c80637b135f3a113d319b163422f98174ee6c
+#    Author: Khem Raj <raj.khem@gmail.com>
+#    Date:   Wed Jun 9 13:37:03 2010 -0700
+#
+#    shadow-4.1.4.2: Add patches to support dots in login id.
+#    
+#    Signed-off-by: Khem Raj <raj.khem@gmail.com>
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
+
+http://bugs.gentoo.org/show_bug.cgi?id=301957
+https://alioth.debian.org/scm/browser.php?group_id=30580
+
+Index: shadow-4.1.4.2/src/su.c
+===================================================================
+--- shadow-4.1.4.2.orig/src/su.c	2009-07-23 13:38:56.000000000 -0700
++++ shadow-4.1.4.2/src/su.c	2010-06-03 17:46:47.718944010 -0700
+@@ -378,7 +378,7 @@ int main (int argc, char **argv)
+ #endif
+ #endif				/* !USE_PAM */
+ 
+-	sanitize_env ();
++	/* sanitize_env (); */
+ 
+ 	(void) setlocale (LC_ALL, "");
+ 	(void) bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch
new file mode 100644
index 000000000..36d7be6fd
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch
@@ -0,0 +1,102 @@
+# patch is from openembedded:
+#    commit 2db61370333f7a2fc1dbb86385734883387e0217
+#    Author: Martin Jansa <Martin.Jansa@gmail.com>
+#    Date:   Fri Apr 2 07:34:46 2010 +0200
+#
+#    shadow: fix do_install with automake-1.11
+#    
+#    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+#
+# comment added by Kevin Tian <kevin.tian@intel.com>
+
+man_nopan is for !USE_PAM already included in man_MANS and automake-1.11 hates to install some file twice
+
+diff -uNr shadow-4.1.4.2.orig/man/Makefile.am shadow-4.1.4.2/man/Makefile.am
+--- shadow-4.1.4.2.orig/man/Makefile.am	2009-03-14 15:40:10.000000000 +0100
++++ shadow-4.1.4.2/man/Makefile.am	2010-04-02 07:31:17.000000000 +0200
+@@ -163,7 +163,6 @@
+ 	$(man_MANS) \
+ 	$(man_XMANS) \
+ 	$(addprefix login.defs.d/,$(login_defs_v)) \
+-	$(man_nopam) \
+ 	id.1 \
+ 	id.1.xml \
+ 	sulogin.8 \
+diff -uNr shadow-4.1.4.2.orig/man/fr/Makefile.am shadow-4.1.4.2/man/fr/Makefile.am
+--- shadow-4.1.4.2.orig/man/fr/Makefile.am	2008-09-06 18:44:45.000000000 +0200
++++ shadow-4.1.4.2/man/fr/Makefile.am	2010-04-02 07:42:11.000000000 +0200
+@@ -52,7 +52,6 @@
+ 
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	$(man_nopam) \
+ 	id.1
+ 
+ include ../generate_translations.mak
+diff -uNr shadow-4.1.4.2.orig/man/it/Makefile.am shadow-4.1.4.2/man/it/Makefile.am
+--- shadow-4.1.4.2.orig/man/it/Makefile.am	2008-09-06 18:44:45.000000000 +0200
++++ shadow-4.1.4.2/man/it/Makefile.am	2010-04-02 07:42:20.000000000 +0200
+@@ -46,7 +46,6 @@
+                         
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	$(man_nopam) \
+ 	id.1 \
+ 	logoutd.8
+ 
+diff -uNr shadow-4.1.4.2.orig/man/ja/Makefile.am shadow-4.1.4.2/man/ja/Makefile.am
+--- shadow-4.1.4.2.orig/man/ja/Makefile.am	2007-12-31 17:48:28.000000000 +0100
++++ shadow-4.1.4.2/man/ja/Makefile.am	2010-04-02 07:42:17.000000000 +0200
+@@ -49,7 +49,6 @@
+ 
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	$(man_nopam) \
+ 	id.1 \
+ 	shadow.3 \
+ 	sulogin.8
+diff -uNr shadow-4.1.4.2.orig/man/pl/Makefile.am shadow-4.1.4.2/man/pl/Makefile.am
+--- shadow-4.1.4.2.orig/man/pl/Makefile.am	2008-09-06 18:44:45.000000000 +0200
++++ shadow-4.1.4.2/man/pl/Makefile.am	2010-04-02 07:42:07.000000000 +0200
+@@ -49,7 +49,6 @@
+ 
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	$(man_nopam) \
+ 	getspnam.3 \
+ 	id.1 \
+ 	shadow.3 \
+diff -uNr shadow-4.1.4.2.orig/man/ru/Makefile.am shadow-4.1.4.2/man/ru/Makefile.am
+--- shadow-4.1.4.2.orig/man/ru/Makefile.am	2010-04-02 07:39:00.000000000 +0200
++++ shadow-4.1.4.2/man/ru/Makefile.am	2010-04-02 07:42:01.000000000 +0200
+@@ -54,7 +54,6 @@
+ 
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	$(man_nopam) \
+ 	id.1 \
+ 	sulogin.8
+ 
+diff -uNr shadow-4.1.4.2.orig/man/sv/Makefile.am shadow-4.1.4.2/man/sv/Makefile.am
+--- shadow-4.1.4.2.orig/man/sv/Makefile.am	2008-09-06 18:44:45.000000000 +0200
++++ shadow-4.1.4.2/man/sv/Makefile.am	2010-04-02 07:42:24.000000000 +0200
+@@ -53,8 +53,7 @@
+ endif
+ 
+ EXTRA_DIST = \
+-	$(man_MANS) \
+-	$(man_nopam)
++	$(man_MANS)
+ 
+ include ../generate_translations.mak
+ 
+--- shadow-4.1.4.2.orig/man/ru/Makefile.am	2010-04-02 07:54:09.000000000 +0200
++++ shadow-4.1.4.2/man/ru/Makefile.am	2010-04-02 07:51:57.000000000 +0200
+@@ -1,7 +1,6 @@
+ mandir = @mandir@/ru
+ 
+ man_MANS = \
+-	$(man_nopam) \
+ 	chage.1 \
+ 	chfn.1 \
+ 	chgpasswd.8 \
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
new file mode 100644
index 000000000..fcbcb3eb7
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -0,0 +1,121 @@
+DESCRIPTION = "Tools to change and administer password and group data."
+HOMEPAGE = "http://pkg-shadow.alioth.debian.org/"
+BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
+SECTION = "base utils"
+LICENSE = "BSD | Artistic"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
+                    file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
+
+PAM_PLUGINS = "  libpam-runtime \
+                 pam-plugin-faildelay \
+                 pam-plugin-securetty \
+                 pam-plugin-nologin \
+                 pam-plugin-env \
+                 pam-plugin-group \
+                 pam-plugin-limits \
+                 pam-plugin-lastlog \
+                 pam-plugin-motd \
+                 pam-plugin-mail \
+                 pam-plugin-shells \
+                 pam-plugin-rootok"
+                 
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
+
+# since we deduce from ${SERIAL_CONSOLE}
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Additional Policy files for PAM
+PAM_SRC_URI = "file://pam.d/chfn \
+               file://pam.d/chpasswd \
+               file://pam.d/chsh \
+               file://pam.d/login \
+               file://pam.d/newusers \
+               file://pam.d/passwd \
+               file://pam.d/su"
+
+SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2 \
+           file://login_defs_pam.sed \
+           ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+           file://securetty"
+
+inherit autotools gettext
+
+EXTRA_OECONF += "--without-audit \
+                 --without-libcrack \
+                 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)} \
+                 --without-selinux"
+
+do_install_append() {
+	# Ensure that the image has as /var/spool/mail dir so shadow can put mailboxes there if the user
+	# reconfigures Shadow to default (see sed below).
+	install -d ${D}${localstatedir}/spool/mail
+
+	if [ -e ${WORKDIR}/pam.d ]; then
+		install -d ${D}${sysconfdir}/pam.d/
+		install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
+		# Remove defaults that are not used when supporting PAM
+		sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs
+	fi
+
+	# Enable CREATE_HOME by default.
+	sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs
+
+	# As we are on an embedded system ensure the users mailbox is in ~/ not
+	# /var/spool/mail by default as who knows where or how big /var is.
+	# The system MDA will set this later anyway.
+	sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs
+	sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs
+
+	# disable checking emails at all
+	sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs
+
+	# now we don't have a mail system. disable mail creation for now
+	sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
+	sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
+
+	install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 
+	for i in passwd chfn newgrp chsh ; do
+		mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
+	done
+
+	mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN}
+	mv ${D}${sbindir}/vigr ${D}${base_sbindir}/vigr.${PN}
+	mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw.${PN}
+	mv ${D}${bindir}/login ${D}${base_bindir}/login.${PN}
+
+	# Ensure we add a suitable securetty file to the package that has most common embedded TTYs defined.
+	if [ ! -z "${SERIAL_CONSOLE}" ]; then
+	# our SERIAL_CONSOLE contains baud rate too and sometime -L option as well.
+	# the following pearl :) takes that and converts it into newline sepated tty's and appends
+	# them into securetty. So if a machine has a weird looking console device node (e.g. ttyAMA0) that securetty
+	# does not know then it will get appended to securetty and root login will be allowed on
+	# that console.
+		echo "${SERIAL_CONSOLE}" | sed -e 's/[0-9][0-9]\|\-L//g'|tr "[ ]" "[\n]"  >> ${WORKDIR}/securetty
+	fi
+	install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty 
+}
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${bindir}/passwd passwd passwd.${PN} 200
+	update-alternatives --install ${sbindir}/chpasswd chpasswd chpasswd.${PN} 200
+	update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200
+	update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
+	update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200
+	update-alternatives --install ${base_bindir}/login login login.${PN} 200
+	update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200
+	update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200
+
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi  
+
+	pwconv
+	grpconv
+}
+
+pkg_prerm_${PN} () {
+	for i in passwd chpasswd chfn newgrp chsh login vipw vigr ; do
+		update-alternatives --remove $i $i.${PN}
+	done
+}
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
new file mode 100644
index 000000000..bc00c099b
--- /dev/null
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
@@ -0,0 +1,11 @@
+require shadow.inc
+
+PR = "r0"
+
+SRC_URI += "file://shadow.automake-1.11.patch \
+	    file://shadow-4.1.3-dots-in-usernames.patch \
+	    file://shadow-4.1.4.2-env-reset-keep-locale.patch \
+	    file://shadow-4.1.4.2-groupmod-pam-check.patch \
+	    file://shadow-4.1.4.2-su_no_sanitize_env.patch"
+
+EXTRA_OECONF_libc-uclibc += " --with-nscd=no "
diff --git a/meta/recipes-extended/sysstat/files/99_sysstat b/meta/recipes-extended/sysstat/files/99_sysstat
new file mode 100644
index 000000000..0b0ec30de
--- /dev/null
+++ b/meta/recipes-extended/sysstat/files/99_sysstat
@@ -0,0 +1 @@
+d root root 0755 /var/log/sa none
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
new file mode 100644
index 000000000..564bc7da0
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -0,0 +1,33 @@
+DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
+HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
+LICENSE = "GPLv2+"
+SECTION = "console/utils"
+
+DEPENDS = "virtual/libintl"
+
+SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
+		   file://99_sysstat"
+
+inherit autotools
+
+do_install() {
+	autotools_do_install
+
+	# don't install /var/log/sa when populating rootfs. Do it through volatile
+
+	rm -rf ${D}/var
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
+}
+
+pkg_postinst_${PN} () {
+        /etc/init.d/populate-volatile.sh update
+}
+
+
+FILES_${PN} += "${libdir}/sa"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+LDFLAGS_append_linux-uclibc = " -lintl"
+LDFLAGS_append_linux-uclibceabi = " -lintl"
+LDFLAGS_append_linux-uclibcspe = " -lintl"
diff --git a/meta/recipes-extended/sysstat/sysstat_9.1.4.bb b/meta/recipes-extended/sysstat/sysstat_9.1.4.bb
new file mode 100644
index 000000000..d7b7e667d
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat_9.1.4.bb
@@ -0,0 +1,7 @@
+require sysstat.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+PR = "r0"
+
+
diff --git a/meta/recipes-extended/tar/tar-1.17/gcc43build.patch b/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
new file mode 100644
index 000000000..cc5f0e13d
--- /dev/null
+++ b/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
@@ -0,0 +1,35 @@
+# Fix errors when built with gcc 4.3
+# Patch taken from Debian bug #452096
+
+diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h
+--- tar-1.17.orig/lib/argp-fmtstream.h	2006-01-11 12:24:05.000000000 -0800
++++ tar-1.17/lib/argp-fmtstream.h	2010-07-22 22:36:12.000000000 -0700
+@@ -198,7 +198,11 @@
+ #endif
+ 
+ #ifndef ARGP_FS_EI
+-#define ARGP_FS_EI extern inline
++ #if defined __GNUC_STDC_INLINE__
++   #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
++ #else
++   #define ARGP_FS_EI extern inline
++ #endif
+ #endif
+ 
+ ARGP_FS_EI size_t
+diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h
+--- tar-1.17.orig/lib/argp.h	2007-03-30 00:09:11.000000000 -0700
++++ tar-1.17/lib/argp.h	2010-07-22 22:38:44.000000000 -0700
+@@ -580,7 +580,11 @@
+ # endif
+ 
+ # ifndef ARGP_EI
+-#  define ARGP_EI extern __inline__
++#  if defined __GNUC_STDC_INLINE__
++#    define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
++#  else
++#    define ARGP_EI extern __inline__
++#  endif
+ # endif
+ 
+ ARGP_EI void
diff --git a/meta/recipes-extended/tar/tar-1.17/m4extensions.patch b/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
new file mode 100644
index 000000000..11b981aa9
--- /dev/null
+++ b/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
@@ -0,0 +1,28 @@
+# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
+# This is needed to configure correctly with newer versions of autoconf.
+
+--- tar-1.17/m4/extensions.m4.orig	2010-07-22 22:21:35.000000000 -0700
++++ tar-1.17/m4/extensions.m4	2010-07-22 22:23:41.000000000 -0700
+@@ -1,4 +1,4 @@
+-# serial 4  -*- Autoconf -*-
++# serial 5  -*- Autoconf -*-
+ # Enable extensions on systems that normally disable them.
+ 
+ # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+@@ -16,6 +16,7 @@
+ # ------------------------
+ # Enable extensions on systems that normally disable them,
+ # typically due to standards-conformance issues.
++m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
+ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+ [
+   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+@@ -48,7 +49,7 @@
+     AC_DEFINE([__EXTENSIONS__])
+   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+   AC_DEFINE([_TANDEM_SOURCE])
+-])
++])])
+ 
+ # gl_USE_SYSTEM_EXTENSIONS
+ # ------------------------
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
new file mode 100644
index 000000000..cf72d4893
--- /dev/null
+++ b/meta/recipes-extended/tar/tar.inc
@@ -0,0 +1,25 @@
+DESCRIPTION = "GNU tar saves many files together into a single tape \
+or disk archive, and can restore individual files from the archive."
+HOMEPAGE = "http://www.gnu.org/software/tar/"
+SECTION = "base"
+
+SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
+
+inherit autotools gettext
+
+do_install () {
+    autotools_do_install
+    install -d ${D}${base_bindir}
+    mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
+    mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
+}
+
+pkg_postinst_${PN} () {
+    update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
+    update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+    update-alternatives --remove tar tar.${PN}
+    update-alternatives --remove rmt rmt.${PN}
+}
diff --git a/meta/recipes-extended/tar/tar_1.17.bb b/meta/recipes-extended/tar/tar_1.17.bb
new file mode 100644
index 000000000..be7454209
--- /dev/null
+++ b/meta/recipes-extended/tar/tar_1.17.bb
@@ -0,0 +1,13 @@
+require tar.inc
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+PR = "r0"
+
+SRC_URI += "file://m4extensions.patch \
+    file://gcc43build.patch \
+    "
+
+SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
+SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
diff --git a/meta/recipes-extended/tar/tar_1.23.bb b/meta/recipes-extended/tar/tar_1.23.bb
new file mode 100644
index 000000000..093c0b43c
--- /dev/null
+++ b/meta/recipes-extended/tar/tar_1.23.bb
@@ -0,0 +1,9 @@
+require tar.inc
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
+SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
new file mode 100644
index 000000000..bbd4205ce
--- /dev/null
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -0,0 +1,156 @@
+#
+# Copyright (C) 2010 Intel Corporation
+#
+
+DESCRIPTION = "Create Basic Image Tasks"
+PR = "r1"
+
+PACKAGES = "\
+    task-poky-basic \
+    task-poky-base-utils \
+    task-poky-base-utils-dbg \
+    task-poky-base-utils-dev \
+    task-poky-basic-libs \
+    task-poky-basic-libs-dbg \
+    task-poky-basic-libs-dev \
+    task-poky-basic-utils \
+    task-poky-basic-utils-dbg \
+    task-poky-basic-utils-dev \
+    task-poky-basic-extended \
+    task-poky-basic-extended-dbg \
+    task-poky-basic-extended-dev \
+    task-poky-dev-utils \
+    task-poky-dev-utils-dbg \
+    task-poky-dev-utils-dev \
+    task-poky-multiuser \
+    task-poky-multiuser-dbg \
+    task-poky-multiuser-dev \
+    task-poky-initscripts \
+    task-poky-initscripts-dbg \
+    task-poky-initscripts-dev \
+    task-poky-rpm \
+    task-poky-rpm-dbg \
+    task-poky-rpm-dev \
+    task-poky-sys-services \
+    task-poky-sys-services-dbg \
+    task-poky-sys-services-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-poky-basic = "\
+    task-poky-base-utils \
+    task-poky-basic-libs \
+    task-poky-basic-utils \
+    task-poky-basic-extended \
+    task-poky-dev-utils \
+    task-poky-multiuser \
+    task-poky-initscripts \
+    task-poky-rpm \
+    task-poky-sys-services \
+    "
+
+RDEPENDS_task-poky-base-utils = "\
+    busybox \
+    dropbear \
+    "
+
+RDEPENDS_task-poky-basic-libs = "\
+    glib-2.0 \
+    "
+
+RDEPENDS_task-poky-basic-utils = "\
+    bash \
+    acl \
+    attr \
+    bc \
+    coreutils \
+    cpio \
+    e2fsprogs \
+    ed \
+    file \
+    findutils \
+    gawk \
+    gmp \
+    grep \
+    makedevs \
+    mktemp \
+    ncurses \
+    net-tools \
+    pax \
+    popt \
+    procps \
+    psmisc \
+    sed \
+    tar \
+    time \
+    udev \
+    util-linux \
+    zlib \
+    "
+
+RDEPENDS_task-poky-basic-extended = "\
+    iproute2 \
+    iputils \
+    iptables \
+    module-init-tools \
+#    openssh \
+    openssl \
+    "
+
+RDEPENDS_task-poky-dev-utils = "\
+    byacc \
+    diffutils \
+    m4 \
+    make \
+    patch \
+    binutils \
+    "
+
+RDEPENDS_task-poky-initscripts = "\
+    initscripts \
+    sysvinit \
+    ethtool \
+#    mingetty \
+#    sysklogd \
+    "
+
+RDEPENDS_task-poky-multiuser = "\
+    cracklib \
+    gzip \
+    libuser \
+    libpam \
+    shadow \
+    sudo \
+    "
+
+RDEPENDS_task-poky-rpm = "\
+    beecrypt \
+    rpm \
+    "
+
+RDEPENDS_task-poky-sys-services = "\
+#    at \
+    bzip2 \
+#    cronie \
+#    crontabs \
+    dbus \
+    dbus-glib \
+    python-dbus \
+    elfutils \
+    gzip \
+    hal \
+    less \
+    libcap \
+    libevent \
+#    logrotate \
+    nfs-utils \
+    pciutils \
+    libpcre \
+    portmap \
+#    rpcbind \
+    sysfsutils \
+    tcp-wrappers \
+    tzdata \
+    "
+
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb
new file mode 100644
index 000000000..4718f3b76
--- /dev/null
+++ b/meta/recipes-extended/tasks/task-poky-lsb.bb
@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2010 Intel Corporation
+#
+
+DESCRIPTION = "Create Small Image Tasks"
+PR = "r1"
+
+PACKAGES = "\
+    task-poky-lsb \
+    task-poky-sys-extended \
+    task-poky-sys-extended-dbg \
+    task-poky-sys-extended-dev \
+    task-poky-db \
+    task-poky-db-dbg \
+    task-poky-db-dev \
+    task-poky-misc \
+    task-poky-misc-dbg \
+    task-poky-misc-dev \
+    task-poky-perl \
+    task-poky-perl-dbg \
+    task-poky-perl-dev \
+    task-poky-python \
+    task-poky-python-dbg \
+    task-poky-python-dev \
+    task-poky-tcl \
+    task-poky-tcl-dbg \
+    task-poky-tcl-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-poky-lsb = "\
+    task-poky-sys-extended \
+    task-poky-db \
+    task-poky-misc \
+    task-poky-perl \
+    task-poky-python \
+    task-poky-tcl \
+    "
+
+#
+# GPLv2 Should List
+RDEPENDS_task-poky-sys-extended = "\
+    curl \
+    diffutils \
+    gamin \
+    hdparm \
+#    libaio \
+    libxml2 \
+    lrzsz \
+    lzo \
+#    mdadm \
+    minicom \
+    neon \
+    parted \
+    pth \
+    quota \
+#    screen \
+    setserial \
+    sysstat \
+    unzip \
+#    watchdog \
+    which \
+    zip \
+    "
+
+RDEPENDS_task-poky-db = "\
+    db \
+    sqlite3 \
+    "
+
+RDEPENDS_task-poky-perl = "\
+    gdbm \
+    perl \
+    zlib \
+    "
+
+
+RDEPENDS_task-poky-python = "\
+    expat \
+    gdbm \
+    gmp \
+    ncurses \
+    openssl \
+    python \
+    readline \
+    zip \
+    "
+
+RDEPENDS_task-poky-tcl = "\
+    tcl \
+    "
+
+RDEPENDS_task-poky-misc = "\
+    elfutils \
+    gettext \
+    lsof \
+    ncurses \
+    strace \
+    libusb1 \
+    usbutils \
+    zlib \
+    "
diff --git a/meta/packages/time/files/debian.patch b/meta/recipes-extended/time/files/debian.patch
index 40df19da4..40df19da4 100644
--- a/meta/packages/time/files/debian.patch
+++ b/meta/recipes-extended/time/files/debian.patch
diff --git a/meta/packages/time/time.inc b/meta/recipes-extended/time/time.inc
index 8d31b47a0..8d31b47a0 100644
--- a/meta/packages/time/time.inc
+++ b/meta/recipes-extended/time/time.inc
diff --git a/meta/packages/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index 1030489b6..1030489b6 100644
--- a/meta/packages/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
diff --git a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
new file mode 100644
index 000000000..568d4233f
--- /dev/null
+++ b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
@@ -0,0 +1,51 @@
+# glibc also implements the function group_member. To avoid name conflict,
+# here let us append a "_" to which's version.
+#
+# Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
+# (this patch is licensed under GPLv2)
+
+--- which-2.18/bash.c
++++ which-2.18/bash.c
+@@ -45,7 +45,12 @@
+  * - changed all occurences of 'gid_t' into 'GID_T'.
+  * - exported functions needed in which.c
+  */
+-static int group_member (GID_T gid);
++
++/*
++ * glibc also implements the function group_member. To avoid name conflict,
++ * here let us append a "_" to which's version.
++ */
++static int _group_member (GID_T gid);
+ static char* extract_colon_unit (char const* string, int *p_index);
+ 
+ /*===========================================================================
+@@ -200,8 +205,8 @@
+ 
+ /* From bash-2.05b / general.c / line 805 */
+ /* Return non-zero if GID is one that we have in our groups list. */
+-int
+-group_member (GID_T gid)
++static int
++_group_member (GID_T gid)
+ {
+ #if defined (HAVE_GETGROUPS)
+   register int i;
+@@ -290,7 +295,7 @@
+     return (X_BIT (u_mode_bits (finfo.st_mode))) ? (FS_EXISTS | FS_EXECABLE) : FS_EXISTS;
+ 
+   /* Otherwise, if we are in the owning group, the group permissions apply. */
+-  if (group_member (finfo.st_gid))
++  if (_group_member (finfo.st_gid))
+     return (X_BIT (g_mode_bits (finfo.st_mode))) ? (FS_EXISTS | FS_EXECABLE) : FS_EXISTS;
+ 
+   /* Otherwise, if we are in the other group, the other permissions apply. */
+@@ -331,7 +336,7 @@
+ /* Given a string containing units of information separated by colons,
+    return the next one pointed to by (P_INDEX), or NULL if there are no more.
+    Advance (P_INDEX) to the character after the colon. */
+-char*
++static char*
+ extract_colon_unit (char const* string, int* p_index)
+ {
+   int i, start, len;
diff --git a/meta/recipes-extended/which/which-2.20/remove-declaration.patch b/meta/recipes-extended/which/which-2.20/remove-declaration.patch
new file mode 100644
index 000000000..09b81439b
--- /dev/null
+++ b/meta/recipes-extended/which/which-2.20/remove-declaration.patch
@@ -0,0 +1,16 @@
+Remove the declaration of group_member since it has already been
+declared in unistd.h
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN which-2.20-orig/bash.c which-2.20/bash.c
+--- which-2.20-orig/bash.c	2010-08-03 12:59:08.897088878 +0800
++++ which-2.20/bash.c	2010-08-03 13:17:23.406097212 +0800
+@@ -46,7 +46,6 @@
+  * - changed all occurences of 'gid_t' into 'GID_T'.
+  * - exported functions needed in which.c
+  */
+-static int group_member (GID_T gid);
+ static char* extract_colon_unit (char const* string, int* p_index);
+ 
+ /*===========================================================================
diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
new file mode 100644
index 000000000..b17794978
--- /dev/null
+++ b/meta/recipes-extended/which/which_2.18.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Which is a utility that prints out the full path of the \
+executables that bash(1) would execute when the passed \
+program names would have been entered on the shell prompt. \
+It does this by using the exact same algorithm as bash."
+HOMEPAGE = "http://www.xs4all.nl/~carlo17/which/"
+BUGTRACKER = "n/a"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+PR = "r0"
+
+SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
+           file://fix_name_conflict_group_member.patch"
+
+DEPENDS = "cwautomacros-native"
+
+inherit autotools
+
+do_configure_prepend() {
+	OLD="@ACLOCAL_CWFLAGS@"
+	NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4"
+	sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}`
+}
+do_install_append() {
+	mv ${D}/${bindir}/which ${D}/${bindir}/which.${PN}
+}
+
+pkg_postinst_${PN}() {
+	if [ "${PN}" = "${BPN}" ] ; then
+		update-alternatives --install ${bindir}/which which which.${PN} 100
+	fi
+}
+
+pkg_prerm_${PN}() {
+	if [ "${PN}" = "${BPN}" ] ; then
+		update-alternatives --remove which which.${PN}
+	fi
+}
+
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb
new file mode 100644
index 000000000..b7730de3b
--- /dev/null
+++ b/meta/recipes-extended/which/which_2.20.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "which - shows the full path of (shell) commands."
+SECTION     = "libs"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+                    file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2"
+HOMEPAGE = "http://ftp.gnu.org/gnu/which/"
+DEPENDS     = "cwautomacros-native"
+
+inherit autotools
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnu.org/gnu/which/which-${PV}.tar.gz \
+           file://remove-declaration.patch"
+
+do_configure_prepend() {
+	sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am
+}
+
+do_install() {
+	autotools_do_install
+	mv ${D}${bindir}/which ${D}${bindir}/which.${PN}
+}
+
+pkg_postinst_${PN} () {
+        if [ "${PN}" = "${BPN}" ] ; then
+                update-alternatives --install ${bindir}/which which which.${PN} 100
+        fi
+}
+
+pkg_prerm_${PN} () {
+	if [ "${PN}" = "${BPN}" ] ; then
+		update-alternatives --remove which which.${PN}
+	fi
+}
diff --git a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
new file mode 100644
index 000000000..8602a8870
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
@@ -0,0 +1,84 @@
+From d588b6530e1382a624898b3f4307f636c72c80a9 Mon Sep 17 00:00:00 2001
+From: Pierre Habouzit <madcoder@debian.org>
+Date: Wed, 28 Nov 2007 10:13:08 +0100
+Subject: [PATCH] Disable services from inetd.conf if a service with the same id exists.
+
+  This way, if a service is enabled in /etc/xinetd* _and_ in
+/etc/inetd.conf, the one (even if disabled) from /etc/xinetd* takes
+precedence.
+
+Signed-off-by: Pierre Habouzit <madcoder@debian.org>
+---
+ xinetd/inet.c |   22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/xinetd/inet.c b/xinetd/inet.c
+index 1cb2ba2..8caab45 100644
+--- a/xinetd/inet.c
++++ b/xinetd/inet.c
+@@ -23,6 +23,8 @@
+ #include "parsesup.h"
+ #include "nvlists.h"
+ 
++static psi_h iter ;
++
+ static int get_next_inet_entry( int fd, pset_h sconfs, 
+                           struct service_config *defaults);
+ 
+@@ -32,12 +34,15 @@ void parse_inet_conf_file( int fd, struct configuration *confp )
+    struct service_config *default_config = CNF_DEFAULTS( confp );
+    
+    line_count = 0;
++   iter = psi_create (sconfs);
+ 
+    for( ;; )
+    {   
+       if (get_next_inet_entry(fd, sconfs, default_config) == -2)
+          break;
+    }
++
++   psi_destroy(iter);
+ }
+ 
+ static int get_next_inet_entry( int fd, pset_h sconfs, 
+@@ -46,7 +51,7 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
+    char *p;
+    str_h strp;
+    char *line = next_line(fd);
+-   struct service_config *scp;
++   struct service_config *scp, *tmp;
+    unsigned u, i;
+    const char *func = "get_next_inet_entry";
+    char *name = NULL, *rpcvers = NULL, *rpcproto = NULL;
+@@ -405,7 +410,16 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
+    SC_SPECIFY( scp, A_SOCKET_TYPE );
+    SC_SPECIFY( scp, A_WAIT );
+ 
+-   if( ! pset_add(sconfs, scp) )
++   for ( tmp = SCP( psi_start( iter ) ) ; tmp ; tmp = SCP( psi_next(iter)) ){
++      if (EQ(SC_ID(scp), SC_ID(tmp))) {
++         parsemsg(LOG_DEBUG, func, "removing duplicate service %s", SC_NAME(scp));
++         sc_free(scp);
++         scp = NULL;
++         break;
++      }
++   }
++
++   if( scp && ! pset_add(sconfs, scp) )
+    {
+       out_of_memory( func );
+       pset_destroy(args);
+@@ -414,7 +428,9 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
+    }
+ 
+    pset_destroy(args);
+-   parsemsg( LOG_DEBUG, func, "added service %s", SC_NAME(scp));
++   if (scp) {
++      parsemsg( LOG_DEBUG, func, "added service %s", SC_NAME(scp));
++   }
+    return 0;
+ }
+ 
+-- 
+1.5.3.6.2040.g15e6
+
diff --git a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
new file mode 100644
index 000000000..d24369276
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
@@ -0,0 +1,77 @@
+From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001
+From: Pierre Habouzit <madcoder@debian.org>
+Date: Mon, 26 Nov 2007 16:02:04 +0100
+Subject: [PATCH] Various fixes from the previous maintainer.
+
+---
+ xinetd/child.c   |   20 +++++++++++++++++---
+ xinetd/service.c |    8 ++++----
+ 2 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/xinetd/child.c b/xinetd/child.c
+index 89ee54c..48e9615 100644
+--- a/xinetd/child.c
++++ b/xinetd/child.c
+@@ -284,6 +284,7 @@ void child_process( struct server *serp )
+    connection_s            *cp  = SERVER_CONNECTION( serp ) ;
+    struct service_config   *scp = SVC_CONF( sp ) ;
+    const char              *func = "child_process" ;
++   int                     fd, null_fd;
+ 
+    signal_default_state();
+ 
+@@ -296,9 +297,22 @@ void child_process( struct server *serp )
+    signals_pending[0] = -1;
+    signals_pending[1] = -1;
+ 
+-   Sclose(0);
+-   Sclose(1);
+-   Sclose(2);
++   if ( ( null_fd = open( "/dev/null", O_RDONLY ) ) == -1 )
++   {
++      msg( LOG_ERR, func, "open('/dev/null') failed: %m") ;
++      _exit( 1 ) ;
++   }
++
++   for ( fd = 0 ; fd <= MAX_PASS_FD ; fd++ )
++   {
++      if ( fd != null_fd && dup2( null_fd, fd ) == -1 )
++      {
++         msg( LOG_ERR, func, "dup2(%d, %d) failed: %m") ;
++         _exit( 1 ) ;
++      }
++   }
++   if ( null_fd > MAX_PASS_FD )
++      (void) Sclose( null_fd ) ;
+ 
+ 
+ #ifdef DEBUG_SERVER
+diff --git a/xinetd/service.c b/xinetd/service.c
+index 3d68d78..0132d6c 100644
+--- a/xinetd/service.c
++++ b/xinetd/service.c
+@@ -745,8 +745,8 @@ static status_e failed_service(struct service *sp,
+                return FAILED;
+ 
+             if ( last == NULL ) {
+-               last = SAIN( calloc( 1, sizeof(union xsockaddr) ) );
+-	       SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last;
++	    SVC_LAST_DGRAM_ADDR(sp) =  SAIN( calloc( 1, sizeof(union xsockaddr) ) );
++	    last = SAIN( SVC_LAST_DGRAM_ADDR(sp) );
+             }
+ 
+             (void) time( &current_time ) ;
+@@ -772,8 +772,8 @@ static status_e failed_service(struct service *sp,
+                return FAILED;
+ 
+ 	    if( last == NULL ) {
+-               last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
+-	       SVC_LAST_DGRAM_ADDR( sp ) = (union xsockaddr *)last;
++	    SVC_LAST_DGRAM_ADDR(sp) = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
++            last = SAIN6(SVC_LAST_DGRAM_ADDR(sp));
+             }
+ 
+             (void) time( &current_time ) ;
+-- 
+1.5.3.6.2040.g15e6
+
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
new file mode 100644
index 000000000..2b76fe3d4
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
@@ -0,0 +1,110 @@
+From f44b218ccc779ab3f4aed072390ccf129d94b58d Mon Sep 17 00:00:00 2001
+From: David Madore <david@pleiades.stars>
+Date: Mon, 24 Mar 2008 12:45:36 +0100
+Subject: [PATCH] xinetd should be able to listen on IPv6 even in -inetd_compat mode
+
+xinetd does not bind to IPv6 addresses (and does not seem to have an
+option to do so) when used in -inetd_compat mode.  As current inetd's
+are IPv6-aware, this is a problem: this means xinetd cannot be used as
+a drop-in inetd replacement.
+
+The attached patch is a suggestion: it adds a -inetd_ipv6 global
+option that, if used, causes inetd-compatibility lines to have an
+implicit "IPv6" option.  Perhaps this is not the best solution, but
+there should definitely be a way to get inetd.conf to be read in
+IPv6-aware mode.
+---
+ xinetd/confparse.c |    1 +
+ xinetd/inet.c      |   17 +++++++++++++++++
+ xinetd/options.c   |    3 +++
+ xinetd/xinetd.man  |    6 ++++++
+ 4 files changed, 27 insertions(+), 0 deletions(-)
+
+diff --git a/xinetd/confparse.c b/xinetd/confparse.c
+index db9f431..d7b0bcc 100644
+--- a/xinetd/confparse.c
++++ b/xinetd/confparse.c
+@@ -40,6 +40,7 @@
+ #include "inet.h"
+ #include "main.h"
+ 
++extern int inetd_ipv6;
+ extern int inetd_compat;
+ 
+ /*
+diff --git a/xinetd/inet.c b/xinetd/inet.c
+index 8caab45..2e617ae 100644
+--- a/xinetd/inet.c
++++ b/xinetd/inet.c
+@@ -25,6 +25,8 @@
+ 
+ static psi_h iter ;
+ 
++extern int inetd_ipv6;
++
+ static int get_next_inet_entry( int fd, pset_h sconfs, 
+                           struct service_config *defaults);
+ 
+@@ -360,6 +362,21 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
+          }
+          SC_SERVER_ARGV(scp)[u] = p;
+       }
++
++      /* Set the IPv6 flag if we were passed the -inetd_ipv6 option */
++      if ( inetd_ipv6 )
++      {
++         nvp = nv_find_value( service_flags, "IPv6" );
++         if ( nvp == NULL )
++         {
++            parsemsg( LOG_WARNING, func, "inetd.conf - Bad foo %s", name ) ;
++            pset_destroy(args);
++            sc_free(scp);
++            return -1;
++         }
++         M_SET(SC_XFLAGS(scp), nvp->value);
++      }
++
+       /* Set the reuse flag, as this is the default for inetd */
+       nvp = nv_find_value( service_flags, "REUSE" );
+       if ( nvp == NULL )
+diff --git a/xinetd/options.c b/xinetd/options.c
+index b058b6a..dc2f3a0 100644
+--- a/xinetd/options.c
++++ b/xinetd/options.c
+@@ -30,6 +30,7 @@ int logprocs_option ;
+ unsigned logprocs_option_arg ;
+ int stayalive_option=0;
+ char *program_name ;
++int inetd_ipv6 = 0 ;
+ int inetd_compat = 0 ;
+ int dont_fork = 0;
+ 
+@@ -128,6 +129,8 @@ int opt_recognize( int argc, char *argv[] )
+             fprintf(stderr, "\n");
+             exit(0);
+          }
++         else if ( strcmp ( &argv[ arg ][ 1 ], "inetd_ipv6" ) == 0 )
++            inetd_ipv6 = 1;
+          else if ( strcmp ( &argv[ arg ][ 1 ], "inetd_compat" ) == 0 )
+             inetd_compat = 1;
+       }
+diff --git a/xinetd/xinetd.man b/xinetd/xinetd.man
+index c76c3c6..c9dd803 100644
+--- a/xinetd/xinetd.man
++++ b/xinetd/xinetd.man
+@@ -106,6 +106,12 @@ This option causes xinetd to read /etc/inetd.conf in addition to the
+ standard xinetd config files.  /etc/inetd.conf is read after the
+ standard xinetd config files.
+ .TP
++.BI \-inetd_ipv6
++This option causes xinetd to bind to IPv6 (AF_INET6) addresses for
++inetd compatibility lines (see previous option).  This only affects
++how /etc/inetd.conf is interpreted and thus only has any effect if
++the \-inetd_compat option is also used.
++.TP
+ .BI \-cc " interval"
+ This option instructs
+ .B xinetd
+-- 
+1.5.5.rc0.127.gb4337
+
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.conf b/meta/recipes-extended/xinetd/xinetd/xinetd.conf
new file mode 100644
index 000000000..9e6ea2577
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd.conf
@@ -0,0 +1,11 @@
+# Simple configuration file for xinetd
+#
+# Some defaults, and include /etc/xinetd.d/
+
+defaults
+{
+
+
+}
+
+includedir /etc/xinetd.d
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init
new file mode 100644
index 000000000..26dbea741
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# /etc/init.d/xinetd  --  script to start and stop xinetd.
+
+if test -f /etc/default/xinetd; then
+	. /etc/default/xinetd
+fi
+
+
+test -x /usr/sbin/xinetd || exit 0
+
+checkportmap () {
+  if grep "^[^ *#]" /etc/xinetd.conf | grep -q 'rpc/'; then
+    if ! rpcinfo -u localhost portmapper >/dev/null 2>&1; then
+      echo
+      echo "WARNING: portmapper inactive - RPC services unavailable!"
+      echo "    Commenting out or removing the RPC services from"
+      echo "    the /etc/xinetd.conf file will remove this message."
+      echo
+    fi
+  fi
+} 
+
+case "$1" in
+    start)
+        checkportmap
+	echo -n "Starting internet superserver: xinetd"
+	start-stop-daemon --start --quiet --background --exec /usr/sbin/xinetd -- -pidfile /var/run/xinetd.pid $XINETD_OPTS
+	echo "."
+	;;
+    stop)
+	echo -n "Stopping internet superserver: xinetd"
+	start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd
+	echo "."
+	;;
+    reload)
+	echo -n "Reloading internet superserver configuration: xinetd"
+	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd
+	echo "."
+	;;
+    force-reload)
+	echo "$0 force-reload: Force Reload is deprecated"
+	echo -n "Forcefully reloading internet superserver configuration: xinetd"
+	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd
+	echo "."
+	;;
+    restart)
+	$0 stop
+	$0 start
+	;;
+    *)
+	echo "Usage: /etc/init.d/xinetd {start|stop|reload|force-reload|restart}"
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb b/meta/recipes-extended/xinetd/xinetd_2.3.14.bb
new file mode 100644
index 000000000..122be2c18
--- /dev/null
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.14.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "Highly configurable, modular and secure inetd"
+HOMEPAGE = "http://www.xinetd.org"
+
+# xinetd is a BSD-like license
+LICENSE = "xinetd"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
+
+DEPENDS = ""
+PR ="r0"
+
+SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
+      file://xinetd.init \
+      file://xinetd.conf \
+      file://Various-fixes-from-the-previous-maintainer.patch \
+      file://Disable-services-from-inetd.conf-if-a-service-with-t.patch \
+      file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \
+      "
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "xinetd"
+INITSCRIPT_PARAMS = "defaults"
+
+EXTRA_OECONF="--disable-nls"
+
+do_configure() {
+	# Looks like configure.in is broken, so we are skipping
+	# rebuilding configure and are just using the shipped one
+	oe_runconf
+}
+
+do_install() {
+	# Same here, the Makefile does some really stupid things,
+	# but since we only want two files why not override
+	# do_install from autotools and doing it ourselfs?
+	install -d "${D}/usr/sbin"
+	install -d "${D}/etc/init.d"
+	install -d "${D}/etc/xinetd.d"
+	install -m 644 "${WORKDIR}/xinetd.conf" "${D}/etc"
+	install -m 755 "${WORKDIR}/xinetd.init" "${D}/etc/init.d/xinetd"
+	install -m 755 "${S}/xinetd/xinetd" "${D}/usr/sbin"
+	install -m 755 "${S}/xinetd/itox" "${D}/usr/sbin"
+}
+
+CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"
diff --git a/meta/recipes-extended/xz/xz_4.999.9beta.bb b/meta/recipes-extended/xz/xz_4.999.9beta.bb
new file mode 100644
index 000000000..ca7618234
--- /dev/null
+++ b/meta/recipes-extended/xz/xz_4.999.9beta.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "utils for managing LZMA compressed files"
+HOMEPAGE = "http://tukaani.org/xz/"
+SECTION = "base"
+
+LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
+                    file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
+                    file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24 \
+                    file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
+
+SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
+
+DEPENDS = "gettext"
+
+PR = "r0"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/abiword/abiword-2.5.inc b/meta/recipes-gnome/abiword/abiword-2.5.inc
index dcd3b8553..dcd3b8553 100644
--- a/meta/packages/abiword/abiword-2.5.inc
+++ b/meta/recipes-gnome/abiword/abiword-2.5.inc
diff --git a/meta/packages/abiword/abiword-embedded_2.5.2.bb b/meta/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
index 47cf9e03c..47cf9e03c 100644
--- a/meta/packages/abiword/abiword-embedded_2.5.2.bb
+++ b/meta/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
diff --git a/meta/packages/abiword/abiword.inc b/meta/recipes-gnome/abiword/abiword.inc
index d2fabf931..d2fabf931 100644
--- a/meta/packages/abiword/abiword.inc
+++ b/meta/recipes-gnome/abiword/abiword.inc
diff --git a/meta/packages/abiword/abiword_2.5.2.bb b/meta/recipes-gnome/abiword/abiword_2.5.2.bb
index 566d0fa20..566d0fa20 100644
--- a/meta/packages/abiword/abiword_2.5.2.bb
+++ b/meta/recipes-gnome/abiword/abiword_2.5.2.bb
diff --git a/meta/packages/abiword/abiword_cvs.bb b/meta/recipes-gnome/abiword/abiword_cvs.bb
index e0e3bd7d6..e0e3bd7d6 100644
--- a/meta/packages/abiword/abiword_cvs.bb
+++ b/meta/recipes-gnome/abiword/abiword_cvs.bb
diff --git a/meta/packages/gnome/gail_1.20.0.bb b/meta/recipes-gnome/gnome/gail_1.20.0.bb
index 2e9f857a8..2e9f857a8 100644
--- a/meta/packages/gnome/gail_1.20.0.bb
+++ b/meta/recipes-gnome/gnome/gail_1.20.0.bb
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
index 879a0bb55..879a0bb55 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
diff --git a/meta/packages/gnome/gnome-common-2.28.0/omf.patch b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
index 0d85b001e..0d85b001e 100644
--- a/meta/packages/gnome/gnome-common-2.28.0/omf.patch
+++ b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
diff --git a/meta/packages/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
index 5106f58e6..5106f58e6 100644
--- a/meta/packages/gnome/gnome-common_2.28.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
diff --git a/meta/packages/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index de3f751ef..de3f751ef 100644
--- a/meta/packages/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
diff --git a/meta/packages/gnome/gnome-desktop/no-desktop-docs.patch b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
index c13234172..c13234172 100644
--- a/meta/packages/gnome/gnome-desktop/no-desktop-docs.patch
+++ b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
diff --git a/meta/packages/gnome/gnome-desktop_2.26.2.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
index f4184a4d6..f4184a4d6 100644
--- a/meta/packages/gnome/gnome-desktop_2.26.2.bb
+++ b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
diff --git a/meta/packages/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 00a64e258..00a64e258 100644
--- a/meta/packages/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
diff --git a/meta/packages/gnome/gnome-doc-utils_0.12.0.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.12.0.bb
index 2499ac36e..2499ac36e 100644
--- a/meta/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.12.0.bb
diff --git a/meta/packages/gnome/gnome-icon-theme_2.22.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
index f78e6a6e5..f78e6a6e5 100644
--- a/meta/packages/gnome/gnome-icon-theme_2.22.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb
diff --git a/meta/packages/gnome/gnome-keyring/org.gnome.keyring.service b/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
index 96ea061cf..96ea061cf 100644
--- a/meta/packages/gnome/gnome-keyring/org.gnome.keyring.service
+++ b/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
diff --git a/meta/packages/gnome/gnome-keyring_2.31.4.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.31.4.bb
index 1826a7ac3..1826a7ac3 100644
--- a/meta/packages/gnome/gnome-keyring_2.31.4.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.31.4.bb
diff --git a/meta/packages/gnome/gnome-mime-data/pkgconfig.patch b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
index de287e55a..de287e55a 100644
--- a/meta/packages/gnome/gnome-mime-data/pkgconfig.patch
+++ b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
diff --git a/meta/packages/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
index edaabe15d..edaabe15d 100644
--- a/meta/packages/gnome/gnome-mime-data_2.18.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb
diff --git a/meta/packages/gnome/gnome-settings-daemon/configurefix.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
index 01b4f6419..01b4f6419 100644
--- a/meta/packages/gnome/gnome-settings-daemon/configurefix.patch
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
diff --git a/meta/packages/gnome/gnome-settings-daemon/desktop-moblin.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
index d3fd76c62..d3fd76c62 100644
--- a/meta/packages/gnome/gnome-settings-daemon/desktop-moblin.patch
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
diff --git a/meta/packages/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
index 8e1d0ce9c..8e1d0ce9c 100644
--- a/meta/packages/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
diff --git a/meta/packages/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
index d77063eba..d77063eba 100644
--- a/meta/packages/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
diff --git a/meta/packages/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
index 1aff2d6d6..1aff2d6d6 100644
--- a/meta/packages/gnome/gnome-settings-daemon/mojito-cleanup.patch
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
diff --git a/meta/packages/gnome/gnome-settings-daemon/mount-plugin.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
index 67f056b50..67f056b50 100644
--- a/meta/packages/gnome/gnome-settings-daemon/mount-plugin.patch
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
diff --git a/meta/packages/gnome/gnome-settings-daemon_2.26.1.bb b/meta/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb
index cb216b275..cb216b275 100644
--- a/meta/packages/gnome/gnome-settings-daemon_2.26.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb
diff --git a/meta/packages/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
index 0358ed8a6..0358ed8a6 100644
--- a/meta/packages/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
+++ b/meta/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
diff --git a/meta/packages/gnome/gnome-terminal_2.26.3.bb b/meta/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
index 73f0b99ea..73f0b99ea 100644
--- a/meta/packages/gnome/gnome-terminal_2.26.3.bb
+++ b/meta/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
diff --git a/meta/packages/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch
index 3dbc130dd..3dbc130dd 100644
--- a/meta/packages/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch
diff --git a/meta/packages/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch
index e25ecdd66..e25ecdd66 100644
--- a/meta/packages/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch
diff --git a/meta/packages/gnome/gnome-vfs_2.24.3.bb b/meta/recipes-gnome/gnome/gnome-vfs_2.24.3.bb
index 928549cca..928549cca 100644
--- a/meta/packages/gnome/gnome-vfs_2.24.3.bb
+++ b/meta/recipes-gnome/gnome/gnome-vfs_2.24.3.bb
diff --git a/meta/packages/gnome/gobject-introspection/configure.patch b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
index c441799b2..c441799b2 100644
--- a/meta/packages/gnome/gobject-introspection/configure.patch
+++ b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
diff --git a/meta/packages/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
index b4582e2ea..b4582e2ea 100644
--- a/meta/packages/gnome/gobject-introspection/pathfix.patch
+++ b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
diff --git a/meta/packages/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
index fe6eea285..fe6eea285 100644
--- a/meta/packages/gnome/gobject-introspection_git.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
diff --git a/meta/packages/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
index edeed0a6e..edeed0a6e 100644
--- a/meta/packages/gnome/libart-lgpl/Makefile.am.patch
+++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
diff --git a/meta/packages/gnome/libart-lgpl/arm/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h
index b0e74ad6a..b0e74ad6a 100644
--- a/meta/packages/gnome/libart-lgpl/arm/art_config.h
+++ b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h
diff --git a/meta/packages/gnome/libart-lgpl/i386/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h
index b0e74ad6a..b0e74ad6a 100644
--- a/meta/packages/gnome/libart-lgpl/i386/art_config.h
+++ b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h
diff --git a/meta/packages/gnome/libart-lgpl/i586/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h
index b0e74ad6a..b0e74ad6a 100644
--- a/meta/packages/gnome/libart-lgpl/i586/art_config.h
+++ b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h
diff --git a/meta/packages/gnome/libart-lgpl/i686/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h
index b0e74ad6a..b0e74ad6a 100644
--- a/meta/packages/gnome/libart-lgpl/i686/art_config.h
+++ b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h
diff --git a/meta/packages/gnome/libart-lgpl_2.3.19.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb
index fa565f3d1..fa565f3d1 100644
--- a/meta/packages/gnome/libart-lgpl_2.3.19.bb
+++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb
diff --git a/meta/packages/gnome/libgnome-keyring_2.30.1.bb b/meta/recipes-gnome/gnome/libgnome-keyring_2.30.1.bb
index 900400688..900400688 100644
--- a/meta/packages/gnome/libgnome-keyring_2.30.1.bb
+++ b/meta/recipes-gnome/gnome/libgnome-keyring_2.30.1.bb
diff --git a/meta/packages/gnome/libgnomecanvas_2.20.0.bb b/meta/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
index 266d44b05..266d44b05 100644
--- a/meta/packages/gnome/libgnomecanvas_2.20.0.bb
+++ b/meta/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
diff --git a/meta/packages/gnome/libgnomekbd_2.26.0.bb b/meta/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
index f2e4ec533..f2e4ec533 100644
--- a/meta/packages/gnome/libgnomekbd_2.26.0.bb
+++ b/meta/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
diff --git a/meta/packages/gnome/metacity_2.22.0.bb b/meta/recipes-gnome/gnome/metacity_2.22.0.bb
index 44a5f86eb..44a5f86eb 100644
--- a/meta/packages/gnome/metacity_2.22.0.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.22.0.bb
diff --git a/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
index c88a79570..c88a79570 100644
--- a/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
diff --git a/meta/packages/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
index 6b030e8f1..6b030e8f1 100644
--- a/meta/packages/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
+++ b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
index 4439e69fb..4439e69fb 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/combo-arrow-size.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
index d44c454ce..d44c454ce 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/combo-arrow-size.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/disable-print.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
index 13cbd91d7..13cbd91d7 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/disable-print.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
index 3313e7f13..3313e7f13 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-default.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
index 146316c9c..146316c9c 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-default.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
index 7d55f3cbb..7d55f3cbb 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
index 694b059b9..694b059b9 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filesystem-volumes.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
index 826fd6bee..826fd6bee 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filesystem-volumes.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/gtklabel-resize-patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
index df2965634..df2965634 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/gtklabel-resize-patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
index 1c2cd0576..1c2cd0576 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/menu-deactivate.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
index cfb8849e9..cfb8849e9 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/menu-deactivate.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
index 0fc4c48d1..0fc4c48d1 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff b/meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
index 63828cec6..63828cec6 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
diff --git a/meta/packages/gtk+/gtk+-2.12.7/range-no-redraw.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
index 14387b8a2..14387b8a2 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/range-no-redraw.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
index ac15e9ab2..ac15e9ab2 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/scrolled-placement.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
index a0b50c8ca..a0b50c8ca 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/scrolled-placement.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.7/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
index 59ad150b2..59ad150b2 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
diff --git a/meta/packages/gtk+/gtk+-2.12.7/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
index b63e262d3..b63e262d3 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index e0d6ab952..e0d6ab952 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
index 4439e69fb..4439e69fb 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
index 5c64ac04d..5c64ac04d 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
diff --git a/meta/packages/gtk+/gtk+-2.16.6/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
index 3313e7f13..3313e7f13 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
index 82fbbac8d..82fbbac8d 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
index 0fc4c48d1..0fc4c48d1 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
index ac15e9ab2..ac15e9ab2 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
diff --git a/meta/packages/gtk+/gtk+-2.16.6/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
index 59ad150b2..59ad150b2 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
diff --git a/meta/packages/gtk+/gtk+-2.16.6/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
index b63e262d3..b63e262d3 100644
--- a/meta/packages/gtk+/gtk+-2.16.6/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index ee55f9cc3..ee55f9cc3 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch
index 92ce64312..92ce64312 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch
index 7f6c73be4..7f6c73be4 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/configurefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
index 13ae61ef8..13ae61ef8 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
diff --git a/meta/packages/gtk+/gtk+-2.20.1/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch
index 3313e7f13..3313e7f13 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
index 66be74475..66be74475 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
index 0fc4c48d1..0fc4c48d1 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
index 518875e6f..518875e6f 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
diff --git a/meta/packages/gtk+/gtk+-2.20.1/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
index 4853628c8..4853628c8 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
diff --git a/meta/packages/gtk+/gtk+-2.20.1/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch
index 84231e9b9..84231e9b9 100644
--- a/meta/packages/gtk+/gtk+-2.20.1/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index f7fa00d5c..f7fa00d5c 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index d82930851..d82930851 100644
--- a/meta/packages/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
diff --git a/meta/packages/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index becd2bc29..becd2bc29 100644
--- a/meta/packages/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
diff --git a/meta/packages/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
index 00de6950a..00de6950a 100644
--- a/meta/packages/gtk+/gtk+_2.20.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
diff --git a/meta/packages/gtk-doc/gtk-doc.bb b/meta/recipes-gnome/gtk-doc/gtk-doc.bb
index 3f5e29121..3f5e29121 100644
--- a/meta/packages/gtk-doc/gtk-doc.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc.bb
diff --git a/meta/packages/gtk-doc/gtk-doc.m4 b/meta/recipes-gnome/gtk-doc/gtk-doc.m4
index 2cfa1e717..2cfa1e717 100644
--- a/meta/packages/gtk-doc/gtk-doc.m4
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc.m4
diff --git a/meta/packages/gtk-engines/gtk-engines_2.14.0.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.14.0.bb
index d711f07aa..d711f07aa 100644
--- a/meta/packages/gtk-engines/gtk-engines_2.14.0.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.14.0.bb
diff --git a/meta/packages/gtk-theme-darkilouche/gtk-theme-darkilouche.bb b/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche.bb
index 6bf1eedaf..6bf1eedaf 100644
--- a/meta/packages/gtk-theme-darkilouche/gtk-theme-darkilouche.bb
+++ b/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche.bb
diff --git a/meta/packages/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff b/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff
index c9fb7bd73..c9fb7bd73 100644
--- a/meta/packages/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff
+++ b/meta/recipes-gnome/gtk-theme-darkilouche/gtk-theme-darkilouche/change-colours.diff
diff --git a/meta/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb b/meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb
index adcdf2ed2..adcdf2ed2 100644
--- a/meta/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb
+++ b/meta/recipes-gnome/gtk-theme-torturer/gtk-theme-torturer_git.bb
diff --git a/meta/packages/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index 43e4d07b8..43e4d07b8 100644
--- a/meta/packages/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
diff --git a/meta/packages/hicolor-icon-theme/files/index.theme b/meta/recipes-gnome/hicolor-icon-theme/files/index.theme
index 0471bd53f..0471bd53f 100644
--- a/meta/packages/hicolor-icon-theme/files/index.theme
+++ b/meta/recipes-gnome/hicolor-icon-theme/files/index.theme
diff --git a/meta/packages/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index 7b2ae29d3..7b2ae29d3 100644
--- a/meta/packages/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
diff --git a/meta/packages/libglade/libglade-2.6.4/glade-cruft.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
index 0fceccf0c..0fceccf0c 100644
--- a/meta/packages/libglade/libglade-2.6.4/glade-cruft.patch
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
diff --git a/meta/packages/libglade/libglade-2.6.4/no-deprecation.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/no-deprecation.patch
index 514c761b0..514c761b0 100644
--- a/meta/packages/libglade/libglade-2.6.4/no-deprecation.patch
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/no-deprecation.patch
diff --git a/meta/packages/libglade/libglade-2.6.4/no-xml2.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
index 1c2e215b8..1c2e215b8 100644
--- a/meta/packages/libglade/libglade-2.6.4/no-xml2.patch
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
diff --git a/meta/packages/libglade/libglade_2.6.4.bb b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index 9296edaeb..9296edaeb 100644
--- a/meta/packages/libglade/libglade_2.6.4.bb
+++ b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
diff --git a/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch b/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
index afdf2c8f0..afdf2c8f0 100644
--- a/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch
+++ b/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
diff --git a/meta/packages/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc
index bdaf78979..bdaf78979 100644
--- a/meta/packages/cairo/cairo-fpu.inc
+++ b/meta/recipes-graphics/cairo/cairo-fpu.inc
diff --git a/meta/packages/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index e73a83967..e73a83967 100644
--- a/meta/packages/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
diff --git a/meta/packages/cairo/cairo_1.8.10.bb b/meta/recipes-graphics/cairo/cairo_1.8.10.bb
index 9e7e7a3bf..9e7e7a3bf 100644
--- a/meta/packages/cairo/cairo_1.8.10.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.8.10.bb
diff --git a/meta/packages/clutter/aaina.inc b/meta/recipes-graphics/clutter/aaina.inc
index afbc022cd..afbc022cd 100644
--- a/meta/packages/clutter/aaina.inc
+++ b/meta/recipes-graphics/clutter/aaina.inc
diff --git a/meta/packages/clutter/aaina_git.bb b/meta/recipes-graphics/clutter/aaina_git.bb
index a348cd3d4..a348cd3d4 100644
--- a/meta/packages/clutter/aaina_git.bb
+++ b/meta/recipes-graphics/clutter/aaina_git.bb
diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-0.6_git.bb
index 5a8ccec16..5a8ccec16 100644
--- a/meta/packages/clutter/clutter-0.6_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-0.6_git.bb
diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-0.8_git.bb
index 71e619803..71e619803 100644
--- a/meta/packages/clutter/clutter-0.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-0.8_git.bb
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-1.0_git.bb
index 7e62954ee..7e62954ee 100644
--- a/meta/packages/clutter/clutter-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.0_git.bb
diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 1a107c399..1a107c399 100644
--- a/meta/packages/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
diff --git a/meta/packages/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index 4c74ffeb4..4c74ffeb4 100644
--- a/meta/packages/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
diff --git a/meta/packages/clutter/clutter-cairo-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb
index 3b7f6a9be..3b7f6a9be 100644
--- a/meta/packages/clutter/clutter-cairo-0.6_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb
diff --git a/meta/packages/clutter/clutter-cairo-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb
index cb8482b74..cb8482b74 100644
--- a/meta/packages/clutter/clutter-cairo-0.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb
diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/recipes-graphics/clutter/clutter-cairo.inc
index ff889899e..ff889899e 100644
--- a/meta/packages/clutter/clutter-cairo.inc
+++ b/meta/recipes-graphics/clutter/clutter-cairo.inc
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch b/meta/recipes-graphics/clutter/clutter-cairo/enable_examples-0.6.patch
index 3baea4c5c..3baea4c5c 100644
--- a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
+++ b/meta/recipes-graphics/clutter/clutter-cairo/enable_examples-0.6.patch
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples.patch b/meta/recipes-graphics/clutter/clutter-cairo/enable_examples.patch
index c5ed63ff1..c5ed63ff1 100644
--- a/meta/packages/clutter/clutter-cairo/enable_examples.patch
+++ b/meta/recipes-graphics/clutter/clutter-cairo/enable_examples.patch
diff --git a/meta/packages/clutter/clutter-fpu.inc b/meta/recipes-graphics/clutter/clutter-fpu.inc
index 21a16feac..21a16feac 100644
--- a/meta/packages/clutter/clutter-fpu.inc
+++ b/meta/recipes-graphics/clutter/clutter-fpu.inc
diff --git a/meta/packages/clutter/clutter-gst-0.10_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb
index a0f874db2..a0f874db2 100644
--- a/meta/packages/clutter/clutter-gst-0.10_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb
diff --git a/meta/packages/clutter/clutter-gst-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb
index 09979f9e0..09979f9e0 100644
--- a/meta/packages/clutter/clutter-gst-0.6_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb
diff --git a/meta/packages/clutter/clutter-gst-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb
index c5348ecef..c5348ecef 100644
--- a/meta/packages/clutter/clutter-gst-0.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb
diff --git a/meta/packages/clutter/clutter-gst-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
index 5580596f0..5580596f0 100644
--- a/meta/packages/clutter/clutter-gst-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index 0a2f26153..0a2f26153 100644
--- a/meta/packages/clutter/clutter-gst.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst.inc
diff --git a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
index 54df63d29..54df63d29 100644
--- a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
diff --git a/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
index 569b0d8be..569b0d8be 100644
--- a/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
diff --git a/meta/packages/clutter/clutter-gst/autofoo.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
index ad77d636c..ad77d636c 100644
--- a/meta/packages/clutter/clutter-gst/autofoo.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
diff --git a/meta/packages/clutter/clutter-gtk-0.10_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb
index d0613277a..d0613277a 100644
--- a/meta/packages/clutter/clutter-gtk-0.10_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb
diff --git a/meta/packages/clutter/clutter-gtk-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb
index d2633ff2d..d2633ff2d 100644
--- a/meta/packages/clutter/clutter-gtk-0.6_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb
diff --git a/meta/packages/clutter/clutter-gtk-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb
index 506d3fb15..506d3fb15 100644
--- a/meta/packages/clutter/clutter-gtk-0.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb
diff --git a/meta/packages/clutter/clutter-gtk-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
index dfabbd56c..dfabbd56c 100644
--- a/meta/packages/clutter/clutter-gtk-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc
index 89ae3e53c..89ae3e53c 100644
--- a/meta/packages/clutter/clutter-gtk.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk.inc
diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/recipes-graphics/clutter/clutter-helix.inc
index 6bbbb244d..6bbbb244d 100644
--- a/meta/packages/clutter/clutter-helix.inc
+++ b/meta/recipes-graphics/clutter/clutter-helix.inc
diff --git a/meta/packages/clutter/clutter-helix_git.bb b/meta/recipes-graphics/clutter/clutter-helix_git.bb
index 1c272306b..1c272306b 100644
--- a/meta/packages/clutter/clutter-helix_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-helix_git.bb
diff --git a/meta/packages/clutter/clutter-mozembed.inc b/meta/recipes-graphics/clutter/clutter-mozembed.inc
index 72c9412d0..72c9412d0 100644
--- a/meta/packages/clutter/clutter-mozembed.inc
+++ b/meta/recipes-graphics/clutter/clutter-mozembed.inc
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch b/meta/recipes-graphics/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
index 135b9e79f..135b9e79f 100644
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
+++ b/meta/recipes-graphics/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/recipes-graphics/clutter/clutter-mozembed/link-with-g++.patch
index cc9d43a67..cc9d43a67 100644
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ b/meta/recipes-graphics/clutter/clutter-mozembed/link-with-g++.patch
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/recipes-graphics/clutter/clutter-mozembed_git.bb
index e2da2d6a7..e2da2d6a7 100644
--- a/meta/packages/clutter/clutter-mozembed_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-mozembed_git.bb
diff --git a/meta/packages/clutter/clutter-package.inc b/meta/recipes-graphics/clutter/clutter-package.inc
index 22993ffd0..22993ffd0 100644
--- a/meta/packages/clutter/clutter-package.inc
+++ b/meta/recipes-graphics/clutter/clutter-package.inc
diff --git a/meta/packages/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index c099309bb..c099309bb 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
diff --git a/meta/packages/clutter/clutter/build-fix.patch b/meta/recipes-graphics/clutter/clutter/build-fix.patch
index 68cf84ec2..68cf84ec2 100644
--- a/meta/packages/clutter/clutter/build-fix.patch
+++ b/meta/recipes-graphics/clutter/clutter/build-fix.patch
diff --git a/meta/packages/clutter/clutter/enable_tests-0.6.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
index 544a7e588..544a7e588 100644
--- a/meta/packages/clutter/clutter/enable_tests-0.6.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
diff --git a/meta/packages/clutter/clutter/enable_tests-0.8.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
index 4f449b117..4f449b117 100644
--- a/meta/packages/clutter/clutter/enable_tests-0.8.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
diff --git a/meta/packages/clutter/clutter/enable_tests-1.0.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
index 953edf6bb..953edf6bb 100644
--- a/meta/packages/clutter/clutter/enable_tests-1.0.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
diff --git a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
index 953edf6bb..953edf6bb 100644
--- a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
index f4af7c94f..f4af7c94f 100644
--- a/meta/packages/clutter/clutter/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
diff --git a/meta/packages/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch
index 7685c2116..7685c2116 100644
--- a/meta/packages/clutter/clutter/symconflict.patch
+++ b/meta/recipes-graphics/clutter/clutter/symconflict.patch
diff --git a/meta/packages/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
index a20515ec5..a20515ec5 100644
--- a/meta/packages/clutter/clutter_git.bb
+++ b/meta/recipes-graphics/clutter/clutter_git.bb
diff --git a/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch b/meta/recipes-graphics/clutter/moblin-proto/fix-shader-and-callbacks.patch
index 4a3eddb8c..4a3eddb8c 100644
--- a/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch
+++ b/meta/recipes-graphics/clutter/moblin-proto/fix-shader-and-callbacks.patch
diff --git a/meta/packages/clutter/moblin-proto/fix.patch b/meta/recipes-graphics/clutter/moblin-proto/fix.patch
index 8bde67762..8bde67762 100644
--- a/meta/packages/clutter/moblin-proto/fix.patch
+++ b/meta/recipes-graphics/clutter/moblin-proto/fix.patch
diff --git a/meta/packages/clutter/moblin-proto/paths.patch b/meta/recipes-graphics/clutter/moblin-proto/paths.patch
index d241c8ff7..d241c8ff7 100644
--- a/meta/packages/clutter/moblin-proto/paths.patch
+++ b/meta/recipes-graphics/clutter/moblin-proto/paths.patch
diff --git a/meta/packages/clutter/moblin-proto_git.bb b/meta/recipes-graphics/clutter/moblin-proto_git.bb
index b86d62238..b86d62238 100644
--- a/meta/packages/clutter/moblin-proto_git.bb
+++ b/meta/recipes-graphics/clutter/moblin-proto_git.bb
diff --git a/meta/packages/clutter/table.inc b/meta/recipes-graphics/clutter/table.inc
index dc949172b..dc949172b 100644
--- a/meta/packages/clutter/table.inc
+++ b/meta/recipes-graphics/clutter/table.inc
diff --git a/meta/packages/clutter/table/fixes.patch b/meta/recipes-graphics/clutter/table/fixes.patch
index a7cdc4371..a7cdc4371 100644
--- a/meta/packages/clutter/table/fixes.patch
+++ b/meta/recipes-graphics/clutter/table/fixes.patch
diff --git a/meta/packages/clutter/table_git.bb b/meta/recipes-graphics/clutter/table_git.bb
index 5aa4153c1..5aa4153c1 100644
--- a/meta/packages/clutter/table_git.bb
+++ b/meta/recipes-graphics/clutter/table_git.bb
diff --git a/meta/packages/clutter/tidy.inc b/meta/recipes-graphics/clutter/tidy.inc
index 3fa387c04..3fa387c04 100644
--- a/meta/packages/clutter/tidy.inc
+++ b/meta/recipes-graphics/clutter/tidy.inc
diff --git a/meta/packages/clutter/tidy/autofoo.patch b/meta/recipes-graphics/clutter/tidy/autofoo.patch
index 7f54a3372..7f54a3372 100644
--- a/meta/packages/clutter/tidy/autofoo.patch
+++ b/meta/recipes-graphics/clutter/tidy/autofoo.patch
diff --git a/meta/packages/clutter/tidy/tidy-enable-tests.patch b/meta/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
index c5e1660c5..c5e1660c5 100644
--- a/meta/packages/clutter/tidy/tidy-enable-tests.patch
+++ b/meta/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
diff --git a/meta/packages/clutter/tidy_git.bb b/meta/recipes-graphics/clutter/tidy_git.bb
index 178526027..178526027 100644
--- a/meta/packages/clutter/tidy_git.bb
+++ b/meta/recipes-graphics/clutter/tidy_git.bb
diff --git a/meta/packages/drm/libdrm-2.4.21/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch
index 9d6a168bb..9d6a168bb 100644
--- a/meta/packages/drm/libdrm-2.4.21/installtests.patch
+++ b/meta/recipes-graphics/drm/libdrm-2.4.21/installtests.patch
diff --git a/meta/packages/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index 4f153ff7f..4f153ff7f 100644
--- a/meta/packages/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
diff --git a/meta/packages/drm/libdrm_2.4.21.bb b/meta/recipes-graphics/drm/libdrm_2.4.21.bb
index 97ca06900..97ca06900 100644
--- a/meta/packages/drm/libdrm_2.4.21.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.21.bb
diff --git a/meta/packages/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index d80dd5f43..d80dd5f43 100644
--- a/meta/packages/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
diff --git a/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
index 2993959db..2993959db 100644
--- a/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
diff --git a/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
index 7fec1e910..7fec1e910 100644
--- a/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
diff --git a/meta/packages/fontconfig/fontconfig-native_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
index 03a1bc86c..03a1bc86c 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
diff --git a/meta/packages/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
index e0403ecb3..e0403ecb3 100644
--- a/meta/packages/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
diff --git a/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.3.12/no-hardcode.patch
index 44ae450a1..44ae450a1 100644
--- a/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch
+++ b/meta/recipes-graphics/freetype/freetype-2.3.12/no-hardcode.patch
diff --git a/meta/packages/freetype/freetype_2.3.12.bb b/meta/recipes-graphics/freetype/freetype_2.3.12.bb
index da62ffb3b..da62ffb3b 100644
--- a/meta/packages/freetype/freetype_2.3.12.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.3.12.bb
diff --git a/meta/packages/libfakekey/libfakekey_svn.bb b/meta/recipes-graphics/libfakekey/libfakekey_svn.bb
index cb835445b..634fd4ea0 100644
--- a/meta/packages/libfakekey/libfakekey_svn.bb
+++ b/meta/recipes-graphics/libfakekey/libfakekey_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Matchbox keyboard"
+DESCRIPTION = "libfakekey"
 HOMEPAGE = "http://matchbox-project.org/"
 BUGTRACKER = "http://bugzilla.openedhand.com/"
 
diff --git a/meta/packages/libmatchbox/files/16bppfixes-2.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
index ab9cdc74a..ab9cdc74a 100644
--- a/meta/packages/libmatchbox/files/16bppfixes-2.patch
+++ b/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
diff --git a/meta/packages/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
index 09a034780..09a034780 100644
--- a/meta/packages/libmatchbox/files/16bppfixes.patch
+++ b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
diff --git a/meta/packages/libmatchbox/files/autofoo.patch b/meta/recipes-graphics/libmatchbox/files/autofoo.patch
index ad3be578e..ad3be578e 100644
--- a/meta/packages/libmatchbox/files/autofoo.patch
+++ b/meta/recipes-graphics/libmatchbox/files/autofoo.patch
diff --git a/meta/packages/libmatchbox/files/check.m4 b/meta/recipes-graphics/libmatchbox/files/check.m4
index 97bfd9c47..97bfd9c47 100644
--- a/meta/packages/libmatchbox/files/check.m4
+++ b/meta/recipes-graphics/libmatchbox/files/check.m4
diff --git a/meta/packages/libmatchbox/files/configure_fixes.patch b/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
index 083d32a04..083d32a04 100644
--- a/meta/packages/libmatchbox/files/configure_fixes.patch
+++ b/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
diff --git a/meta/packages/libmatchbox/files/fix-configure-for-1.9.patch b/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
index 990b738e6..990b738e6 100644
--- a/meta/packages/libmatchbox/files/fix-configure-for-1.9.patch
+++ b/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
diff --git a/meta/packages/libmatchbox/libmatchbox.inc b/meta/recipes-graphics/libmatchbox/libmatchbox.inc
index fdc866fe0..fdc866fe0 100644
--- a/meta/packages/libmatchbox/libmatchbox.inc
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox.inc
diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
index 1d7d9c8f4..1d7d9c8f4 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
diff --git a/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb
index 3cdcd324f..3cdcd324f 100644
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb
diff --git a/meta/packages/libxklavier/libxklavier/pkgconfigfix.patch b/meta/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
index 4aaafb2b1..4aaafb2b1 100644
--- a/meta/packages/libxklavier/libxklavier/pkgconfigfix.patch
+++ b/meta/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
diff --git a/meta/packages/libxklavier/libxklavier_3.9.bb b/meta/recipes-graphics/libxklavier/libxklavier_3.9.bb
index 1d9b6f21a..1d9b6f21a 100644
--- a/meta/packages/libxklavier/libxklavier_3.9.bb
+++ b/meta/recipes-graphics/libxklavier/libxklavier_3.9.bb
diff --git a/meta/packages/libxsettings-client/files/MIT-style-license b/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license
index 628de9830..628de9830 100644
--- a/meta/packages/libxsettings-client/files/MIT-style-license
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license
diff --git a/meta/packages/libxsettings-client/files/link-x11.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
index ee12f0a5b..ee12f0a5b 100644
--- a/meta/packages/libxsettings-client/files/link-x11.patch
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
index ecd6d181e..ecd6d181e 100644
--- a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
diff --git a/meta/packages/matchbox-session/matchbox-session/matchbox-session b/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
index 4d6caa0c5..4d6caa0c5 100644
--- a/meta/packages/matchbox-session/matchbox-session/matchbox-session
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
diff --git a/meta/packages/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index df9f2ab60..df9f2ab60 100644
--- a/meta/packages/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
diff --git a/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
index f67e06083..f67e06083 100644
--- a/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
diff --git a/meta/packages/matchbox-keyboard/files/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
index 52cea0e8f..52cea0e8f 100644
--- a/meta/packages/matchbox-keyboard/files/configure_fix.patch
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
diff --git a/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
index aca7c7da4..aca7c7da4 100644
--- a/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
diff --git a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig b/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
index 239da8f57..239da8f57 100644
--- a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
diff --git a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb
index e09eb00ed..e09eb00ed 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb
diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb
index ebed31e2a..ebed31e2a 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb
diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index f68eb2b4a..f68eb2b4a 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb
index 09c0f70f4..09c0f70f4 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb
diff --git a/meta/packages/menu-cache/menu-cache_0.3.2.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb
index 90cc5716b..90cc5716b 100644
--- a/meta/packages/menu-cache/menu-cache_0.3.2.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 240f956b8..240f956b8 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
diff --git a/meta/packages/mesa/mesa-dri-glsl-native_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
index f6121c19a..f6121c19a 100644
--- a/meta/packages/mesa/mesa-dri-glsl-native_7.8.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
diff --git a/meta/packages/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
index d2147910a..d2147910a 100644
--- a/meta/packages/mesa/mesa-dri/cross2.patch
+++ b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
diff --git a/meta/packages/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
index 84be428c4..84be428c4 100644
--- a/meta/packages/mesa/mesa-dri/crossfix.patch
+++ b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
diff --git a/meta/packages/mesa/mesa-dri/i586/matypes.h b/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
index 98d2188e7..98d2188e7 100644
--- a/meta/packages/mesa/mesa-dri/i586/matypes.h
+++ b/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
diff --git a/meta/packages/mesa/mesa-dri_7.5.bb b/meta/recipes-graphics/mesa/mesa-dri_7.5.bb
index 6e9cdc9aa..6e9cdc9aa 100644
--- a/meta/packages/mesa/mesa-dri_7.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.5.bb
diff --git a/meta/packages/mesa/mesa-dri_7.7.bb b/meta/recipes-graphics/mesa/mesa-dri_7.7.bb
index a5899f389..a5899f389 100644
--- a/meta/packages/mesa/mesa-dri_7.7.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.7.bb
diff --git a/meta/packages/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
index ffd885f29..ffd885f29 100644
--- a/meta/packages/mesa/mesa-dri_7.8.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index fa0a7c8dc..fa0a7c8dc 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
diff --git a/meta/packages/mesa/mesa-xlib_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.8.2.bb
index 093ad6ed7..093ad6ed7 100644
--- a/meta/packages/mesa/mesa-xlib_7.8.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.8.2.bb
diff --git a/meta/packages/mesa/qemugl/versionfix.patch b/meta/recipes-graphics/mesa/qemugl/versionfix.patch
index a3d33e830..a3d33e830 100644
--- a/meta/packages/mesa/qemugl/versionfix.patch
+++ b/meta/recipes-graphics/mesa/qemugl/versionfix.patch
diff --git a/meta/packages/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
index 184c78272..184c78272 100644
--- a/meta/packages/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
diff --git a/meta/packages/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index 456348754..456348754 100644
--- a/meta/packages/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
diff --git a/meta/packages/mutter/mutter/crosscompile.patch b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
index b27383b09..b27383b09 100644
--- a/meta/packages/mutter/mutter/crosscompile.patch
+++ b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
diff --git a/meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
index 3714383bc..3714383bc 100644
--- a/meta/packages/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
+++ b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
diff --git a/meta/packages/mutter/mutter/fix_pkgconfig.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
index 5ac5ecc60..5ac5ecc60 100644
--- a/meta/packages/mutter/mutter/fix_pkgconfig.patch
+++ b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
diff --git a/meta/packages/mutter/mutter/nodocs.patch b/meta/recipes-graphics/mutter/mutter/nodocs.patch
index 98f43be5e..98f43be5e 100644
--- a/meta/packages/mutter/mutter/nodocs.patch
+++ b/meta/recipes-graphics/mutter/mutter/nodocs.patch
diff --git a/meta/packages/mutter/mutter/nozenity.patch b/meta/recipes-graphics/mutter/mutter/nozenity.patch
index 06f590953..06f590953 100644
--- a/meta/packages/mutter/mutter/nozenity.patch
+++ b/meta/recipes-graphics/mutter/mutter/nozenity.patch
diff --git a/meta/packages/mutter/mutter_2.28.1.bb b/meta/recipes-graphics/mutter/mutter_2.28.1.bb
index c4b810789..c4b810789 100644
--- a/meta/packages/mutter/mutter_2.28.1.bb
+++ b/meta/recipes-graphics/mutter/mutter_2.28.1.bb
diff --git a/meta/packages/mutter/mutter_git.bb b/meta/recipes-graphics/mutter/mutter_git.bb
index b41bf1e50..b41bf1e50 100644
--- a/meta/packages/mutter/mutter_git.bb
+++ b/meta/recipes-graphics/mutter/mutter_git.bb
diff --git a/meta/packages/pango/pango-1.28.0/no-tests.patch b/meta/recipes-graphics/pango/pango-1.28.0/no-tests.patch
index 4a74d8c4d..4a74d8c4d 100644
--- a/meta/packages/pango/pango-1.28.0/no-tests.patch
+++ b/meta/recipes-graphics/pango/pango-1.28.0/no-tests.patch
diff --git a/meta/packages/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index fa22fa578..fa22fa578 100644
--- a/meta/packages/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
diff --git a/meta/packages/pango/pango_1.28.0.bb b/meta/recipes-graphics/pango/pango_1.28.0.bb
index ae914ffc5..ae914ffc5 100644
--- a/meta/packages/pango/pango_1.28.0.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.0.bb
diff --git a/meta/packages/startup-notification/startup-notification_0.10.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
index 8b349821f..8b349821f 100644
--- a/meta/packages/startup-notification/startup-notification_0.10.bb
+++ b/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
diff --git a/meta/packages/tslib/tslib/a780/tslib.sh b/meta/recipes-graphics/tslib/tslib/a780/tslib.sh
index 51cd0f1f3..51cd0f1f3 100644
--- a/meta/packages/tslib/tslib/a780/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/a780/tslib.sh
diff --git a/meta/packages/tslib/tslib/collie/ts.conf b/meta/recipes-graphics/tslib/tslib/collie/ts.conf
index 2099b9b41..2099b9b41 100644
--- a/meta/packages/tslib/tslib/collie/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/collie/ts.conf
diff --git a/meta/packages/tslib/tslib/collie/tslib.sh b/meta/recipes-graphics/tslib/tslib/collie/tslib.sh
index 664bda426..664bda426 100644
--- a/meta/packages/tslib/tslib/collie/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/collie/tslib.sh
diff --git a/meta/packages/tslib/tslib/devfs.patch b/meta/recipes-graphics/tslib/tslib/devfs.patch
index d7ef0a958..d7ef0a958 100644
--- a/meta/packages/tslib/tslib/devfs.patch
+++ b/meta/recipes-graphics/tslib/tslib/devfs.patch
diff --git a/meta/packages/tslib/tslib/e680/tslib.sh b/meta/recipes-graphics/tslib/tslib/e680/tslib.sh
index 51cd0f1f3..51cd0f1f3 100644
--- a/meta/packages/tslib/tslib/e680/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/e680/tslib.sh
diff --git a/meta/packages/tslib/tslib/event1.patch b/meta/recipes-graphics/tslib/tslib/event1.patch
index 88cc3f3a2..88cc3f3a2 100644
--- a/meta/packages/tslib/tslib/event1.patch
+++ b/meta/recipes-graphics/tslib/tslib/event1.patch
diff --git a/meta/packages/tslib/tslib/fix_version.patch b/meta/recipes-graphics/tslib/tslib/fix_version.patch
index d6a0ebd0f..d6a0ebd0f 100644
--- a/meta/packages/tslib/tslib/fix_version.patch
+++ b/meta/recipes-graphics/tslib/tslib/fix_version.patch
diff --git a/meta/packages/tslib/tslib/jornada56x/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf
index 20729b615..20729b615 100644
--- a/meta/packages/tslib/tslib/jornada56x/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/jornada56x/ts.conf
diff --git a/meta/packages/tslib/tslib/jornada56x/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh
index 8f907b075..8f907b075 100644
--- a/meta/packages/tslib/tslib/jornada56x/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/jornada56x/tslib.sh
diff --git a/meta/packages/tslib/tslib/jornada6xx/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf
index 20729b615..20729b615 100644
--- a/meta/packages/tslib/tslib/jornada6xx/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/jornada6xx/ts.conf
diff --git a/meta/packages/tslib/tslib/jornada6xx/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh
index 1b5db781c..1b5db781c 100644
--- a/meta/packages/tslib/tslib/jornada6xx/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/jornada6xx/tslib.sh
diff --git a/meta/packages/tslib/tslib/jornada7xx/ts.conf b/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf
index 09309719f..09309719f 100644
--- a/meta/packages/tslib/tslib/jornada7xx/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/jornada7xx/ts.conf
diff --git a/meta/packages/tslib/tslib/jornada7xx/tslib.sh b/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh
index 040f4de3d..040f4de3d 100644
--- a/meta/packages/tslib/tslib/jornada7xx/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/jornada7xx/tslib.sh
diff --git a/meta/packages/tslib/tslib/mnci/ts.conf b/meta/recipes-graphics/tslib/tslib/mnci/ts.conf
index adff17717..adff17717 100644
--- a/meta/packages/tslib/tslib/mnci/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/mnci/ts.conf
diff --git a/meta/packages/tslib/tslib/mnci/tslib.sh b/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh
index 07928f226..07928f226 100644
--- a/meta/packages/tslib/tslib/mnci/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/mnci/tslib.sh
diff --git a/meta/packages/tslib/tslib/multievent.patch b/meta/recipes-graphics/tslib/tslib/multievent.patch
index 854e7af5d..854e7af5d 100644
--- a/meta/packages/tslib/tslib/multievent.patch
+++ b/meta/recipes-graphics/tslib/tslib/multievent.patch
diff --git a/meta/packages/tslib/tslib/netbook-pro/ts.conf b/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf
index 6d94a8f46..6d94a8f46 100644
--- a/meta/packages/tslib/tslib/netbook-pro/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/netbook-pro/ts.conf
diff --git a/meta/packages/tslib/tslib/netbook-pro/tslib.sh b/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh
index d31bc7636..d31bc7636 100644
--- a/meta/packages/tslib/tslib/netbook-pro/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/netbook-pro/tslib.sh
diff --git a/meta/packages/tslib/tslib/omap1610h2/tslib.sh b/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh
index 040f4de3d..040f4de3d 100644
--- a/meta/packages/tslib/tslib/omap1610h2/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/omap1610h2/tslib.sh
diff --git a/meta/packages/tslib/tslib/omap5912osk/tslib.sh b/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh
index 6bb56651f..6bb56651f 100644
--- a/meta/packages/tslib/tslib/omap5912osk/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/omap5912osk/tslib.sh
diff --git a/meta/packages/tslib/tslib/simpad/tslib.sh b/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh
index 9c4eb1e0f..9c4eb1e0f 100644
--- a/meta/packages/tslib/tslib/simpad/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/simpad/tslib.sh
diff --git a/meta/packages/tslib/tslib/ts.conf b/meta/recipes-graphics/tslib/tslib/ts.conf
index 1b0da937e..1b0da937e 100644
--- a/meta/packages/tslib/tslib/ts.conf
+++ b/meta/recipes-graphics/tslib/tslib/ts.conf
diff --git a/meta/packages/tslib/tslib/ts.conf-collie-2.4 b/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4
index 2099b9b41..2099b9b41 100644
--- a/meta/packages/tslib/tslib/ts.conf-collie-2.4
+++ b/meta/recipes-graphics/tslib/tslib/ts.conf-collie-2.4
diff --git a/meta/packages/tslib/tslib/ts.conf-simpad-2.4 b/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4
index 035e794cb..035e794cb 100644
--- a/meta/packages/tslib/tslib/ts.conf-simpad-2.4
+++ b/meta/recipes-graphics/tslib/tslib/ts.conf-simpad-2.4
diff --git a/meta/packages/tslib/tslib/tslib.sh b/meta/recipes-graphics/tslib/tslib/tslib.sh
index 7068e8d92..7068e8d92 100644
--- a/meta/packages/tslib/tslib/tslib.sh
+++ b/meta/recipes-graphics/tslib/tslib/tslib.sh
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index 12c0ace8f..12c0ace8f 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
diff --git a/meta/packages/ttf-fonts/liberation-fonts/30-liberation-aliases.conf b/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
index 06094503c..06094503c 100644
--- a/meta/packages/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
diff --git a/meta/packages/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
index 6b887e31b..6b887e31b 100644
--- a/meta/packages/ttf-fonts/liberation-fonts_1.04.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
diff --git a/meta/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index a6f4cd62f..a6f4cd62f 100644
--- a/meta/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xdefaults b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
index f5b69dd51..f5b69dd51 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xdefaults
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
index 3d4aa74b9..3d4aa74b9 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
index a87447a87..a87447a87 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
index a9d102c74..a9d102c74 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
index db7aa229d..db7aa229d 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
index b936dedf3..b936dedf3 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
diff --git a/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap b/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
index 05a13fa3c..05a13fa3c 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap
diff --git a/meta/packages/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 6791f961a..6791f961a 100644
--- a/meta/packages/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
diff --git a/meta/packages/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index c77b2f0f8..c77b2f0f8 100644
--- a/meta/packages/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
diff --git a/meta/packages/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index 69ea94972..69ea94972 100755
--- a/meta/packages/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
diff --git a/meta/packages/xcb/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb
index 8ded7a074..8ded7a074 100644
--- a/meta/packages/xcb/libpthread-stubs_0.3.bb
+++ b/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb
diff --git a/meta/packages/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc
index 37d1f8633..37d1f8633 100644
--- a/meta/packages/xcb/libxcb.inc
+++ b/meta/recipes-graphics/xcb/libxcb.inc
diff --git a/meta/packages/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
index cef635096..cef635096 100644
--- a/meta/packages/xcb/libxcb/xcbincludedir.patch
+++ b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
diff --git a/meta/packages/xcb/libxcb_1.1.91.bb b/meta/recipes-graphics/xcb/libxcb_1.1.91.bb
index ae0cc5761..ae0cc5761 100644
--- a/meta/packages/xcb/libxcb_1.1.91.bb
+++ b/meta/recipes-graphics/xcb/libxcb_1.1.91.bb
diff --git a/meta/packages/xcb/libxcb_1.6.bb b/meta/recipes-graphics/xcb/libxcb_1.6.bb
index fc80927be..fc80927be 100644
--- a/meta/packages/xcb/libxcb_1.6.bb
+++ b/meta/recipes-graphics/xcb/libxcb_1.6.bb
diff --git a/meta/packages/xcb/libxcb_git.bb b/meta/recipes-graphics/xcb/libxcb_git.bb
index b9ac07341..b9ac07341 100644
--- a/meta/packages/xcb/libxcb_git.bb
+++ b/meta/recipes-graphics/xcb/libxcb_git.bb
diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index 2e1810f6f..2e1810f6f 100644
--- a/meta/packages/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
diff --git a/meta/packages/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
index a367b7cac..a367b7cac 100644
--- a/meta/packages/xcb/xcb-proto_1.6.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
diff --git a/meta/packages/xcb/xcb-proto_git.bb b/meta/recipes-graphics/xcb/xcb-proto_git.bb
index b96fc121c..b96fc121c 100644
--- a/meta/packages/xcb/xcb-proto_git.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_git.bb
diff --git a/meta/packages/xcb/xcb-util.inc b/meta/recipes-graphics/xcb/xcb-util.inc
index 6bda3d0bf..6bda3d0bf 100644
--- a/meta/packages/xcb/xcb-util.inc
+++ b/meta/recipes-graphics/xcb/xcb-util.inc
diff --git a/meta/packages/xcb/xcb-util_0.3.6.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
index b0e50d85c..b0e50d85c 100644
--- a/meta/packages/xcb/xcb-util_0.3.6.bb
+++ b/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
diff --git a/meta/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
index 73a5b2a87..73a5b2a87 100644
--- a/meta/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
diff --git a/meta/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
index df28dfbc8..df28dfbc8 100644
--- a/meta/packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
diff --git a/meta/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 67ca086be..67ca086be 100644
--- a/meta/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
diff --git a/meta/packages/xorg-app/mkfontdir_1.0.5.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
index ebd577572..ebd577572 100644
--- a/meta/packages/xorg-app/mkfontdir_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.5.bb
diff --git a/meta/packages/xorg-app/mkfontscale_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
index 46a73111b..46a73111b 100644
--- a/meta/packages/xorg-app/mkfontscale_1.0.7.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.0.7.bb
diff --git a/meta/packages/xorg-app/x11perf_1.5.bb b/meta/recipes-graphics/xorg-app/x11perf_1.5.bb
index 35680e792..35680e792 100644
--- a/meta/packages/xorg-app/x11perf_1.5.bb
+++ b/meta/recipes-graphics/xorg-app/x11perf_1.5.bb
diff --git a/meta/packages/xorg-app/xauth_1.0.4.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.4.bb
index d5f35768a..d5f35768a 100644
--- a/meta/packages/xorg-app/xauth_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-app/xauth_1.0.4.bb
diff --git a/meta/packages/xorg-app/xbacklight_1.1.bb b/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb
index 78804d734..78804d734 100644
--- a/meta/packages/xorg-app/xbacklight_1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb
diff --git a/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
index 24af21f4f..24af21f4f 100644
--- a/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
diff --git a/meta/packages/xorg-app/xdpyinfo_1.1.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.1.0.bb
index f5d47e139..f5d47e139 100644
--- a/meta/packages/xorg-app/xdpyinfo_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.1.0.bb
diff --git a/meta/packages/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
index 9f515e8c7..9f515e8c7 100644
--- a/meta/packages/xorg-app/xev/diet-x11.patch
+++ b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
diff --git a/meta/packages/xorg-app/xev_1.0.3.bb b/meta/recipes-graphics/xorg-app/xev_1.0.3.bb
index b7a4070a8..b7a4070a8 100644
--- a/meta/packages/xorg-app/xev_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-app/xev_1.0.3.bb
diff --git a/meta/packages/xorg-app/xeyes_1.0.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb
index 07ce0724f..07ce0724f 100644
--- a/meta/packages/xorg-app/xeyes_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb
diff --git a/meta/packages/xorg-app/xhost_1.0.3.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
index 2c643d81a..2c643d81a 100644
--- a/meta/packages/xorg-app/xhost_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-app/xhost_1.0.3.bb
diff --git a/meta/packages/xorg-app/xinit_1.2.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.2.1.bb
index 7a083a788..7a083a788 100644
--- a/meta/packages/xorg-app/xinit_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.2.1.bb
diff --git a/meta/packages/xorg-app/xkbcomp_1.1.1.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
index bc2b788ba..bc2b788ba 100644
--- a/meta/packages/xorg-app/xkbcomp_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
diff --git a/meta/packages/xorg-app/xmodmap_1.0.4.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.4.bb
index d7d31e267..d7d31e267 100644
--- a/meta/packages/xorg-app/xmodmap_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.4.bb
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 4add357cc..4add357cc 100644
--- a/meta/packages/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
diff --git a/meta/packages/xorg-app/xprop_1.1.0.bb b/meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
index e9b0b2ee7..e9b0b2ee7 100644
--- a/meta/packages/xorg-app/xprop_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xprop_1.1.0.bb
diff --git a/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch b/meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
index 1ecf9563f..1ecf9563f 100644
--- a/meta/packages/xorg-app/xrandr/resolve_symbol_clash.patch
+++ b/meta/recipes-graphics/xorg-app/xrandr/resolve_symbol_clash.patch
diff --git a/meta/packages/xorg-app/xrandr_1.3.2.bb b/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb
index 3ddccb249..3ddccb249 100644
--- a/meta/packages/xorg-app/xrandr_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-app/xrandr_1.3.2.bb
diff --git a/meta/packages/xorg-app/xrdb/60XDefaults.sh b/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
index 08d8beca3..08d8beca3 100644
--- a/meta/packages/xorg-app/xrdb/60XDefaults.sh
+++ b/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
diff --git a/meta/packages/xorg-app/xrdb_1.0.5.bb b/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb
index 906d7d852..906d7d852 100644
--- a/meta/packages/xorg-app/xrdb_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb
diff --git a/meta/packages/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index 6060fbb99..6060fbb99 100644
--- a/meta/packages/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
diff --git a/meta/packages/xorg-app/xset_1.1.0.bb b/meta/recipes-graphics/xorg-app/xset_1.1.0.bb
index 817b09721..817b09721 100644
--- a/meta/packages/xorg-app/xset_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.1.0.bb
diff --git a/meta/packages/xorg-app/xvinfo_1.0.2.bb b/meta/recipes-graphics/xorg-app/xvinfo_1.0.2.bb
index ac27f13f3..ac27f13f3 100644
--- a/meta/packages/xorg-app/xvinfo_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-app/xvinfo_1.0.2.bb
diff --git a/meta/packages/xorg-app/xwininfo_1.0.5.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.0.5.bb
index bd3e3e758..bd3e3e758 100644
--- a/meta/packages/xorg-app/xwininfo_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-app/xwininfo_1.0.5.bb
diff --git a/meta/packages/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
index 550423b0f..550423b0f 100644
--- a/meta/packages/xorg-driver/xf86-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
diff --git a/meta/packages/xorg-driver/xf86-input-common.inc b/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
index 6fc88cf9d..6fc88cf9d 100644
--- a/meta/packages/xorg-driver/xf86-input-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb
index fad47fbc0..fad47fbc0 100644
--- a/meta/packages/xorg-driver/xf86-input-evdev_2.4.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
index 1efb505e2..1efb505e2 100644
--- a/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
index a6744bda6..a6744bda6 100644
--- a/meta/packages/xorg-driver/xf86-input-keyboard_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
diff --git a/meta/packages/xorg-driver/xf86-input-mouse/unbreak.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
index 665b320df..665b320df 100644
--- a/meta/packages/xorg-driver/xf86-input-mouse/unbreak.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb
index 44d60bf75..44d60bf75 100644
--- a/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
index 94dedf104..94dedf104 100644
--- a/meta/packages/xorg-driver/xf86-input-mouse_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
index 81128394c..81128394c 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
index f7dc3b731..f7dc3b731 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
diff --git a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.9.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb
index 36418ad59..36418ad59 100644
--- a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.9.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb
diff --git a/meta/packages/xorg-driver/xf86-video-common.inc b/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
index f2e28170e..f2e28170e 100644
--- a/meta/packages/xorg-driver/xf86-video-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
index 968c20167..968c20167 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_2.12.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
diff --git a/meta/packages/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 7011b7ea7..7011b7ea7 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
diff --git a/meta/packages/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
index 325ca66f0..325ca66f0 100644
--- a/meta/packages/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
diff --git a/meta/packages/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 15bef8719..15bef8719 100644
--- a/meta/packages/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
diff --git a/meta/packages/xorg-driver/xf86-video-vesa_2.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
index 3212004db..3212004db 100644
--- a/meta/packages/xorg-driver/xf86-video-vesa_2.3.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
diff --git a/meta/packages/xorg-driver/xf86-video-vmware_11.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb
index 56daa86c8..56daa86c8 100644
--- a/meta/packages/xorg-driver/xf86-video-vmware_11.0.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb
diff --git a/meta/packages/xorg-font/encodings_1.0.3.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.3.bb
index 02a199fc6..02a199fc6 100644
--- a/meta/packages/xorg-font/encodings_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-font/encodings_1.0.3.bb
diff --git a/meta/packages/xorg-font/font-alias-1.0.2/fix_COPYING_1f8141a5e3b585dfccc748400b05c9c24b41e767.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.2/fix_COPYING_1f8141a5e3b585dfccc748400b05c9c24b41e767.patch
index db0bd27d4..db0bd27d4 100644
--- a/meta/packages/xorg-font/font-alias-1.0.2/fix_COPYING_1f8141a5e3b585dfccc748400b05c9c24b41e767.patch
+++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.2/fix_COPYING_1f8141a5e3b585dfccc748400b05c9c24b41e767.patch
diff --git a/meta/packages/xorg-font/font-alias_1.0.2.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.2.bb
index 11ad407f3..11ad407f3 100644
--- a/meta/packages/xorg-font/font-alias_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.2.bb
diff --git a/meta/packages/xorg-font/font-util_1.1.1.bb b/meta/recipes-graphics/xorg-font/font-util_1.1.1.bb
index ba4623632..ba4623632 100644
--- a/meta/packages/xorg-font/font-util_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.1.1.bb
diff --git a/meta/packages/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
index c2175a961..c2175a961 100644
--- a/meta/packages/xorg-font/xorg-font-common.inc
+++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 26a64cdd6..26a64cdd6 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
index 8bc8570a4..8bc8570a4 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
index 8fa829015..8fa829015 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
index bb1c5e138..bb1c5e138 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
index 842fa1b41..842fa1b41 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
index cd119b66d..cd119b66d 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
index 25fe84a0e..25fe84a0e 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
index e362c70ce..e362c70ce 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
index 176a7591c..176a7591c 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
index a4faf1a6c..a4faf1a6c 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
index 96ddd1525..96ddd1525 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
index 541a2ad2c..541a2ad2c 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
index a4986f406..a4986f406 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
index 3f89abe77..3f89abe77 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
index 432b53622..432b53622 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
index e7fcb898e..e7fcb898e 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
index 2df635537..2df635537 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
index a263c5dd3..a263c5dd3 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
index a1a7d37e6..a1a7d37e6 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
index a148e99bc..a148e99bc 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
index 8791b8ca3..8791b8ca3 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
index 860450868..860450868 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
index f28b1f1c4..f28b1f1c4 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
index fd1e6cfe9..fd1e6cfe9 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
index 672b75942..672b75942 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
index d90a4330d..d90a4330d 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
index 775e7c18b..775e7c18b 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
index ac12fd98a..ac12fd98a 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
index 42bbd5221..42bbd5221 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
index 690d31f86..690d31f86 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
index d4c3184c7..d4c3184c7 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
index 884b5130c..884b5130c 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
index cbb1a9d70..cbb1a9d70 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
index 78c8580cf..78c8580cf 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
index 0e90f3ee1..0e90f3ee1 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
index bd1273e1f..bd1273e1f 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
index 5100b429a..5100b429a 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
index ec5bbed29..ec5bbed29 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
index 06c835ee6..06c835ee6 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
index 478541c2a..478541c2a 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
index 1c593ce0c..1c593ce0c 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
index 335cf5fc3..335cf5fc3 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
index 099423e64..099423e64 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
index 4a546ddb1..4a546ddb1 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
index 72eb72bbe..72eb72bbe 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.alias
index 390003673..390003673 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.alias
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
index 0a2718f7b..0a2718f7b 100644
--- a/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
diff --git a/meta/packages/xorg-lib/libapplewm_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb
index bc502fb50..bc502fb50 100644
--- a/meta/packages/xorg-lib/libapplewm_1.0.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb
diff --git a/meta/packages/xorg-lib/libdmx_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.0.bb
index 20523b894..20523b894 100644
--- a/meta/packages/xorg-lib/libdmx_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.0.bb
diff --git a/meta/packages/xorg-lib/libfontenc_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.0.5.bb
index dc7b62d02..dc7b62d02 100644
--- a/meta/packages/xorg-lib/libfontenc_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libfs_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb
index 010aa311e..010aa311e 100644
--- a/meta/packages/xorg-lib/libfs_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb
diff --git a/meta/packages/xorg-lib/libice_1.0.6.bb b/meta/recipes-graphics/xorg-lib/libice_1.0.6.bb
index ec3ad136a..ec3ad136a 100644
--- a/meta/packages/xorg-lib/libice_1.0.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libice_1.0.6.bb
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch b/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
index 029d761d9..029d761d9 100644
--- a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
+++ b/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
diff --git a/meta/packages/xorg-lib/liblbxutil_1.1.0.bb b/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
index cdf350924..cdf350924 100644
--- a/meta/packages/xorg-lib/liblbxutil_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
diff --git a/meta/packages/xorg-lib/liboldx_1.0.1.bb b/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb
index 84470cbc7..84470cbc7 100644
--- a/meta/packages/xorg-lib/liboldx_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb
diff --git a/meta/packages/xorg-lib/libpciaccess_0.11.0.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.11.0.bb
index b4032c0a1..b4032c0a1 100644
--- a/meta/packages/xorg-lib/libpciaccess_0.11.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.11.0.bb
diff --git a/meta/packages/xorg-lib/libsm_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libsm_1.1.1.bb
index 0ec38c5aa..0ec38c5aa 100644
--- a/meta/packages/xorg-lib/libsm_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libsm_1.1.1.bb
diff --git a/meta/packages/xorg-lib/libwindowswm_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb
index a03d49505..a03d49505 100644
--- a/meta/packages/xorg-lib/libwindowswm_1.0.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb
diff --git a/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
index c8aa08595..c8aa08595 100644
--- a/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
diff --git a/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
index 011c23e8d..011c23e8d 100644
--- a/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
diff --git a/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
index 4036757e5..4036757e5 100644
--- a/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
diff --git a/meta/packages/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index a76aba16e..a76aba16e 100644
--- a/meta/packages/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
diff --git a/meta/packages/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
index d1f0a753f..d1f0a753f 100644
--- a/meta/packages/xorg-lib/libx11-diet_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
diff --git a/meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
index 2dd27fc94..2dd27fc94 100644
--- a/meta/packages/xorg-lib/libx11-git/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
diff --git a/meta/packages/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
index 9dbf6dac6..9dbf6dac6 100644
--- a/meta/packages/xorg-lib/libx11-git/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
diff --git a/meta/packages/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
index a098db194..a098db194 100644
--- a/meta/packages/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
diff --git a/meta/packages/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
index 99ed57194..99ed57194 100644
--- a/meta/packages/xorg-lib/libx11-git/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
diff --git a/meta/packages/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
index ecf9625ca..ecf9625ca 100644
--- a/meta/packages/xorg-lib/libx11-git/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
diff --git a/meta/packages/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
index 9cc2bbbbd..9cc2bbbbd 100644
--- a/meta/packages/xorg-lib/libx11-git/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
diff --git a/meta/packages/xorg-lib/libx11-git/xim.patch b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
index 0eab197a8..0eab197a8 100644
--- a/meta/packages/xorg-lib/libx11-git/xim.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
diff --git a/meta/packages/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
index 99ed57194..99ed57194 100644
--- a/meta/packages/xorg-lib/libx11-trim/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
diff --git a/meta/packages/xorg-lib/libx11-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
index ecf9625ca..ecf9625ca 100644
--- a/meta/packages/xorg-lib/libx11-trim/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
diff --git a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
index 670578257..670578257 100644
--- a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
diff --git a/meta/packages/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 190217d38..190217d38 100644
--- a/meta/packages/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
diff --git a/meta/packages/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
index 99426c3c5..99426c3c5 100644
--- a/meta/packages/xorg-lib/libx11-trim_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
diff --git a/meta/packages/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index f8c17b1a6..f8c17b1a6 100644
--- a/meta/packages/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
diff --git a/meta/packages/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 54b1727a9..54b1727a9 100644
--- a/meta/packages/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
diff --git a/meta/packages/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
index 9dbf6dac6..9dbf6dac6 100644
--- a/meta/packages/xorg-lib/libx11/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
diff --git a/meta/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index a098db194..a098db194 100644
--- a/meta/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
diff --git a/meta/packages/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
index 99ed57194..99ed57194 100644
--- a/meta/packages/xorg-lib/libx11/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
diff --git a/meta/packages/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
index ecf9625ca..ecf9625ca 100644
--- a/meta/packages/xorg-lib/libx11/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
diff --git a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
index 670578257..670578257 100644
--- a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
diff --git a/meta/packages/xorg-lib/libx11/xim.patch b/meta/recipes-graphics/xorg-lib/libx11/xim.patch
index 0eab197a8..0eab197a8 100644
--- a/meta/packages/xorg-lib/libx11/xim.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/xim.patch
diff --git a/meta/packages/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
index aaeb38e2d..aaeb38e2d 100644
--- a/meta/packages/xorg-lib/libx11_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
index a976a16cd..a976a16cd 100644
--- a/meta/packages/xorg-lib/libx11_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_git.bb
diff --git a/meta/packages/xorg-lib/libx11_git.inc b/meta/recipes-graphics/xorg-lib/libx11_git.inc
index 40d806178..40d806178 100644
--- a/meta/packages/xorg-lib/libx11_git.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11_git.inc
diff --git a/meta/packages/xorg-lib/libxau_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.5.bb
index 65374611b..65374611b 100644
--- a/meta/packages/xorg-lib/libxau_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libxaw_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
index 489f45664..489f45664 100644
--- a/meta/packages/xorg-lib/libxaw_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
index 0d7efc70f..0d7efc70f 100644
--- a/meta/packages/xorg-lib/libxcalibrate/fix-xcb.patch
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
diff --git a/meta/packages/xorg-lib/libxcalibrate_git.bb b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
index 8ca731b2e..8ca731b2e 100644
--- a/meta/packages/xorg-lib/libxcalibrate_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
index 9b10d1a26..9b10d1a26 100644
--- a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
diff --git a/meta/packages/xorg-lib/libxcomposite_0.4.1.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb
index 8c5ca022c..8c5ca022c 100644
--- a/meta/packages/xorg-lib/libxcomposite_0.4.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb
diff --git a/meta/packages/xorg-lib/libxcursor_1.1.10.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.10.bb
index 4b0a3b1ab..4b0a3b1ab 100644
--- a/meta/packages/xorg-lib/libxcursor_1.1.10.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.1.10.bb
diff --git a/meta/packages/xorg-lib/libxdamage_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.2.bb
index 2ea9891c9..2ea9891c9 100644
--- a/meta/packages/xorg-lib/libxdamage_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.2.bb
diff --git a/meta/packages/xorg-lib/libxdmcp_1.0.3.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.0.3.bb
index b1648fbf3..b1648fbf3 100644
--- a/meta/packages/xorg-lib/libxdmcp_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.0.3.bb
diff --git a/meta/packages/xorg-lib/libxevie_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
index 6c6b4595a..6c6b4595a 100644
--- a/meta/packages/xorg-lib/libxevie_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
diff --git a/meta/packages/xorg-lib/libxext_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxext_1.1.2.bb
index 14e6c1fb7..14e6c1fb7 100644
--- a/meta/packages/xorg-lib/libxext_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxext_1.1.2.bb
diff --git a/meta/packages/xorg-lib/libxext_git.bb b/meta/recipes-graphics/xorg-lib/libxext_git.bb
index d0b3d7fbf..d0b3d7fbf 100644
--- a/meta/packages/xorg-lib/libxext_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libxext_git.bb
diff --git a/meta/packages/xorg-lib/libxfixes_4.0.4.bb b/meta/recipes-graphics/xorg-lib/libxfixes_4.0.4.bb
index b3ee0711d..b3ee0711d 100644
--- a/meta/packages/xorg-lib/libxfixes_4.0.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfixes_4.0.4.bb
diff --git a/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
index 90bded6fb..90bded6fb 100644
--- a/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch
+++ b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
diff --git a/meta/packages/xorg-lib/libxfont_1.4.2.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.4.2.bb
index 6aa83c4ac..6aa83c4ac 100644
--- a/meta/packages/xorg-lib/libxfont_1.4.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.4.2.bb
diff --git a/meta/packages/xorg-lib/libxfontcache_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb
index 97f7ed627..97f7ed627 100644
--- a/meta/packages/xorg-lib/libxfontcache_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libxft_2.1.14.bb b/meta/recipes-graphics/xorg-lib/libxft_2.1.14.bb
index 7f5ccdd0f..7f5ccdd0f 100644
--- a/meta/packages/xorg-lib/libxft_2.1.14.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.1.14.bb
diff --git a/meta/packages/xorg-lib/libxi_1.3.bb b/meta/recipes-graphics/xorg-lib/libxi_1.3.bb
index bd21eadd1..bd21eadd1 100644
--- a/meta/packages/xorg-lib/libxi_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.3.bb
diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/recipes-graphics/xorg-lib/libxi_git.bb
index 30c1778c3..30c1778c3 100644
--- a/meta/packages/xorg-lib/libxi_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_git.bb
diff --git a/meta/packages/xorg-lib/libxinerama_1.1.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.bb
index 35a967cff..35a967cff 100644
--- a/meta/packages/xorg-lib/libxinerama_1.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.bb
diff --git a/meta/packages/xorg-lib/libxkbfile_1.0.6.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.6.bb
index f46c147e4..f46c147e4 100644
--- a/meta/packages/xorg-lib/libxkbfile_1.0.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.6.bb
diff --git a/meta/packages/xorg-lib/libxkbui_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
index 9a3f5f132..9a3f5f132 100644
--- a/meta/packages/xorg-lib/libxkbui_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
diff --git a/meta/packages/xorg-lib/libxmu_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.0.5.bb
index 761746e2c..761746e2c 100644
--- a/meta/packages/xorg-lib/libxmu_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxmu_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libxp_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libxp_1.0.0.bb
index 7d3b87473..7d3b87473 100644
--- a/meta/packages/xorg-lib/libxp_1.0.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxp_1.0.0.bb
diff --git a/meta/packages/xorg-lib/libxpm_3.5.7.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.7.bb
index 75c10bf2c..75c10bf2c 100644
--- a/meta/packages/xorg-lib/libxpm_3.5.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.7.bb
diff --git a/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb
index 3a24a888d..3a24a888d 100644
--- a/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxprintapputil_1.0.1.bb
diff --git a/meta/packages/xorg-lib/libxprintutil_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb
index 327138e7f..327138e7f 100644
--- a/meta/packages/xorg-lib/libxprintutil_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxprintutil_1.0.1.bb
diff --git a/meta/packages/xorg-lib/libxrandr_1.3.0.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.3.0.bb
index 461dff424..461dff424 100644
--- a/meta/packages/xorg-lib/libxrandr_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.3.0.bb
diff --git a/meta/packages/xorg-lib/libxrender_0.9.5.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.5.bb
index 662796e90..662796e90 100644
--- a/meta/packages/xorg-lib/libxrender_0.9.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.5.bb
diff --git a/meta/packages/xorg-lib/libxres_1.0.4.bb b/meta/recipes-graphics/xorg-lib/libxres_1.0.4.bb
index 5c8c47ccb..5c8c47ccb 100644
--- a/meta/packages/xorg-lib/libxres_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxres_1.0.4.bb
diff --git a/meta/packages/xorg-lib/libxscrnsaver_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.0.bb
index ff22c337a..ff22c337a 100644
--- a/meta/packages/xorg-lib/libxscrnsaver_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.0.bb
diff --git a/meta/packages/xorg-lib/libxt_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxt_1.0.8.bb
index a35d03eb0..a35d03eb0 100644
--- a/meta/packages/xorg-lib/libxt_1.0.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.0.8.bb
diff --git a/meta/packages/xorg-lib/libxtrap_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb
index 7a25ae5bc..7a25ae5bc 100644
--- a/meta/packages/xorg-lib/libxtrap_1.0.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxtrap_1.0.0.bb
diff --git a/meta/packages/xorg-lib/libxtst_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxtst_1.1.0.bb
index bd18fb3c6..bd18fb3c6 100644
--- a/meta/packages/xorg-lib/libxtst_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxtst_1.1.0.bb
diff --git a/meta/packages/xorg-lib/libxv_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxv_1.0.5.bb
index d6e5777bc..d6e5777bc 100644
--- a/meta/packages/xorg-lib/libxv_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxv_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libxvmc_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.5.bb
index 7a8013fa5..7a8013fa5 100644
--- a/meta/packages/xorg-lib/libxvmc_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.5.bb
diff --git a/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.1.bb
index 6d5bd6aaa..6d5bd6aaa 100644
--- a/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.1.bb
diff --git a/meta/packages/xorg-lib/libxxf86misc_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.2.bb
index 8284dac23..8284dac23 100644
--- a/meta/packages/xorg-lib/libxxf86misc_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.2.bb
diff --git a/meta/packages/xorg-lib/libxxf86vm_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.0.bb
index 7dc4a3a12..7dc4a3a12 100644
--- a/meta/packages/xorg-lib/libxxf86vm_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.0.bb
diff --git a/meta/packages/xorg-lib/pixman_0.18.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb
index 3bc1f0202..3bc1f0202 100644
--- a/meta/packages/xorg-lib/pixman_0.18.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.18.2.bb
diff --git a/meta/packages/xorg-lib/xkeyboard-config_1.9.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_1.9.bb
index 0e59bd506..0e59bd506 100644
--- a/meta/packages/xorg-lib/xkeyboard-config_1.9.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_1.9.bb
diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 4ed8c866e..4ed8c866e 100644
--- a/meta/packages/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
diff --git a/meta/packages/xorg-lib/xtrans/abstract_socket_fix.patch b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
index 197da0735..197da0735 100644
--- a/meta/packages/xorg-lib/xtrans/abstract_socket_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
diff --git a/meta/packages/xorg-lib/xtrans_1.2.5.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.2.5.bb
index 52609b7e2..52609b7e2 100644
--- a/meta/packages/xorg-lib/xtrans_1.2.5.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.2.5.bb
diff --git a/meta/packages/xorg-proto/applewmproto_1.4.1.bb b/meta/recipes-graphics/xorg-proto/applewmproto_1.4.1.bb
index 9f09fff7b..9f09fff7b 100644
--- a/meta/packages/xorg-proto/applewmproto_1.4.1.bb
+++ b/meta/recipes-graphics/xorg-proto/applewmproto_1.4.1.bb
diff --git a/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.0.bb
index 0ea0729bc..0ea0729bc 100644
--- a/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.0.bb
diff --git a/meta/packages/xorg-proto/calibrateproto/fix.patch b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
index 0c85cb0cc..0c85cb0cc 100644
--- a/meta/packages/xorg-proto/calibrateproto/fix.patch
+++ b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
diff --git a/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
index 9fd5c3fe0..9fd5c3fe0 100644
--- a/meta/packages/xorg-proto/calibrateproto_git.bb
+++ b/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
diff --git a/meta/packages/xorg-proto/compositeproto_0.4.bb b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.bb
index 191053b1c..191053b1c 100644
--- a/meta/packages/xorg-proto/compositeproto_0.4.bb
+++ b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.bb
diff --git a/meta/packages/xorg-proto/damageproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/damageproto_1.2.0.bb
index af61d03af..af61d03af 100644
--- a/meta/packages/xorg-proto/damageproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/damageproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/dmxproto_2.3.bb b/meta/recipes-graphics/xorg-proto/dmxproto_2.3.bb
index 635c63f99..635c63f99 100644
--- a/meta/packages/xorg-proto/dmxproto_2.3.bb
+++ b/meta/recipes-graphics/xorg-proto/dmxproto_2.3.bb
diff --git a/meta/packages/xorg-proto/dri2proto_2.3.bb b/meta/recipes-graphics/xorg-proto/dri2proto_2.3.bb
index 048c27f55..048c27f55 100644
--- a/meta/packages/xorg-proto/dri2proto_2.3.bb
+++ b/meta/recipes-graphics/xorg-proto/dri2proto_2.3.bb
diff --git a/meta/packages/xorg-proto/dri2proto_git.bb b/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
index a5ad7d091..a5ad7d091 100644
--- a/meta/packages/xorg-proto/dri2proto_git.bb
+++ b/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
diff --git a/meta/packages/xorg-proto/evieext_1.1.0.bb b/meta/recipes-graphics/xorg-proto/evieext_1.1.0.bb
index 16f9039b9..16f9039b9 100644
--- a/meta/packages/xorg-proto/evieext_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-proto/evieext_1.1.0.bb
diff --git a/meta/packages/xorg-proto/fixesproto_4.1.1.bb b/meta/recipes-graphics/xorg-proto/fixesproto_4.1.1.bb
index cb709f784..cb709f784 100644
--- a/meta/packages/xorg-proto/fixesproto_4.1.1.bb
+++ b/meta/recipes-graphics/xorg-proto/fixesproto_4.1.1.bb
diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb b/meta/recipes-graphics/xorg-proto/fontcacheproto_0.1.3.bb
index 302e84a56..302e84a56 100644
--- a/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb
+++ b/meta/recipes-graphics/xorg-proto/fontcacheproto_0.1.3.bb
diff --git a/meta/packages/xorg-proto/fontsproto_2.1.0.bb b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.0.bb
index 74b2fed79..74b2fed79 100644
--- a/meta/packages/xorg-proto/fontsproto_2.1.0.bb
+++ b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.0.bb
diff --git a/meta/packages/xorg-proto/glproto_1.4.11.bb b/meta/recipes-graphics/xorg-proto/glproto_1.4.11.bb
index c1ade41f2..c1ade41f2 100644
--- a/meta/packages/xorg-proto/glproto_1.4.11.bb
+++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.11.bb
diff --git a/meta/packages/xorg-proto/inputproto_2.0.bb b/meta/recipes-graphics/xorg-proto/inputproto_2.0.bb
index f3332a8ca..f3332a8ca 100644
--- a/meta/packages/xorg-proto/inputproto_2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/inputproto_2.0.bb
diff --git a/meta/packages/xorg-proto/inputproto_git.bb b/meta/recipes-graphics/xorg-proto/inputproto_git.bb
index a97fb0bfa..a97fb0bfa 100644
--- a/meta/packages/xorg-proto/inputproto_git.bb
+++ b/meta/recipes-graphics/xorg-proto/inputproto_git.bb
diff --git a/meta/packages/xorg-proto/kbproto_1.0.4.bb b/meta/recipes-graphics/xorg-proto/kbproto_1.0.4.bb
index b49d5a692..b49d5a692 100644
--- a/meta/packages/xorg-proto/kbproto_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-proto/kbproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/printproto_1.0.4.bb b/meta/recipes-graphics/xorg-proto/printproto_1.0.4.bb
index 194abbafc..194abbafc 100644
--- a/meta/packages/xorg-proto/printproto_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-proto/printproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/randrproto_1.3.1.bb b/meta/recipes-graphics/xorg-proto/randrproto_1.3.1.bb
index 725be1d70..725be1d70 100644
--- a/meta/packages/xorg-proto/randrproto_1.3.1.bb
+++ b/meta/recipes-graphics/xorg-proto/randrproto_1.3.1.bb
diff --git a/meta/packages/xorg-proto/recordproto_1.14.bb b/meta/recipes-graphics/xorg-proto/recordproto_1.14.bb
index abb91d769..abb91d769 100644
--- a/meta/packages/xorg-proto/recordproto_1.14.bb
+++ b/meta/recipes-graphics/xorg-proto/recordproto_1.14.bb
diff --git a/meta/packages/xorg-proto/renderproto_0.11.bb b/meta/recipes-graphics/xorg-proto/renderproto_0.11.bb
index afdbb0509..afdbb0509 100644
--- a/meta/packages/xorg-proto/renderproto_0.11.bb
+++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.bb
diff --git a/meta/packages/xorg-proto/resourceproto_1.1.0.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.1.0.bb
index 702e8f36f..702e8f36f 100644
--- a/meta/packages/xorg-proto/resourceproto_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.1.0.bb
diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.0.bb
index cd992516e..cd992516e 100644
--- a/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/trapproto_3.4.3.bb b/meta/recipes-graphics/xorg-proto/trapproto_3.4.3.bb
index c152be703..c152be703 100644
--- a/meta/packages/xorg-proto/trapproto_3.4.3.bb
+++ b/meta/recipes-graphics/xorg-proto/trapproto_3.4.3.bb
diff --git a/meta/packages/xorg-proto/videoproto_2.3.0.bb b/meta/recipes-graphics/xorg-proto/videoproto_2.3.0.bb
index baedc281c..baedc281c 100644
--- a/meta/packages/xorg-proto/videoproto_2.3.0.bb
+++ b/meta/recipes-graphics/xorg-proto/videoproto_2.3.0.bb
diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.4.bb b/meta/recipes-graphics/xorg-proto/windowswmproto_1.0.4.bb
index 9f09fff7b..9f09fff7b 100644
--- a/meta/packages/xorg-proto/windowswmproto_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-proto/windowswmproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.0.bb
index 1ed5a5f31..1ed5a5f31 100644
--- a/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/xextproto_7.1.1.bb b/meta/recipes-graphics/xorg-proto/xextproto_7.1.1.bb
index 157f07030..157f07030 100644
--- a/meta/packages/xorg-proto/xextproto_7.1.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xextproto_7.1.1.bb
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
index f038a1c29..f038a1c29 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/xf86dgaproto_2.1.bb b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
index c400193a0..c400193a0 100644
--- a/meta/packages/xorg-proto/xf86dgaproto_2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
diff --git a/meta/packages/xorg-proto/xf86driproto_2.1.0.bb b/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.0.bb
index 6f31845b8..6f31845b8 100644
--- a/meta/packages/xorg-proto/xf86driproto_2.1.0.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.0.bb
diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb b/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
index 9ea07806f..9ea07806f 100644
--- a/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
diff --git a/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb b/meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb
index 9ea07806f..9ea07806f 100644
--- a/meta/packages/xorg-proto/xf86rushproto_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86rushproto_1.1.2.bb
diff --git a/meta/packages/xorg-proto/xf86vidmodeproto_2.3.bb b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.bb
index ccbbb36f1..ccbbb36f1 100644
--- a/meta/packages/xorg-proto/xf86vidmodeproto_2.3.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.bb
diff --git a/meta/packages/xorg-proto/xineramaproto_1.2.bb b/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.bb
index d053dbbcd..d053dbbcd 100644
--- a/meta/packages/xorg-proto/xineramaproto_1.2.bb
+++ b/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.bb
diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
index 92aa1fe6d..92aa1fe6d 100644
--- a/meta/packages/xorg-proto/xorg-proto-common.inc
+++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
diff --git a/meta/packages/xorg-proto/xproto_7.0.17.bb b/meta/recipes-graphics/xorg-proto/xproto_7.0.17.bb
index c145b60b2..c145b60b2 100644
--- a/meta/packages/xorg-proto/xproto_7.0.17.bb
+++ b/meta/recipes-graphics/xorg-proto/xproto_7.0.17.bb
diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/meta/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
index 9c3d9efa7..9c3d9efa7 100644
--- a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
diff --git a/meta/packages/xorg-util/gccmakedep_1.0.2.bb b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
index b1035676c..b1035676c 100644
--- a/meta/packages/xorg-util/gccmakedep_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb
diff --git a/meta/packages/xorg-util/imake_1.0.2.bb b/meta/recipes-graphics/xorg-util/imake_1.0.2.bb
index e533ece46..e533ece46 100644
--- a/meta/packages/xorg-util/imake_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-util/imake_1.0.2.bb
diff --git a/meta/packages/xorg-util/lndir_1.0.1.bb b/meta/recipes-graphics/xorg-util/lndir_1.0.1.bb
index b7bd0ad54..b7bd0ad54 100644
--- a/meta/packages/xorg-util/lndir_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-util/lndir_1.0.1.bb
diff --git a/meta/packages/xorg-util/makedepend_1.0.2.bb b/meta/recipes-graphics/xorg-util/makedepend_1.0.2.bb
index 7d6a5355a..7d6a5355a 100644
--- a/meta/packages/xorg-util/makedepend_1.0.2.bb
+++ b/meta/recipes-graphics/xorg-util/makedepend_1.0.2.bb
diff --git a/meta/packages/xorg-util/util-macros/xaw.patch b/meta/recipes-graphics/xorg-util/util-macros/xaw.patch
index 8b39869cc..8b39869cc 100644
--- a/meta/packages/xorg-util/util-macros/xaw.patch
+++ b/meta/recipes-graphics/xorg-util/util-macros/xaw.patch
diff --git a/meta/packages/xorg-util/util-macros_1.10.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.10.0.bb
index d3bf613a6..d3bf613a6 100644
--- a/meta/packages/xorg-util/util-macros_1.10.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.10.0.bb
diff --git a/meta/packages/xorg-util/xorg-cf-files_1.0.3.bb b/meta/recipes-graphics/xorg-util/xorg-cf-files_1.0.3.bb
index 7c3fb8d7e..7c3fb8d7e 100644
--- a/meta/packages/xorg-util/xorg-cf-files_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-util/xorg-cf-files_1.0.3.bb
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/recipes-graphics/xorg-util/xorg-util-common.inc
index 18d022c49..18d022c49 100644
--- a/meta/packages/xorg-util/xorg-util-common.inc
+++ b/meta/recipes-graphics/xorg-util/xorg-util-common.inc
diff --git a/meta/packages/xorg-xserver/files/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
index 6998adffe..6998adffe 100644
--- a/meta/packages/xorg-xserver/files/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
index 13a6c2c95..13a6c2c95 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-builtin-fonts.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
index 8ec3a37c7..8ec3a37c7 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
index 9a59530ed..9a59530ed 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
index 5a971002c..5a971002c 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
index dc957cc82..dc957cc82 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
index eb98fb82c..eb98fb82c 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/fix-newer-xorg-headers.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
index c160cd41d..c160cd41d 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/hide-cursor-and-ppm-root.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
index 2dc22bf50..2dc22bf50 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-evdev.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
index 28d732560..28d732560 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-use-evdev.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
index a580b500b..a580b500b 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
index 72c8a18ad..72c8a18ad 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
index 395bc7d51..395bc7d51 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/scheduler.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
index e0cca5428..e0cca5428 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
index 2341e40bc..2341e40bc 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
index bd8842721..bd8842721 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
index 13a6c2c95..13a6c2c95 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
index 9794e98cb..9794e98cb 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
index 14cf99055..14cf99055 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
index a5c22a5ef..a5c22a5ef 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
index eb98fb82c..eb98fb82c 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch
index 73f30ee71..73f30ee71 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
index 2dc22bf50..2dc22bf50 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
index 28d732560..28d732560 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
index d614b547a..d614b547a 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
index 35ccadaa8..35ccadaa8 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
index 6b34032a3..6b34032a3 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
index a580b500b..a580b500b 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive.inc b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
index 8c9312765..8c9312765 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
index bd8842721..bd8842721 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
index ccc19139c..ccc19139c 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
index 14cf99055..14cf99055 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/extra-kmodes.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
index a5c22a5ef..a5c22a5ef 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
index 35ccadaa8..35ccadaa8 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
index 7ca88e64e..7ca88e64e 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index cf69a1e15..cf69a1e15 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf
index ae8a395a0..ae8a395a0 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/igep0020/xorg.conf
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
index e18b91119..e18b91119 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/netbook/xorg.conf
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
index 4216de7bd..4216de7bd 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
index 4216de7bd..4216de7bd 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
index 9c3d49019..9c3d49019 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
diff --git a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index fc91285f2..fc91285f2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index db2d1266b..db2d1266b 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
index b121bba65..b121bba65 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
index 8b82de222..8b82de222 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
index 092a71290..092a71290 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
index a62a767f2..a62a767f2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
index eed491b4d..eed491b4d 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
index 94852f0de..94852f0de 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
index 565832eed..565832eed 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
index db29da93c..db29da93c 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/libdri-xinerama-symbol.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
index cd408c7bc..cd408c7bc 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
index 6b34032a3..6b34032a3 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
index 3d2fa1669..3d2fa1669 100755
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
index 7ff3658d0..7ff3658d0 100755
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
index ef53689bd..ef53689bd 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-1.5.0-bg-none-root.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
index 2754170d2..2754170d2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-DRI2Swapbuffer.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
index efc85a42a..efc85a42a 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
index afc94dcc5..afc94dcc5 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-no-root-2.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
index 98d79a1b2..98d79a1b2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.8.99.904.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 4789f28f5..4789f28f5 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 7150a2a46..7150a2a46 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
index 2341e40bc..2341e40bc 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/drmfix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch
index a62a767f2..a62a767f2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite/drmfix.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
index 565832eed..565832eed 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
index db29da93c..db29da93c 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch
index 6b34032a3..6b34032a3 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite/nodolt.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
index 235b55153..235b55153 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
index 5ef23019a..5ef23019a 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb
diff --git a/meta/packages/xtscal/xtscal/30xTs_Calibrate.sh b/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
index ee5578454..ee5578454 100644
--- a/meta/packages/xtscal/xtscal/30xTs_Calibrate.sh
+++ b/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
diff --git a/meta/packages/xtscal/xtscal/change-cross.patch b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
index 3ecd36bb5..3ecd36bb5 100644
--- a/meta/packages/xtscal/xtscal/change-cross.patch
+++ b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
diff --git a/meta/packages/xtscal/xtscal/cleanup.patch b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
index ce674edef..ce674edef 100644
--- a/meta/packages/xtscal/xtscal/cleanup.patch
+++ b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
diff --git a/meta/packages/xtscal/xtscal_0.6.3.bb b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
index 565393d06..565393d06 100644
--- a/meta/packages/xtscal/xtscal_0.6.3.bb
+++ b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
diff --git a/meta/packages/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 9ce5bd70b..9ce5bd70b 100644
--- a/meta/packages/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
diff --git a/meta/packages/kexec/kexec-tools-2.0.1/configurefix.patch b/meta/recipes-kernel/kexec/kexec-tools-2.0.1/configurefix.patch
index 1f0b50773..1f0b50773 100644
--- a/meta/packages/kexec/kexec-tools-2.0.1/configurefix.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools-2.0.1/configurefix.patch
diff --git a/meta/packages/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
index 55ab906a9..55ab906a9 100644
--- a/meta/packages/kexec/kexec-tools.inc
+++ b/meta/recipes-kernel/kexec/kexec-tools.inc
diff --git a/meta/packages/kexec/kexec-tools_2.0.1.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.1.bb
index 758d3ec9f..758d3ec9f 100644
--- a/meta/packages/kexec/kexec-tools_2.0.1.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.1.bb
diff --git a/meta/packages/latencytop/latencytop-0.5/latencytop-makefile.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index b979f57ca..b979f57ca 100644
--- a/meta/packages/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
diff --git a/meta/packages/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index 75c72c107..75c72c107 100644
--- a/meta/packages/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
diff --git a/meta/packages/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 81583fc40..81583fc40 100644
--- a/meta/packages/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-wrs_git.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-wrs_git.bb
index ab25e500b..ab25e500b 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers-wrs_git.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-wrs_git.bb
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index e6cb1d866..e6cb1d866 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers/hayes-gone.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
index 719c32020..719c32020 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers/hayes-gone.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
index 81fa5ce8c..81fa5ce8c 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.34.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
index 31c305854..31c305854 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.34.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
diff --git a/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch b/meta/recipes-kernel/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch
index 3ff0c07c1..3ff0c07c1 100644
--- a/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch
+++ b/meta/recipes-kernel/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch
diff --git a/meta/packages/linux/files/sumversion-fix.patch b/meta/recipes-kernel/linux/files/sumversion-fix.patch
index 8158d9d5f..8158d9d5f 100644
--- a/meta/packages/linux/files/sumversion-fix.patch
+++ b/meta/recipes-kernel/linux/files/sumversion-fix.patch
diff --git a/meta/packages/linux/linux-2.6.23/binutils-buildid-arm.patch b/meta/recipes-kernel/linux/linux-2.6.23/binutils-buildid-arm.patch
index 68e35e89e..68e35e89e 100644
--- a/meta/packages/linux/linux-2.6.23/binutils-buildid-arm.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/binutils-buildid-arm.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch
index dc68ce9d4..dc68ce9d4 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch
index 68da30191..68da30191 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch
index 0ff115efc..0ff115efc 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch
index 274eaf24d..274eaf24d 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch
index 7dceff5c9..7dceff5c9 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch
index aa25dd9bf..aa25dd9bf 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch
index 90e66b530..90e66b530 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch
index c07f049e5..c07f049e5 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/16bpp.patch b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/16bpp.patch
index 6f038e35d..6f038e35d 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/16bpp.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/16bpp.patch
diff --git a/meta/packages/linux/linux-2.6.23/cm-x270/defconfig b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/defconfig
index 273de85b0..273de85b0 100644
--- a/meta/packages/linux/linux-2.6.23/cm-x270/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.23/cm-x270/defconfig
diff --git a/meta/packages/linux/linux-2.6.23/em-x270/defconfig b/meta/recipes-kernel/linux/linux-2.6.23/em-x270/defconfig
index 324613657..324613657 100644
--- a/meta/packages/linux/linux-2.6.23/em-x270/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.23/em-x270/defconfig
diff --git a/meta/packages/linux/linux-2.6.23/em-x270/em-x270-battery-sysfs-fix.patch b/meta/recipes-kernel/linux/linux-2.6.23/em-x270/em-x270-battery-sysfs-fix.patch
index 51ec773e5..51ec773e5 100644
--- a/meta/packages/linux/linux-2.6.23/em-x270/em-x270-battery-sysfs-fix.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/em-x270/em-x270-battery-sysfs-fix.patch
diff --git a/meta/packages/linux/linux-2.6.23/em-x270/em-x270.patch b/meta/recipes-kernel/linux/linux-2.6.23/em-x270/em-x270.patch
index 3c28be83c..3c28be83c 100644
--- a/meta/packages/linux/linux-2.6.23/em-x270/em-x270.patch
+++ b/meta/recipes-kernel/linux/linux-2.6.23/em-x270/em-x270.patch
diff --git a/meta/packages/linux/linux-2.6.33.2/mpc8313erdb/defconfig b/meta/recipes-kernel/linux/linux-2.6.33.2/mpc8313erdb/defconfig
index edabefffd..edabefffd 100644
--- a/meta/packages/linux/linux-2.6.33.2/mpc8313erdb/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.33.2/mpc8313erdb/defconfig
diff --git a/meta/packages/linux/linux-2.6.33.2/qemuarm/defconfig b/meta/recipes-kernel/linux/linux-2.6.33.2/qemuarm/defconfig
index 57864766f..57864766f 100644
--- a/meta/packages/linux/linux-2.6.33.2/qemuarm/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.33.2/qemuarm/defconfig
diff --git a/meta/packages/linux/linux-2.6.33.2/qemumips/defconfig b/meta/recipes-kernel/linux/linux-2.6.33.2/qemumips/defconfig
index a4578e7cc..a4578e7cc 100644
--- a/meta/packages/linux/linux-2.6.33.2/qemumips/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.33.2/qemumips/defconfig
diff --git a/meta/packages/linux/linux-2.6.33.2/qemuppc/defconfig b/meta/recipes-kernel/linux/linux-2.6.33.2/qemuppc/defconfig
index edabefffd..edabefffd 100644
--- a/meta/packages/linux/linux-2.6.33.2/qemuppc/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.33.2/qemuppc/defconfig
diff --git a/meta/packages/linux/linux-2.6.33.2/qemux86/defconfig b/meta/recipes-kernel/linux/linux-2.6.33.2/qemux86/defconfig
index 93e4be4a3..93e4be4a3 100644
--- a/meta/packages/linux/linux-2.6.33.2/qemux86/defconfig
+++ b/meta/recipes-kernel/linux/linux-2.6.33.2/qemux86/defconfig
diff --git a/meta/packages/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb
index 3ea80b537..3ea80b537 100644
--- a/meta/packages/linux/linux-dummy.bb
+++ b/meta/recipes-kernel/linux/linux-dummy.bb
diff --git a/meta/packages/linux/linux-igep-2.6.33.5/0001-omap3-init-MUX-for-OMAP3-IGEP-module.patch b/meta/recipes-kernel/linux/linux-igep-2.6.33.5/0001-omap3-init-MUX-for-OMAP3-IGEP-module.patch
index 85024f50a..85024f50a 100644
--- a/meta/packages/linux/linux-igep-2.6.33.5/0001-omap3-init-MUX-for-OMAP3-IGEP-module.patch
+++ b/meta/recipes-kernel/linux/linux-igep-2.6.33.5/0001-omap3-init-MUX-for-OMAP3-IGEP-module.patch
diff --git a/meta/packages/linux/linux-igep-2.6.33.5/defconfig-igep0020 b/meta/recipes-kernel/linux/linux-igep-2.6.33.5/defconfig-igep0020
index 65b962f77..65b962f77 100644
--- a/meta/packages/linux/linux-igep-2.6.33.5/defconfig-igep0020
+++ b/meta/recipes-kernel/linux/linux-igep-2.6.33.5/defconfig-igep0020
diff --git a/meta/packages/linux/linux-igep-2.6.33.5/defconfig-igep0030 b/meta/recipes-kernel/linux/linux-igep-2.6.33.5/defconfig-igep0030
index c2cf05bb1..c2cf05bb1 100644
--- a/meta/packages/linux/linux-igep-2.6.33.5/defconfig-igep0030
+++ b/meta/recipes-kernel/linux/linux-igep-2.6.33.5/defconfig-igep0030
diff --git a/meta/packages/linux/linux-igep_2.6.33.5.bb b/meta/recipes-kernel/linux/linux-igep_2.6.33.5.bb
index 6e961b7ef..6e961b7ef 100644
--- a/meta/packages/linux/linux-igep_2.6.33.5.bb
+++ b/meta/recipes-kernel/linux/linux-igep_2.6.33.5.bb
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/defconfig-mx31ads b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/defconfig-mx31ads
index 3fffd84eb..3fffd84eb 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/defconfig-mx31ads
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/defconfig-mx31ads
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/defconfig-mx31litekit b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/defconfig-mx31litekit
index 66fa3ed7b..66fa3ed7b 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/defconfig-mx31litekit
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/defconfig-mx31litekit
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/defconfig-mx31phy b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/defconfig-mx31phy
index 7500ded30..7500ded30 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/defconfig-mx31phy
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/defconfig-mx31phy
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/linux-2.6.19.2-mx3lite.patch.gz b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/linux-2.6.19.2-mx3lite.patch.gz
index 2935dc4c3..2935dc4c3 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/linux-2.6.19.2-mx3lite.patch.gz
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/linux-2.6.19.2-mx3lite.patch.gz
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/mx31ads-patches.tgz b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31ads-patches.tgz
index 00f619d8b..00f619d8b 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/mx31ads-patches.tgz
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31ads-patches.tgz
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/mx31lite-boot.patch b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31lite-boot.patch
index 26cf38cc8..26cf38cc8 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/mx31lite-boot.patch
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31lite-boot.patch
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/mx31lite-fb.patch b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31lite-fb.patch
index c5b465c7d..c5b465c7d 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/mx31lite-fb.patch
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31lite-fb.patch
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/mx31lite-spi.patch b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31lite-spi.patch
index 7b0b8bbc5..7b0b8bbc5 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/mx31lite-spi.patch
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31lite-spi.patch
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/mx31phy-patches.tgz b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31phy-patches.tgz
index 5a517222b..5a517222b 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/mx31phy-patches.tgz
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/mx31phy-patches.tgz
diff --git a/meta/packages/linux/linux-mx31-2.6.19.2/nor-query-table-fix.patch b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/nor-query-table-fix.patch
index 4408da0e4..4408da0e4 100644
--- a/meta/packages/linux/linux-mx31-2.6.19.2/nor-query-table-fix.patch
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.19.2/nor-query-table-fix.patch
diff --git a/meta/packages/linux/linux-mx31-2.6.22.6/defconfig-mx31ads b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/defconfig-mx31ads
index 451db271c..451db271c 100644
--- a/meta/packages/linux/linux-mx31-2.6.22.6/defconfig-mx31ads
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/defconfig-mx31ads
diff --git a/meta/packages/linux/linux-mx31-2.6.22.6/defconfig-mx31phy b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/defconfig-mx31phy
index dd905eef7..dd905eef7 100644
--- a/meta/packages/linux/linux-mx31-2.6.22.6/defconfig-mx31phy
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/defconfig-mx31phy
diff --git a/meta/packages/linux/linux-mx31-2.6.22.6/mx31ads-patches.tgz b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/mx31ads-patches.tgz
index 90c591dc7..90c591dc7 100644
--- a/meta/packages/linux/linux-mx31-2.6.22.6/mx31ads-patches.tgz
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/mx31ads-patches.tgz
diff --git a/meta/packages/linux/linux-mx31-2.6.22.6/mx31phy-patches.tgz b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/mx31phy-patches.tgz
index 5d81c1b4e..5d81c1b4e 100644
--- a/meta/packages/linux/linux-mx31-2.6.22.6/mx31phy-patches.tgz
+++ b/meta/recipes-kernel/linux/linux-mx31-2.6.22.6/mx31phy-patches.tgz
diff --git a/meta/packages/linux/linux-mx31.inc b/meta/recipes-kernel/linux/linux-mx31.inc
index 520229cf7..520229cf7 100644
--- a/meta/packages/linux/linux-mx31.inc
+++ b/meta/recipes-kernel/linux/linux-mx31.inc
diff --git a/meta/packages/linux/linux-mx31_2.6.19.2.bb b/meta/recipes-kernel/linux/linux-mx31_2.6.19.2.bb
index 56d111e2f..56d111e2f 100644
--- a/meta/packages/linux/linux-mx31_2.6.19.2.bb
+++ b/meta/recipes-kernel/linux/linux-mx31_2.6.19.2.bb
diff --git a/meta/packages/linux/linux-mx31_2.6.22.6.bb b/meta/recipes-kernel/linux/linux-mx31_2.6.22.6.bb
index d19a02fa0..d19a02fa0 100644
--- a/meta/packages/linux/linux-mx31_2.6.22.6.bb
+++ b/meta/recipes-kernel/linux/linux-mx31_2.6.22.6.bb
diff --git a/meta/packages/linux/linux-omap-2.6.22.19/add_rootwait.patch b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/add_rootwait.patch
index 80900526c..80900526c 100644
--- a/meta/packages/linux/linux-omap-2.6.22.19/add_rootwait.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/add_rootwait.patch
diff --git a/meta/packages/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp
index c6a7a7214..c6a7a7214 100644
--- a/meta/packages/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/defconfig-omap-3430ldp
diff --git a/meta/packages/linux/linux-omap-2.6.22.19/fixes.patch b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/fixes.patch
index df1bcc71a..df1bcc71a 100644
--- a/meta/packages/linux/linux-omap-2.6.22.19/fixes.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/fixes.patch
diff --git a/meta/packages/linux/linux-omap-2.6.22.19/linux-2.6.22.19-ldp-v1.3.patch.gz b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/linux-2.6.22.19-ldp-v1.3.patch.gz
index f406f0e0d..f406f0e0d 100644
--- a/meta/packages/linux/linux-omap-2.6.22.19/linux-2.6.22.19-ldp-v1.3.patch.gz
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.22.19/linux-2.6.22.19-ldp-v1.3.patch.gz
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/add_rootwait.patch b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/add_rootwait.patch
index 80900526c..80900526c 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/add_rootwait.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/add_rootwait.patch
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp
index 10a3a9900..10a3a9900 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/defconfig-omap-3430ldp
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430sdp b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/defconfig-omap-3430sdp
index 27111aa7c..27111aa7c 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/defconfig-omap-3430sdp
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/defconfig-omap-3430sdp
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/fixes.patch b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes.patch
index e1559064d..e1559064d 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/fixes.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes.patch
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/fixes2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch
index 362368a6c..362368a6c 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/fixes2.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/fixes2.patch
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/linux-2.6.24.7-ldp-v1.4.patch.gz b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/linux-2.6.24.7-ldp-v1.4.patch.gz
index 49f110b06..49f110b06 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/linux-2.6.24.7-ldp-v1.4.patch.gz
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/linux-2.6.24.7-ldp-v1.4.patch.gz
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/module_fix.patch b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/module_fix.patch
index 7275eccde..7275eccde 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/module_fix.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/module_fix.patch
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch
index 58cbe7be2..58cbe7be2 100644
--- a/meta/packages/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch
index a76e96e44..a76e96e44 100644
--- a/meta/packages/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch
index d590f8ffb..d590f8ffb 100644
--- a/meta/packages/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch
index 49045f7bb..49045f7bb 100644
--- a/meta/packages/linux/linux-omap-2.6.29/0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/0124-leds-gpio-broken-with-current-git.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/0124-leds-gpio-broken-with-current-git.patch
index dc6e190e8..dc6e190e8 100644
--- a/meta/packages/linux/linux-omap-2.6.29/0124-leds-gpio-broken-with-current-git.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/0124-leds-gpio-broken-with-current-git.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/ads7846-detection.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch
index 25a1cb052..25a1cb052 100644
--- a/meta/packages/linux/linux-omap-2.6.29/ads7846-detection.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/beagleboard/beagle-asoc.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/beagle-asoc.patch
index b2b920037..b2b920037 100644
--- a/meta/packages/linux/linux-omap-2.6.29/beagleboard/beagle-asoc.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/beagle-asoc.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/beagleboard/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/defconfig
index ef5e35c99..ef5e35c99 100644
--- a/meta/packages/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/beagleboard/ehci.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/ehci.patch
index 5a8c84471..5a8c84471 100644
--- a/meta/packages/linux/linux-omap-2.6.29/beagleboard/ehci.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/ehci.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/beagleboard/logo_linux_clut224.ppm b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/logo_linux_clut224.ppm
index d29fc1c54..d29fc1c54 100644
--- a/meta/packages/linux/linux-omap-2.6.29/beagleboard/logo_linux_clut224.ppm
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/beagleboard/logo_linux_clut224.ppm
diff --git a/meta/packages/linux/linux-omap-2.6.29/cache-display-fix.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/cache-display-fix.patch
index 019fd5acf..019fd5acf 100644
--- a/meta/packages/linux/linux-omap-2.6.29/cache-display-fix.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/cache-display-fix.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch
index aeab62f10..aeab62f10 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch
index 04ac6a9ce..04ac6a9ce 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch
index c3523362c..c3523362c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch
index 09afa7e5b..09afa7e5b 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch
index d12586ca2..d12586ca2 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch
index 0025f1aa8..0025f1aa8 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch
index 26d21d874..26d21d874 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch
index 4c8d432dd..4c8d432dd 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch
index 3f55f0446..3f55f0446 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch
index c7efc58a0..c7efc58a0 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch
index 1a82ed2a2..1a82ed2a2 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch
index 22add6efd..22add6efd 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch
index 76b8c7363..76b8c7363 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch
index 3b3fd77a9..3b3fd77a9 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch
index d6b0cbbb4..d6b0cbbb4 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch
index bca449f16..bca449f16 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch
index 5b68b57da..5b68b57da 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
index 088135c0a..088135c0a 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch
index daa95ca50..daa95ca50 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch
index b3248527e..b3248527e 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch
index 31ff18022..31ff18022 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch
index d4fb327c7..d4fb327c7 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch
index 649290553..649290553 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch
index 559e49f40..559e49f40 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch
index e81b1331b..e81b1331b 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch
index 6ee3908d1..6ee3908d1 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch
index b56e32a11..b56e32a11 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch
index 6400da3c2..6400da3c2 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch
index 072978670..072978670 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch
index 7e2bb4893..7e2bb4893 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch
index ae777ed04..ae777ed04 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch
index 4959a760b..4959a760b 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch
index f643ca64f..f643ca64f 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch
index fdfc25fb4..fdfc25fb4 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch
index b7b395458..b7b395458 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch
index c6e9f16b3..c6e9f16b3 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch
index fc62b0951..fc62b0951 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch
index 65cb11357..65cb11357 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch
index af8c2cd09..af8c2cd09 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch
index 66be75f3f..66be75f3f 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch
index 6785ade27..6785ade27 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch
index 5264911b4..5264911b4 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch
index 76e37817c..76e37817c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch
index 32def9e8d..32def9e8d 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch
index 938246985..938246985 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch
index 4ae5fbdd9..4ae5fbdd9 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch
index 0b0f104b3..0b0f104b3 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch
index cc6663fa2..cc6663fa2 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch
index e9fc76ce1..e9fc76ce1 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch
index 8c5edd0c3..8c5edd0c3 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch
index 93ff3205d..93ff3205d 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch
index b8f89b623..b8f89b623 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch
index f591fb700..f591fb700 100644
--- a/meta/packages/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/ehci.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/ehci.patch
index e69de29bb..e69de29bb 100644
--- a/meta/packages/linux/linux-omap-2.6.29/ehci.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/ehci.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/evm-mcspi-ts.diff b/meta/recipes-kernel/linux/linux-omap-2.6.29/evm-mcspi-ts.diff
index 64d797cf9..64d797cf9 100644
--- a/meta/packages/linux/linux-omap-2.6.29/evm-mcspi-ts.diff
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/evm-mcspi-ts.diff
diff --git a/meta/packages/linux/linux-omap-2.6.29/fix-audio-capture.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/fix-audio-capture.patch
index c5ff91475..c5ff91475 100644
--- a/meta/packages/linux/linux-omap-2.6.29/fix-audio-capture.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/fix-audio-capture.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/fix-install.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/fix-install.patch
index 46bc25a50..46bc25a50 100644
--- a/meta/packages/linux/linux-omap-2.6.29/fix-install.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/fix-install.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/fix-unaligned-access.diff b/meta/recipes-kernel/linux/linux-omap-2.6.29/fix-unaligned-access.diff
index c82090f54..c82090f54 100644
--- a/meta/packages/linux/linux-omap-2.6.29/fix-unaligned-access.diff
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/fix-unaligned-access.diff
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch
index 902f87943..902f87943 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch
index c2c9bc2b6..c2c9bc2b6 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0001-omap-iommu-tlb-and-pagetable-primitives.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch
index d5f78dd14..d5f78dd14 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0002-omap-iommu-omap2-architecture-specific-functions.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch
index 2954c4787..2954c4787 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0003-omap-iommu-omap3-iommu-device-registration.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch
index 945778b94..945778b94 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0004-omap-iommu-simple-virtual-address-space-management.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch
index c0f9e4d9a..c0f9e4d9a 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch
index 54a7abfe8..54a7abfe8 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0006-omap-iommu-Don-t-try-BUG_ON-in_interrupt.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch
index d8ad0eb0b..d8ad0eb0b 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0007-omap-iommu-We-support-chained-scatterlists-probabl.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch
index 298e797c3..298e797c3 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/iommu/0008-omap2-iommu-entries-for-Kconfig-and-Makefile.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch
index e6e07d8af..e6e07d8af 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0001-omap3isp-Add-ISP-main-driver-and-register-definitio.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch
index cfca26723..cfca26723 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0002-omap3isp-Add-ISP-MMU-wrapper.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0003-omap3isp-Add-userspace-header.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0003-omap3isp-Add-userspace-header.patch
index 66c171f54..66c171f54 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0003-omap3isp-Add-userspace-header.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0003-omap3isp-Add-userspace-header.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch
index 4a161729f..4a161729f 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0004-omap3isp-Add-ISP-frontend-CCDC.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch
index c549eadc8..c549eadc8 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0005-omap3isp-Add-ISP-backend-PRV-and-RSZ.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch
index 876ce780f..876ce780f 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0006-omap3isp-Add-statistics-collection-modules-H3A-and.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch
index 842f39538..842f39538 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch
index db023e514..db023e514 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch
index 22074be14..22074be14 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch
index f796ce834..f796ce834 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch
index 631b05f41..631b05f41 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch
index d9e4243b4..d9e4243b4 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch
index 45e27a2fd..45e27a2fd 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0003-V4L-Int-if-Dummy-slave.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0003-V4L-Int-if-Dummy-slave.patch
index 829810fab..829810fab 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0003-V4L-Int-if-Dummy-slave.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0003-V4L-Int-if-Dummy-slave.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch
index b81b20419..b81b20419 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0004-V4L-int-device-add-support-for-VIDIOC_QUERYMENU.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch
index a9e06290f..a9e06290f 100644
--- a/meta/packages/linux/linux-omap-2.6.29/isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/isp/v4l/0005-V4L-Int-if-Add-vidioc_int_querycap.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/make-alignment-visible.diff b/meta/recipes-kernel/linux/linux-omap-2.6.29/make-alignment-visible.diff
index 9b3958f82..9b3958f82 100644
--- a/meta/packages/linux/linux-omap-2.6.29/make-alignment-visible.diff
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/make-alignment-visible.diff
diff --git a/meta/packages/linux/linux-omap-2.6.29/mmctiming.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/mmctiming.patch
index ec540ab3c..ec540ab3c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/mmctiming.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/mmctiming.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/modedb-hd720.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/modedb-hd720.patch
index 0166de651..0166de651 100644
--- a/meta/packages/linux/linux-omap-2.6.29/modedb-hd720.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/modedb-hd720.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch
index a7898d144..a7898d144 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0001-USB-musb-only-turn-off-vbus-in-OTG-hosts.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0002-USB-composite-avoid-inconsistent-lock-state.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0002-USB-composite-avoid-inconsistent-lock-state.patch
index 5cb7bcb06..5cb7bcb06 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0002-USB-composite-avoid-inconsistent-lock-state.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0002-USB-composite-avoid-inconsistent-lock-state.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch
index fadad9e44..fadad9e44 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0003-USB-musb-NAK-timeout-scheme-on-bulk-RX-endpoint.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch
index 438f11cf7..438f11cf7 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0004-USB-musb-rewrite-host-periodic-endpoint-allocation.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch
index db3481b87..db3481b87 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0005-USB-TWL-disable-VUSB-regulators-when-cable-unplugg.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch
index 3f49a4d63..3f49a4d63 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0006-USB-gadget-composite-device-level-suspend-resume-h.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch
index a89bc2ff5..a89bc2ff5 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0007-usb-gadget-fix-ethernet-link-reports-to-ethtool.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch
index 8627825b5..8627825b5 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0008-usb-musb_host-minor-enqueue-locking-fix-v2.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch
index 09fc0a17d..09fc0a17d 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0009-usb-musb_host-fix-ep0-fifo-flushing.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch
index bcbe3bbe3..bcbe3bbe3 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0010-musb-sanitize-clearing-TXCSR-DMA-bits-take-2.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0011-musb-fix-isochronous-TXDMA-take-2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0011-musb-fix-isochronous-TXDMA-take-2.patch
index 7d546e10b..7d546e10b 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0011-musb-fix-isochronous-TXDMA-take-2.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0011-musb-fix-isochronous-TXDMA-take-2.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0012-musb-fix-possible-panic-while-resuming.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0012-musb-fix-possible-panic-while-resuming.patch
index 2bbde84c1..2bbde84c1 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0012-musb-fix-possible-panic-while-resuming.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0012-musb-fix-possible-panic-while-resuming.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch
index 0202871d4..0202871d4 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0013-musb_host-refactor-musb_save_toggle-take-2.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch
index 08e08a853..08e08a853 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0014-musb_gadget-suppress-parasitic-TX-interrupts-with.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch
index 7115b152d..7115b152d 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0015-musb_gadget-fix-unhandled-endpoint-0-IRQs.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch
index a2f54ff47..a2f54ff47 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0016-musb_host-factor-out-musb_ep_-get-set-_qh.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0017-musb_host-refactor-URB-giveback.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0017-musb_host-refactor-URB-giveback.patch
index 4a520dff8..4a520dff8 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0017-musb_host-refactor-URB-giveback.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0017-musb_host-refactor-URB-giveback.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0018-musb-split-out-CPPI-interrupt-handler.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0018-musb-split-out-CPPI-interrupt-handler.patch
index bf3d6e702..bf3d6e702 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0018-musb-split-out-CPPI-interrupt-handler.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0018-musb-split-out-CPPI-interrupt-handler.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0019-musb_host-simplify-check-for-active-URB.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0019-musb_host-simplify-check-for-active-URB.patch
index c0e57155c..c0e57155c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0019-musb_host-simplify-check-for-active-URB.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0019-musb_host-simplify-check-for-active-URB.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch
index d89eaadd6..d89eaadd6 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0020-musb_host-streamline-musb_cleanup_urb-calls.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch
index d9733f92b..d9733f92b 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0021-twl4030-usb-fix-minor-reporting-goofage.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch
index 16b5b9908..16b5b9908 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0022-musb-use-dma-mode-1-for-TX-if-transfer-size-equals.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
index 3038dd171..3038dd171 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0024-USB-otg-adding-nop-usb-transceiver.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0024-USB-otg-adding-nop-usb-transceiver.patch
index 67004d7ec..67004d7ec 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0024-USB-otg-adding-nop-usb-transceiver.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0024-USB-otg-adding-nop-usb-transceiver.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch
index 21fe7bea1..21fe7bea1 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0025-nop-usb-xceiv-behave-when-linked-as-a-module.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0026-musb-proper-hookup-to-transceiver-drivers.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0026-musb-proper-hookup-to-transceiver-drivers.patch
index 035a6c767..035a6c767 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0026-musb-proper-hookup-to-transceiver-drivers.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0026-musb-proper-hookup-to-transceiver-drivers.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0027-musb-otg-timer-cleanup.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0027-musb-otg-timer-cleanup.patch
index f41b766cf..f41b766cf 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0027-musb-otg-timer-cleanup.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0027-musb-otg-timer-cleanup.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch
index 626901622..626901622 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch
index fc34fb983..fc34fb983 100644
--- a/meta/packages/linux/linux-omap-2.6.29/musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/no-cortex-deadlock.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/no-cortex-deadlock.patch
index 78547c896..78547c896 100644
--- a/meta/packages/linux/linux-omap-2.6.29/no-cortex-deadlock.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/no-cortex-deadlock.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/no-empty-flash-warnings.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/no-empty-flash-warnings.patch
index ab344b044..ab344b044 100644
--- a/meta/packages/linux/linux-omap-2.6.29/no-empty-flash-warnings.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/no-empty-flash-warnings.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/no-harry-potter.diff b/meta/recipes-kernel/linux/linux-omap-2.6.29/no-harry-potter.diff
index 2bb20ab9c..2bb20ab9c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/no-harry-potter.diff
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/no-harry-potter.diff
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap-2430-lcd.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap-2430-lcd.patch
index 8f8a687c0..8f8a687c0 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap-2430-lcd.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap-2430-lcd.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap1710h3/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap1710h3/defconfig
index 21f7c54e4..21f7c54e4 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap1710h3/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap1710h3/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap2420h4/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap2420h4/defconfig
index c1133eef9..c1133eef9 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap2420h4/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap2420h4/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap2430sdp/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap2430sdp/defconfig
index f3897e48a..f3897e48a 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap2430sdp/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap2430sdp/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap3-pandora/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3-pandora/defconfig
index 8ac420cc3..8ac420cc3 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap3-pandora/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3-pandora/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap3evm/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3evm/defconfig
index da726718c..da726718c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap3evm/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3evm/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap3evm/omap3evm-dss2.diff b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3evm/omap3evm-dss2.diff
index 60832e72c..60832e72c 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap3evm/omap3evm-dss2.diff
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3evm/omap3evm-dss2.diff
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap3evm/omap3evm-lcd-redtint.diff b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3evm/omap3evm-lcd-redtint.diff
index 54ea3c9f6..54ea3c9f6 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap3evm/omap3evm-lcd-redtint.diff
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap3evm/omap3evm-lcd-redtint.diff
diff --git a/meta/packages/linux/linux-omap-2.6.29/omap5912osk/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap5912osk/defconfig
index 3c334868e..3c334868e 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omap5912osk/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omap5912osk/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/omapzoom/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/omapzoom/defconfig
index aa11eb04f..aa11eb04f 100644
--- a/meta/packages/linux/linux-omap-2.6.29/omapzoom/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/omapzoom/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/overo/defconfig b/meta/recipes-kernel/linux/linux-omap-2.6.29/overo/defconfig
index 0101ca509..0101ca509 100644
--- a/meta/packages/linux/linux-omap-2.6.29/overo/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/overo/defconfig
diff --git a/meta/packages/linux/linux-omap-2.6.29/overo/ehci.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/overo/ehci.patch
index 72c6b9bec..72c6b9bec 100644
--- a/meta/packages/linux/linux-omap-2.6.29/overo/ehci.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/overo/ehci.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/read_die_ids.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/read_die_ids.patch
index 3f6c930cc..3f6c930cc 100644
--- a/meta/packages/linux/linux-omap-2.6.29/read_die_ids.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/read_die_ids.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/timer-suppression.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/timer-suppression.patch
index 04362c96e..04362c96e 100644
--- a/meta/packages/linux/linux-omap-2.6.29/timer-suppression.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/timer-suppression.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/touchscreen.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/touchscreen.patch
index 2325c401e..2325c401e 100644
--- a/meta/packages/linux/linux-omap-2.6.29/touchscreen.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/touchscreen.patch
diff --git a/meta/packages/linux/linux-omap-2.6.29/usbttyfix.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/usbttyfix.patch
index 997705a31..997705a31 100644
--- a/meta/packages/linux/linux-omap-2.6.29/usbttyfix.patch
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/usbttyfix.patch
diff --git a/meta/packages/linux/linux-omap-zoomsync/zoom2/defconfig b/meta/recipes-kernel/linux/linux-omap-zoomsync/zoom2/defconfig
index 28403aa4b..28403aa4b 100644
--- a/meta/packages/linux/linux-omap-zoomsync/zoom2/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap-zoomsync/zoom2/defconfig
diff --git a/meta/packages/linux/linux-omap-zoomsync_2.6.32.bb b/meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb
index 50dea004e..50dea004e 100644
--- a/meta/packages/linux/linux-omap-zoomsync_2.6.32.bb
+++ b/meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb
diff --git a/meta/packages/linux/linux-omap.inc b/meta/recipes-kernel/linux/linux-omap.inc
index e164bad59..e164bad59 100644
--- a/meta/packages/linux/linux-omap.inc
+++ b/meta/recipes-kernel/linux/linux-omap.inc
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
index 6e31ead2b..6e31ead2b 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch
index cdc9447b4..cdc9447b4 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0001-omap3-cpuidle.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
index 17329be29..17329be29 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch
index d35fd4756..d35fd4756 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/0002-omap3-cpuidle.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff
index 89fbe3a83..89fbe3a83 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init
index 5123bafe5..5123bafe5 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick
index 6eb6c9b47..6eb6c9b47 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff
index c437f145d..c437f145d 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff
index 9fa749f5f..9fa749f5f 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf
index 3de6e0504..3de6e0504 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q
index aa9f09811..aa9f09811 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/04-use-pcd.diff
index bdf8ab5f0..bdf8ab5f0 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/04-use-pcd.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff
index d3c9fffcd..d3c9fffcd 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff
index 79871a720..79871a720 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff
index 99bd80eae..99bd80eae 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/16bpp.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/16bpp.patch
index d2bff4b01..d2bff4b01 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/16bpp.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/16bpp.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
index f749dbcf5..f749dbcf5 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/4bitmmc.diff
index 5cd120c54..5cd120c54 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/4bitmmc.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
index c361c33d6..c361c33d6 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
index 48a59b945..48a59b945 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
index fe1bea539..fe1bea539 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
index fb65ac98b..fb65ac98b 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
index 02a72ed9d..02a72ed9d 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
index 67b837c45..67b837c45 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
index 8e4c4d6be..8e4c4d6be 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-08.patch
index 9af25a762..9af25a762 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-08.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-09.patch
index ab6cc6d87..ab6cc6d87 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/TWL4030-09.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/cache-display-fix.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/cache-display-fix.patch
index c96b95f2f..c96b95f2f 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/cache-display-fix.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/cache-display-fix.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/defconfig b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/defconfig
index 0adc45274..0adc45274 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/defconfig
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/flash.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/flash.patch
index 4c76cd97b..4c76cd97b 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/flash.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/flash.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff
index 6eb33f76b..6eb33f76b 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/logo_linux_clut224.ppm b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/logo_linux_clut224.ppm
index d29fc1c54..d29fc1c54 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/logo_linux_clut224.ppm
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/logo_linux_clut224.ppm
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
index d7dadbc85..d7dadbc85 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
index c8b370da0..c8b370da0 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
index f8407fc2d..f8407fc2d 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch
index 32ec4c2d3..32ec4c2d3 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch
index ab344b044..ab344b044 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/no-harry-potter.diff
index 2bb20ab9c..2bb20ab9c 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/no-harry-potter.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch
index 25e5aad9c..25e5aad9c 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/omap3-jitter.patch
index 2e0dfd9f1..2e0dfd9f1 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/omap3-jitter.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff
index dbc11fbe7..dbc11fbe7 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/read_die_ids.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/read_die_ids.patch
index 3f6c930cc..3f6c930cc 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/read_die_ids.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/read_die_ids.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/serialfix.diff b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/serialfix.diff
index 74c2ebaa6..74c2ebaa6 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/serialfix.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/serialfix.diff
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/soc.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/soc.patch
index f4cce21ca..f4cce21ca 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/soc.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/soc.patch
diff --git a/meta/packages/linux/linux-omap2-git/beagleboard/timer-suppression.patch b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/timer-suppression.patch
index 04362c96e..04362c96e 100644
--- a/meta/packages/linux/linux-omap2-git/beagleboard/timer-suppression.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/beagleboard/timer-suppression.patch
diff --git a/meta/packages/linux/linux-omap2-git/fixes.patch b/meta/recipes-kernel/linux/linux-omap2-git/fixes.patch
index 847868278..847868278 100644
--- a/meta/packages/linux/linux-omap2-git/fixes.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/fixes.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap-2430-lcd.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap-2430-lcd.patch
index 8f8a687c0..8f8a687c0 100644
--- a/meta/packages/linux/linux-omap2-git/omap-2430-lcd.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap-2430-lcd.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap-2430sdp/defconfig b/meta/recipes-kernel/linux/linux-omap2-git/omap-2430sdp/defconfig
index f3897e48a..f3897e48a 100644
--- a/meta/packages/linux/linux-omap2-git/omap-2430sdp/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap-2430sdp/defconfig
diff --git a/meta/packages/linux/linux-omap2-git/omap-2430sdp/defconfig.eabi b/meta/recipes-kernel/linux/linux-omap2-git/omap-2430sdp/defconfig.eabi
index f3897e48a..f3897e48a 100644
--- a/meta/packages/linux/linux-omap2-git/omap-2430sdp/defconfig.eabi
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap-2430sdp/defconfig.eabi
diff --git a/meta/packages/linux/linux-omap2-git/omap2420h4/defconfig b/meta/recipes-kernel/linux/linux-omap2-git/omap2420h4/defconfig
index c1133eef9..c1133eef9 100644
--- a/meta/packages/linux/linux-omap2-git/omap2420h4/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap2420h4/defconfig
diff --git a/meta/packages/linux/linux-omap2-git/omap2430sdp/defconfig b/meta/recipes-kernel/linux/linux-omap2-git/omap2430sdp/defconfig
index f3897e48a..f3897e48a 100644
--- a/meta/packages/linux/linux-omap2-git/omap2430sdp/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap2430sdp/defconfig
diff --git a/meta/packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi b/meta/recipes-kernel/linux/linux-omap2-git/omap2430sdp/defconfig.eabi
index f3897e48a..f3897e48a 100644
--- a/meta/packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap2430sdp/defconfig.eabi
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0001-ARM-OMAP-SmartReflex-driver.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ARM-OMAP-SmartReflex-driver.patch
index 550a4f58b..550a4f58b 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0001-ARM-OMAP-SmartReflex-driver.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ARM-OMAP-SmartReflex-driver.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
index 6e31ead2b..6e31ead2b 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch
index cdc9447b4..cdc9447b4 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-omap3-cpuidle.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
index 17329be29..17329be29 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-omap3beagle-add-a-platform-device-to-hook-up-the-GP.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch
index 8e609395a..8e609395a 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0002-ARM-OMAP-SmartReflex-driver.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch
index d35fd4756..d35fd4756 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0002-omap3-cpuidle.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/0003-ARM-OMAP-SmartReflex-driver.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0003-ARM-OMAP-SmartReflex-driver.patch
index 40d579036..40d579036 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/0003-ARM-OMAP-SmartReflex-driver.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0003-ARM-OMAP-SmartReflex-driver.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/defconfig b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/defconfig
index f74cef90e..f74cef90e 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/defconfig
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch
index ab344b044..ab344b044 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch
diff --git a/meta/packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/no-harry-potter.diff
index 2bb20ab9c..2bb20ab9c 100644
--- a/meta/packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff
+++ b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/no-harry-potter.diff
diff --git a/meta/packages/linux/linux-omap2.inc b/meta/recipes-kernel/linux/linux-omap2.inc
index c706a3f91..c706a3f91 100644
--- a/meta/packages/linux/linux-omap2.inc
+++ b/meta/recipes-kernel/linux/linux-omap2.inc
diff --git a/meta/packages/linux/linux-omap2_git.bb b/meta/recipes-kernel/linux/linux-omap2_git.bb
index 4d4692dbb..4d4692dbb 100644
--- a/meta/packages/linux/linux-omap2_git.bb
+++ b/meta/recipes-kernel/linux/linux-omap2_git.bb
diff --git a/meta/packages/linux/linux-omap3-git/beagleboard/defconfig b/meta/recipes-kernel/linux/linux-omap3-git/beagleboard/defconfig
index b4c3c31d0..b4c3c31d0 100644
--- a/meta/packages/linux/linux-omap3-git/beagleboard/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap3-git/beagleboard/defconfig
diff --git a/meta/packages/linux/linux-omap3-git/beagleboard/flash.patch b/meta/recipes-kernel/linux/linux-omap3-git/beagleboard/flash.patch
index 4c76cd97b..4c76cd97b 100644
--- a/meta/packages/linux/linux-omap3-git/beagleboard/flash.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-git/beagleboard/flash.patch
diff --git a/meta/packages/linux/linux-omap3-git/beagleboard/no-empty-flash-warnings.patch b/meta/recipes-kernel/linux/linux-omap3-git/beagleboard/no-empty-flash-warnings.patch
index ab344b044..ab344b044 100644
--- a/meta/packages/linux/linux-omap3-git/beagleboard/no-empty-flash-warnings.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-git/beagleboard/no-empty-flash-warnings.patch
diff --git a/meta/packages/linux/linux-omap3-git/omap3evm/defconfig b/meta/recipes-kernel/linux/linux-omap3-git/omap3evm/defconfig
index 2e938ed95..2e938ed95 100644
--- a/meta/packages/linux/linux-omap3-git/omap3evm/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap3-git/omap3evm/defconfig
diff --git a/meta/packages/linux/linux-omap3-git/omap3evm/no-empty-flash-warnings.patch b/meta/recipes-kernel/linux/linux-omap3-git/omap3evm/no-empty-flash-warnings.patch
index ab344b044..ab344b044 100644
--- a/meta/packages/linux/linux-omap3-git/omap3evm/no-empty-flash-warnings.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-git/omap3evm/no-empty-flash-warnings.patch
diff --git a/meta/packages/linux/linux-omap3-git/overo/defconfig b/meta/recipes-kernel/linux/linux-omap3-git/overo/defconfig
index 688fa378e..688fa378e 100644
--- a/meta/packages/linux/linux-omap3-git/overo/defconfig
+++ b/meta/recipes-kernel/linux/linux-omap3-git/overo/defconfig
diff --git a/meta/packages/linux/linux-omap3-git/overo/logo_linux_clut224.ppm b/meta/recipes-kernel/linux/linux-omap3-git/overo/logo_linux_clut224.ppm
index 42f390da0..42f390da0 100644
--- a/meta/packages/linux/linux-omap3-git/overo/logo_linux_clut224.ppm
+++ b/meta/recipes-kernel/linux/linux-omap3-git/overo/logo_linux_clut224.ppm
diff --git a/meta/packages/linux/linux-omap3-git/overo/no-empty-flash-warnings.patch b/meta/recipes-kernel/linux/linux-omap3-git/overo/no-empty-flash-warnings.patch
index ab344b044..ab344b044 100644
--- a/meta/packages/linux/linux-omap3-git/overo/no-empty-flash-warnings.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-git/overo/no-empty-flash-warnings.patch
diff --git a/meta/packages/linux/linux-omap3-git/overo/overo.patch b/meta/recipes-kernel/linux/linux-omap3-git/overo/overo.patch
index 5e9b696b4..5e9b696b4 100644
--- a/meta/packages/linux/linux-omap3-git/overo/overo.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-git/overo/overo.patch
diff --git a/meta/packages/linux/linux-omap3-pm-git/zoom2/0001-OMAP1-2-3-4-DEBUG_LL-cleanup.patch b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0001-OMAP1-2-3-4-DEBUG_LL-cleanup.patch
index e1e216c91..e1e216c91 100644
--- a/meta/packages/linux/linux-omap3-pm-git/zoom2/0001-OMAP1-2-3-4-DEBUG_LL-cleanup.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0001-OMAP1-2-3-4-DEBUG_LL-cleanup.patch
diff --git a/meta/packages/linux/linux-omap3-pm-git/zoom2/0002-OMAP1-2-3-4-Adapt-board-files-for-cleand-DEBUG_LL-in.patch b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0002-OMAP1-2-3-4-Adapt-board-files-for-cleand-DEBUG_LL-in.patch
index 8019631b1..8019631b1 100644
--- a/meta/packages/linux/linux-omap3-pm-git/zoom2/0002-OMAP1-2-3-4-Adapt-board-files-for-cleand-DEBUG_LL-in.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0002-OMAP1-2-3-4-Adapt-board-files-for-cleand-DEBUG_LL-in.patch
diff --git a/meta/packages/linux/linux-omap3-pm-git/zoom2/0003-OMAP-Zoom2-Add-DEBUG_LL-interface-using-external-Qua.patch b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0003-OMAP-Zoom2-Add-DEBUG_LL-interface-using-external-Qua.patch
index e39090f6c..e39090f6c 100644
--- a/meta/packages/linux/linux-omap3-pm-git/zoom2/0003-OMAP-Zoom2-Add-DEBUG_LL-interface-using-external-Qua.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0003-OMAP-Zoom2-Add-DEBUG_LL-interface-using-external-Qua.patch
diff --git a/meta/packages/linux/linux-omap3-pm-git/zoom2/0005-OMAP-Zoom2-Release-Dbg-board-detect-gpio.patch b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0005-OMAP-Zoom2-Release-Dbg-board-detect-gpio.patch
index a01f65f89..a01f65f89 100644
--- a/meta/packages/linux/linux-omap3-pm-git/zoom2/0005-OMAP-Zoom2-Release-Dbg-board-detect-gpio.patch
+++ b/meta/recipes-kernel/linux/linux-omap3-pm-git/zoom2/0005-OMAP-Zoom2-Release-Dbg-board-detect-gpio.patch
diff --git a/meta/packages/linux/linux-omap3-pm_git.bb b/meta/recipes-kernel/linux/linux-omap3-pm_git.bb
index 45bc492d8..45bc492d8 100644
--- a/meta/packages/linux/linux-omap3-pm_git.bb
+++ b/meta/recipes-kernel/linux/linux-omap3-pm_git.bb
diff --git a/meta/packages/linux/linux-omap3_git.bb b/meta/recipes-kernel/linux/linux-omap3_git.bb
index d728efa0d..d728efa0d 100644
--- a/meta/packages/linux/linux-omap3_git.bb
+++ b/meta/recipes-kernel/linux/linux-omap3_git.bb
diff --git a/meta/packages/linux/linux-omap_2.6.22.19.bb b/meta/recipes-kernel/linux/linux-omap_2.6.22.19.bb
index f6777bcc5..f6777bcc5 100644
--- a/meta/packages/linux/linux-omap_2.6.22.19.bb
+++ b/meta/recipes-kernel/linux/linux-omap_2.6.22.19.bb
diff --git a/meta/packages/linux/linux-omap_2.6.24.7.bb b/meta/recipes-kernel/linux/linux-omap_2.6.24.7.bb
index 1defa79c5..1defa79c5 100644
--- a/meta/packages/linux/linux-omap_2.6.24.7.bb
+++ b/meta/recipes-kernel/linux/linux-omap_2.6.24.7.bb
diff --git a/meta/packages/linux/linux-omap_2.6.29.bb b/meta/recipes-kernel/linux/linux-omap_2.6.29.bb
index f0769f855..f0769f855 100644
--- a/meta/packages/linux/linux-omap_2.6.29.bb
+++ b/meta/recipes-kernel/linux/linux-omap_2.6.29.bb
diff --git a/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
index ad4ce996d..ad4ce996d 100644
--- a/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/binutils-buildid-arm.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/binutils-buildid-arm.patch
index 68e35e89e..68e35e89e 100644
--- a/meta/packages/linux/linux-rp-2.6.23/binutils-buildid-arm.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/binutils-buildid-arm.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/connectplus-prevent-oops-HACK.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/connectplus-prevent-oops-HACK.patch
index b5439c62e..b5439c62e 100644
--- a/meta/packages/linux/linux-rp-2.6.23/connectplus-prevent-oops-HACK.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/connectplus-prevent-oops-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch
index 4414b2119..4414b2119 100644
--- a/meta/packages/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-akita
index ddc7ba01b..ddc7ba01b 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-bootcdx86
index 244df733a..244df733a 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-c7x0
index f1d0295fb..f1d0295fb 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-collie b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-collie
index 64e5090ae..64e5090ae 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-collie
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-htcuniversal
index 3f33b1446..3f33b1446 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-htcuniversal
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-hx2000
index 447d26da8..447d26da8 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-poodle
index 5afa7c556..5afa7c556 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-qemuarm
index 78f08bea4..78f08bea4 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-qemux86
index 62bbaceaf..62bbaceaf 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-spitz
index d3512f2a4..d3512f2a4 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-tosa
index d005193a3..d005193a3 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-tosa
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-zylonite
index d98974989..d98974989 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/defconfig-zylonite
diff --git a/meta/packages/linux/linux-rp-2.6.23/hostap-monitor-mode.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/hostap-monitor-mode.patch
index 641fd19e5..641fd19e5 100644
--- a/meta/packages/linux/linux-rp-2.6.23/hostap-monitor-mode.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch
index 5ee8b2042..5ee8b2042 100644
--- a/meta/packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/htcuni-acx.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/htcuni-acx.patch
index 769674c93..769674c93 100644
--- a/meta/packages/linux/linux-rp-2.6.23/htcuni-acx.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/htcuni-acx.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/htcuni.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/htcuni.patch
index 4d746749c..4d746749c 100644
--- a/meta/packages/linux/linux-rp-2.6.23/htcuni.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/htcuni.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/mtd-module.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/mtd-module.patch
index 4aa2f22ae..4aa2f22ae 100644
--- a/meta/packages/linux/linux-rp-2.6.23/mtd-module.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/mtd-module.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/pxa-serial-hack.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/pxa-serial-hack.patch
index bf20f46a0..bf20f46a0 100644
--- a/meta/packages/linux/linux-rp-2.6.23/pxa-serial-hack.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/pxa_fb_overlay.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/pxa_fb_overlay.patch
index 49c59b327..49c59b327 100644
--- a/meta/packages/linux/linux-rp-2.6.23/pxa_fb_overlay.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/pxa_fb_overlay.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba146..b513ba146 100644
--- a/meta/packages/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch
index 08f1f2e72..08f1f2e72 100644
--- a/meta/packages/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch
index a210afcaf..a210afcaf 100644
--- a/meta/packages/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/squashfs3.0-2.6.15.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch
index 711375114..711375114 100644
--- a/meta/packages/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/uvesafb-0.1-rc3-2.6.22.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/versatile-armv6.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/versatile-armv6.patch
index e2d0060ac..e2d0060ac 100644
--- a/meta/packages/linux/linux-rp-2.6.23/versatile-armv6.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/versatile-armv6.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/wm8750-treble.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm8750-treble.patch
index 07a8d8e14..07a8d8e14 100644
--- a/meta/packages/linux/linux-rp-2.6.23/wm8750-treble.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm8750-treble.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/wm9712-reset-loop-r2.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm9712-reset-loop-r2.patch
index 78e81ea83..78e81ea83 100644
--- a/meta/packages/linux/linux-rp-2.6.23/wm9712-reset-loop-r2.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm9712-reset-loop-r2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/wm9712-suspend-cold-res-r2.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm9712-suspend-cold-res-r2.patch
index 5179b47cc..5179b47cc 100644
--- a/meta/packages/linux/linux-rp-2.6.23/wm9712-suspend-cold-res-r2.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm9712-suspend-cold-res-r2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0-fix-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm97xx-lg13-r0-fix-r0.patch
index 5ad0d8703..5ad0d8703 100644
--- a/meta/packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0-fix-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm97xx-lg13-r0-fix-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm97xx-lg13-r0.patch
index c918c5daf..c918c5daf 100644
--- a/meta/packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/wm97xx-lg13-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/zylonite-boot.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite-boot.patch
index f41928eca..f41928eca 100644
--- a/meta/packages/linux/linux-rp-2.6.23/zylonite-boot.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite-boot.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/zylonite_keypad-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite_keypad-r0.patch
index 1889b3884..1889b3884 100644
--- a/meta/packages/linux/linux-rp-2.6.23/zylonite_keypad-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite_keypad-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/zylonite_mtd-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite_mtd-r0.patch
index cb5a9c5f7..cb5a9c5f7 100644
--- a/meta/packages/linux/linux-rp-2.6.23/zylonite_mtd-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite_mtd-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.23/zylonite_touch-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite_touch-r0.patch
index 1c0069605..1c0069605 100644
--- a/meta/packages/linux/linux-rp-2.6.23/zylonite_touch-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.23/zylonite_touch-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/binutils-buildid-arm.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/binutils-buildid-arm.patch
index 68e35e89e..68e35e89e 100644
--- a/meta/packages/linux/linux-rp-2.6.24/binutils-buildid-arm.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/binutils-buildid-arm.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/connectplus-prevent-oops-HACK.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/connectplus-prevent-oops-HACK.patch
index b5439c62e..b5439c62e 100644
--- a/meta/packages/linux/linux-rp-2.6.24/connectplus-prevent-oops-HACK.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/connectplus-prevent-oops-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/connectplus-remove-ide-HACK.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/connectplus-remove-ide-HACK.patch
index 4414b2119..4414b2119 100644
--- a/meta/packages/linux/linux-rp-2.6.24/connectplus-remove-ide-HACK.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-akita b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-akita
index 32bfa9dfc..32bfa9dfc 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-akita
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-bootcdx86
index 397468a36..397468a36 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0 b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-c7x0
index 4b54f9fc7..4b54f9fc7 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-collie b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-collie
index 4d3f9f878..4d3f9f878 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-collie
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-htcuniversal
index 770359467..770359467 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-htcuniversal
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000 b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-hx2000
index d023ffeca..d023ffeca 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-poodle b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-poodle
index 4d4020511..4d4020511 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-poodle
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-qemuarm
index ae7ef52d3..ae7ef52d3 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86 b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-qemux86
index d1012b5c7..d1012b5c7 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-spitz b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-spitz
index d97e13faf..d97e13faf 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-spitz
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-zylonite
index bdf6a3be8..bdf6a3be8 100644
--- a/meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/defconfig-zylonite
diff --git a/meta/packages/linux/linux-rp-2.6.24/hostap-monitor-mode.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/hostap-monitor-mode.patch
index 641fd19e5..641fd19e5 100644
--- a/meta/packages/linux/linux-rp-2.6.24/hostap-monitor-mode.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/hrw-hostapcard.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/hrw-hostapcard.patch
index 67fc5b7c7..67fc5b7c7 100644
--- a/meta/packages/linux/linux-rp-2.6.24/hrw-hostapcard.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/hrw-hostapcard.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/htcuni-acx.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/htcuni-acx.patch
index 1ccebddc8..1ccebddc8 100644
--- a/meta/packages/linux/linux-rp-2.6.24/htcuni-acx.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/htcuni-acx.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/htcuni.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/htcuni.patch
index 8448c4ec0..8448c4ec0 100644
--- a/meta/packages/linux/linux-rp-2.6.24/htcuni.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/htcuni.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/mtd-module.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/mtd-module.patch
index 4aa2f22ae..4aa2f22ae 100644
--- a/meta/packages/linux/linux-rp-2.6.24/mtd-module.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/mtd-module.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/pxa-serial-hack.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa-serial-hack.patch
index bf20f46a0..bf20f46a0 100644
--- a/meta/packages/linux/linux-rp-2.6.24/pxa-serial-hack.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/pxa27x-resume.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa27x-resume.patch
index 6447a0b10..6447a0b10 100644
--- a/meta/packages/linux/linux-rp-2.6.24/pxa27x-resume.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa27x-resume.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch
index 14c496a31..14c496a31 100644
--- a/meta/packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/pxa_fb_overlay.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa_fb_overlay.patch
index 49c59b327..49c59b327 100644
--- a/meta/packages/linux/linux-rp-2.6.24/pxa_fb_overlay.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/pxa_fb_overlay.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba146..b513ba146 100644
--- a/meta/packages/linux/linux-rp-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
index bed41c55d..bed41c55d 100644
--- a/meta/packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
index 6fb34ec17..6fb34ec17 100644
--- a/meta/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/spitz_h_rewrite.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/spitz_h_rewrite.patch
index df6d5f66c..df6d5f66c 100644
--- a/meta/packages/linux/linux-rp-2.6.24/spitz_h_rewrite.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/spitz_h_rewrite.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/squashfs3.3.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/squashfs3.3.patch
index cb9a5c49e..cb9a5c49e 100644
--- a/meta/packages/linux/linux-rp-2.6.24/squashfs3.3.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/squashfs3.3.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/versatile-armv6.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/versatile-armv6.patch
index e2d0060ac..e2d0060ac 100644
--- a/meta/packages/linux/linux-rp-2.6.24/versatile-armv6.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/versatile-armv6.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/wm8750-treble.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/wm8750-treble.patch
index 07a8d8e14..07a8d8e14 100644
--- a/meta/packages/linux/linux-rp-2.6.24/wm8750-treble.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/wm8750-treble.patch
diff --git a/meta/packages/linux/linux-rp-2.6.24/zylonite-boot.patch b/meta/recipes-kernel/linux/linux-rp-2.6.24/zylonite-boot.patch
index f41928eca..f41928eca 100644
--- a/meta/packages/linux/linux-rp-2.6.24/zylonite-boot.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.24/zylonite-boot.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/binutils-buildid-arm.patch
index 68e35e89e..68e35e89e 100644
--- a/meta/packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/binutils-buildid-arm.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch
index b5439c62e..b5439c62e 100644
--- a/meta/packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch
index 4414b2119..4414b2119 100644
--- a/meta/packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/cpufreq-fix.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/cpufreq-fix.patch
index a3c996f7b..a3c996f7b 100644
--- a/meta/packages/linux/linux-rp-2.6.26/cpufreq-fix.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/cpufreq-fix.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-akita b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-akita
index e630a9abf..e630a9abf 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-akita
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-bootcdx86
index 35e9b5cd2..35e9b5cd2 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-c7x0 b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-c7x0
index 830c8189a..830c8189a 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-c7x0
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-collie b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-collie
index 271bfd588..271bfd588 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-collie
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-htcuniversal b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-htcuniversal
index 8b2a31dbb..8b2a31dbb 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-htcuniversal
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-htcuniversal
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-hx2000 b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-hx2000
index 0f2557c0f..0f2557c0f 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-hx2000
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-poodle b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-poodle
index 7d41252b1..7d41252b1 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-poodle
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarm b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemuarm
index e636b6c67..e636b6c67 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarm
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarmv6 b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemuarmv6
index 67975a818..67975a818 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarmv6
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemuarmv6
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarmv7 b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemuarmv7
index dc1f7490f..dc1f7490f 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarmv7
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemuarmv7
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemux86 b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemux86
index 42f674020..42f674020 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-qemux86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-spitz b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-spitz
index 9c8f0ae8a..9c8f0ae8a 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-spitz
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.26/defconfig-zylonite b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-zylonite
index cc2fc482a..cc2fc482a 100644
--- a/meta/packages/linux/linux-rp-2.6.26/defconfig-zylonite
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/defconfig-zylonite
diff --git a/meta/packages/linux/linux-rp-2.6.26/fixes.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/fixes.patch
index 5df21d5fa..5df21d5fa 100644
--- a/meta/packages/linux/linux-rp-2.6.26/fixes.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/fixes.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/hostap-monitor-mode.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/hostap-monitor-mode.patch
index 641fd19e5..641fd19e5 100644
--- a/meta/packages/linux/linux-rp-2.6.26/hostap-monitor-mode.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/hrw-hostapcard.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/hrw-hostapcard.patch
index 67fc5b7c7..67fc5b7c7 100644
--- a/meta/packages/linux/linux-rp-2.6.26/hrw-hostapcard.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/hrw-hostapcard.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/htcuni-acx.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/htcuni-acx.patch
index 1ccebddc8..1ccebddc8 100644
--- a/meta/packages/linux/linux-rp-2.6.26/htcuni-acx.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/htcuni-acx.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/htcuni.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/htcuni.patch
index 783f55b06..783f55b06 100644
--- a/meta/packages/linux/linux-rp-2.6.26/htcuni.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/htcuni.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/pxa-serial-hack.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/pxa-serial-hack.patch
index bf20f46a0..bf20f46a0 100644
--- a/meta/packages/linux/linux-rp-2.6.26/pxa-serial-hack.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/pxa_fb_overlay.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/pxa_fb_overlay.patch
index 49c59b327..49c59b327 100644
--- a/meta/packages/linux/linux-rp-2.6.26/pxa_fb_overlay.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/pxa_fb_overlay.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba146..b513ba146 100644
--- a/meta/packages/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch
index c4b95ad4f..c4b95ad4f 100644
--- a/meta/packages/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/spitz_h_rewrite.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/spitz_h_rewrite.patch
index 3dcf4ed8a..3dcf4ed8a 100644
--- a/meta/packages/linux/linux-rp-2.6.26/spitz_h_rewrite.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/spitz_h_rewrite.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/versatile-armv6.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/versatile-armv6.patch
index 2ee84021b..2ee84021b 100644
--- a/meta/packages/linux/linux-rp-2.6.26/versatile-armv6.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/versatile-armv6.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
index e0db0746c..e0db0746c 100644
--- a/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/zylonite-boot.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite-boot.patch
index f41928eca..f41928eca 100644
--- a/meta/packages/linux/linux-rp-2.6.26/zylonite-boot.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite-boot.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch
index 1889b3884..1889b3884 100644
--- a/meta/packages/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch
index cb5a9c5f7..cb5a9c5f7 100644
--- a/meta/packages/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/zylonite_touch-r0.patch b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite_touch-r0.patch
index 1c0069605..1c0069605 100644
--- a/meta/packages/linux/linux-rp-2.6.26/zylonite_touch-r0.patch
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.26/zylonite_touch-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.29/defconfig-qemumips b/meta/recipes-kernel/linux/linux-rp-2.6.29/defconfig-qemumips
index 000c6e4ec..000c6e4ec 100644
--- a/meta/packages/linux/linux-rp-2.6.29/defconfig-qemumips
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.29/defconfig-qemumips
diff --git a/meta/packages/linux/linux-rp-2.6.29/defconfig-qemux86 b/meta/recipes-kernel/linux/linux-rp-2.6.29/defconfig-qemux86
index a94085f0a..a94085f0a 100644
--- a/meta/packages/linux/linux-rp-2.6.29/defconfig-qemux86
+++ b/meta/recipes-kernel/linux/linux-rp-2.6.29/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp.inc b/meta/recipes-kernel/linux/linux-rp.inc
index 8b86bdee1..8b86bdee1 100644
--- a/meta/packages/linux/linux-rp.inc
+++ b/meta/recipes-kernel/linux/linux-rp.inc
diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/recipes-kernel/linux/linux-rp_2.6.23.bb
index 0c67fd4ea..0c67fd4ea 100644
--- a/meta/packages/linux/linux-rp_2.6.23.bb
+++ b/meta/recipes-kernel/linux/linux-rp_2.6.23.bb
diff --git a/meta/packages/linux/linux-rp_2.6.24.bb b/meta/recipes-kernel/linux/linux-rp_2.6.24.bb
index 1d927e3ff..1d927e3ff 100644
--- a/meta/packages/linux/linux-rp_2.6.24.bb
+++ b/meta/recipes-kernel/linux/linux-rp_2.6.24.bb
diff --git a/meta/packages/linux/linux-rp_2.6.26.bb b/meta/recipes-kernel/linux/linux-rp_2.6.26.bb
index 67d674b7b..67d674b7b 100644
--- a/meta/packages/linux/linux-rp_2.6.26.bb
+++ b/meta/recipes-kernel/linux/linux-rp_2.6.26.bb
diff --git a/meta/packages/linux/linux-rp_2.6.29.bb b/meta/recipes-kernel/linux/linux-rp_2.6.29.bb
index ed1a7b1d7..ed1a7b1d7 100644
--- a/meta/packages/linux/linux-rp_2.6.29.bb
+++ b/meta/recipes-kernel/linux/linux-rp_2.6.29.bb
diff --git a/meta/packages/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append b/meta/recipes-kernel/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append
index fc1af85be..fc1af85be 100644
--- a/meta/packages/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append
+++ b/meta/recipes-kernel/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append
diff --git a/meta/packages/linux/linux-simtec.inc b/meta/recipes-kernel/linux/linux-simtec.inc
index 2b7a5cc07..2b7a5cc07 100644
--- a/meta/packages/linux/linux-simtec.inc
+++ b/meta/recipes-kernel/linux/linux-simtec.inc
diff --git a/meta/packages/linux/linux-simtec_2.6.26-simtec3.bb b/meta/recipes-kernel/linux/linux-simtec_2.6.26-simtec3.bb
index 33b0e8808..33b0e8808 100644
--- a/meta/packages/linux/linux-simtec_2.6.26-simtec3.bb
+++ b/meta/recipes-kernel/linux/linux-simtec_2.6.26-simtec3.bb
diff --git a/meta/packages/linux/linux-wrs/connect-size.patch b/meta/recipes-kernel/linux/linux-wrs/connect-size.patch
index a78629c85..a78629c85 100644
--- a/meta/packages/linux/linux-wrs/connect-size.patch
+++ b/meta/recipes-kernel/linux/linux-wrs/connect-size.patch
diff --git a/meta/packages/linux/linux-wrs/qemux86-64.cfg b/meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg
index df3fbe32d..df3fbe32d 100644
--- a/meta/packages/linux/linux-wrs/qemux86-64.cfg
+++ b/meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg
diff --git a/meta/packages/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index eaa8e4447..eaa8e4447 100644
--- a/meta/packages/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
diff --git a/meta/packages/linux/linux-zylonite-2.6.14/defconfig b/meta/recipes-kernel/linux/linux-zylonite-2.6.14/defconfig
index addf080d0..addf080d0 100644
--- a/meta/packages/linux/linux-zylonite-2.6.14/defconfig
+++ b/meta/recipes-kernel/linux/linux-zylonite-2.6.14/defconfig
diff --git a/meta/packages/linux/linux-zylonite-2.6.14/rp_ts_sync.patch b/meta/recipes-kernel/linux/linux-zylonite-2.6.14/rp_ts_sync.patch
index 8d02f0365..8d02f0365 100644
--- a/meta/packages/linux/linux-zylonite-2.6.14/rp_ts_sync.patch
+++ b/meta/recipes-kernel/linux/linux-zylonite-2.6.14/rp_ts_sync.patch
diff --git a/meta/packages/linux/linux-zylonite.inc b/meta/recipes-kernel/linux/linux-zylonite.inc
index 5cf23bf6d..5cf23bf6d 100644
--- a/meta/packages/linux/linux-zylonite.inc
+++ b/meta/recipes-kernel/linux/linux-zylonite.inc
diff --git a/meta/packages/linux/linux-zylonite_2.6.14.bb b/meta/recipes-kernel/linux/linux-zylonite_2.6.14.bb
index f7e6a900e..f7e6a900e 100644
--- a/meta/packages/linux/linux-zylonite_2.6.14.bb
+++ b/meta/recipes-kernel/linux/linux-zylonite_2.6.14.bb
diff --git a/meta/packages/linux/linux.inc b/meta/recipes-kernel/linux/linux.inc
index 6f4db987d..6f4db987d 100644
--- a/meta/packages/linux/linux.inc
+++ b/meta/recipes-kernel/linux/linux.inc
diff --git a/meta/packages/linux/linux_2.6.23.bb b/meta/recipes-kernel/linux/linux_2.6.23.bb
index 5d5c21b9d..5d5c21b9d 100644
--- a/meta/packages/linux/linux_2.6.23.bb
+++ b/meta/recipes-kernel/linux/linux_2.6.23.bb
diff --git a/meta/packages/linux/linux_2.6.33.2.bb b/meta/recipes-kernel/linux/linux_2.6.33.2.bb
index 0f1a9f4e0..0f1a9f4e0 100644
--- a/meta/packages/linux/linux_2.6.33.2.bb
+++ b/meta/recipes-kernel/linux/linux_2.6.33.2.bb
diff --git a/meta/packages/lttng/lttng-control_0.87.bb b/meta/recipes-kernel/lttng/lttng-control_0.87.bb
index da6a6c6e5..da6a6c6e5 100644
--- a/meta/packages/lttng/lttng-control_0.87.bb
+++ b/meta/recipes-kernel/lttng/lttng-control_0.87.bb
diff --git a/meta/packages/lttng/lttng-ust_0.5.bb b/meta/recipes-kernel/lttng/lttng-ust_0.5.bb
index 4214423f1..4214423f1 100644
--- a/meta/packages/lttng/lttng-ust_0.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_0.5.bb
diff --git a/meta/packages/lttng/lttng-viewer_0.8.84.bb b/meta/recipes-kernel/lttng/lttng-viewer_0.8.84.bb
index a1786071e..a1786071e 100644
--- a/meta/packages/lttng/lttng-viewer_0.8.84.bb
+++ b/meta/recipes-kernel/lttng/lttng-viewer_0.8.84.bb
diff --git a/meta/packages/module-init-tools/files/disable_man.patch b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
index daf58248b..daf58248b 100644
--- a/meta/packages/module-init-tools/files/disable_man.patch
+++ b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
diff --git a/meta/packages/module-init-tools/files/grab_module_memset.patch b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
index 955025531..955025531 100644
--- a/meta/packages/module-init-tools/files/grab_module_memset.patch
+++ b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
diff --git a/meta/packages/module-init-tools/files/ignore_arch_directory.patch b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
index 7b3082480..7b3082480 100644
--- a/meta/packages/module-init-tools/files/ignore_arch_directory.patch
+++ b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
diff --git a/meta/packages/module-init-tools/files/modutils_extension.patch b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
index 128c9531a..128c9531a 100644
--- a/meta/packages/module-init-tools/files/modutils_extension.patch
+++ b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
diff --git a/meta/packages/module-init-tools/files/no-static-binaries.patch b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
index ca83ec075..ca83ec075 100644
--- a/meta/packages/module-init-tools/files/no-static-binaries.patch
+++ b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
index 08bf1a95e..08bf1a95e 100644
--- a/meta/packages/module-init-tools/module-init-tools-cross_3.12.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
diff --git a/meta/packages/module-init-tools/module-init-tools.inc b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
index f1319ad90..f1319ad90 100644
--- a/meta/packages/module-init-tools/module-init-tools.inc
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
diff --git a/meta/packages/module-init-tools/module-init-tools_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
index 6c312b4ce..6c312b4ce 100644
--- a/meta/packages/module-init-tools/module-init-tools_3.12.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
diff --git a/meta/packages/modutils/files/armeb.patch b/meta/recipes-kernel/modutils/files/armeb.patch
index a26a3a24e..a26a3a24e 100644
--- a/meta/packages/modutils/files/armeb.patch
+++ b/meta/recipes-kernel/modutils/files/armeb.patch
diff --git a/meta/packages/modutils/files/configure.patch b/meta/recipes-kernel/modutils/files/configure.patch
index cdf501593..cdf501593 100644
--- a/meta/packages/modutils/files/configure.patch
+++ b/meta/recipes-kernel/modutils/files/configure.patch
diff --git a/meta/packages/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
index e204898f0..e204898f0 100644
--- a/meta/packages/modutils/files/gcc4.patch
+++ b/meta/recipes-kernel/modutils/files/gcc4.patch
diff --git a/meta/packages/modutils/files/ipaq-pxa-2.6/modules b/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules
index ca99e71df..ca99e71df 100644
--- a/meta/packages/modutils/files/ipaq-pxa-2.6/modules
+++ b/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules
diff --git a/meta/packages/modutils/files/ipaq-pxa-2.6/modules.conf b/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules.conf
index ef2e561e8..ef2e561e8 100644
--- a/meta/packages/modutils/files/ipaq-pxa-2.6/modules.conf
+++ b/meta/recipes-kernel/modutils/files/ipaq-pxa-2.6/modules.conf
diff --git a/meta/packages/modutils/files/lex.l.diff b/meta/recipes-kernel/modutils/files/lex.l.diff
index 65904b6b0..65904b6b0 100644
--- a/meta/packages/modutils/files/lex.l.diff
+++ b/meta/recipes-kernel/modutils/files/lex.l.diff
diff --git a/meta/packages/modutils/files/mnci/modules b/meta/recipes-kernel/modutils/files/mnci/modules
index e228d2e8a..e228d2e8a 100644
--- a/meta/packages/modutils/files/mnci/modules
+++ b/meta/recipes-kernel/modutils/files/mnci/modules
diff --git a/meta/packages/modutils/files/mnci/modules-ramses b/meta/recipes-kernel/modutils/files/mnci/modules-ramses
index e228d2e8a..e228d2e8a 100644
--- a/meta/packages/modutils/files/mnci/modules-ramses
+++ b/meta/recipes-kernel/modutils/files/mnci/modules-ramses
diff --git a/meta/packages/modutils/files/mnci/modules.conf b/meta/recipes-kernel/modutils/files/mnci/modules.conf
index 310e5bb6c..310e5bb6c 100644
--- a/meta/packages/modutils/files/mnci/modules.conf
+++ b/meta/recipes-kernel/modutils/files/mnci/modules.conf
diff --git a/meta/packages/modutils/files/mnci/modutils.sh b/meta/recipes-kernel/modutils/files/mnci/modutils.sh
index 378915c27..378915c27 100755
--- a/meta/packages/modutils/files/mnci/modutils.sh
+++ b/meta/recipes-kernel/modutils/files/mnci/modutils.sh
diff --git a/meta/packages/modutils/files/modules b/meta/recipes-kernel/modutils/files/modules
index e69de29bb..e69de29bb 100644
--- a/meta/packages/modutils/files/modules
+++ b/meta/recipes-kernel/modutils/files/modules
diff --git a/meta/packages/modutils/files/modules.conf b/meta/recipes-kernel/modutils/files/modules.conf
index e69de29bb..e69de29bb 100644
--- a/meta/packages/modutils/files/modules.conf
+++ b/meta/recipes-kernel/modutils/files/modules.conf
diff --git a/meta/packages/modutils/files/modutils-notest.patch b/meta/recipes-kernel/modutils/files/modutils-notest.patch
index 0e15a1014..0e15a1014 100644
--- a/meta/packages/modutils/files/modutils-notest.patch
+++ b/meta/recipes-kernel/modutils/files/modutils-notest.patch
diff --git a/meta/packages/modutils/files/modutils.sh b/meta/recipes-kernel/modutils/files/modutils.sh
index 9049bbb8a..9049bbb8a 100755
--- a/meta/packages/modutils/files/modutils.sh
+++ b/meta/recipes-kernel/modutils/files/modutils.sh
diff --git a/meta/packages/modutils/files/mtx-1/modules b/meta/recipes-kernel/modutils/files/mtx-1/modules
index 3eb719acf..3eb719acf 100644
--- a/meta/packages/modutils/files/mtx-1/modules
+++ b/meta/recipes-kernel/modutils/files/mtx-1/modules
diff --git a/meta/packages/modutils/files/omap1610h2/modules b/meta/recipes-kernel/modutils/files/omap1610h2/modules
index e69de29bb..e69de29bb 100644
--- a/meta/packages/modutils/files/omap1610h2/modules
+++ b/meta/recipes-kernel/modutils/files/omap1610h2/modules
diff --git a/meta/packages/modutils/files/omap1610h2/modules.conf b/meta/recipes-kernel/modutils/files/omap1610h2/modules.conf
index e69de29bb..e69de29bb 100644
--- a/meta/packages/modutils/files/omap1610h2/modules.conf
+++ b/meta/recipes-kernel/modutils/files/omap1610h2/modules.conf
diff --git a/meta/packages/modutils/files/poodle/modules b/meta/recipes-kernel/modutils/files/poodle/modules
index 28d14f658..28d14f658 100644
--- a/meta/packages/modutils/files/poodle/modules
+++ b/meta/recipes-kernel/modutils/files/poodle/modules
diff --git a/meta/packages/modutils/files/poodle/modules.conf b/meta/recipes-kernel/modutils/files/poodle/modules.conf
index 8ff87872f..8ff87872f 100644
--- a/meta/packages/modutils/files/poodle/modules.conf
+++ b/meta/recipes-kernel/modutils/files/poodle/modules.conf
diff --git a/meta/packages/modutils/files/program_prefix.patch b/meta/recipes-kernel/modutils/files/program_prefix.patch
index 2927a23a2..2927a23a2 100644
--- a/meta/packages/modutils/files/program_prefix.patch
+++ b/meta/recipes-kernel/modutils/files/program_prefix.patch
diff --git a/meta/packages/modutils/files/tosa/modules b/meta/recipes-kernel/modutils/files/tosa/modules
index 754cc7f60..754cc7f60 100644
--- a/meta/packages/modutils/files/tosa/modules
+++ b/meta/recipes-kernel/modutils/files/tosa/modules
diff --git a/meta/packages/modutils/files/tosa/modules.conf b/meta/recipes-kernel/modutils/files/tosa/modules.conf
index 8ff87872f..8ff87872f 100644
--- a/meta/packages/modutils/files/tosa/modules.conf
+++ b/meta/recipes-kernel/modutils/files/tosa/modules.conf
diff --git a/meta/packages/modutils/files/wrt54/modules b/meta/recipes-kernel/modutils/files/wrt54/modules
index 78f651a83..78f651a83 100644
--- a/meta/packages/modutils/files/wrt54/modules
+++ b/meta/recipes-kernel/modutils/files/wrt54/modules
diff --git a/meta/packages/modutils/modutils-collateral.bb b/meta/recipes-kernel/modutils/modutils-collateral.bb
index 6d010a575..6d010a575 100644
--- a/meta/packages/modutils/modutils-collateral.bb
+++ b/meta/recipes-kernel/modutils/modutils-collateral.bb
diff --git a/meta/packages/modutils/modutils-cross/module.h.diff b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
index 077baaf3e..077baaf3e 100644
--- a/meta/packages/modutils/modutils-cross/module.h.diff
+++ b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
diff --git a/meta/packages/modutils/modutils-cross_2.4.27.bb b/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb
index d772516d3..d772516d3 100644
--- a/meta/packages/modutils/modutils-cross_2.4.27.bb
+++ b/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb
diff --git a/meta/packages/modutils/modutils-initscripts.bb b/meta/recipes-kernel/modutils/modutils-initscripts.bb
index b8fc6c229..b8fc6c229 100644
--- a/meta/packages/modutils/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils/modutils-initscripts.bb
diff --git a/meta/packages/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
index a5a923132..a5a923132 100644
--- a/meta/packages/modutils/modutils_2.4.27.bb
+++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
diff --git a/meta/packages/oprofile/oprofile/acinclude.m4 b/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
index ffaa8288d..ffaa8288d 100644
--- a/meta/packages/oprofile/oprofile/acinclude.m4
+++ b/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
diff --git a/meta/packages/oprofile/oprofile/opstart.patch b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
index d61c30095..d61c30095 100644
--- a/meta/packages/oprofile/oprofile/opstart.patch
+++ b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
diff --git a/meta/packages/oprofile/oprofile/xml_callgraph_details.patch b/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
index e5ab3d916..e5ab3d916 100644
--- a/meta/packages/oprofile/oprofile/xml_callgraph_details.patch
+++ b/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
diff --git a/meta/packages/oprofile/oprofile_0.9.6.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
index 9679411be..9679411be 100644
--- a/meta/packages/oprofile/oprofile_0.9.6.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/recipes-kernel/oprofile/oprofile_cvs.bb
index dd8dd5886..dd8dd5886 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_cvs.bb
diff --git a/meta/packages/oprofile/oprofileui-svn.inc b/meta/recipes-kernel/oprofile/oprofileui-svn.inc
index 4c9211cc0..4c9211cc0 100644
--- a/meta/packages/oprofile/oprofileui-svn.inc
+++ b/meta/recipes-kernel/oprofile/oprofileui-svn.inc
diff --git a/meta/packages/oprofile/oprofileui.inc b/meta/recipes-kernel/oprofile/oprofileui.inc
index 22b56a584..22b56a584 100644
--- a/meta/packages/oprofile/oprofileui.inc
+++ b/meta/recipes-kernel/oprofile/oprofileui.inc
diff --git a/meta/packages/oprofile/oprofileui_svn.bb b/meta/recipes-kernel/oprofile/oprofileui_svn.bb
index 39e10b4fd..39e10b4fd 100644
--- a/meta/packages/oprofile/oprofileui_svn.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui_svn.bb
diff --git a/meta/packages/powertop/powertop_1.11.bb b/meta/recipes-kernel/powertop/powertop_1.11.bb
index 371fc62e3..371fc62e3 100644
--- a/meta/packages/powertop/powertop_1.11.bb
+++ b/meta/recipes-kernel/powertop/powertop_1.11.bb
diff --git a/meta/packages/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index 57d54d668..57d54d668 100644
--- a/meta/packages/trace-cmd/trace-cmd_git.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
diff --git a/meta/packages/update-modules/update-modules-1.0/openmn/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules
index 976161f14..976161f14 100755
--- a/meta/packages/update-modules/update-modules-1.0/openmn/update-modules
+++ b/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules
diff --git a/meta/packages/update-modules/update-modules-1.0/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
index 636fe1c0d..636fe1c0d 100755
--- a/meta/packages/update-modules/update-modules-1.0/update-modules
+++ b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
diff --git a/meta/packages/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index 73ee558a0..73ee558a0 100644
--- a/meta/packages/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
diff --git a/meta/packages/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc
index ebd3493e6..ebd3493e6 100644
--- a/meta/packages/alsa/alsa-fpu.inc
+++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc
diff --git a/meta/packages/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch
index 9016b348d..9016b348d 100644
--- a/meta/packages/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch
diff --git a/meta/packages/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch
index 7d1316680..7d1316680 100644
--- a/meta/packages/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch
diff --git a/meta/packages/alsa/alsa-lib_1.0.23.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb
index b0a2a305c..b0a2a305c 100644
--- a/meta/packages/alsa/alsa-lib_1.0.23.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb
diff --git a/meta/packages/alsa/alsa-oss_1.0.17.bb b/meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb
index 00e00dc62..00e00dc62 100644
--- a/meta/packages/alsa/alsa-oss_1.0.17.bb
+++ b/meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb
diff --git a/meta/packages/alsa/alsa-tools_1.0.20.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb
index 789b68e43..789b68e43 100644
--- a/meta/packages/alsa/alsa-tools_1.0.20.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb
diff --git a/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch
index 0009c1afe..0009c1afe 100644
--- a/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch
diff --git a/meta/packages/alsa/alsa-utils_1.0.23.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
index 7b30c0d4b..7b30c0d4b 100644
--- a/meta/packages/alsa/alsa-utils_1.0.23.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
diff --git a/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
index e2f4fa136..e2f4fa136 100644
--- a/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
diff --git a/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
index fdb6f1337..fdb6f1337 100644
--- a/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
diff --git a/meta/packages/flac/flac-1.2.1/xmms.m4 b/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
index 5e250cdd3..5e250cdd3 100644
--- a/meta/packages/flac/flac-1.2.1/xmms.m4
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
diff --git a/meta/packages/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb
index 30a8cfb93..30a8cfb93 100644
--- a/meta/packages/flac/flac_1.2.1.bb
+++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb
diff --git a/meta/packages/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
index 15f56492f..15f56492f 100644
--- a/meta/packages/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
diff --git a/meta/packages/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
index 9ffcafff7..9ffcafff7 100644
--- a/meta/packages/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
diff --git a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
index 65d60f9ce..65d60f9ce 100644
--- a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
diff --git a/meta/packages/gstreamer/gst-fluendo-mp3/configure_fix.patch b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
index d8b213b3e..d8b213b3e 100644
--- a/meta/packages/gstreamer/gst-fluendo-mp3/configure_fix.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3/configure_fix.patch
diff --git a/meta/packages/gstreamer/gst-fluendo-mp3_0.10.2.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
index 9e33b3082..9e33b3082 100644
--- a/meta/packages/gstreamer/gst-fluendo-mp3_0.10.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.2.bb
diff --git a/meta/packages/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
index 81645accd..81645accd 100644
--- a/meta/packages/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.7.bb
diff --git a/meta/packages/gstreamer/gst-fluendo.inc b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
index 76b76c2b0..76b76c2b0 100644
--- a/meta/packages/gstreamer/gst-fluendo.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
diff --git a/meta/packages/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 36f30e061..36f30e061 100644
--- a/meta/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
diff --git a/meta/packages/gstreamer/gst-openmax_0.10.0.2.bb b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.0.2.bb
index 825cccb83..825cccb83 100644
--- a/meta/packages/gstreamer/gst-openmax_0.10.0.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.0.2.bb
diff --git a/meta/packages/gstreamer/gst-plugins-bad_0.10.19.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb
index 8f1821a7b..8f1821a7b 100644
--- a/meta/packages/gstreamer/gst-plugins-bad_0.10.19.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb
index bfbe28108..bfbe28108 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.29.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb
index 528dcbf54..528dcbf54 100644
--- a/meta/packages/gstreamer/gst-plugins-good_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb
diff --git a/meta/packages/gstreamer/gst-plugins-ugly_0.10.15.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.bb
index 7dda68500..7dda68500 100644
--- a/meta/packages/gstreamer/gst-plugins-ugly_0.10.15.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.bb
diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index f7f0a2d7c..f7f0a2d7c 100644
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
diff --git a/meta/packages/gstreamer/gstreamer-0.10.29/check_fix.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/check_fix.patch
index 72c3f6407..72c3f6407 100644
--- a/meta/packages/gstreamer/gstreamer-0.10.29/check_fix.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/check_fix.patch
diff --git a/meta/packages/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch
index 4ca1dbe6a..4ca1dbe6a 100644
--- a/meta/packages/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch
diff --git a/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.c b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstregistrybinary.c
index c1f3e71af..c1f3e71af 100644
--- a/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.c
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstregistrybinary.c
diff --git a/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.h b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstregistrybinary.h
index 2ef24d765..2ef24d765 100644
--- a/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.h
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstregistrybinary.h
diff --git a/meta/packages/gstreamer/gstreamer_0.10.29.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.29.bb
index 38e28fa53..38e28fa53 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.29.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.29.bb
diff --git a/meta/packages/lame/lame-3.98.4/no-gtk1.patch b/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
index 8669d3b43..8669d3b43 100644
--- a/meta/packages/lame/lame-3.98.4/no-gtk1.patch
+++ b/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
diff --git a/meta/packages/lame/lame_3.98.4.bb b/meta/recipes-multimedia/lame/lame_3.98.4.bb
index 316933495..316933495 100644
--- a/meta/packages/lame/lame_3.98.4.bb
+++ b/meta/recipes-multimedia/lame/lame_3.98.4.bb
diff --git a/meta/packages/liba52/liba52/buildcleanup.patch b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
index a86c5a8e3..a86c5a8e3 100644
--- a/meta/packages/liba52/liba52/buildcleanup.patch
+++ b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
diff --git a/meta/packages/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
index 884b861a9..884b861a9 100644
--- a/meta/packages/liba52/liba52_0.7.4.bb
+++ b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
diff --git a/meta/packages/libexif/libexif_0.6.16.bb b/meta/recipes-multimedia/libexif/libexif_0.6.16.bb
index e3b5c331a..e3b5c331a 100644
--- a/meta/packages/libexif/libexif_0.6.16.bb
+++ b/meta/recipes-multimedia/libexif/libexif_0.6.16.bb
diff --git a/meta/packages/libid3tag/libid3tag/addpkgconfig.patch b/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
index 07a8f6ec4..07a8f6ec4 100644
--- a/meta/packages/libid3tag/libid3tag/addpkgconfig.patch
+++ b/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
diff --git a/meta/packages/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index 072db9de6..072db9de6 100644
--- a/meta/packages/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
diff --git a/meta/packages/libmad/libmad/add-pkgconfig.patch b/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
index 636b27a92..636b27a92 100644
--- a/meta/packages/libmad/libmad/add-pkgconfig.patch
+++ b/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
diff --git a/meta/packages/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch b/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
index 785a8a22d..785a8a22d 100644
--- a/meta/packages/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
+++ b/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
diff --git a/meta/packages/libmad/libmad/no-force-mem.patch b/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
index d4dab7556..d4dab7556 100644
--- a/meta/packages/libmad/libmad/no-force-mem.patch
+++ b/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
diff --git a/meta/packages/libmad/libmad_0.15.1b.bb b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
index acc9df550..acc9df550 100644
--- a/meta/packages/libmad/libmad_0.15.1b.bb
+++ b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
diff --git a/meta/packages/libogg/libogg_1.2.0.bb b/meta/recipes-multimedia/libogg/libogg_1.2.0.bb
index 0c64da280..0c64da280 100644
--- a/meta/packages/libogg/libogg_1.2.0.bb
+++ b/meta/recipes-multimedia/libogg/libogg_1.2.0.bb
diff --git a/meta/packages/libpng/libpng_1.2.44.bb b/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
index 318bb7436..318bb7436 100644
--- a/meta/packages/libpng/libpng_1.2.44.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
diff --git a/meta/packages/libtiff/files/libtool2.patch b/meta/recipes-multimedia/libtiff/files/libtool2.patch
index 8285be51d..8285be51d 100644
--- a/meta/packages/libtiff/files/libtool2.patch
+++ b/meta/recipes-multimedia/libtiff/files/libtool2.patch
diff --git a/meta/packages/libtiff/tiff_3.8.2.bb b/meta/recipes-multimedia/libtiff/tiff_3.8.2.bb
index 4e3c82baa..4e3c82baa 100644
--- a/meta/packages/libtiff/tiff_3.8.2.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_3.8.2.bb
diff --git a/meta/packages/libvorbis/libvorbis_1.3.1.bb b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.1.bb
index 2181cb609..2181cb609 100644
--- a/meta/packages/libvorbis/libvorbis_1.3.1.bb
+++ b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.1.bb
diff --git a/meta/packages/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index a769e5a70..a769e5a70 100644
--- a/meta/packages/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
diff --git a/meta/packages/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch
index 80d4d8bf2..80d4d8bf2 100644
--- a/meta/packages/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch
diff --git a/meta/packages/musicbrainz/libmusicbrainz_3.0.2.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.2.bb
index 5dfda12a3..5dfda12a3 100644
--- a/meta/packages/musicbrainz/libmusicbrainz_3.0.2.bb
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.2.bb
diff --git a/meta/packages/tremor/tremor_20100422.bb b/meta/recipes-multimedia/tremor/tremor_20100422.bb
index 5c66b2ab7..5c66b2ab7 100644
--- a/meta/packages/tremor/tremor_20100422.bb
+++ b/meta/recipes-multimedia/tremor/tremor_20100422.bb
diff --git a/meta/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch b/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch
index 4ebc3dea8..4ebc3dea8 100644
--- a/meta/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
+++ b/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch
diff --git a/meta/packages/qmake/qmake2-cross/linux-oe-qmake.conf b/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf
index f58481a69..f58481a69 100644
--- a/meta/packages/qmake/qmake2-cross/linux-oe-qmake.conf
+++ b/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf
diff --git a/meta/packages/qmake/qmake2-cross/use-lflags-last.patch b/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch
index 4197dbbf6..4197dbbf6 100644
--- a/meta/packages/qmake/qmake2-cross/use-lflags-last.patch
+++ b/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch
diff --git a/meta/packages/qmake/qmake2-cross_2.10a.bb b/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb
index 60f738b9c..60f738b9c 100644
--- a/meta/packages/qmake/qmake2-cross_2.10a.bb
+++ b/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
new file mode 100644
index 000000000..4070ac554
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Fotowall is a creative tool that allows you to layout your photos or pictures \
+in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.."
+
+HOMEPAGE = "http://www.enricoros.com/opensource/fotowall"
+LICENSE = "GPLv2+"
+SECTION = "x11/apps"
+
+DEPENDS = "qt4-x11-free"
+RDEPENDS = "qt4-x11-free"
+
+SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
+
+S = "${WORKDIR}/Fotowall-${PV}"
+
+inherit qmake2 pkgconfig
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb
new file mode 100644
index 000000000..5f971e8b4
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp_0.4.1.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
+HOMEPAGE = "http://qmmp.ylsoftware.com"
+LICENSE = "GPLv2"
+SECTION = "multimedia"
+
+DEPENDS = "qt4-x11-free"
+RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl"
+
+SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2"
+
+PARALLEL_MAKE = ""
+
+inherit qmake2 pkgconfig
+
+do_configure_prepend() {
+	# fix qt4 lrelease name
+	sed -i -e 's/lrelease-qt4/lrelease4/' ${S}/qmmp.pro
+
+	# disable the unsupported plugin
+	for plugin in sndfile wavpack ; do
+		sed -i -e "s/$plugin//" ${S}/src/plugins/Input/Input.pro
+	done
+	sed -i -e 's/mms//' ${S}/src/plugins/Transports/Transports.pro
+	sed -i -e 's/srconverter//' ${S}/src/plugins/Effect/Effect.pro
+
+	sed -i -e 's/^CONFIG/#CONFIG/' ${S}/qmmp.pri
+	sed -i -e 's/CONFIG += WITH_ENCA/#CONFIG += WITH_ENCA/' ${S}/qmmp.pri
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
diff --git a/meta/recipes-qt/qt-apps/quicky_0.4.bb b/meta/recipes-qt/qt-apps/quicky_0.4.bb
new file mode 100644
index 000000000..ece8ead92
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/quicky_0.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A simple note-taking application with Wiki-style syntax and behaviour"
+HOMEPAGE = "http://qt-apps.org/content/show.php/Quicky?content=80325"
+LICENSE = "GPLv2+"
+SECTION = "x11/apps"
+
+DEPENDS = "qt4-x11-free"
+RDEPENDS = "qt4-x11-free"
+
+SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
+
+inherit qmake2 pkgconfig
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/${PN} ${D}${bindir}
+}
diff --git a/meta/recipes-qt/qt4/files/0001-cross-compile.patch b/meta/recipes-qt/qt4/files/0001-cross-compile.patch
new file mode 100644
index 000000000..053be06e5
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0001-cross-compile.patch
@@ -0,0 +1,36 @@
+Add configure option "crossarch" for cross compiling
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+Index: qt-embedded-linux-opensource-src-4.4.3/configure
+===================================================================
+--- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2009-03-26 17:02:45.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-03-26 17:03:43.000000000 +0100
+@@ -726,7 +726,7 @@
+             UNKNOWN_ARG=yes
+         fi
+         ;;
+-    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
++    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         shift
+         VAL="$1"
+@@ -1143,6 +1143,9 @@
+     xplatform)
+         XPLATFORM="$VAL"
+         ;;
++	crossarch)
++		CROSSARCH="$VAL"
++		;;
+     debug-and-release)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_DEBUG_RELEASE="$VAL"
+@@ -2405,6 +2408,8 @@
+     CFG_ARCH=$CFG_HOST_ARCH
+ fi
+ 
++CFG_ARCH="$CROSSARCH"
++
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
+     if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "    '$CFG_ARCH' is supported"
diff --git a/meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch b/meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
new file mode 100644
index 000000000..be4d5c0e2
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
@@ -0,0 +1,22 @@
+From acfeb18aa94bad6b2066e91cd15570889baaa252 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Sat, 2 Jun 2007 16:04:01 +0200
+Subject: [PATCH] fix resinit declaration
+
+---
+ src/qt3support/network/q3dns.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp
+===================================================================
+--- qt-embedded-linux-opensource-src-4.4.3.orig/src/qt3support/network/q3dns.cpp	2008-09-27 11:01:28.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp	2009-03-26 17:04:05.000000000 +0100
+@@ -44,7 +44,7 @@
+ # include <netinet/in.h>
+ # include <arpa/nameser.h>
+ # include <resolv.h>
+-extern "C" int res_init();
++extern "C" int res_init() throw();
+ #endif
+ 
+ // POSIX Large File Support redefines open -> open64
diff --git a/meta/recipes-qt/qt4/files/0004-no-qmake.patch b/meta/recipes-qt/qt4/files/0004-no-qmake.patch
new file mode 100644
index 000000000..a58b19f90
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0004-no-qmake.patch
@@ -0,0 +1,26 @@
+From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Sat, 2 Jun 2007 16:06:59 +0200
+Subject: [PATCH] no qmake
+
+qmake is already built in qt4-tools-native, so disable it
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.4.3/configure
+===================================================================
+--- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2009-03-26 17:03:43.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-03-26 17:04:17.000000000 +0100
+@@ -3786,7 +3786,7 @@
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
new file mode 100644
index 000000000..081d8992e
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
@@ -0,0 +1,24 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+Host include path should not be used in corss compiling case.
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch b/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
new file mode 100644
index 000000000..a1b89124d
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
@@ -0,0 +1,36 @@
+Add lib infix to distinguish different qt compile version: e.g. "E" for embedded, "" for X11
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+--- /tmp/uitools.prf	2009-12-01 18:38:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf	2009-12-01 18:58:16.000000000 +0100
+@@ -3,11 +3,11 @@
+ 
+ # Include the correct version of the UiLoader library
+ symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
+-else: QTUITOOLS_LINKAGE = -lQtUiTools
++else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ 
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+--- /tmp/uitools.pro	2009-12-01 18:40:28.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro	2009-12-01 18:59:18.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -43,3 +43,5 @@
+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+    QMAKE_PKGCONFIG_REQUIRES += QtXml
+ }
++
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/meta/recipes-qt/qt4/files/0009-support-2bpp.patch b/meta/recipes-qt/qt4/files/0009-support-2bpp.patch
new file mode 100644
index 000000000..cf44ea821
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0009-support-2bpp.patch
@@ -0,0 +1,299 @@
+Add 2bpp support
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure
+--- qt-embedded-linux-opensource-src-4.4.3.orig/configure	2008-09-27 11:01:23.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/configure	2009-01-14 14:30:53.000000000 +0100
+@@ -5045,6 +5045,7 @@
+     echo "Choose pixel-depths to support:"
+     echo
+     echo "   1. 1bpp, black/white"
++    echo "   2. 2bpp, grayscale"
+     echo "   4. 4bpp, grayscale"
+     echo "   8. 8bpp, paletted"
+     echo "  12. 12bpp, rgb 4-4-4"
+@@ -5063,11 +5064,11 @@
+ fi
+ if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
+     if [ "$CFG_QWS_DEPTHS" = "all" ]; then
+-        CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
++        CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic"
+     fi
+     for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
+ 	case $D in
+-	    1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
++	    1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
+ 	    generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
+ 	esac
+     done
+diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp
+--- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp	2008-09-27 11:01:28.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp	2009-01-14 17:22:34.000000000 +0100
+@@ -404,8 +404,8 @@
+         setupOffScreen();
+ 
+     // Now read in palette
+-    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
+-        screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
++    if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
++        screencols= 1 << vinfo.bits_per_pixel;
+         int loopc;
+         fb_cmap startcmap;
+         startcmap.start=0;
+diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp
+--- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp	2008-09-27 11:01:28.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp	2009-01-14 17:22:44.000000000 +0100
+@@ -444,6 +444,58 @@
+ }
+ #endif // QT_QWS_DEPTH_4
+ 
++#ifdef QT_QWS_DEPTH_2
++static inline void qt_rectfill_gray2(quint8 *dest, quint8 value,
++                                     int x, int y, int width, int height,
++                                     int stride)
++{
++    const int pixelsPerByte = 4;
++    const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
++    const int doAlign = (alignWidth > 0 ? 1 : 0);
++    const int alignStart = pixelsPerByte - 1 - (x & 3);
++    const int alignStop = alignStart - (alignWidth - 1);
++    const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
++    const int tailWidth = (width - alignWidth) & 3;
++    const int doTail = (tailWidth > 0 ? 1 : 0);
++    const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
++    const int width8 = (width - alignWidth) / pixelsPerByte;
++
++    dest += y * stride + x / pixelsPerByte;
++    stride -= (doAlign + width8);
++
++    for (int j = 0; j < height; ++j) {
++        if (doAlign) {
++            *dest = (*dest & ~alignMask) | (value & alignMask);
++            ++dest;
++        }
++        if (width8) {
++            qt_memfill<quint8>(dest, value, width8);
++            dest += width8;
++        }
++        if (doTail)
++            *dest = (*dest & tailMask) | (value & ~tailMask);
++        dest += stride;
++    }
++}
++
++static void solidFill_gray2(QScreen *screen, const QColor &color,
++                            const QRegion &region)
++{
++    quint8 *dest = reinterpret_cast<quint8*>(screen->base());
++    const quint8 c = qGray(color.rgba()) >> 6;
++    const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c;
++
++    const int stride = screen->linestep();
++    const QVector<QRect> rects = region.rects();
++
++    for (int i = 0; i < rects.size(); ++i) {
++        const QRect r = rects.at(i);
++        qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(),
++                          stride);
++    }
++}
++#endif // QT_QWS_DEPTH_2
++
+ #ifdef QT_QWS_DEPTH_1
+ static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
+                                     int x, int y, int width, int height,
+@@ -551,6 +603,11 @@
+         screen->d_ptr->solidFill = solidFill_gray4;
+         break;
+ #endif
++#ifdef QT_QWS_DEPTH_2
++    case 2:
++        screen->d_ptr->solidFill = solidFill_gray2;
++        break;
++#endif
+ #ifdef QT_QWS_DEPTH_1
+     case 1:
+         screen->d_ptr->solidFill = solidFill_mono;
+@@ -958,6 +1015,149 @@
+ }
+ #endif // QT_QWS_DEPTH_4
+ 
++#ifdef QT_QWS_DEPTH_2
++
++struct qgray2 { quint8 dummy; } Q_PACKED;
++
++template <typename SRC>
++static inline quint8 qt_convertToGray2(SRC color);
++
++template <>
++inline quint8 qt_convertToGray2(quint32 color)
++{
++    return qGray(color) >> 6;
++}
++
++template <>
++inline quint8 qt_convertToGray2(quint16 color)
++{
++    const int r = (color & 0xf800) >> 11;
++    const int g = (color & 0x07e0) >> 6; // only keep 5 bit
++    const int b = (color & 0x001f);
++    return (r * 11 + g * 16 + b * 5) >> 8;
++}
++
++template <>
++inline quint8 qt_convertToGray2(qrgb444 color)
++{
++    return qt_convertToGray2(quint32(color));
++}
++
++template <>
++inline quint8 qt_convertToGray2(qargb4444 color)
++{
++    return qt_convertToGray2(quint32(color));
++}
++
++template <typename SRC>
++static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src,
++                                        int x, int y, int width, int height,
++                                        int dstStride, int srcStride)
++{
++    const int pixelsPerByte = 4;
++    quint8 *dest8 = reinterpret_cast<quint8*>(dest2)
++                    + y * dstStride + x / pixelsPerByte;
++    const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
++    const int doAlign = (alignWidth > 0 ? 1 : 0);
++    const int alignStart = pixelsPerByte - 1 - (x & 3);
++    const int alignStop = alignStart - (alignWidth - 1);
++    const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
++    const int tailWidth = (width - alignWidth) & 3;
++    const int doTail = (tailWidth > 0 ? 1 : 0);
++    const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
++    const int width8 = (width - alignWidth) / pixelsPerByte;
++
++    srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth);
++    dstStride -= (width8 + doAlign);
++
++    for (int j = 0;  j < height; ++j) {
++        if (doAlign) {
++            quint8 d = *dest8 & ~alignMask;
++            for (int i = alignStart; i >= alignStop; --i)
++                d |= qt_convertToGray2<SRC>(*src++) << (2 * i);
++            *dest8++ = d;
++        }
++        for (int i = 0; i < width8; ++i) {
++            *dest8 = (qt_convertToGray2<SRC>(src[0]) << 6)
++                     | (qt_convertToGray2<SRC>(src[1]) << 4)
++                     | (qt_convertToGray2<SRC>(src[2]) << 2)
++                     | (qt_convertToGray2<SRC>(src[3]));
++            src += 4;
++            ++dest8;
++        }
++        if (doTail) {
++            quint8 d = *dest8 & tailMask;
++            switch (tailWidth) {
++            case 3: d |= qt_convertToGray2<SRC>(src[2]) << 2;
++            case 2: d |= qt_convertToGray2<SRC>(src[1]) << 4;
++            case 1: d |= qt_convertToGray2<SRC>(src[0]) << 6;
++            }
++            *dest8 = d;
++        }
++
++        dest8 += dstStride;
++        src += srcStride;
++    }
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const quint32 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<quint32>(dest, src, x, y, width, height,
++                                  dstStride, srcStride);
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const quint16 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<quint16>(dest, src, x, y, width, height,
++                                  dstStride, srcStride);
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const qrgb444 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<qrgb444>(dest, src, x, y, width, height,
++                                  dstStride, srcStride);
++}
++
++template <>
++void qt_rectconvert(qgray2 *dest, const qargb4444 *src,
++                    int x, int y, int width, int height,
++                    int dstStride, int srcStride)
++{
++    qt_rectconvert_gray2<qargb4444>(dest, src, x, y, width, height,
++                                    dstStride, srcStride);
++}
++
++static void blit_2(QScreen *screen, const QImage &image,
++                   const QPoint &topLeft, const QRegion &region)
++{
++    switch (image.format()) {
++    case QImage::Format_ARGB32_Premultiplied:
++        blit_template<qgray2, quint32>(screen, image, topLeft, region);
++        return;
++    case QImage::Format_RGB16:
++        blit_template<qgray2, quint16>(screen, image, topLeft, region);
++        return;
++    case QImage::Format_RGB444:
++        blit_template<qgray2, qrgb444>(screen, image, topLeft, region);
++        return;
++    case QImage::Format_ARGB4444_Premultiplied:
++        blit_template<qgray2, qargb4444>(screen, image, topLeft, region);
++        return;
++    default:
++        qCritical("blit_2(): Image format %d not supported!", image.format());
++    }
++}
++#endif // QT_QWS_DEPTH_2
++
+ #ifdef QT_QWS_DEPTH_1
+ 
+ struct qmono { quint8 dummy; } Q_PACKED;
+@@ -1206,6 +1406,11 @@
+         screen->d_ptr->blit = blit_4;
+         break;
+ #endif
++#ifdef QT_QWS_DEPTH_2
++    case 2:
++        screen->d_ptr->blit = blit_2;
++        break;
++#endif
+ #ifdef QT_QWS_DEPTH_1
+     case 1:
+         screen->d_ptr->blit = blit_1;
+@@ -2056,6 +2261,8 @@
+         }
+     } else if (d == 4) {
+         ret = qGray(r, g, b) >> 4;
++    } else if (d == 2) {
++        ret = qGray(r, g, b) >> 6;
+     } else if (d == 1) {
+         ret = qGray(r, g, b) >= 128;
+     } else {
+@@ -2126,6 +2333,10 @@
+     } else if(d==1) {
+         return true;
+ #endif
++#ifdef QT_QWS_DEPTH_2
++    } else if(d==2) {
++        return true;
++#endif
+ #ifdef QT_QWS_DEPTH_4
+     } else if(d==4) {
+         return true;
diff --git a/meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch b/meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
new file mode 100644
index 000000000..e52736926
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
@@ -0,0 +1,14 @@
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+--- /tmp/qws.pro	2009-12-10 19:30:08.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro	2009-12-10 19:30:21.000000000 +0100
+@@ -1,7 +1,7 @@
+ TEMPLATE      = subdirs
+ # no /dev/fbX
+ !qnx:!vxworks:SUBDIRS = framebuffer
+-SUBDIRS      += mousecalibration simpledecoration
++SUBDIRS      += mousecalibration
+ 
+ # install
+ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/meta/recipes-qt/qt4/files/fix-config-tests.patch b/meta/recipes-qt/qt4/files/fix-config-tests.patch
new file mode 100644
index 000000000..21054555b
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/fix-config-tests.patch
@@ -0,0 +1,36 @@
+Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache some-compiler-gcc" will not exist but "ccache" will.
+
+both visibility and relocs were affected.
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
+===================================================================
+--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test      2009-08-01 08:01:16.000000000 +0200
+@@ -8,7 +8,7 @@
+ int main() { return 0; }
+ EOF
+ 
+-"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
++$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+ rm -f bsymbolic_functions.c libtest.so
+ 
+ # done
+Index: qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test
+===================================================================
+--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/fvisibility.test 2009-06-20 06:57:50.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test      2009-08-01 07:59:05.000000000 +0200
+@@ -15,9 +15,9 @@
+ EOF
+ 
+     if [ "$VERBOSE" = "yes" ] ; then
+-        "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
++        $COMPILER -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
+     else
+-        "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
++        $COMPILER -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+     fi
+     rm -f fvisibility.c fvisibility.o
+ }
+
diff --git a/meta/recipes-qt/qt4/files/g++.conf b/meta/recipes-qt/qt4/files/g++.conf
new file mode 100644
index 000000000..4cd76e62e
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/g++.conf
@@ -0,0 +1,53 @@
+#
+# qmake configuration for common gcc
+#
+
+QMAKE_CC       = $(OE_QMAKE_CC)
+QMAKE_CFLAGS       += -pipe $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_DEPS	+= -M
+QMAKE_CFLAGS_WARN_ON	+= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	+= -w
+QMAKE_CFLAGS_RELEASE	+= 
+QMAKE_CFLAGS_DEBUG	+= -g
+QMAKE_CFLAGS_SHLIB	+= -fPIC
+QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
+QMAKE_CFLAGS_YACC	+= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+QMAKE_CXX      = $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS     += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC	+= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_LINK     = $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB   = $(OE_QMAKE_LINK)
+QMAKE_LFLAGS       += $(OE_QMAKE_LDFLAGS)
+QMAKE_LFLAGS_RELEASE	+=
+QMAKE_LFLAGS_DEBUG	+=
+QMAKE_LFLAGS_APP	+=
+QMAKE_LFLAGS_SHLIB	+= -shared
+QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
+QMAKE_LFLAGS_THREAD	+=
+QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
+QMAKE_RPATH        = -Wl,-rpath-link,
+
+QMAKE_PCH_OUTPUT_EXT    = .gch
+
+# -Bsymbolic-functions (ld) support
+QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
+QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
+
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/files/hack-out-pg_config.patch b/meta/recipes-qt/qt4/files/hack-out-pg_config.patch
new file mode 100644
index 000000000..650ed7745
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/hack-out-pg_config.patch
@@ -0,0 +1,30 @@
+Hack to not use the pg_config of the host system which will add /usr/include
+
+pg_config is a native binary so using that when cross compiling
+will always fail.  The commented out fix would do, but for OE
+our -platform and -xplatform is the same so we are actually not
+really cross compiling. Just comment out the test, we are passing
+the location to the postgres headers and if they are okay we
+will padd.
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+Index: qt-embedded-linux-opensource-src-4.5.2/configure
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.2.orig/configure	2009-08-10 03:03:04.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.5.2/configure	2009-08-10 03:58:11.000000000 +0200
+@@ -4401,10 +4402,10 @@
+             ;;
+         psql)
+             if [ "$CFG_SQL_psql" != "no" ]; then
+-                if "$WHICH" pg_config >/dev/null 2>&1; then
+-                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+-                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+-                fi
++#                if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pg_config >/dev/null 2>&1; then
++#                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
++#                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
++#                fi
+                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+                 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then
diff --git a/meta/recipes-qt/qt4/files/linux.conf b/meta/recipes-qt/qt4/files/linux.conf
new file mode 100644
index 000000000..90b8d65ab
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/linux.conf
@@ -0,0 +1,54 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR          =
+QMAKE_LIBDIR          =
+QMAKE_INCDIR_X11      =
+QMAKE_LIBDIR_X11      =
+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL   =
+QMAKE_LIBDIR_OPENGL   =
+
+
+QMAKE_LIBS            =
+QMAKE_LIBS_DYNLOAD    = -ldl
+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_OPENGL     = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT  = -lGL
+QMAKE_LIBS_THREAD     = -lpthread
+
+QMAKE_MOC             = $(OE_QMAKE_MOC)
+QMAKE_UIC             = $(OE_QMAKE_UIC)
+QMAKE_UIC3            = $(OE_QMAKE_UIC3)
+QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML    = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
+
+QMAKE_AR              = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY         = objcopy
+QMAKE_RANLIB          =
+
+QMAKE_TAR             = tar -cf
+QMAKE_GZIP            = gzip -9f
+
+QMAKE_COPY            = cp -f
+QMAKE_COPY_FILE       = $(COPY)
+QMAKE_COPY_DIR        = $(COPY) -r
+QMAKE_MOVE            = mv -f
+QMAKE_DEL_FILE        = rm -f
+QMAKE_DEL_DIR         = rmdir
+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS  = test -d
+QMAKE_MKDIR           = mkdir -p
+QMAKE_INSTALL_FILE    = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+include(unix.conf)
diff --git a/meta/recipes-qt/qt4/files/qt-config.patch b/meta/recipes-qt/qt4/files/qt-config.patch
new file mode 100644
index 000000000..a31e7b3e2
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qt-config.patch
@@ -0,0 +1,24 @@
+
+Ported from OE by: Yu Ke <ke.yu@intel.com>
+
+--- /tmp/qlibraryinfo.cpp	2008-08-02 17:16:41.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp	2008-08-02 17:17:42.000000000 +0200
+@@ -47,6 +47,7 @@
+ QT_BEGIN_NAMESPACE
+ extern QString qmake_libraryInfoFile();
+ QT_END_NAMESPACE
++#include <stdlib.h>
+ #else
+ # include "qcoreapplication.h"
+ #endif
+@@ -113,6 +114,10 @@
+ #ifdef QT_BUILD_QMAKE
+     if(!QFile::exists(qtconfig))
+         qtconfig = qmake_libraryInfoFile();
++    if (!QFile::exists(qtconfig)) {
++        QByteArray config = getenv("QT_CONF_PATH");
++        qtconfig = QFile::decodeName(config);
++    }
+ #else
+     if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
diff --git a/meta/recipes-qt/qt4/qt-4.6.3.inc b/meta/recipes-qt/qt4/qt-4.6.3.inc
new file mode 100644
index 000000000..9f4e221bb
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.6.3.inc
@@ -0,0 +1,65 @@
+LICENSE = "LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+                    file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
+                    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
+           file://0010-no-simpledecoration-example.patch \
+           file://fix-config-tests.patch \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf \
+           file://hack-out-pg_config.patch \
+           "
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+do_configure_prepend() {
+	for pro in $(find ${S} -name "*.pro") ; do
+		sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+	done
+
+	sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+	sed -i \
+	-e /QMAKE_MOC\ /d \
+	-e /QMAKE_UIC\ /d \
+	-e /QMAKE_UIC3\ /d \
+	-e /QMAKE_RCC\ /d \
+	${S}/configure
+}
+
+do_configure_append() {
+	sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+}
+
+QT_GLFLAGS ?= ""
+QT_CONFIG_FLAGS += " -no-rpath -qt3support -silent ${QT_GLFLAGS}"
+
+do_compile() {
+	# Fixup missing wsegl header in some SGX SDKs
+	if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
+		cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
+	fi
+
+	unset CFLAGS CXXFLAGS
+	oe_runmake ${EXTRA_ENV}
+}
+
+do_install_append() {
+	install -d ${D}${bindir}
+	for i in rcc uic moc ; do
+		install -m 0755 ${S}/bin/$i ${D}${bindir}/
+	done
+
+	#Append an E to the qtdemo file
+	if [ -n "${QT_LIBINFIX}" ] ; then
+		mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+	fi
+}
+
diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-tools-native.inc
new file mode 100644
index 000000000..7621d629f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-native.inc
@@ -0,0 +1,74 @@
+DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native dbus-native libsm-native"
+SECTION = "libs"
+HOMEPAGE = "http://qt.nokia.com"
+PRIORITY = "optional"
+
+inherit native
+
+SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF = "-prefix ${prefix} \
+                -L ${STAGING_LIBDIR_NATIVE} \
+                -I ${STAGING_INCDIR_NATIVE} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng \
+                -no-accessibility \
+                -no-cups \
+                -no-exceptions  \
+                -no-nas-sound \
+                -no-nis \
+                -verbose -release -static \
+                -qt3support"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+	(echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/dbus \
+  src/qt3support \
+  src/xml \
+  src/tools/uic \
+  src/tools/rcc \
+  src/network \
+  src/gui \
+  src/tools/uic3 \
+  tools/linguist/lrelease \
+  tools/linguist/lupdate \
+  tools/qdbus \
+"
+
+do_compile() {
+	for i in ${TOBUILD}; do
+		cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+	done
+}
+
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -m 0755 bin/qmake ${D}${bindir}/qmake2
+	for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
+		install -m 0755 bin/${i} ${D}${bindir}/${i}4
+	done
+
+	install -d ${D}${datadir}/qt4/
+	cp -PfR mkspecs ${D}${datadir}/qt4/
+	ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
+	cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
+
+	install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
+}
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
new file mode 100644
index 000000000..de24b38de
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
@@ -0,0 +1,11 @@
+require qt4-tools-native.inc
+
+LICENSE = "LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+                    file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
+                    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+PR = "r0"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf b/meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
new file mode 100644
index 000000000..68ae80b92
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
@@ -0,0 +1,54 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR          =
+QMAKE_LIBDIR          =
+QMAKE_INCDIR_X11      =
+QMAKE_LIBDIR_X11      =
+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL   =
+QMAKE_LIBDIR_OPENGL   =
+
+
+QMAKE_LIBS            = -Wl,-rpath-link,SEDME/lib -lglib-2.0
+QMAKE_LIBS_DYNLOAD    = -ldl
+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_OPENGL     = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT  = -lGL
+QMAKE_LIBS_THREAD     = -lpthread
+
+QMAKE_MOC             = $(OE_QMAKE_MOC)
+QMAKE_UIC             = $(OE_QMAKE_UIC)
+QMAKE_UIC3            = $(OE_QMAKE_UIC3)
+QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML    = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
+
+QMAKE_AR              = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY         = ${OBJCOPY}
+QMAKE_RANLIB          =
+
+QMAKE_TAR             = tar -cf
+QMAKE_GZIP            = gzip -9f
+
+QMAKE_COPY            = cp -f
+QMAKE_COPY_FILE       = $(COPY)
+QMAKE_COPY_DIR        = $(COPY) -r
+QMAKE_MOVE            = mv -f
+QMAKE_DEL_FILE        = rm -f
+QMAKE_DEL_DIR         = rmdir
+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS  = test -d
+QMAKE_MKDIR           = mkdir -p
+QMAKE_INSTALL_FILE    = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
new file mode 100644
index 000000000..352df1e5a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -0,0 +1,14 @@
+require qt4.inc
+
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+
+QT_GLFLAGS ?= "-no-opengl"
+QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
+QT_BASE_NAME ?= "qt4"
+QT_BASE_LIB  ?= "libqt"
+QT_DIR_NAME = "qt4"
+QT_LIBINFIX = ""
+
+inherit qmake2
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
new file mode 100644
index 000000000..e42f650c0
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
@@ -0,0 +1,6 @@
+require qt4-x11-free.inc
+require qt-4.6.3.inc
+
+PR = "r0"
+
+QT_CONFIG_FLAGS += " -xrandr "
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
new file mode 100644
index 000000000..16d5bebd3
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -0,0 +1,300 @@
+DESCRIPTION = "Qt is a comprehensive cross-platform C++ application framework"
+HOMEPAGE = "http://qt.nokia.com"
+
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3"
+
+inherit qmake_base
+
+QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
+                    -shared -no-nas-sound -no-sm -no-nis \
+                    -qt-gif -system-libjpeg -system-libpng -system-zlib \
+                    -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
+                    -no-pch -dbus -stl -glib -phonon -webkit"
+
+EXTRA_OEMAKE = "-e"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
+             INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+             QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+             AR="${TARGET_PREFIX}ar cqs" \
+             MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+
+export QT_CONF_PATH="${WORKDIR}/qt.conf"
+
+# Library packages
+QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns phonon QtMultimedia QtOpenVG QtMediaServices"
+
+QT_EXTRA_LIBS = "pvrQWSWSEGL"
+
+python __anonymous () {
+    import bb
+
+    lib_packages = []
+    dev_packages = []
+    dbg_packages = []
+    for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
+        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
+        # NOTE: the headers for QtAssistantClient are different
+        incname = name.replace("QtAssistantClient", "QtAssistant")
+        bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
+        bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
+                  ${libdir}/lib%(name)s${QT_LIBINFIX}.a
+                  ${libdir}/lib%(name)s${QT_LIBINFIX}.la
+                  ${libdir}/lib%(name)s${QT_LIBINFIX}.so
+                  ${includedir}/${QT_DIR_NAME}/%(incname)s
+                  ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
+        bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
+        lib_packages.append(pkg)
+        dev_packages.append("%s-dev" % pkg)
+        dbg_packages.append("%s-dbg" % pkg)
+    for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split():
+        dbg_packages.append("%s-dbg" % name)
+
+    for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
+        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
+        bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
+        bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
+                  ${libdir}/lib%(name)s.a
+                  ${libdir}/lib%(name)s.la
+                  ${libdir}/lib%(name)s.so
+                  ${includedir}/${QT_DIR_NAME}/%(incname)s
+                  ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
+        bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
+        lib_packages.append(pkg)
+        dev_packages.append("%s-dev" % pkg)
+        dbg_packages.append("%s-dbg" % pkg)
+
+    bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d)
+    bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d)
+    bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d)
+}
+
+OTHER_PACKAGES = "\
+             ${QT_BASE_NAME}-tools \
+             ${QT_BASE_NAME}-assistant \
+             ${QT_BASE_NAME}-common \
+             ${QT_BASE_NAME}-dbus \
+             ${QT_BASE_NAME}-demos \
+             ${QT_BASE_NAME}-designer \
+             ${QT_BASE_NAME}-examples \
+             ${QT_BASE_NAME}-fonts \
+             ${QT_BASE_NAME}-fonts-ttf-vera \
+             ${QT_BASE_NAME}-fonts-ttf-dejavu \
+             ${QT_BASE_NAME}-fonts-pfa \
+             ${QT_BASE_NAME}-fonts-pfb \
+             ${QT_BASE_NAME}-fonts-qpf \
+             ${QT_BASE_NAME}-linguist \
+             ${QT_BASE_NAME}-makeqpf \
+             ${QT_BASE_NAME}-mkspecs \
+             ${QT_BASE_NAME}-pixeltool \
+             ${QT_BASE_NAME}-qt3to4"
+
+PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
+PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"
+
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
+FILES_${PN}     = ""
+FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
+FILES_${PN}-dbg = ""
+RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
+RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
+RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
+RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
+             ${QT_BASE_NAME}-fonts-ttf-vera \
+             ${QT_BASE_NAME}-fonts-ttf-dejavu \
+             ${QT_BASE_NAME}-fonts-pfa \
+             ${QT_BASE_NAME}-fonts-pfb \
+             ${QT_BASE_NAME}-fonts-qpf"
+
+FILES_${QT_BASE_NAME}-tools                = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*"
+FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
+FILES_${QT_BASE_NAME}-assistant-dbg        = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
+FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
+FILES_${QT_BASE_NAME}-common-dbg           = "${bindir}/.debug/qtconfig"
+FILES_${QT_BASE_NAME}-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
+FILES_${QT_BASE_NAME}-dbus-dbg             = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
+FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
+FILES_${QT_BASE_NAME}-demos-dbg            = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/*  ${bindir}/${QT_DIR_NAME}/demos/*/.debug  ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug  ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
+FILES_${QT_BASE_NAME}-designer             = "${bindir}/*designer*"
+FILES_${QT_BASE_NAME}-designer-dbg         = "${bindir}/.debug/*designer*"
+FILES_${QT_BASE_NAME}-examples             = "${bindir}/${QT_DIR_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-examples-dbg         = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug"
+FILES_${QT_BASE_NAME}-fonts-ttf-vera       = "${libdir}/fonts/Vera*.ttf"
+FILES_${QT_BASE_NAME}-fonts-ttf-dejavu     = "${libdir}/fonts/DejaVu*.ttf"
+FILES_${QT_BASE_NAME}-fonts-pfa            = "${libdir}/fonts/*.pfa"
+FILES_${QT_BASE_NAME}-fonts-pfb            = "${libdir}/fonts/*.pfb"
+FILES_${QT_BASE_NAME}-fonts-qpf            = "${libdir}/fonts/*.qpf"
+FILES_${QT_BASE_NAME}-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
+FILES_${QT_BASE_NAME}-linguist-dbg         = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
+FILES_${QT_BASE_NAME}-pixeltool            = "${bindir}/pixeltool"
+FILES_${QT_BASE_NAME}-pixeltool-dbg        = "${bindir}/.debug/pixeltool"
+FILES_${QT_BASE_NAME}-qt3to4               = "${bindir}/qt3to4 ${datadir}/${QT_DIR_NAME}/q3porting.xml"
+FILES_${QT_BASE_NAME}-qt3to4-dbg           = "${bindir}/.debug/qt3to4"
+FILES_${QT_BASE_NAME}-makeqpf              = "${bindir}/makeqpf"
+FILES_${QT_BASE_NAME}-makeqpf-dbg          = "${bindir}/.debug/makeqpf"
+FILES_${QT_BASE_NAME}-mkspecs              = "${datadir}/${QT_DIR_NAME}/mkspecs/*"
+
+ARM_INSTRUCTION_SET = "arm"
+
+set_arch() {
+	case ${TARGET_ARCH} in
+		arm*)     QT_ARCH=arm ;;
+		i*86*)    QT_ARCH=i386 ;;
+		mips*)    QT_ARCH=mips ;;
+		powerpc*) QT_ARCH=powerpc ;;
+		x86_64*)  QT_ARCH=x86_64 ;;
+	esac
+}
+
+do_configure() {
+	unset QMAKESPEC
+	unset QTDIR
+
+	set_arch
+
+	if [ ! -e bin/qmake ]; then
+		ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+	fi
+
+	if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
+		ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
+	fi
+
+	cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/
+
+	echo "[Paths]"                                 > $QT_CONF_PATH
+	echo "Prefix=${prefix}/"                      >> $QT_CONF_PATH
+	echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+	echo "Headers=${includedir}/${QT_DIR_NAME}"   >> $QT_CONF_PATH
+	echo "Libraries=${libdir}"                    >> $QT_CONF_PATH
+	echo "Binaries=${bindir}"                     >> $QT_CONF_PATH
+	echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
+	echo "Data=${datadir}/${QT_DIR_NAME}"         >> $QT_CONF_PATH
+	echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
+	echo "Settings=${sysconfdir}/${QT_DIR_NAME}"  >> $QT_CONF_PATH
+	echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
+	echo "Demos=${bindir}/${QT_DIR_NAME}/demos"   >> $QT_CONF_PATH
+
+	${EXTRA_QMAKE_MUNGE}|| true
+
+	(echo o; echo yes) | ./configure -v \
+			-prefix ${prefix}/ \
+			-bindir ${bindir} \
+			-libdir ${libdir} \
+			-datadir ${datadir}/${QT_DIR_NAME} \
+			-sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
+			-docdir ${docdir}/${QT_DIR_NAME} \
+			-headerdir ${includedir}/${QT_DIR_NAME} \
+			-plugindir ${libdir}/${QT_DIR_NAME}/plugins \
+			-translationdir ${datadir}/${QT_DIR_NAME}/translations \
+			-examplesdir ${bindir}/${QT_DIR_NAME}/examples \
+			-demosdir ${bindir}/${QT_DIR_NAME}/demos \
+			-platform ${TARGET_OS}-oe-g++ \
+			-xplatform ${TARGET_OS}-oe-g++ \
+			-crossarch ${QT_ARCH} \
+			${QT_CONFIG_FLAGS} -no-fast \
+			-L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
+			-I${STAGING_INCDIR}/freetype2
+}
+
+do_compile() {
+	unset CFLAGS CXXFLAGS
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+
+	oe_runmake ${EXTRA_ENV}
+}
+
+python populate_packages_prepend() {
+        translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
+        translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d)
+        do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
+
+        phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
+        phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
+        do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+
+        # Package all the plugins and their -dbg version and create a meta package
+        import os
+        def qtopia_split(path, name, glob):
+                """
+                Split the package into a normal and -dbg package and then add the
+                new packages to the meta package.
+                """
+                plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d)
+                if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)):
+                        bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir)
+                        return
+
+                plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d)
+                dev_packages = []
+                dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg))
+                do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
+                # Create a -dbg package as well
+                plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d)
+                packages = bb.data.getVar('PACKAGES',d)
+                for (file,package) in dev_packages:
+                        packages = "%s %s-dbg" % (packages, package)
+                        file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
+                        bb.data.setVar("FILES_%s-dbg" % package, file_name, d)
+                        bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d)
+
+                bb.data.setVar('PACKAGES', packages, d)
+
+        qtopia_split('accessible',    'accessible',    '^libq(.*)\.so$')
+        qtopia_split('codecs',        'codec',         '^libq(.*)\.so$')
+        qtopia_split('decorations',   'decoration',    '^libqdecoration(.*)\.so$')
+        qtopia_split('designer',      'designer',      '^lib(.*)\.so$')
+        qtopia_split('gfxdrivers',    'gfxdriver',     '^libq(.*)\.so$')
+        qtopia_split('graphicssystems','graphicssystems', '^libq(.*)\.so$')
+        qtopia_split('mousedrivers',  'mousedriver',   '^libq(.*)mousedriver\.so$')
+        qtopia_split('iconengines',   'iconengine',    '^libq(.*)\.so$')
+        qtopia_split('imageformats',  'imageformat',   '^libq(.*)\.so$')
+        qtopia_split('inputmethods',  'inputmethod',   '^libq(.*)\.so$')
+        qtopia_split('sqldrivers',    'sqldriver',     '^libq(.*)\.so$')
+        qtopia_split('script',        'script',        '^libqtscript(.*)\.so$')
+        qtopia_split('styles',        'style',         '^libq(.*)\.so$')
+        qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$')
+}
+
+do_install() {
+	oe_runmake install INSTALL_ROOT=${D}
+
+	# These are host binaries, we should only use them in staging
+	rm -rf ${D}/${bindir}/qmake
+
+	# fix pkgconfig, libtool and prl files
+	sed -i -e s#-L${S}/lib##g \
+			-e s#-L${STAGING_LIBDIR}##g \
+			-e 's#STAGING_LIBDIR}#libdir}'#g \
+			-e s#-L${libdir}##g \
+			-e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
+			-e s#" -Wl,-rpath-link,${S}/lib"##g \
+			-e s#" -Wl,-rpath-link,${libdir}"##g \
+			-e 's#I/usr/include#Iincludedir}#g' \ 
+			-e 's#Iin#I${in#g' \
+			${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
+
+	sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \
+			${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf
+
+	# fix pkgconfig files
+	sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \
+			-e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \
+			${D}${libdir}/pkgconfig/*.pc
+	for name in ${QT_LIB_NAMES}; do
+			sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc
+	done
+
+	# QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
+	for pc in ${D}${libdir}/pkgconfig/*.pc ; do
+		sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
+				-e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
+				-e 's:IP{:I${:g' $pc
+	done
+
+	install -d ${D}/${libdir}/fonts
+	touch ${D}/${libdir}/fonts/fontdir
+}
diff --git a/meta/packages/uicmoc/uicmoc4-native.inc b/meta/recipes-qt/uicmoc/uicmoc4-native.inc
index b6933628d..b6933628d 100644
--- a/meta/packages/uicmoc/uicmoc4-native.inc
+++ b/meta/recipes-qt/uicmoc/uicmoc4-native.inc
diff --git a/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb b/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb
index 1950f6306..1950f6306 100644
--- a/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb
+++ b/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb
diff --git a/meta/packages/clipboard-manager/clipboard-manager_0.6.4.bb b/meta/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb
index 82dd1d047..82dd1d047 100644
--- a/meta/packages/clipboard-manager/clipboard-manager_0.6.4.bb
+++ b/meta/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb
diff --git a/meta/packages/clipboard-manager/files/daemonize.patch b/meta/recipes-sato/clipboard-manager/files/daemonize.patch
index 51ce4781a..51ce4781a 100644
--- a/meta/packages/clipboard-manager/files/daemonize.patch
+++ b/meta/recipes-sato/clipboard-manager/files/daemonize.patch
diff --git a/meta/packages/clipboard-manager/files/makefile.patch b/meta/recipes-sato/clipboard-manager/files/makefile.patch
index 6e48da004..6e48da004 100644
--- a/meta/packages/clipboard-manager/files/makefile.patch
+++ b/meta/recipes-sato/clipboard-manager/files/makefile.patch
diff --git a/meta/packages/clipboard-manager/files/script.patch b/meta/recipes-sato/clipboard-manager/files/script.patch
index 09e68620d..09e68620d 100644
--- a/meta/packages/clipboard-manager/files/script.patch
+++ b/meta/recipes-sato/clipboard-manager/files/script.patch
diff --git a/meta/packages/eds/eds-dbus-2.20.0/iconv-detect.h b/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h
index 46f476d5b..46f476d5b 100644
--- a/meta/packages/eds/eds-dbus-2.20.0/iconv-detect.h
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h
diff --git a/meta/packages/eds/eds-dbus-2.20.0/no_iconv_test.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
index 4a034b6c5..4a034b6c5 100644
--- a/meta/packages/eds/eds-dbus-2.20.0/no_iconv_test.patch
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
diff --git a/meta/packages/eds/eds-dbus-2.20.0/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
index e5c0f5184..e5c0f5184 100644
--- a/meta/packages/eds/eds-dbus-2.20.0/oh-contact.patch
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
diff --git a/meta/packages/eds/eds-dbus/iconv-detect.h b/meta/recipes-sato/eds/eds-dbus/iconv-detect.h
index 46f476d5b..46f476d5b 100644
--- a/meta/packages/eds/eds-dbus/iconv-detect.h
+++ b/meta/recipes-sato/eds/eds-dbus/iconv-detect.h
diff --git a/meta/packages/eds/eds-dbus/nossl.patch b/meta/recipes-sato/eds/eds-dbus/nossl.patch
index 30568ff07..30568ff07 100644
--- a/meta/packages/eds/eds-dbus/nossl.patch
+++ b/meta/recipes-sato/eds/eds-dbus/nossl.patch
diff --git a/meta/packages/eds/eds-dbus/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
index fdd7e4bdf..fdd7e4bdf 100644
--- a/meta/packages/eds/eds-dbus/oh-contact.patch
+++ b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
diff --git a/meta/packages/eds/eds-dbus/optional_imapx_provider.patch b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
index 128307a5f..128307a5f 100644
--- a/meta/packages/eds/eds-dbus/optional_imapx_provider.patch
+++ b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
diff --git a/meta/packages/eds/eds-dbus/parallelmake.patch b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
index 08cfac0d8..08cfac0d8 100644
--- a/meta/packages/eds/eds-dbus/parallelmake.patch
+++ b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
diff --git a/meta/packages/eds/eds-dbus_2.20.0.bb b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
index 2cbc9037a..2cbc9037a 100644
--- a/meta/packages/eds/eds-dbus_2.20.0.bb
+++ b/meta/recipes-sato/eds/eds-dbus_2.20.0.bb
diff --git a/meta/packages/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
index e11c91d5d..e11c91d5d 100644
--- a/meta/packages/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
diff --git a/meta/packages/eds/eds-tools_bzr.bb b/meta/recipes-sato/eds/eds-tools_bzr.bb
index 85e1c4b7c..85e1c4b7c 100644
--- a/meta/packages/eds/eds-tools_bzr.bb
+++ b/meta/recipes-sato/eds/eds-tools_bzr.bb
diff --git a/meta/packages/epdfview/epdfview/epdfview-ui-print.xml b/meta/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml
index 3ddf5147d..3ddf5147d 100644
--- a/meta/packages/epdfview/epdfview/epdfview-ui-print.xml
+++ b/meta/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml
diff --git a/meta/packages/epdfview/epdfview/epdfview-ui.xml b/meta/recipes-sato/epdfview/epdfview/epdfview-ui.xml
index 602d86f90..602d86f90 100644
--- a/meta/packages/epdfview/epdfview/epdfview-ui.xml
+++ b/meta/recipes-sato/epdfview/epdfview/epdfview-ui.xml
diff --git a/meta/packages/epdfview/epdfview/epdfview.desktop b/meta/recipes-sato/epdfview/epdfview/epdfview.desktop
index d3bf06d2a..d3bf06d2a 100644
--- a/meta/packages/epdfview/epdfview/epdfview.desktop
+++ b/meta/recipes-sato/epdfview/epdfview/epdfview.desktop
diff --git a/meta/packages/epdfview/epdfview/owl-menus.patch b/meta/recipes-sato/epdfview/epdfview/owl-menus.patch
index 755b71e7a..755b71e7a 100644
--- a/meta/packages/epdfview/epdfview/owl-menus.patch
+++ b/meta/recipes-sato/epdfview/epdfview/owl-menus.patch
diff --git a/meta/packages/epdfview/epdfview_0.1.6.bb b/meta/recipes-sato/epdfview/epdfview_0.1.6.bb
index a528474d9..a528474d9 100644
--- a/meta/packages/epdfview/epdfview_0.1.6.bb
+++ b/meta/recipes-sato/epdfview/epdfview_0.1.6.bb
diff --git a/meta/packages/epdfview/epdfview_0.1.7.bb b/meta/recipes-sato/epdfview/epdfview_0.1.7.bb
index 34e08bd14..34e08bd14 100644
--- a/meta/packages/epdfview/epdfview_0.1.7.bb
+++ b/meta/recipes-sato/epdfview/epdfview_0.1.7.bb
diff --git a/meta/packages/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
index a9a0b0555..a9a0b0555 100644
--- a/meta/packages/gaku/gaku_svn.bb
+++ b/meta/recipes-sato/gaku/gaku_svn.bb
diff --git a/meta/packages/gtk-engines/gtk-sato-engine.inc b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
index a7ebddff9..a7ebddff9 100644
--- a/meta/packages/gtk-engines/gtk-sato-engine.inc
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
diff --git a/meta/packages/gtk-engines/gtk-sato-engine_svn.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
index a7ee6c6e4..a7ee6c6e4 100644
--- a/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
diff --git a/meta/packages/images/poky-image-sato-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-directdisk.bb
index eac3b589b..5fa20b6ca 100644
--- a/meta/packages/images/poky-image-sato-directdisk.bb
+++ b/meta/recipes-sato/images/poky-image-sato-directdisk.bb
@@ -1,4 +1,4 @@
-require poky-image-directdisk.inc
+require recipes-core/images/poky-image-directdisk.inc
 
 DESCRIPTION = "Sato Direct Disk Image"
 
diff --git a/meta/packages/images/poky-image-sato-live.bb b/meta/recipes-sato/images/poky-image-sato-live.bb
index 9b686e812..08e344186 100644
--- a/meta/packages/images/poky-image-sato-live.bb
+++ b/meta/recipes-sato/images/poky-image-sato-live.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Sato Bootable Live Image"
 
-require poky-image-live.inc
+require recipes-core/images/poky-image-live.inc
 
 LABELS += "boot install"
 
diff --git a/meta/packages/images/poky-image-sato.bb b/meta/recipes-sato/images/poky-image-sato.bb
index 58eb5d68c..58eb5d68c 100644
--- a/meta/packages/images/poky-image-sato.bb
+++ b/meta/recipes-sato/images/poky-image-sato.bb
diff --git a/meta/packages/images/poky-image-sdk-live.bb b/meta/recipes-sato/images/poky-image-sdk-live.bb
index 807de392a..06c56ee15 100644
--- a/meta/packages/images/poky-image-sdk-live.bb
+++ b/meta/recipes-sato/images/poky-image-sdk-live.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Bootable Live SDK Image"
 
-require poky-image-live.inc
+require recipes-core/images/poky-image-live.inc
 
 LABELS += "boot install"
 
diff --git a/meta/packages/images/poky-image-sdk.bb b/meta/recipes-sato/images/poky-image-sdk.bb
index 1df832a0b..1df832a0b 100644
--- a/meta/packages/images/poky-image-sdk.bb
+++ b/meta/recipes-sato/images/poky-image-sdk.bb
diff --git a/meta/packages/kf/files/fix-configure.patch b/meta/recipes-sato/kf/files/fix-configure.patch
index fc1ad9a41..fc1ad9a41 100644
--- a/meta/packages/kf/files/fix-configure.patch
+++ b/meta/recipes-sato/kf/files/fix-configure.patch
diff --git a/meta/packages/kf/files/fix-desktop-file.patch b/meta/recipes-sato/kf/files/fix-desktop-file.patch
index 7a0f7d1bc..7a0f7d1bc 100644
--- a/meta/packages/kf/files/fix-desktop-file.patch
+++ b/meta/recipes-sato/kf/files/fix-desktop-file.patch
diff --git a/meta/packages/kf/files/gcc4.patch b/meta/recipes-sato/kf/files/gcc4.patch
index 58727ea0e..58727ea0e 100644
--- a/meta/packages/kf/files/gcc4.patch
+++ b/meta/recipes-sato/kf/files/gcc4.patch
diff --git a/meta/packages/kf/kf_0.5.4.1.bb b/meta/recipes-sato/kf/kf_0.5.4.1.bb
index 2baa6d46f..2baa6d46f 100644
--- a/meta/packages/kf/kf_0.5.4.1.bb
+++ b/meta/recipes-sato/kf/kf_0.5.4.1.bb
diff --git a/meta/packages/leafpad/files/leafpad.desktop b/meta/recipes-sato/leafpad/files/leafpad.desktop
index c7e2d5bb5..c7e2d5bb5 100644
--- a/meta/packages/leafpad/files/leafpad.desktop
+++ b/meta/recipes-sato/leafpad/files/leafpad.desktop
diff --git a/meta/packages/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch
index acfc88030..acfc88030 100644
--- a/meta/packages/leafpad/files/owl-menu.patch
+++ b/meta/recipes-sato/leafpad/files/owl-menu.patch
diff --git a/meta/packages/leafpad/leafpad_0.8.17.bb b/meta/recipes-sato/leafpad/leafpad_0.8.17.bb
index 5407b9e99..5407b9e99 100644
--- a/meta/packages/leafpad/leafpad_0.8.17.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.17.bb
diff --git a/meta/packages/libowl/libowl_svn.bb b/meta/recipes-sato/libowl/libowl_svn.bb
index 31a142c93..31a142c93 100644
--- a/meta/packages/libowl/libowl_svn.bb
+++ b/meta/recipes-sato/libowl/libowl_svn.bb
diff --git a/meta/packages/matchbox-config-gtk/files/no-handed.patch b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
index 9ab51eced..9ab51eced 100644
--- a/meta/packages/matchbox-config-gtk/files/no-handed.patch
+++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
diff --git a/meta/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
index af748f14f..af748f14f 100644
--- a/meta/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
diff --git a/meta/packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
index bdae33d5a..bdae33d5a 100644
--- a/meta/packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
+++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 0a02bb9f3..0a02bb9f3 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
index 83d4d0b3f..83d4d0b3f 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
index 324c81ff2..324c81ff2 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
index 43c5d3ed6..43c5d3ed6 100755
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
+++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
diff --git a/meta/packages/matchbox-stroke/files/configure_fix.patch b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
index 52cea0e8f..52cea0e8f 100644
--- a/meta/packages/matchbox-stroke/files/configure_fix.patch
+++ b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
index 0425fec78..0425fec78 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
index 45998633f..45998633f 100644
--- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
diff --git a/meta/packages/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
index 9262d33ea..9262d33ea 100644
--- a/meta/packages/matchbox-panel-2/startup_fix.diff
+++ b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
diff --git a/meta/packages/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index 1a7e99c0a..1a7e99c0a 100644
--- a/meta/packages/matchbox-sato/matchbox-session-sato/session
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
diff --git a/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 5c01a1328..5c01a1328 100644
--- a/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
diff --git a/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
index 52cea0e8f..52cea0e8f 100644
--- a/meta/packages/matchbox-wm/matchbox-wm/configure_fix.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
diff --git a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
index f3626557e..f3626557e 100644
--- a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
diff --git a/meta/packages/matchbox-terminal/matchbox-terminal_svn.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb
index 169223f84..169223f84 100644
--- a/meta/packages/matchbox-terminal/matchbox-terminal_svn.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
index 30b632934..30b632934 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
index 032dc2d6d..032dc2d6d 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
index 74fb8cf65..74fb8cf65 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
index 7d492353b..7d492353b 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
diff --git a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index fb91f03b1..fb91f03b1 100644
--- a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
diff --git a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_svn.bb b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb
index 6a9f18bea..6a9f18bea 100644
--- a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_svn.bb
+++ b/meta/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb
diff --git a/meta/packages/matchbox-themes-gtk/files/gtkrc b/meta/recipes-sato/matchbox-themes-gtk/files/gtkrc
index 6dc40c0aa..6dc40c0aa 100644
--- a/meta/packages/matchbox-themes-gtk/files/gtkrc
+++ b/meta/recipes-sato/matchbox-themes-gtk/files/gtkrc
diff --git a/meta/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb b/meta/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
index 60be56de1..60be56de1 100644
--- a/meta/packages/matchbox-themes-gtk/matchbox-themes-gtk.bb
+++ b/meta/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb
diff --git a/meta/packages/owl-video-widget/files/owl-video-widget.desktop b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop
index e7af07ee6..e7af07ee6 100644
--- a/meta/packages/owl-video-widget/files/owl-video-widget.desktop
+++ b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.desktop
diff --git a/meta/packages/owl-video-widget/files/owl-video-widget.png b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.png
index f463fe186..f463fe186 100644
--- a/meta/packages/owl-video-widget/files/owl-video-widget.png
+++ b/meta/recipes-sato/owl-video-widget/files/owl-video-widget.png
diff --git a/meta/packages/owl-video-widget/files/stock_media-play.png b/meta/recipes-sato/owl-video-widget/files/stock_media-play.png
index c2b9c582a..c2b9c582a 100644
--- a/meta/packages/owl-video-widget/files/stock_media-play.png
+++ b/meta/recipes-sato/owl-video-widget/files/stock_media-play.png
diff --git a/meta/packages/owl-video-widget/files/stock_volume-0.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-0.png
index f3f57143d..f3f57143d 100644
--- a/meta/packages/owl-video-widget/files/stock_volume-0.png
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-0.png
diff --git a/meta/packages/owl-video-widget/files/stock_volume-max.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-max.png
index 03f5a03b4..03f5a03b4 100644
--- a/meta/packages/owl-video-widget/files/stock_volume-max.png
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-max.png
diff --git a/meta/packages/owl-video-widget/files/stock_volume-med.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-med.png
index f774e42bb..f774e42bb 100644
--- a/meta/packages/owl-video-widget/files/stock_volume-med.png
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-med.png
diff --git a/meta/packages/owl-video-widget/files/stock_volume-min.png b/meta/recipes-sato/owl-video-widget/files/stock_volume-min.png
index f3f57143d..f3f57143d 100644
--- a/meta/packages/owl-video-widget/files/stock_volume-min.png
+++ b/meta/recipes-sato/owl-video-widget/files/stock_volume-min.png
diff --git a/meta/packages/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
index be3469965..be3469965 100644
--- a/meta/packages/owl-video-widget/libowl-av_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
diff --git a/meta/packages/owl-video-widget/owl-video_svn.bb b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
index 50027f5f2..50027f5f2 100644
--- a/meta/packages/owl-video-widget/owl-video_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
diff --git a/meta/packages/pcmanfm/files/cross-compile-fix.patch b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
index 2f654a5fb..2f654a5fb 100644
--- a/meta/packages/pcmanfm/files/cross-compile-fix.patch
+++ b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
diff --git a/meta/packages/pcmanfm/files/emblem-symbolic-link.png b/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
index b8e559456..b8e559456 100644
--- a/meta/packages/pcmanfm/files/emblem-symbolic-link.png
+++ b/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
diff --git a/meta/packages/pcmanfm/files/gnome-fs-directory.png b/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
index 05921a668..05921a668 100644
--- a/meta/packages/pcmanfm/files/gnome-fs-directory.png
+++ b/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
diff --git a/meta/packages/pcmanfm/files/gnome-fs-regular.png b/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
index ce77a8e62..ce77a8e62 100644
--- a/meta/packages/pcmanfm/files/gnome-fs-regular.png
+++ b/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
diff --git a/meta/packages/pcmanfm/files/gnome-mime-text-plain.png b/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
index bfe4bad56..bfe4bad56 100644
--- a/meta/packages/pcmanfm/files/gnome-mime-text-plain.png
+++ b/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
diff --git a/meta/packages/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
index f3d4e61a2..f3d4e61a2 100644
--- a/meta/packages/pcmanfm/files/owl-window-menu.patch
+++ b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
diff --git a/meta/packages/pcmanfm/pcmanfm_0.9.7.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.7.bb
index 46e46da68..46e46da68 100644
--- a/meta/packages/pcmanfm/pcmanfm_0.9.7.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.7.bb
diff --git a/meta/packages/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc
index a424295ac..a424295ac 100644
--- a/meta/packages/pimlico/contacts.inc
+++ b/meta/recipes-sato/pimlico/contacts.inc
diff --git a/meta/packages/pimlico/contacts/contacts-owl-window-menu.patch b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
index 4b9238b43..4b9238b43 100644
--- a/meta/packages/pimlico/contacts/contacts-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
diff --git a/meta/packages/pimlico/contacts/stock_contact.png b/meta/recipes-sato/pimlico/contacts/stock_contact.png
index 123b4485a..123b4485a 100644
--- a/meta/packages/pimlico/contacts/stock_contact.png
+++ b/meta/recipes-sato/pimlico/contacts/stock_contact.png
diff --git a/meta/packages/pimlico/contacts/stock_person.png b/meta/recipes-sato/pimlico/contacts/stock_person.png
index 2b1328b4e..2b1328b4e 100644
--- a/meta/packages/pimlico/contacts/stock_person.png
+++ b/meta/recipes-sato/pimlico/contacts/stock_person.png
diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb
index 1e4628737..1e4628737 100644
--- a/meta/packages/pimlico/contacts_0.9.bb
+++ b/meta/recipes-sato/pimlico/contacts_0.9.bb
diff --git a/meta/packages/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
index bff4e288d..bff4e288d 100644
--- a/meta/packages/pimlico/contacts_git.bb
+++ b/meta/recipes-sato/pimlico/contacts_git.bb
diff --git a/meta/packages/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc
index 6ef7b6061..6ef7b6061 100644
--- a/meta/packages/pimlico/dates.inc
+++ b/meta/recipes-sato/pimlico/dates.inc
diff --git a/meta/packages/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
index d5901658b..d5901658b 100644
--- a/meta/packages/pimlico/dates/dates-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
diff --git a/meta/packages/pimlico/dates_0.4.8.bb b/meta/recipes-sato/pimlico/dates_0.4.8.bb
index 13afc157d..13afc157d 100644
--- a/meta/packages/pimlico/dates_0.4.8.bb
+++ b/meta/recipes-sato/pimlico/dates_0.4.8.bb
diff --git a/meta/packages/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index 49ca4eca8..49ca4eca8 100644
--- a/meta/packages/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
diff --git a/meta/packages/pimlico/tasks.inc b/meta/recipes-sato/pimlico/tasks.inc
index 747840844..747840844 100644
--- a/meta/packages/pimlico/tasks.inc
+++ b/meta/recipes-sato/pimlico/tasks.inc
diff --git a/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch
index 6c458d260..6c458d260 100644
--- a/meta/packages/pimlico/tasks/fix_pre-GTK+2.16.patch
+++ b/meta/recipes-sato/pimlico/tasks/fix_pre-GTK+2.16.patch
diff --git a/meta/packages/pimlico/tasks/tasks-owl.diff b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
index e4078066f..e4078066f 100644
--- a/meta/packages/pimlico/tasks/tasks-owl.diff
+++ b/meta/recipes-sato/pimlico/tasks/tasks-owl.diff
diff --git a/meta/packages/pimlico/tasks_0.16.bb b/meta/recipes-sato/pimlico/tasks_0.16.bb
index 999da7652..999da7652 100644
--- a/meta/packages/pimlico/tasks_0.16.bb
+++ b/meta/recipes-sato/pimlico/tasks_0.16.bb
diff --git a/meta/packages/pimlico/tasks_git.bb b/meta/recipes-sato/pimlico/tasks_git.bb
index 1ab8cd18c..1ab8cd18c 100644
--- a/meta/packages/pimlico/tasks_git.bb
+++ b/meta/recipes-sato/pimlico/tasks_git.bb
diff --git a/meta/packages/puzzles/files/makedist_hack.patch b/meta/recipes-sato/puzzles/files/makedist_hack.patch
index d07e06602..d07e06602 100644
--- a/meta/packages/puzzles/files/makedist_hack.patch
+++ b/meta/recipes-sato/puzzles/files/makedist_hack.patch
diff --git a/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
index 61da9191a..61da9191a 100644
--- a/meta/packages/puzzles/files/oh-puzzles-owl-menu.patch
+++ b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
diff --git a/meta/packages/puzzles/oh-puzzles_svn.bb b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
index 5fcea24b3..5fcea24b3 100644
--- a/meta/packages/puzzles/oh-puzzles_svn.bb
+++ b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
diff --git a/meta/packages/puzzles/puzzles_r7593.bb b/meta/recipes-sato/puzzles/puzzles_r7593.bb
index eb1e00935..eb1e00935 100644
--- a/meta/packages/puzzles/puzzles_r7593.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r7593.bb
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index a1669c6f2..a1669c6f2 100644
--- a/meta/packages/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
index cfa6a0dd1..cfa6a0dd1 100644
--- a/meta/packages/sato-icon-theme/sato-icon-theme/iconpath-option.patch
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
diff --git a/meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index aa976b102..aa976b102 100644
--- a/meta/packages/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
diff --git a/meta/packages/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_svn.bb
index a95ba2d54..a95ba2d54 100644
--- a/meta/packages/screenshot/screenshot_svn.bb
+++ b/meta/recipes-sato/screenshot/screenshot_svn.bb
diff --git a/meta/packages/settings-daemon/files/70settings-daemon.sh b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
index 95374135f..95374135f 100644
--- a/meta/packages/settings-daemon/files/70settings-daemon.sh
+++ b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
diff --git a/meta/packages/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
index e06f02917..e06f02917 100644
--- a/meta/packages/settings-daemon/files/addsoundkeys.patch
+++ b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
diff --git a/meta/packages/settings-daemon/settings-daemon_svn.bb b/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb
index 4d1d9baf4..4d1d9baf4 100644
--- a/meta/packages/settings-daemon/settings-daemon_svn.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb
diff --git a/meta/packages/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
index 651d48189..651d48189 100644
--- a/meta/packages/tasks/task-poky-apps-x11-pimlico.bb
+++ b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
diff --git a/meta/packages/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-poky-x11-sato.bb
index 1b344edb5..1b344edb5 100644
--- a/meta/packages/tasks/task-poky-x11-sato.bb
+++ b/meta/recipes-sato/tasks/task-poky-x11-sato.bb
diff --git a/meta/packages/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
index 50d6e9379..50d6e9379 100644
--- a/meta/packages/web/web-webkit/link-with-g++.patch
+++ b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
diff --git a/meta/packages/web/web-webkit_svn.bb b/meta/recipes-sato/web/web-webkit_svn.bb
index 9cdf1f9da..9cdf1f9da 100644
--- a/meta/packages/web/web-webkit_svn.bb
+++ b/meta/recipes-sato/web/web-webkit_svn.bb
diff --git a/meta/packages/web/files/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
index 6e60dd089..6e60dd089 100644
--- a/meta/packages/web/files/owl-window-menu.patch
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
diff --git a/meta/packages/web/web_svn.bb b/meta/recipes-sato/web/web_svn.bb
index 583be4aa2..583be4aa2 100644
--- a/meta/packages/web/web_svn.bb
+++ b/meta/recipes-sato/web/web_svn.bb
diff --git a/meta/packages/gcalctool/gcalctool/fix-includedir.patch b/meta/recipes-tbd/gcalctool/gcalctool/fix-includedir.patch
index aeb02ab2c..aeb02ab2c 100644
--- a/meta/packages/gcalctool/gcalctool/fix-includedir.patch
+++ b/meta/recipes-tbd/gcalctool/gcalctool/fix-includedir.patch
diff --git a/meta/packages/gcalctool/gcalctool_5.7.32.bb b/meta/recipes-tbd/gcalctool/gcalctool_5.7.32.bb
index f12e6c402..f12e6c402 100644
--- a/meta/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/meta/recipes-tbd/gcalctool/gcalctool_5.7.32.bb
diff --git a/meta/packages/gcalctool/gcalctool_5.8.17.bb b/meta/recipes-tbd/gcalctool/gcalctool_5.8.17.bb
index c72860c8f..c72860c8f 100644
--- a/meta/packages/gcalctool/gcalctool_5.8.17.bb
+++ b/meta/recipes-tbd/gcalctool/gcalctool_5.8.17.bb
diff --git a/meta/recipes.txt b/meta/recipes.txt
new file mode 100644
index 000000000..51bb746fd
--- /dev/null
+++ b/meta/recipes.txt
@@ -0,0 +1,13 @@
+recipes-bsp          - Anything with links to specific hardware or hardware configuration information
+recipes-connectivity - Libraries and applications related to communication with other devices 
+recipes-core         - What's needed to build a basic working Linux image including commonly used dependencies
+recipes-devtools     - Tools primarily used by the build system (but can also be used on targets)
+recipes-extended     - Applications which whilst not essential add features compared to the alternatives in
+                       core. May be needed for full tool functionality or LSB compliance.
+recipes-gnome        - All things related to the GTK+ application framework
+recipes-graphics     - X and other graphically related system libraries  
+recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
+recipes-multimedia   - Codecs and support utilties for audio, images and video
+recipes-qt           - All things related to the QT application framework
+recipes-sato         - The Sato demo/reference UI/UX, its associated apps and configuration 
+