356 files changed, 9021 insertions, 3521 deletions

diff --git a/LICENSE.GPL3 b/LICENSE.GPL3
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE.GPL3
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README b/README
index 24c8475..592faea 100644
--- a/README
+++ b/README
@@ -1,32 +1,68 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+Meta layer for Boot to Qt Software Stack
+========================================
+
+Boot to Qt (b2qt) is the reference distro used in Qt for Device Creation [1].
+It combines Poky, meta-qt5 and various BSP meta layers to provide an integrated
+solution for building device images and toolchains with the latest Qt version.
+
+Currently used dependencies, meta repositories and their revisions are shown in
+scripts/manifest.xml
+
+[1] http://www.qt.io/qt-for-device-creation/
+
+Sources
+-------
+
+Git: git://code.qt.io/yocto/meta-boot2qt
+Web: http://code.qt.io/cgit/yocto/meta-boot2qt.git
+Gerrit: https://codereview.qt-project.org/#/admin/projects/yocto/meta-boot2qt
+
+Contributing
+------------
+
+To contribute to this layer you should submit the patches for review using
+Qt Gerrit (https://codereview.qt-project.org).
+
+More information about Qt Gerrit and how to use it:
+https://wiki.qt.io/Gerrit_Introduction
+https://wiki.qt.io/Setting_up_Gerrit
 
-OpenEmbedded/Yocto meta layer for Boot to Qt Software Stack
-==========================================================
+Layer maintainers
+-----------------
 
-This layer provides B2Qt for embedded Linux recipes for use with
-OpenEmbedded and Yocto.
+Samuli Piippo <samuli.piippo@qt.io>
 
-scripts/manifest.xml shows the currectly used meta repositories and
-revisions.
+Setting up build environment
+----------------------------
 
 To initialize build environment, use the b2qt-init-build-env script.
 
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 184af7d..30166d1 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -1,24 +1,32 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 set -e
 
@@ -98,10 +106,10 @@ get_groups() {
     all)
       PROJECT_GROUPS="external"
     ;;
-    apalis-imx6|colibri-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       PROJECT_GROUPS="toradex"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
@@ -116,18 +124,24 @@ get_groups() {
     beaglebone)
       PROJECT_GROUPS="bbb"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       PROJECT_GROUPS="rpi"
     ;;
-    nuc)
-      PROJECT_GROUPS="nuc"
+    intel-corei7-64)
+      PROJECT_GROUPS="intel"
     ;;
     nvidia-logan)
       PROJECT_GROUPS="nvidia-logan"
     ;;
+    tegra-x1|tegra-t18x)
+      PROJECT_GROUPS="nvidia-tegra"
+    ;;
     emulator)
       PROJECT_GROUPS="emulator"
     ;;
+    alt|gose|koelsch|lager|porter|silk|stout)
+      PROJECT_GROUPS="renesas"
+    ;;
     *)
       echo "Unknown device configuration, including all meta layers"
       PROJECT_GROUPS="external"
@@ -184,8 +198,9 @@ init() {
     ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5
   fi
 
-  cp ${DIR}/scripts/setup-environment.sh .
-
+  if [ ! -e "setup-environment.sh" ]; then
+    ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh
+  fi
 }
 
 get_repo
diff --git a/classes/abi-arch.bbclass b/classes/abi-arch.bbclass
index 826fed4..23b9b1c 100644
--- a/classes/abi-arch.bbclass
+++ b/classes/abi-arch.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # map target architecture to abi architectures used by Qt Creator
 valid_archs = "arm x86 itanium mips ppc sh"
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index 56b2acb..2104b50 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}"
 BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
diff --git a/classes/consistent_timestamps.bbclass b/classes/consistent_timestamps.bbclass
new file mode 100644
index 0000000..08cc401
--- /dev/null
+++ b/classes/consistent_timestamps.bbclass
@@ -0,0 +1,35 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+update_file_timestaps() {
+    # Update file timestamp to 0 seconds since Epoch time.
+    TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000' {} \;
+}
+
+ROOTFS_POSTINSTALL_COMMAND += "update_file_timestaps; "
diff --git a/classes/deploy-conf.bbclass b/classes/deploy-conf.bbclass
index 8467576..61df5dc 100644
--- a/classes/deploy-conf.bbclass
+++ b/classes/deploy-conf.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 inherit image_types
 
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index c4940aa..05fd847 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # need to define the dependency and the ROOTFS for directdisk
 do_bootdirectdisk[depends] += "${PN}:do_rootfs"
diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass
index 4d193b7..07cd58f 100644
--- a/classes/image_dd.bbclass
+++ b/classes/image_dd.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # This class is based on meta-fsl-arm/classes/image_types_fsl.bbclass::generate_imx_sdcard()
 DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool."
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index 0ce12e4..e9b07f1 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 IMAGE_ROOTFS_EXTRA_SPACE = "100000"
 SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-SDCARD_GENERATION_COMMAND_ti33x = "generate_imx_sdcard"
+SDCARD_GENERATION_COMMAND ?= "generate_imx_sdcard"
 
 IMAGE_CMD_sdcard_append() {
     parted -s ${SDCARD} set 1 boot on
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index 72498cb..ecee863 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 python enable_internal_build () {
     import socket
@@ -39,7 +47,6 @@ python enable_internal_build () {
         hg://.*/.*    http://yocto-cache.ci.local/sources/ \n \
         osc://.*/.*   http://yocto-cache.ci.local/sources/ \n \
         p4://.*/.*    http://yocto-cache.ci.local/sources/ \n \
-        svk://.*/.*   http://yocto-cache.ci.local/sources/ \n \
         svn://.*/.*   http://yocto-cache.ci.local/sources/ \n \
         ")
 }
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass
index ae88685..7acd095 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo
 
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
index cce6669..75c6e55 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/classes/populate_b2qt_sdk.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 inherit populate_sdk
 
diff --git a/classes/qt5-module.bbclass b/classes/qt5-module.bbclass
index febd6b0..e68f95f 100644
--- a/classes/qt5-module.bbclass
+++ b/classes/qt5-module.bbclass
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 require recipes-qt/qt5/qt5.inc
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 90fcfb4..3564ad1 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 python __anonymous() {
     provider = ""
diff --git a/classes/sdk-sources.bbclass b/classes/sdk-sources.bbclass
index 5f75357..b12f371 100644
--- a/classes/sdk-sources.bbclass
+++ b/classes/sdk-sources.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 python do_fetch () {
     src_uri = (d.getVar('SRC_URI', True) or "").split()
@@ -44,6 +52,7 @@ python do_fetch () {
 }
 
 python do_unpack () {
+    sdk_uds = [];
     src_uri = (d.getVar('SRC_URI', True) or "").split()
     if len(src_uri) == 0:
         return
@@ -56,17 +65,18 @@ python do_unpack () {
         for url in uris:
             ud = list(bb.fetch2.decodeurl(url))
             if ("sdk-uri" in ud[5]):
-                unpack_local_uri(ud, d)
+                sdk_uds.append(ud)
                 src_uri.remove(url)
 
-    if len(src_uri) == 0:
-        return
+    if len(src_uri) != 0:
+        try:
+            fetcher = bb.fetch2.Fetch(src_uri, d)
+            fetcher.unpack(rootdir)
+        except bb.fetch2.BBFetchException as e:
+            raise bb.build.FuncFailed(e)
 
-    try:
-        fetcher = bb.fetch2.Fetch(src_uri, d)
-        fetcher.unpack(rootdir)
-    except bb.fetch2.BBFetchException as e:
-        raise bb.build.FuncFailed(e)
+    for ud in sdk_uds:
+        unpack_local_uri(ud, d)
 }
 
 def unpack_local_uri(ud, d):
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index fc68a36..ddd469b 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -37,7 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index f1a722d..75d7aae 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -34,7 +42,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 4581cbf..1a255de 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -36,7 +44,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.intel.sample
index 01c6703..c03ad50 100644
--- a/conf/bblayers.conf.nuc.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -31,14 +39,13 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-intel \
-  ${BSPDIR}/sources/meta-intel/meta-nuc \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-nuc-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-intel-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index 84fa455..f893f8c 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -30,14 +38,16 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
-  ${BSPDIR}/sources/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-vib3 \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-logan-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-vib3-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
new file mode 100644
index 0000000..1fbce2b
--- /dev/null
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -0,0 +1,58 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
+  ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-vib4-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
+
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample
new file mode 100644
index 0000000..f19b1ea
--- /dev/null
+++ b/conf/bblayers.conf.rcar-gen2.sample
@@ -0,0 +1,57 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
+  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-renesas \
+  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-mingw \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index 4345135..c788ab0 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -35,7 +43,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index b69608f..8b3e578 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -37,7 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-raspberrypi \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index 5daec93..55a9535 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -37,7 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-smx6-extras \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 0e0ddec..527b404 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -36,7 +44,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 18412bc..6351d1f 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -37,6 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-architech-extras \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 72d0d2c..7e49d04 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
@@ -37,7 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-ruby \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 22bbbe1..4ba9d87 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/poky.conf
 
@@ -34,6 +42,7 @@ MAINTAINER = "B2Qt <b2qt@qt.io>"
 
 SANITY_TESTED_DISTROS += " \
             Ubuntu 11.04 \n \
+            Ubuntu-15.10 \n \
             LinuxMint-14 \n \
             LinuxMint-16 \n \
             LinuxMint-17.1 \n \
@@ -45,7 +54,9 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 
-# backport from oe/master, needed by meta-qt5
+FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
+
+# backport from oe/krogoth, needed by meta-qt5
 PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}"
 
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
@@ -69,7 +80,7 @@ OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
 OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
 
 # Disable SHA validation for branch
-QT_MODULE_BRANCH = "5.6;nobranch=1"
+QT_MODULE_BRANCH_PARAM = "nobranch=1"
 
 PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
 
diff --git a/conf/distro/include/alt.conf b/conf/distro/include/alt.conf
new file mode 100644
index 0000000..6ae9e1d
--- /dev/null
+++ b/conf/distro/include/alt.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Alt"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 30bbe1c..4f90a0e 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/ti.inc
 
@@ -39,12 +47,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
         lighttpd \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         libgles-omap3-dev \
         "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 0cef55a..1e8e876 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -1,26 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
@@ -43,21 +52,5 @@ BOOT_SCRIPTS += " \
     u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \
     "
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 25976b0..7f42acf 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/ti.inc
 
@@ -35,12 +43,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         libgles-omap3-dev \
         "
 
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 8a2c3e2..54455a3 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/ti.inc
 
@@ -40,17 +48,17 @@ PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
 PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
 PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
 
-PREFERRED_PROVIDER_u-boot = "u-boot"
+PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
 UBOOT_MACHINE = "am335x_boneblack_config"
 KERNEL_IMAGETYPE = "zImage"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         libgles-omap3-dev \
         "
 
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 9349300..0b4b12c 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -1,26 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 
@@ -32,19 +41,3 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
-
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
new file mode 100644
index 0000000..8b580d4
--- /dev/null
+++ b/conf/distro/include/colibri-imx7.conf
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+include conf/distro/include/toradex.inc
+
+DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
+
+IMAGE_FSTYPES += "ext3 sdcard"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \
+    ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
+BOOT_SCRIPTS += " \
+    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    "
+
+DISTRO_FEATURES_remove = "webengine"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 7da7622..5a8498f 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -1,26 +1,36 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/toradex.inc
 
+BBMASK .= "|meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex|meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb|meta-fsl-arm-extra/recipes-bsp/mqxboot"
+
 DEPLOY_CONF_NAME = "Toradex Colibri VF"
 
 IMAGE_FSTYPES += "ext3 sdcard"
@@ -39,14 +49,14 @@ DEFAULTTUNE = "armv7ahf-neon"
 
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+PREFERRED_VERSION_linux-toradex = "4.1"
 
 DISTRO_FEATURES_remove = "webengine"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         opengldummy \
-        mqxboot \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         opengldummy-dev \
         "
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index d80299d..cd3a80a 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 IMAGE_CLASSES += "image-hdd"
 IMAGE_ROOTFS_ALIGNMENT = "1048576"
@@ -35,10 +43,10 @@ KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
 
 DISTRO_FEATURES_remove = "webengine opengl"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         mount-vboxsf \
         "
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         qtglesstream-dummy-client-dev \
         "
 MACHINE_EXTRA_INSTALL_QT = "\
diff --git a/conf/distro/include/gose.conf b/conf/distro/include/gose.conf
new file mode 100644
index 0000000..3906e76
--- /dev/null
+++ b/conf/distro/include/gose.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Gose"
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
deleted file mode 100644
index 5fd52a0..0000000
--- a/conf/distro/include/imx53qsb.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-include conf/distro/include/imx6.inc
-
-DEPLOY_CONF_NAME = "Freescale iMX53 Quick Start Board"
-
-BOOTFS_CONTENT = "\
-    u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
-
-DISTRO_FEATURES_remove = "webengine"
-
-MACHINE_EXTRA_INSTALL = "\
-        amd-gpu-bin-mx51 \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK = " \
-        libgsl-fsl-mx51-dev \
-        libegl-mx51-dev \
-        libgles2-mx51-dev \
-        "
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/imx6-egl.inc
new file mode 100644
index 0000000..8c4bbcd
--- /dev/null
+++ b/conf/distro/include/imx6-egl.inc
@@ -0,0 +1,41 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+MACHINE_EXTRA_INSTALL += "\
+    libegl-mx6 \
+    libgles2-mx6 \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+    libegl-mx6 \
+    libegl-mx6-dev \
+    libgles2-mx6 \
+    libgles2-mx6-dev \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
+    "
diff --git a/conf/distro/include/imx6-opencv.inc b/conf/distro/include/imx6-opencv.inc
new file mode 100644
index 0000000..a1d37df
--- /dev/null
+++ b/conf/distro/include/imx6-opencv.inc
@@ -0,0 +1,39 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+MACHINE_EXTRA_INSTALL += "\
+    libopencv-core \
+    libopencv-imgproc \
+    libopencv-objdetect \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+    opencv-dev \
+    "
+
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index b952eda..e686e85 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -1,30 +1,44 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 BBMASK ?= " "
 BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 
 IMAGE_FSTYPES += "ext3 sdcard"
 
-MACHINE_EXTRA_INSTALL_SDK = " \
-        ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
-        "
+MACHINE_EXTRA_INSTALL += "\
+    libgal-mx6 \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+    libgal-mx6 \
+    "
 
diff --git a/conf/distro/include/imx6dlsabresd.conf b/conf/distro/include/imx6dlsabresd.conf
index 39b12e0..af49983 100644
--- a/conf/distro/include/imx6dlsabresd.conf
+++ b/conf/distro/include/imx6dlsabresd.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 require imx6qsabresd.conf
 
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 984428d..1463c67 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -1,25 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
+include conf/distro/include/imx6-opencv.inc
 
 DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
 
@@ -37,26 +47,6 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
 DISTRO_FEATURES_DEFAULT += "wayland"
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        libopencv-core \
-        libopencv-imgproc \
-        libopencv-objdetect \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        opencv-dev \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
 # add support for both imx6qsabresd and imx6dlsabresd
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf
new file mode 100644
index 0000000..b21e5b1
--- /dev/null
+++ b/conf/distro/include/imx7dsabresd.conf
@@ -0,0 +1,58 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual"
+
+IMAGE_FSTYPES += "ext3 sdcard"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb.dtb:imx7d-sdb.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-enet.dtb:imx7d-sdb-enet.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-epdc.dtb:imx7d-sdb-epdc.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-gpmi-weim.dtb:imx7d-sdb-gpmi-weim.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-hdmi-audio.dtb:imx7d-sdb-hdmi-audio.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-m4.dtb:imx7d-sdb-m4.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-qspi.dtb:imx7d-sdb-qspi.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-sim.dtb:imx7d-sdb-sim.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-touch.dtb:imx7d-sdb-touch.dtb \
+    ${KERNEL_IMAGETYPE}-imx7d-sdb-wm8960.dtb:imx7d-sdb-wm8960.dtb \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
+
+DISTRO_FEATURES_remove = "webengine"
+
+MACHINE_EXTRA_INSTALL += "\
+        "
+
+MACHINE_EXTRA_INSTALL_SDK += "\
+        "
+
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/intel-corei7-64.conf
index 8a41388..d350c0e 100644
--- a/conf/distro/include/nuc.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DEPLOY_CONF_NAME = "Intel NUC"
 
@@ -32,13 +40,13 @@ INITRAMFS_IMAGE = "initramfs-basic"
 
 SYSVINIT_ENABLED_GETTYS = "1"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         wayland \
         mesa-megadriver \
         grub-efi-config \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         mesa-dev \
         "
 
diff --git a/conf/distro/include/koelsch.conf b/conf/distro/include/koelsch.conf
new file mode 100644
index 0000000..e2add8b
--- /dev/null
+++ b/conf/distro/include/koelsch.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Koelsch"
diff --git a/conf/distro/include/lager.conf b/conf/distro/include/lager.conf
new file mode 100644
index 0000000..97e0b14
--- /dev/null
+++ b/conf/distro/include/lager.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Lager"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 542e159..bfe29bf 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -1,25 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
+include conf/distro/include/imx6-opencv.inc
 
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 
@@ -81,29 +91,16 @@ UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
 
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
-KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb"
+KERNEL_DEVICETREE += "\
+    imx6dl-nit6xlite.dtb \
+    imx6qp-nitrogen6_max.dtb \
+    imx6q-nitrogen6_som2.dtb \
+    "
 
 DISTRO_FEATURES_DEFAULT += "wayland"
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
+MACHINE_EXTRA_INSTALL += "\
         bcm4330-nvram-config \
-        libopencv-core \
-        libopencv-imgproc \
-        libopencv-objdetect \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        opencv-dev \
         "
 
 ADB_PRODUCTID = "0x0d02"
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 21dd305..632e31b 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -1,27 +1,41 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
 
-DISTRO_FEATURES_remove += "wayland"
+DEFAULTTUNE = "cortexa15hf-neon"
 
-MACHINE_EXTRA_INSTALL = "\
+KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
+NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
+
+MACHINE_EXTRA_INSTALL += "\
         libegl \
         libgles2 \
         tegra-firmware-gk20a \
@@ -29,10 +43,24 @@ MACHINE_EXTRA_INSTALL = "\
         libdrm-nv \
 "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         libegl-dev \
         libgles2-dev \
         graphics-headers-dev \
         libdrm-nv-dev \
 "
 
+PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
+PREFERRED_PROVIDER_drm ?= "libdrm-nv"
+
+BBMASK ?= " "
+BBMASK .= "\
+|meta-vib3/recipes-kernel/linux-libc-headers\
+|meta-vib3/recipes-devtools/binutils\
+|meta-vib3/recipes-core/eglibc\
+|meta-vib3/recipes-core/systemd\
+|meta-vib3/recipes-connectivity\
+|meta-vib3/recipes-multimedia/pulseaudio\
+|meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\
+|meta-vib3/recipes-core/packagegroups\
+"
diff --git a/conf/distro/include/porter.conf b/conf/distro/include/porter.conf
new file mode 100644
index 0000000..ef94cf9
--- /dev/null
+++ b/conf/distro/include/porter.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Porter"
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index a9e4b20..4429fa9 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -1,51 +1,37 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
-
-DEPLOY_CONF_NAME = "Raspberry Pi"
-
-IMAGE_FSTYPES += "ext3 rpi-sdimg"
+############################################################################
 
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+include conf/distro/include/raspberrypi.inc
 
-PREFERRED_PROVIDER_virtual/libgles1 = "userland"
+DEPLOY_CONF_NAME = "Raspberry Pi"
 
 DISTRO_FEATURES_remove = "webengine"
 
-MACHINE_EXTRA_INSTALL = "\
-        userland \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK = " \
-        userland-dev \
-        "
-
-KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
-KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
-module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
-
 # additional memory for GPU
 GPU_MEM = "128"
-# video camera support
-VIDEO_CAMERA = "1"
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
new file mode 100644
index 0000000..0833404
--- /dev/null
+++ b/conf/distro/include/raspberrypi.inc
@@ -0,0 +1,58 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
+
+BOOTFS_CONTENT = "\
+    bcm2835-bootfiles/*: \
+    ${KERNEL_IMAGETYPE}:kernel.img \
+    "
+
+BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+        userland-dev \
+        "
+
+MACHINE_EXTRA_INSTALL += "\
+        userland \
+        omxplayer \
+        "
+
+KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
+KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
+module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+
+# video camera support
+VIDEO_CAMERA = "1"
+
+RPI_FT5604 = "1"
+KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
+MACHINE_FEATURES += "pitft"
+
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 392ce40..93215d3 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -1,52 +1,36 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
-
-DEPLOY_CONF_NAME = "Raspberry Pi 2"
+############################################################################
 
-IMAGE_FSTYPES += "ext3 rpi-sdimg"
+include conf/distro/include/raspberrypi.inc
 
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
-
-MACHINE_EXTRA_INSTALL = "\
-        userland \
-        omxplayer \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK = " \
-        userland \
-        "
-
-KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"
-KERNEL_MODULE_PROBECONF += "bcm2835-v4l2"
-module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
+DEPLOY_CONF_NAME = "Raspberry Pi 2"
 
 # additional memory for GPU
 GPU_MEM = "256"
-# video camera support
-VIDEO_CAMERA = "1"
-RPI_FT5406 = "1"
 
-KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
-MACHINE_FEATURES += "pitft"
diff --git a/conf/distro/include/raspberrypi3.conf b/conf/distro/include/raspberrypi3.conf
new file mode 100644
index 0000000..ef090a1
--- /dev/null
+++ b/conf/distro/include/raspberrypi3.conf
@@ -0,0 +1,36 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+include conf/distro/include/raspberrypi.inc
+
+DEPLOY_CONF_NAME = "Raspberry Pi 3"
+
+# additional memory for GPU
+GPU_MEM = "256"
+
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
new file mode 100644
index 0000000..9b638c3
--- /dev/null
+++ b/conf/distro/include/rcar-gen2.inc
@@ -0,0 +1,140 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# To build for the rcar devices you must install the binary gpu drivers as
+# follows. These are made available under the name R-Car Series Evaluation
+# Software Package for Linux at the following address:
+#
+#   http://www.renesas.com/secret/r_car_download/rcar_demoboard.jsp
+#
+# You need two files named as follows:
+#  - R-Car_Series_Evaluation_Software_Package_for_Linux-<yyyymmdd>.zip
+#  - R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers-<yyyymmdd>.zip
+#
+# You can place them in any location, below ~/Downloads is assumed. Now do
+# the following:
+#
+#   $ mkdir build && cd build
+#   $ export MACHINE=YourMachineHere
+#   $ ~/meta-boot2qt/b2qt-init-build-env init --device $MACHINE
+#   $ cd sources/meta-renesas
+#   $ ./meta-rcar-gen2/docs/sample/copyscript/copy_eva_sw_pkgs.sh ~/Downloads
+#
+# The script takes as the sole argument the location of the two zips. You must
+# be in the right directory when you call the script!
+#
+# You can now build as usual:
+#   $ cd ../..
+#   $ . setup-environment.sh
+#   $ bitbake b2qt-embedded-image
+#
+
+# internal copy of R-Car_Series_Evaluation_Software_Packages used for CI
+FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:"
+
+KERNEL_MODULE_AUTOLOAD += " \
+    phy-rcar-gen2-usb \
+    hid_multitouch \
+    renesas_usbhs \
+"
+
+GLES_DRIVER = "sgx"
+GLES_DRIVER_r8a7790 = "rgx"
+
+DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib"
+MACHINE_FEATURES += "multimedia ${GLES_DRIVER}"
+
+IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_CLASSES += "image_types_fsl"
+
+PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3"
+
+PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
+PREFERRED_PROVIDER_virtual/egl = "libegl"
+PREFERRED_PROVIDER_libgbm = "libgbm"
+PREFERRED_PROVIDER_libgbm-dev = "libgbm-dev"
+
+MULTIMEDIA_PACKAGES = " \
+    gstreamer1.0-plugins-base-videorate \
+    gstreamer1.0-plugins-base-videotestsrc \
+    gstreamer1.0-plugins-base-audiotestsrc \
+    gstreamer1.0-plugins-base-alsa \
+    gstreamer1.0-plugins-good-autodetect \
+    gstreamer1.0-plugins-good-isomp4 \
+    gstreamer1.0-plugins-good-video4linux2 \
+    gstreamer1.0-plugins-good-videocrop \
+    gstreamer1.0-plugins-bad-asfmux \
+    gstreamer1.0-plugins-bad-fbdevsink \
+    gstreamer1.0-plugins-bad-faad \
+    gstreamer1.0-plugins-bad-videoparsersbad \
+    packagegroup-rcar-gen2-multimedia \
+"
+
+# Unfortunately several Renesas components suffer from various issues requiring workarounds
+#   libgbm-dev is required as some part of the binary driver stack attempts to dlopen an unversioned so
+#   bash is required as it is hardcoded in a system setup script
+#   libdrm-tests appears to be required (to be confirmed?)
+RENESAS_WORKAROUNGS = " \
+    libgbm-dev \
+    bash \
+    libdrm-tests \
+"
+
+MACHINE_EXTRA_INSTALL += " \
+    kernel-devicetree \
+    libdrm-kms \
+    libegl \
+    gles-kernel-module \
+    gles-user-module \
+    ${RENESAS_WORKAROUNGS} \
+    ${@base_contains("MACHINE_FEATURES", "multimedia", "${MULTIMEDIA_PACKAGES}", "", d)} \
+"
+
+MACHINE_EXTRA_INSTALL_append_lcb = " \
+    can-utils \
+    libsocketcan \
+    ${@base_contains("MACHINE_FEATURES", "multimedia", "packagegroup-lcb-oss-codecs", "", d)} \
+"
+
+BB_MULTIMEDIA_TEST_MODULE = "\
+|fdpm-tp-user-module\
+|mmngr-tp-user-module\
+|mmngrbuf-tp-user-module\
+|s3ctl-tp-user-module\
+|vspm-tp-user-module\
+"
+
+BBMASK ?= " "
+BBMASK .= "\
+${BB_MULTIMEDIA_TEST_MODULE}\
+|dtv-module|ssp-module|scu-module\
+|gles-test-module\
+|poky/meta/recipes-graphics/mesa\
+|meta-fsl-arm/recipes-graphics/mesa\
+"
diff --git a/conf/distro/include/silk.conf b/conf/distro/include/silk.conf
new file mode 100644
index 0000000..85ec4ac
--- /dev/null
+++ b/conf/distro/include/silk.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Silk"
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index d3ce2c9..7c441ff 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -1,25 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
 
@@ -27,23 +36,10 @@ KERNEL_IMAGETYPE = "uImage"
 
 BOOTFS_CONTENT = " "
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
+MACHINE_EXTRA_INSTALL += "\
         kernel-devicetree \
         "
 
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
 BBMASK ?= " "
diff --git a/conf/distro/include/stout.conf b/conf/distro/include/stout.conf
new file mode 100644
index 0000000..d6a1eb0
--- /dev/null
+++ b/conf/distro/include/stout.conf
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require rcar-gen2.inc
+DEPLOY_CONF_NAME = "Renesas Stout"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
new file mode 100644
index 0000000..f58474e
--- /dev/null
+++ b/conf/distro/include/tegra-t18x.conf
@@ -0,0 +1,86 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+include conf/distro/include/tegra.inc
+
+TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
+DISTRO_FEATURES_DEFAULT += "wayland"
+
+KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}'
+NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
+
+MACHINE_EXTRA_INSTALL += "\
+    tegra-firmware-fecs \
+    tegra-firmware-gmicrocode \
+    tegra-firmware-gpccs \
+    tegra-firmware-gpmu \
+    tegra-firmware-gshader \
+    tegra-firmware-pmu \
+    tegra-firmware-prod-fuse \
+    tegra-firmware-xusb \
+    tegra-firmware-vic \
+    tegra-firmware-nvdec \
+    tegra-firmware-nvenc \
+    tegra-firmware-nvjpeg \
+    tegra-drivers \
+    virtual/libegl \
+    virtual/libgles2 \
+    libdrm-nv \
+    asound-conf \
+    "
+
+PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers"
+PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers"
+
+PREFERRED_PROVIDER_wayland ?= "wayland-nv"
+PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
+PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
+
+BBMASK ?= " "
+BBMASK .= "\
+|meta-vib4/recipes-connectivity/connman\
+|meta-vib4/recipes-core/busybox\
+|meta-vib4/recipes-core/images\
+|meta-vib4/recipes-core/meta\
+|meta-vib4/recipes-core/packagegroups\
+|meta-vib4/recipes-core/systemd/systemd\
+|meta-vib4/recipes-devtools\
+|meta-vib4/recipes-extended\
+|meta-vib4/recipes-multimedia/audiomanager\
+|meta-vib4/recipes-core/glibc\
+|meta-vib4/recipes-support/lvm2\
+|meta-vib4/recipes-kernel/linux-libc-headers\
+"
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc
new file mode 100644
index 0000000..618a634
--- /dev/null
+++ b/conf/distro/include/tegra.inc
@@ -0,0 +1,17 @@
+python set_nv_drv_version () {
+    # Boiler plate code to setup bitbake objects
+    d = e.data
+
+    nv_drv_version = d.getVar('NV_DRV_VER', True)
+    if nv_drv_version != "ignore":
+        # FIXME: When we add support to internal builds, both debug and release
+        # builds will need to be considered
+        path = d.getVar('PLATFORM_TOPDIR', True)
+        get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \
+| grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}"
+        # Execute cmd
+        nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip()
+        # Store returned value in NV_DRV_VER
+        d.setVar('NV_DRV_VER', nv_drv_version)
+}
+
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index 2872c65..a445dc2 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 BBMASK ?= " "
 BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index 6f47970..01e1f63 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -1,25 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "ArchiTech Tibidabo"
 
@@ -37,20 +46,4 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q"
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index bd8ce84..647362d 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 BBMASK ?= " "
-BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|recipes-core/glibc/glibc_linaro-2.20.bbappend"
+BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 
diff --git a/conf/layer.conf b/conf/layer.conf
index 61b7dc9..4c8757c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
@@ -33,5 +41,5 @@ BBFILE_PATTERN_b2qt := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt = "20"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
-QT_LICENCE = "${LAYERDIR}/licenses/QtEnterprise"
+QT_LICENSE = "${LAYERDIR}/licenses/The-Qt-Company-DCLA-2.1"
 B2QTBASE = "${LAYERDIR}"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index ad55f78..6851361 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 #
 # This file is your local configuration file and is where all local user settings
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
index feaa9c6..21cd96d 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/emulator.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 #@TYPE: Machine
 #@NAME: virtual box emulator
diff --git a/licenses/QtEnterprise b/licenses/QtEnterprise
deleted file mode 100644
index 29a4f47..0000000
--- a/licenses/QtEnterprise
+++ /dev/null
@@ -1,706 +0,0 @@
-Qt FOR DEVICE CREATION LICENSE AGREEMENT
-Agreement version 1.5
-
-This Qt for Device Creation License Agreement ("Agreement") is a legal agreement
-between The Qt Company Ltd ("The Qt Company") with its registered office at
-Valimotie 21, 00380 Helsinki, Finland, and you (either an individual or a legal
-entity) ("Licensee") for the Licensed Software (as defined below).
-
-1. DEFINITIONS "Affiliate" of a Party shall mean an entity (i) which is directly
-or indirectly controlling such Party; (ii) which is under the same direct or
-indirect ownership or control as such Party; or (iii) which is directly or
-indirectly owned or controlled by such Party. For these purposes, an entity
-shall be treated as being controlled by another if that other entity has fifty
-percent (50 %) or more of the votes in such entity, is able to direct its
-affairs and/or to control the composition of its board of directors or
-equivalent body. "Applications" shall mean Licensee's software products created
-using the Licensed Software which may include portions of the Licensed Software.
-"Customers" shall mean the third parties to whom Licensee directly or indirectly
-distributes copies of the Licensed Software. "Deployment Platforms" shall mean
-those operating systems in which the Licensed Software can be distributed on
-according to the terms and conditions of this Agreement, especially Section 5.2.
-"Designated User(s)" shall mean the employee(s) of Licensee acting within the
-scope of their employment or Licensee's consultant(s) or contractor(s) acting
-within the scope of their services for Licensee and on behalf of Licensee.
-"Development Platforms" shall mean those operating systems in which the Licensed
-Software can be used only for designing, developing and testing Applications,
-but not distributed in any form or used for any other purpose. "Devices" shall
-mean devices or products that 1) are manufactured, sold or distributed by
-Licensee that include the Licensed Software, and 2) fulfill the definition of a
-Joint Hardware and Software Distribution. "Initial Term" shall mean the period
-of time one (1) year from the later of (a) the Effective Date; or (b) the date
-the Licensed Software was initially delivered to Licensee by The Qt Company. If
-no specific Effective Date is set forth in the Agreement, the Effective Date
-shall be deemed to be the date the Licensed Software was initially delivered to
-Licensee. "Intellectual Property Rights" shall mean patents (including utility
-models), design patents, and designs (whether or not capable of registration),
-chip topography rights and other like protection, copyright, trademark and any
-other form of statutory protection of any kind and applications for any of the
-foregoing as well as any trade secrets. "Joint Hardware and Software
-Distribution" shall mean either: (i) distribution of a hardware device where, in
-its final end user configuration, the main user interface or substantial
-functionality of the device is provided by Application(s) created by Licensee or
-others, using Licensed Software or Licensed Software based software product, and
-depends on the Licensed Software or an open source version of Qt or any Qt based
-software product; or (ii) distribution of the Licensed Software with a device
-designed to facilitate the installation of the Licensed Software onto the same
-device where the main user interface or substantial functionality of such device
-is provided by Application(s) created by Licensee or others, using the Licensed
-Software, and depends on the Licensed Software. "License Certificate" shall mean
-the document accompanying the Licensed Software which specifies the modules
-which are licensed under the Agreement, Development Platforms, Deployment
-Platforms and Designated Users. "License Fee" shall mean the fee charged to
-Licensee for (i) each copy of the Licensed Software purchased, as well as (ii)
-reproduction and distribution of Licensed Software under the terms of this
-Agreement. "License Packs" shall mean set of prepaid Distribution Licenses, as
-defined in Section 5.2 b). "Licensed Software" shall mean the computer software,
-"online" or electronic documentation, associated media and printed materials,
-including the source code, example programs and the documentation delivered by
-The Qt Company to Licensee in conjunction with this Agreement. Licensed Software
-does not include Third Party Software (as defined in Section 7). "Modified
-Software" shall mean modifications made to the Licensed Software by Licensee.
-"Nokia" shall mean Nokia Corporation, a corporation incorporated under the laws
-of Finland, having its registered office at PO box 226, 00045 Nokia Group,
-Finland (visiting address Karakaari 7, 02610 Espoo, Finland) and registered with
-the Finnish Trade Register under business ID 0112038-9 and acting on behalf of
-its respective Affiliates. "Online Services" shall mean any services or access
-to systems provided by The Qt Company to the Licensee over Internet in
-conjunction with the Licensed Software or for the purpose of use by the Licensee
-of the Licensed Software or Support. Using some of the Online Services may be
-subject to additional fees. "Party or Parties" shall mean Licensee and/or The Qt
-Company. "Redistributables" shall mean the portions of the Licensed Software set
-forth in Appendix 1, Section 1 that may be distributed with or as part of
-Applications in object code form. "Renewal Term" shall mean a time period of
-twelve months calculated from the end of the Initial Term, or from end of the
-previous Renewal Term. "Support" shall mean standard developer support that is
-provided by The Qt Company to assist eligible Designated Users in using the
-Licensed Software in accordance with its established standard support
-procedures. "Updates" shall mean a release or version of the Licensed Software
-containing enhancements, new features, bug fixes, error corrections and other
-changes that are generally made available to users of the Licensed Software that
-have contracted for maintenance and support.
-
-2. OWNERSHIP The Licensed Software is protected by copyright laws and
-international copyright treaties, as well as other intellectual property laws
-and treaties. The Licensed Software is licensed, not sold. To the extent
-Licensee submits bug fixes or error corrections, including information related
-thereto, Licensee hereby grants The Qt Company a sublicensable, irrevocable,
-perpetual, worldwide, non-exclusive, royalty-free and fully paid-up copyright
-and trade secret license to reproduce, adapt, translate, modify, and prepare
-derivative works of, publicly display, publicly perform, sublicense, make
-available and distribute error corrections and bug fixes, including derivative
-works thereof. All The Qt Company's and/or its licensors' trademarks, service
-marks, trade names, logos or other words or symbols are and shall remain the
-exclusive property of The Qt Company or its licensors respectively.
-
-3. MODULES Some of the files in the Licensed Software have been grouped into
-modules. These files contain specific notices defining the module of which they
-are a part. The modules licensed to Licensee are specified in the License
-Certificate accompanying the Licensed Software. The terms of the License
-Certificate are considered part of the Agreement. In the event of inconsistency
-or conflict between the language of this Agreement and the License Certificate,
-the provisions of this Agreement shall govern. 4. VALIDITY OF THE AGREEMENT By
-installing, copying, or otherwise using the Licensed Software, Licensee agrees
-to be bound by the terms of this Agreement. If Licensee does not agree to the
-terms of this Agreement, Licensee should not install, copy, or otherwise use the
-Licensed Software. In addition, by installing, copying, or otherwise using any
-Updates or other components of the Licensed Software that Licensee receives
-separately as part of the Licensed Software, Licensee agrees to be bound by any
-additional license terms that accompany such Updates, if any. If Licensee does
-not agree to the additional license terms that accompany such Updates, Licensee
-should not install, copy, or otherwise use such Updates. Upon Licensee's
-acceptance of the terms and conditions of this Agreement, The Qt Company grants
-Licensee the right to use the Licensed Software in the manner provided below.
-
-5. LICENSES 5.1 Using, Modifying and Copying The Qt Company grants to Licensee a
-non-exclusive, non-transferable, perpetual license to use, modify and copy the
-Licensed Software for Designated Users specified in the License Certificate for
-the sole purposes of: (i) designing, developing, and testing Application(s);
-(ii) modifying the Licensed Software as limited by section 8 below; and (iii)
-compiling the Licensed Software and/or Modified Software source code into object
-code. Licensee may install copies of the Licensed Software on an unlimited
-number of computers provided that only the Designated Users use the Licensed
-Software. Licensee may at any time designate another Designated User to replace
-a then-current Designated User by notifying The Qt Company, provided that a) the
-then-current Designated User has not been designated as a replacement during the
-last six (6) months; and b) there is no more than the specified number of
-Designated Users at any given time.
-
-5.2 Right for Redistribution a) License for creating Applications For the
-purpose of creating Applications The Qt Company grants Licensee a non-exclusive,
-royalty-free right to reproduce and distribute the object code form of
-Redistributables (listed in Appendix 1, Section 1) for execution on the
-specified Deployment Platforms, excluding the Joint Hardware and Software
-Distribution. Copies of Redistributables may only be distributed with and for
-the sole purpose of executing Applications permitted under this Agreement that
-Licensee has created using the Licensed Software. Under no circumstances may any
-copies of Redistributables be distributed separately. This Agreement does not
-give Licensee any rights to distribute any of the parts of the Licensed Software
-listed in Appendix 1, Section 2, neither as a whole nor as parts or snippets of
-code. Licensee may not distribute, transfer, assign or otherwise dispose of
-Applications and/or Redistributables, in binary/compiled form, or in any other
-form, if such action is part of a Joint Software and Hardware Distribution,
-except as provided in Section 5.2b) below. b) License for creating Devices For
-the purpose of creating Devices The Qt Company grants to Licensee a
-non-exclusive, non-transferable license to (a) install copies of the compiled
-Licensed Software (in object code form only) in Devices and/or bundle or
-integrate copies of the Licensed Software (in object code form only) into or
-with Devices and other services; (b) distribute Licensed Software (in object
-code form only) to one or more tiers of distributors as incorporated or
-integrated in Devices; and (c) sublicense the Licensed Software (in object code
-form only), as incorporated or integrated in Devices, to end users under
-Licensee's standard terms and conditions, which must meet the requirements set
-out in Appendix 2 (collectively, the "Distribution License"). This Distribution
-License does not entitle Licensee to receive, or grant Licensee any rights with
-respect to any source code. Should any third party that has received a product,
-software and/or a sublicense from Licensee in accordance with the provisions
-above, wish to use the product and sublicensed software in a manner not
-warranted in Appendix 2, such third party must request a licensing agreement for
-this purpose directly from The Qt Company. Licensee may also reproduce and
-distribute the Licensed Software (in object code form only) under the
-Distribution License independent of the Device, (i.e. the Licensed Software may
-be reproduced and distributed by Licensee to others as a stand-alone or
-independent product or for use independent of the Device). The Distribution
-License provided under this Section 5.2b) is conditional, subject to Licensee´s
-full compliance of Section 14 of this Agreement. All reproduction and
-distribution of the Licensed Software or any portion thereof requires the
-payment of License Fees from Licensee to The Qt Company. The licenses granted in
-this Section by The Qt Company to Licensee are subject to Licensee's compliance
-with Section 5.3 of this Agreement. c) For the avoidance of doubt, should the
-Licensee wish to distribute Licensed Software as a part of software development
-kit (SDK) for the purpose of developing Applications by Licensee´s customers
-for Licensee´s products, such distribution is subject to a separate Qt SDK
-distribution license agreement to be concluded with The Qt Company. 5.3 Further
-Requirements It is expressly acknowledged and understood by Licensee, that
-Licensee is strictly prohibited from using or licensing Licensed Software for
-creation of mobile phones or tablet computers targeted for consumer end users.
-The aforementioned shall not prohibit Licensee from using Licensed Software for
-the purpose of creating Applications for any devices, including mobile phones
-and tablet computers. Notwithstanding anything contrary to this Agreement, it is
-expressly acknowledged and understood by Licensee, that Nokia shall hereby be
-named as a third party beneficiary under this Agreement with respect to this
-Section 5.3. Therefore, Nokia shall have the same rights as The Qt Company under
-this Agreement with respect to this Section 5.3, and shall be entitled to
-exercise such rights independent from The Qt Company. The licenses granted in
-this Section 5 by The Qt Company to Licensee are subject to Licensee's
-compliance with Section 8 of this Agreement.
-
-6. VERIFICATION The Qt Company or a certified auditor on The Qt Company's
-behalf, may, upon its reasonable request and at its expense, audit Licensee with
-respect to the use of the Licensed Software. Such audit may be conducted by
-mail, electronic means or through an in-person visit to Licensee's place of
-business. Any such in-person audit shall be conducted during regular business
-hours at Licensee's facilities and shall not unreasonably interfere with
-Licensee's business activities. The Qt Company will not remove, copy, or
-redistribute any electronic material during the course of an audit. If an audit
-reveals that Licensee is using the Licensed Software in a way that is in
-material violation of the terms of the Agreement, then Licensee shall pay The Qt
-Company's reasonable costs of conducting the audit. In the case of a material
-violation, Licensee agrees to pay The Qt Company any amounts owing that are
-attributable to the unauthorized use. Alternatively, The Qt Company reserves the
-right, at The Qt Company's sole option, to terminate the licenses for the
-Licensed Software.
-
-7. THIRD PARTY SOFTWARE The Licensed Software may provide links to third party
-libraries or code (collectively "Third Party Software") to implement various
-functions. Third Party Software does not comprise part of the Licensed Software.
-In some cases, access to Third Party Software may be included along with the
-Licensed Software delivery as a convenience for development and testing only.
-Such source code and libraries may be listed in the ".../src/3rdparty" source
-tree delivered with the Licensed Software or documented in the Licensed Software
-where the Third Party Software is used, as may be amended from time to time, do
-not comprise the Licensed Software. Licensee acknowledges (i) that some part of
-Third Party Software may require additional licensing of copyright and patents
-from the owners of such, and (ii) that distribution of any of the Licensed
-Software referencing any portion of a Third Party Software may require
-appropriate licensing from such third parties.
-
-8. CONDITIONS FOR CREATING APPLICATIONS The licenses granted in this Agreement
-for Licensee to create, modify and distribute Applications is subject to all of
-the following conditions: (i) all copies of the Applications Licensee creates
-must bear a valid copyright notice either Licensee's own or the copyright notice
-that appears on the Licensed Software; (ii) Licensee may not remove or alter any
-copyright, trademark or other proprietary rights notice contained in any portion
-of the Licensed Software including but not limited to the About Boxes; (iii)
-Licensee will indemnify and hold The Qt Company, its Affiliates, contractors,
-and its suppliers, harmless from and against any claims or liabilities arising
-out of the use, reproduction or distribution of Applications; (iv) Applications
-must be developed using a licensed, registered copy of the Licensed Software;
-(v) Applications must add primary and substantial functionality to the Licensed
-Software; (vi) Applications may not pass on functionality which in any way makes
-it possible for others to create software with the Licensed Software; however
-Licensee may use the Licensed Software's scripting and QML ("Qt Quick")
-functionality solely in order to enable scripting, themes and styles that
-augment the functionality and appearance of the Application(s) without adding
-primary and substantial functionality to the Application(s); (vii) Licensee may
-create Modified Software that breaks the source or binary compatibility with the
-Licensed Software. This includes, but is not limited to, changing the
-application programming interfaces ("API") by adding, changing or deleting any
-variable, method, or class signature in the Licensed Software, the inter-process
-QCop specification, and/or any inter-process protocols, services or standards in
-the Licensed Software libraries. To the extent that Licensee breaks source or
-binary compatibility with the Licensed Software, Licensee acknowledges that The
-Qt Company's ability to provide Support may be prevented or limited and
-Licensee's ability to make use of Updates may be restricted; (viii) Applications
-may not compete with the Licensed Software; (ix) Licensee may not use The Qt
-Company's or any of its suppliers' names, logos, or trademarks to market
-Applications, except to state that Licensee's Application(s) was developed using
-the Licensed Software; and (x) each Designated User creating the Application(s)
-needs to have a separate license for the Licensed Software. NOTE: If Licensee,
-or another third party, has, at any time, developed all (or any portions of) the
-Application(s) using an open source version of Qt licensed under the terms of
-the GNU Lesser General Public License, version 2.1 or later ("LGPL") or the GNU
-General Public License version 2.0 or later ("GPL"), Licensee may not combine
-such development work with the Licensed Software without an express written
-permission from The Qt Company, and must license such Application(s) (or any
-portions derived there from) under the terms of such applicable version of LGPL
-(Qt only) or GPL (Qt, Qtopia and Qt Extended) . Copies of the licenses referred
-to above are located at http://www.gnu.org/licenses/old-licenses/lgpl- 2.1.html,
-https://www.gnu.org/licenses/lgpl.html,
-http://www.fsf.org/licensing/licenses/info/GPLv2.html, and
-http://www.gnu.org/copyleft/gpl.html. 9. PRE-RELEASE CODE The Licensed Software
-may contain pre-release code and functionality marked or otherwise stated as
-"Technology Preview", "Alpha", "Beta" or similar. Such pre-release code may be
-present in order to provide experimental support for new platforms or
-preliminary version of new functionality. The pre-release code is not at the
-level of performance and compatibility of a final, generally available, product
-offering. The pre- release parts of the Licensed Software may not operate
-correctly and may be substantially modified prior to the first commercial
-product release, if any. The Qt Company is under no obligation to make
-pre-release code commercially available, or provide any Support or Updates
-relating thereto. The pre-release code must not be used for commercial purposes
-or in a live operating environment where it may be relied upon to perform in the
-same manner as a commercially released product or with data that has not been
-sufficiently backed up.
-
-10. LIMITED WARRANTY AND WARRANTY DISCLAIMER The Qt Company hereby represents
-and warrants with respect to the Licensed Software that it has the power and
-authority to grant the rights and licenses granted to Licensee under this
-Agreement. Except as set forth above, the Licensed Software is licensed to
-Licensee "as is". TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT
-COMPANY ON BEHALF OF ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES,
-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-AND NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES
-NOT WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR
-THAT IT IS WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
-UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE
-RISK OF AND RESPONSIBILITY OF LICENSEE. 11. LIMITATION OF LIABILITY AND OTHER
-COVENANTS 11.1 Risk Allocation If, The Qt Company's warranty disclaimer
-notwithstanding, The Qt Company is held to be liable to Licensee whether in
-contract, tort, or any other legal theory, based on the Licensed Software, The
-Qt Company's entire liability to Licensee and Licensee's exclusive remedy shall
-be, at The Qt Company's option, either (a) return of the price Licensee paid for
-the Licensed Software, or (b) repair or replacement of the Licensed Software,
-provided Licensee returns all copies of the Licensed Software to The Qt Company
-as originally delivered to Licensee. EXCEPT FOR INJURY TO PERSONS OR IN CASES OF
-INTENTIONAL MISCONDUCT AND IN CASE OF THE LICENSEE WITH RESPECT TO AMOUNTS
-PAYABLE UNDER SECTION 14 OR LICENSEE'S MATERIAL BREACH OF THIS AGREEMENT AND TO
-THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY BE LIABLE
-TO THE OTHER PARTY IN CONTRACT, TORT OR OTHERWISE, WHATEVER THE CAUSE THEREOF,
-FOR ANY LOSS OF PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY
-INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR
-EXPENSE OF ANY KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS
-AGREEMENT. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LIABILITY FOR SUCH
-DAMAGE SHALL BE EXCLUDED, EVEN IF THE EXCLUSIVE REMEDIES PROVIDED FOR IN THIS
-AGREEMENT FAIL OF THEIR ESSENTIAL PURPOSE. EXCEPT FOR INJURY TO PERSONS OR IN
-CASES OF INTENTIONAL MISCONDUCT AND IN CASE OF THE LICENSEE WITH RESPECT TO
-AMOUNTS PAYABLE UNDER SECTION 14 OR LICENSEE'S MATERIAL BREACH OF THIS AGREEMENT
-AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY'S
-TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES
-RECEIVED FROM LICENSEE FOR THE LICENSED SOFTWARE DURING THE PERIOD OF TWELVE
-(12) MONTHS IMMEDIATELY PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE
-PROVISIONS OF THIS SECTION 11 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN
-THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET
-FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT 11.2 No Third
-Party Representations, Warranties or Transfers Licensee shall make no
-representations or warranties concerning the Licensed Software on behalf of The
-Qt Company, nor shall Licensee sell, transfer, publish, disclose, display or
-otherwise make available the Licensed Software, or copies thereof, to any third
-party except as specifically set forth herein or in another written agreement
-with The Qt Company. Any representation or warranty Licensee makes or purports
-to make on The Qt Company's behalf shall be void as to The Qt Company. 11.3
-Licensee´s Indemnification Licensee shall indemnify and hold harmless The Qt
-Company and its officers, directors, employees, representative, licensors, and
-suppliers from and against any claim, injury, judgment, settlement, loss or
-expense, including attorneys' fees, arising as a consequence of: (a) Licensee's
-breach of its warranties or any other provisions of this Agreement, including,
-but not limited to, (i) the failure of Licensee to comply with the provisions of
-this Section 11, (ii) any misrepresentations of Licensee in connection with The
-Qt Company or the Licensed Software, and (iii) any other wrongful conduct of
-Licensee, its employees, representatives, agents, or (b) the Device. 12.
-SUPPORT, UPDATES AND ONLINE SERVICES Licensee will be eligible to receive
-Support and Updates and to use the Online Services during the Initial Term, in
-accordance with The Qt Company's then current policies and procedures, if any.
-Such policies and procedures may be changed from time to time. Following the
-Initial Term, The Qt Company shall no longer make the Licensed Software,
-Support, Updates or Online Services available to Licensee unless Licensee
-purchases additional Support, Updates and Online Services according to this
-Section 12 below. Licensee shall be responsible for providing service and
-support to Licensee's Customers with respect to the Licensed Software. Licensee,
-as appropriate, shall inform Licensee's Customers that all requests for support
-or service are to be made to Licensee, and not to The Qt Company. Updates shall
-be considered to be Licensed Software and governed by this Agreement as such,
-unless The Qt Company designates that a different agreement shall govern.
-Licensee shall be responsible for distributing patches and fixes to Customers if
-and as The Qt Company reasonable requests. Licensee may purchase additional
-Support, Updates and Online Services following the Initial Term or the currently
-ongoing Renewal Term subject to The Qt Company's terms and conditions applicable
-at the time of renewal. 13. CONFIDENTIALITY Each party acknowledges that during
-the Initial Term of this Agreement it shall have access to information about the
-other party's business, business methods, business plans, customers, business
-relations, technology, and other information, including the terms of this
-Agreement, that is confidential and of great value to the other party, and the
-value of which would be significantly reduced if disclosed to third parties
-("Confidential Information"). Accordingly, when a party (the "Receiving Party")
-receives Confidential Information from another party (the "Disclosing Party"),
-the Receiving Party shall, and shall obligate its employees and agents and
-employees and agents of its Affiliates to: (i) maintain the Confidential
-Information in strict confidence; (ii) not disclose the Confidential Information
-to a third party without the Disclosing Party's prior written approval; and
-(iii) not, directly or indirectly, use the Confidential Information for any
-purpose other than for exercising its rights and fulfilling its responsibilities
-pursuant to this Agreement. Each party shall take reasonable measures to protect
-the Confidential Information of the other party, which measures shall not be
-less than the measures taken by such party to protect its own confidential and
-proprietary information. "Confidential Information" shall not include
-information that (a) is or becomes generally known to the public through no act
-or omission of the Receiving Party; (b) was in the Receiving Party's lawful
-possession prior to the disclosure hereunder and was not subject to limitations
-on disclosure or use; (c) is developed by employees of the Receiving Party or
-other persons working for the Receiving Party who have not had access to the
-Confidential Information of the Disclosing Party, as proven by the written
-records of the Receiving Party or by persons who have not had access to the
-Confidential Information of the Disclosing Party as proven by the written
-records of the Receiving Party; (d) is lawfully disclosed to the Receiving Party
-without restrictions, by a third party not under an obligation of
-confidentiality; or (e) the Receiving Party is legally compelled to disclose the
-information, in which case the Receiving Party shall assert the privileged and
-confidential nature of the information and cooperate fully with the Disclosing
-Party to protect against and prevent disclosure of any Confidential Information
-and to limit the scope of disclosure and the dissemination of disclosed
-Confidential Information by all legally available means. The obligations of the
-Receiving Party under this Section shall continue during the Initial Term and
-for a period of five (5) years after expiration or termination of this
-Agreement. To the extent that the terms of the Non-Disclosure Agreement between
-The Qt Company and Licensee conflict with the terms of this Section 13, this
-Section 13 shall be controlling over the terms of the Non-Disclosure Agreement.
-
-14 FEES, ORDERS, DELIVERY AND PAYMENT 14.1 DISTRIBUTION LICENSE FEES The
-Distribution License provided under Section 5.2b) is conditional on the Licensee
-purchasing the needed amount of Distribution Licenses separately from The Qt
-Company before distributing Devices to Customers. Distribution licenses are sold
-in License Packs subject to a fee. The License Fee for a Distribution License
-purchased by Licensee cannot be refunded or claimed as a credit, even on the
-ground that it is not distributed, by sale or otherwise, from Licensee to
-Customers or for any other reason. Licensee will have an account of Distribution
-Licenses that will be applied to each copy of Licensed Software that is bundled
-or integrated with any of the Devices or that is distributed to Customers.
-Licensee may bundle, integrate and distribute copies of the Licensed Software so
-long as Licensee has Distribution Licenses paid for, but not yet used. Each time
-Licensee bundles, integrates or distributes a copy of Licensed Software, then
-one Distribution License is used, and Licensee's account of available
-Distribution Licenses is decreased accordingly. 14.2 DISTRIBUTION LICENSES
-ORDERED Licensee shall submit all purchase orders for Distribution Licenses to
-The Qt Company either by fax or mail or any other method acceptable to The Qt
-Company (each such order is referred to herein as a "Purchase Order"). If The Qt
-Company wishes to accept the Purchase Order, The Qt Company may then confirm and
-return the Purchase Order to Licensee, whereupon the Purchase Order shall become
-binding between the Parties. In the event of conflict or inconsistency between
-this Agreement and a Purchase Order, this Agreement shall control. 14.3 PAYMENT
-TERMS The Qt Company will submit an invoice to Licensee any time after The Qt
-Company receives a subsequent purchase order(s) from Licensee, and delivers the
-goods or services described in the Agreement or purchase order to Licensee.
-Licensee's payments for the Licensed Software and any other charges under this
-Agreement shall be paid by Licensee no later than thirty (30) days from the time
-The Qt Company mails its invoices to Licensee. A late payment charge of the
-lower of (a) one percent per month; or (b) the highest interest rate allowed by
-applicable law, shall be charged on unpaid balances that remain past due for
-more than thirty (30) days. The Qt Company shall have the right to suspend,
-terminate or withhold Distribution Licenses, License Certificates, deliveries
-and/or services should Licensee fail to make payment in a timely fashion.
-Licensee shall at all times maintain accurate and up-to-date written records of
-the number of copies of the Licensed Software that Licensee installs in each
-Device(s). 14.4 TAXES All amounts payable are gross amounts but exclusive of any
-value added tax, use tax, sales tax or similar tax. Licensee shall be entitled
-to withhold from payments any applicable withholding taxes and comply with all
-applicable tax and employment legislation. Each party shall pay all taxes
-(including, but not limited to, taxes based upon its income) or levies imposed
-on it under applicable laws, regulations and tax treaties as a result of this
-Agreement and any payments made hereunder (including those required to be
-withheld or deducted from payments). Each party shall furnish evidence of such
-paid taxes as is sufficient to enable the other party to obtain any credits
-available to it, including original withholding tax certificates. 15
-RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS 15.1 LICENSEE'S
-RECORD-KEEPING Licensee shall at all times maintain accurate and up-to-date
-written records of Licensee's activities related to the Licensed Software and
-Distribution Licenses, including copying and distribution. The records shall be
-adequate to determine Licensee's compliance with the provisions of this
-Agreement and to demonstrate the number of Distribution Licenses of the Licensed
-Software distributed by Licensee. The records shall conform to good accounting
-practices commonly accepted in the industry and consistently applied. Licensee
-shall, within thirty (30) days from the end of each calendar quarter, deliver to
-The Qt Company a report detailing the number of copies of Licensed Software
-distributed by Licensee during that calendar quarter, and detailing also the
-number of undistributed copies of Licensed Software made by Licensee and
-remaining in its account (i.e., undistributed copies for which Distribution
-Licenses have been or need to be obtained from The Qt Company). Such report
-shall contain such other information as The Qt Company shall require from time
-to time. 15.2. THE QT COMPANY'S INSPECTION RIGHTS The Qt Company or an
-independent auditor on The Qt Company's behalf, may, upon at least five (5)
-business days' prior written notice and at its expense, audit Licensee with
-respect to the use of the Licensed, but not more frequently than once during
-each 6-month period. Such audit may be conducted by mail, electronic means or
-through an in-person visit to Licensee's place of business. Any such in-person
-audit shall be conducted during regular business hours at Licensee's facilities
-and shall not unreasonably interfere with Licensee's business activities. The Qt
-Company or the independent auditor shall be entitled to inspect Licensee's books
-and records that likely to contain information bearing on Licensee's compliance
-with this Agreement or the payments due to The Qt Company under this Agreement,
-including, but not limited to: assembly logs, sales records, distribution
-records ("Licensee's Records") The Qt Company shall not remove, copy, or
-redistribute any electronic material during the course of an audit. If an audit
-reveals that Licensee is using the Licensed Software in a way that is in
-material violation of the terms of the Agreement, then Licensee shall pay The Qt
-Company's reasonable costs of conducting the audit. In the case of a material
-violation, Licensee agrees to pay The Qt Company any amounts owing that are
-attributable to the unauthorized use. In the alternative, The Qt Company
-reserves the right, at The Qt Company's sole option, to terminate the licenses
-for the Licensed Software. 16. GENERAL PROVISIONS 16.1 Marketing The Qt Company
-may include Licensee's company name and logo in a publicly available list of The
-Qt Company customers and in its public communications.
-
-16.2 No Assignment Licensee shall not be entitled to assign or transfer all or
-any of its rights, benefits and obligations under this Agreement without the
-prior written consent of The Qt Company, which shall not be unreasonably
-withheld. The Qt Company shall be entitled to assign or transfer any of its
-rights, benefits or obligations under this Agreement on an unrestricted basis.
-
-16.3 Termination 16.3.1 Termination by The Qt Company The Qt Company shall have
-the right to terminate this Agreement upon thirty (30) days prior written notice
-if (i) the Licensee is in breach of any material obligation under this Agreement
-and the breaching Party fails to remedy such breach within such notice period;
-(ii) any Third Party Software license grant to The Qt Company terminates or
-expires; or (iii) Licensee or any of its Affiliates bring a suit before any
-court or administrative agency or otherwise assert a claim for infringement of
-Intellectual Property Rights owned or licensable by Licensee or its Affiliates
-against (a) The Qt Company or any of its Affiliates; or (b) any other recipient
-of a license from The Qt Company with respect to the Licensed Software; or (c)
-any contractor, customer or distributor of a Party listed above in a or b; where
-such suit or claim relates to the use of the Licensed Software. 16.3.2 Mutual
-right to Terminate Either party shall have the right to terminate this Agreement
-immediately upon written notice in the event that the other party becomes
-insolvent, files for any form of bankruptcy, makes any assignment for the
-benefit of creditors, has a receiver, administrative receiver or officer
-appointed over the whole or a substantial part of its assets, ceases to conduct
-business, or an act equivalent to any of the above occurs under the laws of the
-jurisdiction of the other party. 16.3.3 Parties´ Rights and Duties upon
-Termination 16.3.3.1 Licensed Software which has not been subject to
-Distribution Upon termination of the Licenses, Licensee shall cease using the
-Licensed Software and return to The Qt Company all copies of Licensed Software
-that were supplied by The Qt Company. All other copies of Licensed Software in
-the possession or control of Licensee must be erased or destroyed. An officer of
-Licensee must promptly deliver to The Qt Company a written confirmation that
-this has occurred. 16.3.3.2 Licensed Software which has been distributed in
-connection with Licensed Products Upon termination or expiration of this
-Agreement, the following rights granted hereunder, shall terminate, as follows:
-a) Licensee shall, within: (i) thirty (30) days if termination is based on
-Sections 16.3.1, 16.3.2, 15.2; or (ii) within six (6) months of the termination
-date, if termination is based on any other reason, discontinue all copying,
-embedding, production and distribution of any copies of the Licensed, and will
-cause any third parties who obtained from it the right to manufacture or
-distribution of copies of the Licensed Software to do likewise. b) Any
-termination of this Agreement shall not affect any rights of an end-user to use
-the Licensed Software. c) Licensee shall cease using the Licensed Software as
-provided for above, including without limitation all source code, master
-diskettes and tapes, user manuals for the Licensed Software and Documentation,
-and deliver such to The Qt Company and/or permanently destroy all copies of the
-Licensed Software and all materials relating to the Licensed Software, except
-that Licensee may retain and exploit only such copies of the Licensed Software
-as it may reasonably require in providing continued support to its end-user
-customers, and will certify that that is the case upon the request of the The Qt
-Company. 16.4 Surviving Sections Any terms and conditions that by their nature
-or otherwise reasonably should survive a cancellation or termination of this
-Agreement shall also be deemed to survive. The following Sections and
-Subsections of this Agreement shall survive its termination: 3, 10, 11, 13, 15,
-16.3, 16.9, but none of the licenses or rights granted to Licensee shall
-survive. Any obligation to make payment (including, without limitation, any
-obligation to pay License Fees, interest, and taxes) shall also survive
-termination of this Agreement and be paid in accordance with this Agreement.
-16.5 Entire Agreement This Agreement constitutes the complete agreement between
-the parties and supersedes all prior or contemporaneous discussions,
-representations, and proposals, written or oral, with respect to the subject
-matters discussed herein, with the exception of the non-disclosure agreement
-executed by the parties in connection with this Agreement ("Non-Disclosure
-Agreement"), if any, shall be subject to Section 13. No modification of this
-Agreement shall be effective unless contained in a writing executed by an
-authorized representative of each party. No term or condition contained in
-Licensee's purchase order shall apply unless expressly accepted by The Qt
-Company in writing. If any provision of the Agreement is found void or
-unenforceable, the remainder shall remain valid and enforceable according to its
-terms. If any remedy provided is determined to have failed for its essential
-purpose, all limitations of liability and exclusions of damages set forth in
-this Agreement shall remain in effect.
-
-16.6 Force Majeure Neither party shall be liable to the other for any delay or
-non-performance of its obligations hereunder other than the obligation of paying
-the license fees in the event and to the extent that such delay or non-
-performance is due to an event of Force Majeure (as defined below). If any event
-of Force Majeure results in a delay or non-performance of a party for a period
-of three (3) months or longer, then either party shall have the right to
-terminate this Agreement with immediate effect without any liability (except for
-the obligations of payment arising prior to the event of Force Majeure) towards
-the other party. A "Force Majeure" event shall mean an act of God, terrorist
-attack or other catastrophic event of nature that prevents either party for
-fulfilling its obligations under this Agreement.
-
-16.7 Notices Any notice given by one party to the other shall be deemed properly
-given and deemed received if specifically acknowledged by the receiving party in
-writing or when successfully delivered to the recipient by hand, fax, or special
-courier during normal business hours on a business day to the addresses
-specified below. Each communication and document made or delivered by one party
-to the other party pursuant to this Agreement shall be in the English language
-or accompanied by a translation thereof. Notices to The Qt Company shall be
-given to: The Qt Company Ltd Attn: Legal Valimotie 21 FI-00380 Helsinki Finland
-Fax: +358 10 313 3700 16.8 Export Control Licensee acknowledges that the
-Licensed Software may be subject to export control restrictions of various
-countries. Licensee shall fully comply with all applicable export license
-restrictions and requirements as well as with all laws and regulations relating
-to the importation of the Licensed Software and/or Modified Software and/or
-Applications and shall procure all necessary governmental authorizations,
-including without limitation, all necessary licenses, approvals, permissions or
-consents, where necessary for the re- exportation of the Licensed Software,
-Modified Software or Applications.
-
-16.9 Governing Law and Legal Venue This Agreement shall be construed and
-interpreted in accordance with the laws of Finland, excluding its choice of law
-provisions. Any disputes, controversy or claim arising out of or relating to
-this Agreement, or the breach, termination or validity thereof shall be shall be
-finally settled by arbitration in accordance with the Arbitration Rules of the
-Central Chamber of Commerce of Finland. The arbitration tribunal shall consist
-of one (1), or if either Party so requires, of three (3), arbitrators. The award
-shall be final and binding and enforceable in any court of competent
-jurisdiction. The arbitration shall be held in Helsinki, Finland and the process
-shall be conducted in the English language.
-
-16.10 No Implied License There are no implied licenses or other implied rights
-granted under this Agreement, and all rights, save for those expressly granted
-hereunder, shall remain with The Qt Company and its licensors. In addition, no
-licenses or immunities are granted to the combination of the Licensed Software
-and/or Modified Software, as applicable, with any other software or hardware not
-delivered by The Qt Company under this Agreement.
-
-Appendix 1: Licensed Software
-
-1. Parts of the Licensed Software that are permitted for distribution
-("Redistributables") - The Licensed Software's essential and add-on libraries as
-listed in the License Certificate in object code form - The Licensed Software's
-configuration tool ("qtconfig") - The Licensed Software's help tool in object
-code/executable form ("Qt Assistant") - The Licensed Software's
-internationalization tools in object code/executable form ("Qt Linguist",
-"lupdate", "lrelease") - The Licensed Software's designer tool ("Qt Designer")
-- The Licensed Software's IDE tool ("Qt Creator"), excluding any parts or
-plug-ins which are delivered to Licensee only in object code - The Licensed
-Software's QML ("Qt Quick") launcher tool ("qmlscene" and "qmlviewer") in object
-code/executable form - The Licensed Software's installer framework
-
-2. Parts of the Licensed Software that are not permitted for distribution
-without a separate SDK distribution license agreement include, but are not
-limited to - The Licensed Software's source code and header files - The Licensed
-Software's documentation - The Licensed Software's documentation generation tool
-("qdoc") - The Licensed Software's tool for writing makefiles ("qmake") - The
-Licensed Software's Meta Object Compiler ("moc") - The Licensed Software's User
-Interface Compiler ("uic" or in the case of Qt Jambi: "juic") - The Licensed
-Software's Resource Compiler ("rcc") - The Licensed Software's generator (only
-in the case of Qt Jambi if applicable) - The Licensed Software's parts of the
-IDE tool ("Qt Creator") that are delivered to Licensee only in object code - The
-Licensed Software's Emulator - Build scripts, recipes and other material for
-creating the configuration of Licensed Software and/or 3rd party components,
-including the reference operating system configuration delivered in conjunction
-with the Licensed Software
-
-Appendix 2: Distribution Licensing
-
-I - Definitions The terms used in this Appendix 3 shall have the same meaning as
-defined in the main part of the Agreement. "Sublicensed Software" shall mean the
-Licensed Software, which is sublicensed to end-users (Sublicensees) in
-accordance with Section 5.2 of the Agreement. "Sublicensee" shall mean the
-end-user to which the Sublicensed Software is licensed. "Sublicense" shall mean
-the license given by Licensee to Sublicensee in accordance with Section 5.2 of
-the Agreement and this Appendix 3. II - Sublicensing The sublicensing referred
-to in Section 5.2 of the Agreement must satisfy the criteria set forth under
-sections 1 - 11 below: 1. Source code. Only the object code of the Sublicensed
-Software may be sublicensed. Unless authorized in a separate agreement with The
-Qt Company, the source code may not be sublicensed. 2. End-User Documentation.
-Sublicensee may be given the right to use the end-user Documentation, provided
-that such rights are limited to use in connection with the Sublicensed Software.
-Whenever the context reasonably permits, any reference in this Appendix to
-Sublicensed Software shall also apply to the end-user Documentation. 3.
-Limitations on Numbers of Computers and Processors. The Sublicensee's right to
-use the Sublicensed Software must be limited so that each Sublicense can only be
-used on a single computer or processor within the possession and control of the
-Sublicensee. Each Sublicense may not withstanding the foregoing also cover
-additional computers or processors, but in such case, each additional computer
-or processor covered by the Sublicense shall require Licensee's purchase of one
-additional Distribution license from The Qt Company. 4. Limits on Use,
-Distribution and Derivative Works. The Sublicense and Sublicensee's rights must
-be limited to Sublicensee's internal use purposes only and must not include any
-license, right or authorization to distribute or disclose any copy or portion of
-the Sublicensed Software to any other person. Sublicensee must not be given the
-right to modify or create derivative works based on the Sublicensed Software,
-and it must be stated explicitly in the Sublicense that such modification or
-creation is prohibited.
-
-5. Copies. Sublicensee may be given the right to make copies of the Sublicensed
-Software, provided that any such copy: (a) is created as an essential step in
-the utilization of Sublicensed Software in accordance with the Sublicense, or
-(b) is only for archival purposes to back-up the licensed use of Sublicensed
-Software. Sublicensee may also be given the right to make copies of Sublicensed
-Software to the extent reasonably needed to exercise rights under the
-Sublicense. Sublicensee must be obliged under the Sublicense to make sure that
-all The Qt Company trademark, copyright and intellectual property notices are
-faithfully reproduced and included on copies made by Sublicensee. Sublicensee
-may be given the right to make copies of the Documentation, but only as
-reasonably needed to facilitate the use of Sublicensed Software. Sublicensee may
-not be given the right to make any other copies of Licensed Software or
-Documentation unless and except as permitted by The Qt Company in a separate,
-written agreement. 6. Other Versions and Updates. If Licensee is entitled to
-Updates in accordance with Section 12of the Agreement, such Updates may also be
-sublicensed, subject to the terms and conditions found in this Appendix 3. 7.
-Protection of Sublicensed Software. Except as expressly permitted in this
-Appendix 3 (or in another written agreement with The Qt Company), Sublicensee
-must not be given any rights to modify or create derivative works based on
-Sublicensed Software, or reproduce Sublicensed Software, or distribute any
-copies of Sublicensed Software, or disclose any Sublicensed Software to any
-third party, or decompile, disassemble or otherwise reverse engineer Sublicensed
-Software, or use any Sublicensed Software or information learned therefrom.
-Sublicensee must as part of the contractual terms in the Sublicense acknowledge
-that The Qt Company and its licensors own the copyrights and other intellectual
-property in and to the Sublicensed Software. 8. Disclaimers Of Warranties.
-Licensee may not give any warranties regarding the Sublicensed Software to
-Sublicensee on behalf of The Qt Company. 9. Responsibility of Sublicensee.
-Sublicensee shall, as part of the Sublicense, be made responsible for decisions
-made and actions taken based on Sublicensed Software. Sublicensee shall as part
-of the contractual terms of the Sublicense be made aware that the Sublicensed
-Software is not designed, intended or licensed for use in or with systems,
-devices or products intended for surgical implant into the body or other
-applications intended to support or sustain life or for any aviation or nuclear
-reactor application or any other application in which the software or its
-failure, malfunction or inadequacy could directly or indirectly cause or
-contribute to personal injury or death or significant property damage. It shall
-further be stated in the Sublicense that it is Sublicensee's responsibility to
-ascertain the suitability of Sublicensed Software for any situation or
-application. It shall also be stated that the Sublicense defines a mutually
-agreed-upon allocation of risk and the Sublicense fees reflect such allocation
-of risk. 10. Termination. Licensee shall, as part of the terms of the
-Sublicense, be entitled to terminate the Sublicense granted to Sublicensee if
-Sublicensee breaches terms and conditions set to comply with this Appendix 3.
-The Qt Company may instruct Licensee to terminate the Sublicense without undue
-delay if termination is warranted in accordance with the foregoing. Upon
-termination of the Sublicense, Sublicensee shall be obliged to immediately cease
-all use of Sublicensed Software and to destroy all copies of Sublicensed
-Software within the possession or control of Sublicensee. 11. Mandatory law. The
-requirements above shall not apply to the extent they contravene mandatory
-provisions of the law governing the Sublicense, but in such case, The Qt Company
-shall be notified about the changes.
-
diff --git a/licenses/The-Qt-Company-DCLA-2.1 b/licenses/The-Qt-Company-DCLA-2.1
new file mode 100644
index 0000000..5231cb1
--- /dev/null
+++ b/licenses/The-Qt-Company-DCLA-2.1
@@ -0,0 +1,290 @@
+QT FOR DEVICE CREATION LICENSE AGREEMENT
+Agreement version 2.1
+
+This Qt for Device Creation License Agreement ("Agreement") is a legal agreement between The Qt Company Ltd ("The Qt Company") with its registered office at Valimotie 21, 00380 Helsinki, Finland and you (either an individual or a legal entity) ("Licensee") for the Licensed Software (as defined below).
+
+Please, read these license terms through carefully. By selecting "I accept the Agreement", you are deemed to accept these license terms and to commit yourself to observing them. When representing a legal entity, you should ensure your due authorization to approve these terms before you select "I accept the Agreement". Otherwise, we regard you as personally responsible for compliance with this Agreement. For clarity, please note that in case there already exists a signed license agreement between you and The Qt Company, this Agreement shall not override such an existing agreement but it shall continue to be valid subject to its applicable terms.
+
+Under this Agreement, the Licensee has purchased one (1) of the three (3) different below mentioned rights applicable to the Licensed Software (as defined below):
+(i) A perpetual license, which shall be valid for an unlimited time as further stated in this Agreement ("Perpetual License"); or
+(ii) A subscription license, which shall be valid for the time period specified by the Qt Company ("Subscription License"); or
+(iii) A limited subscription license, which includes a discount in payment based on Licensee´s limited annual sales revenue, as further stated in Section 14.3 and www.qt.io, and which shall be valid for the time period specified by the Qt Company ("Limited Subscription License"). For clarity, Limited Subscription License shall not include any Support (as defined below).
+
+1.    DEFINITIONS
+"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly controlling such Party; (ii) which is under the same direct or indirect ownership or control as such Party; or (iii) which is directly or indirectly owned or controlled by such Party.  For these purposes, an entity shall be treated as being controlled by another if that other entity has fifty percent (50 %) or more of the votes in such entity, is able to direct its affairs and/or to control the composition of its board of directors or equivalent body.
+
+"Applications" shall mean Licensee's software products created using the Licensed Software which may include portions of the Licensed Software.
+
+"Continued-Usage Term" shall mean, depending on the option purchased by Licensee, either a) if you have purchased Perpetual License; perpetuity;  or b) if you have purchased Subscription License or Limited Subscription License; the paid term.
+
+"Customers" shall mean the third parties to whom Licensee directly or indirectly distributes copies of the Licensed Software.
+"Devices" shall mean devices or products that 1) are manufactured, sold or distributed by Licensee that include the Licensed Software, and 2) fulfill the definition of a Joint Hardware and Software Distribution.
+"Deployment Platforms" shall mean those operating systems in which the Licensed Software can be distributed on according to the terms and conditions of this Agreement, especially Section 5.3.
+"Development Platforms" shall mean those operating systems in which the Licensed Software can be used only for designing, developing and testing Applications, but not distributed in any form or used for any other purpose.
+"Designated User(s)" shall mean the employee(s) of Licensee acting within the scope of their employment or Licensee's consultant(s) or contractor(s) acting within the scope of their services for Licensee and on behalf of Licensee.
+
+"Distribution License" shall mean the license described under Section 5.3 of this Agreement.
+"Intellectual Property Rights" shall mean patents (including utility models), design patents, and designs (whether or not capable of registration), chip topography rights and other like protection, copyright, trademark and any other form of statutory protection of any kind and applications for any of the foregoing as well as any trade secrets.
+"Joint Hardware and Software Distribution" shall mean either:
+(i)     distribution of a hardware device where, in its final end user configuration, the main user interface or substantial functionality of the device is provided by Application(s) created by Licensee or others, using Licensed Software or Licensed Software based software product, and depends on the Licensed Software or an open source version of Qt or any Qt based software product; or
+(ii)     distribution of the Licensed Software with a device designed to facilitate the installation of the Licensed Software onto the same device where the main user interface or substantial functionality of such device is provided by Application(s) created by Licensee or others, using the Licensed Software, and depends on the Licensed Software.
+
+"License Certificate" shall mean the document accompanying the Licensed Software which specifies the modules which are licensed under the Agreement, Development Platforms, Deployment Platforms and Designated Users.
+
+"License Fee" shall mean the fee charged to Licensee for (i) each copy of the Licensed Software purchased, as well as (ii) reproduction and distribution of Licensed Software under the terms of this Agreement.
+"License Packs" shall mean set of prepaid Distribution Licenses, as defined in Section 14.1.
+"Licensed Software" shall mean the computer software, "online" or electronic documentation, associated media and printed materials, including the source code, example programs and the documentation delivered by The Qt Company to Licensee in conjunction with this Agreement.  Licensed Software does not include Third Party Software (as defined in Section 7).
+
+"Modified Software" shall mean modifications made to the Licensed Software by Licensee.
+
+"Online Services" shall mean any services or access to systems provided by The Qt Company to the Licensee over Internet in conjunction with the Licensed Software or for the purpose of use by the Licensee of the Licensed Software or Support. Using some of the Online Services may be subject to additional fees.
+
+"Party or Parties" shall mean Licensee and/or The Qt Company.
+
+"Redistributables" shall mean the portions of the Licensed Software set forth in Appendix 1, Section 1 that may be distributed with or as part of Applications in object code form.
+
+"Renewal Term" shall mean a) in case the Licensee has purchased a Perpetual License: (i) a time period of twelve (12) months  and b) in case the Licensee has purchased Subscription License or Limited Subscription License,  a time period specified by The Qt Company at www.qt.io or directly to the Licensee.
+
+"Start-For-Free Term" shall mean the period from the later of (a) the Effective Date; or (b) the date the Licensed Software was initially delivered to Licensee by The Qt Company until the first Supported Term. If no specific Effective Date is set forth in the Agreement, the Effective Date shall be deemed to be the date the Licensed Software was initially delivered to Licensee. Unless otherwise agreed with The Qt Company in writing, the maximum duration of Start-For-Free Term shall be 30 days.
+
+"Support" shall mean standard developer support that is provided by The Qt Company to assist eligible Designated Users in using the Licensed Software in accordance with its established standard support procedures.
+
+"Supported Term" shall mean a time period that you have selected and paid for Support for the Licensed Software, calculated from either (i) the end of the Start-For-Free Term, or (ii) from the purchase of the Supported Term, or (iii) from end of the previous Supported Term, as applicable. For the Limited Subscription License, Supported Term shall mean a time period for which the Licensee has selected and paid for usage of Licensed Software.
+
+"Updates" shall mean a release or version of the Licensed Software containing enhancements, new features, bug fixes, error corrections and other changes that are generally made available to users of the Licensed Software that have contracted for maintenance and support.
+
+2.    OWNERSHIP
+The Licensed Software is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The Licensed Software is licensed, not sold.
+To the extent Licensee submits bug fixes or error corrections, including information related thereto, Licensee hereby grants The Qt Company a sublicensable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and fully paid-up copyright and trade secret license to reproduce, adapt, translate, modify, and prepare derivative works of, publicly display, publicly perform, sublicense, make available and distribute error corrections and bug fixes, including derivative works thereof.  All The Qt Company's and/or its licensors' trademarks, service marks, trade names, logos or other words or symbols are and shall remain the exclusive property of The Qt Company or its licensors respectively.
+
+3.    MODULES
+Some of the files in the Licensed Software have been grouped into modules. These files contain specific notices defining the module of which they are a part. The modules licensed to Licensee are specified in the License Certificate accompanying the Licensed Software. The terms of the License Certificate are considered part of the Agreement. In the event of inconsistency or conflict between the language of this Agreement and the License Certificate, the provisions of this Agreement shall govern.
+
+4.    VALIDITY OF THE AGREEMENT
+By installing, copying, or otherwise using the Licensed Software, Licensee agrees to be bound by the terms of this Agreement. If Licensee does not agree to the terms of this Agreement, Licensee should not install, copy, or otherwise use the Licensed Software. In addition, by installing, copying, or otherwise using any Updates or other components of the Licensed Software that Licensee receives separately as part of the Licensed Software, Licensee agrees to be bound by any additional license terms that accompany such Updates, if any. If Licensee does not agree to the additional license terms that accompany such Updates, Licensee should not install, copy, or otherwise use such Updates.
+
+Upon Licensee's acceptance of the terms and conditions of this Agreement, The Qt Company grants Licensee the right to use the Licensed Software in the manner provided below.
+
+5. LICENSES GRANTED
+
+5.1 General
+
+5.1.1 Licensee is hereby granted a free of charge license for the Start-For-Free Term as described in Section 5.2 below. For clarity, Section 5.3 shall not apply for the Start-For-Free Term.
+
+5.1.2 Licensee may purchase additional license(s) for Continued-Usage Term, as described in Sections 5.2 and 5.3 below, subject to The Qt Company's payment terms and conditions applicable at the time of purchase. In addition, Licensee may purchase license(s) for the Continued-Usage Term without such a preceding Start-For-Free Term.
+
+5.2 Licenses granted during the Start-For-Free Term and the Continued-Usage Term
+
+5.2.1 Using, Modifying and Copying
+
+The Qt Company grants to Licensee a non-exclusive, non-transferable, limited term license to use, modify and copy the Licensed Software for Designated Users specified in the License Certificate for the sole purposes of:
+
+(i) designing, developing, and testing Application(s);
+(ii) modifying the Licensed Software as limited by section 8 below; and
+(iii) compiling the Licensed Software and/or Modified Software source code into object code.
+
+Licensee may install copies of the Licensed Software on an unlimited number of computers provided that only the Designated Users use the Licensed Software.
+Licensee may at any time during the Supported Term designate another Designated User to replace a then-current Designated User by notifying The Qt Company, provided that a) the then-current Designated User has not been designated as a replacement during the last six (6) months; and b) there is no more than the specified number of Designated Users at any given time.
+
+5.3    Limited Redistribution Right for the Continued-Usage Term Only
+
+The limited distribution licenses granted in this Section 5.3 shall only be applicable to the Continued-Usage Term, but not to Start-For-Free Term.
+
+The Qt Company grants to Licensee a non-exclusive, non-transferable license to, for the purpose of creating Devices,  (a) install Applications and copies of the Redistributables (listed in Appendix 1, Section 1, in object code form only) in Devices and/or bundle or integrate copies of the Licensed Software (in object code form only) into or with Devices and other services for execution on the specified Deployment Platforms; (b) distribute Licensed Software (in object code form only) to one or more tiers of distributors as incorporated or integrated in Devices; and (c) sublicense the Licensed Software (in object code form only), as incorporated or integrated in Devices,  to end users under Licensee's standard terms and conditions, which must meet the requirements set out in Appendix 2 (collectively, the "Distribution License").  This Distribution License does not entitle Licensee to receive, or grant Licensee any rights with respect to any source code.  Should any third party that has received a product, software and/or a sublicense from Licensee in accordance with the provisions above, wish to use the product and sublicensed software in a manner not warranted in Appendix 2, such third party must request a licensing agreement for this purpose directly from The Qt Company.  Licensee may also reproduce and distribute the Licensed Software (in object code form only) under the Distribution License independent of the Device, (i.e. the Licensed Software may be reproduced and distributed by Licensee to others as a stand-alone or independent product or for use independent of the Device).  The Distribution License provided under this Section 5.3 is conditional, subject to Licensee´s full compliance of Section 14 of this Agreement.  All reproduction and distribution of the Licensed Software or any portion thereof requires the payment of License Fees from Licensee to The Qt Company.
+
+The licenses granted in this Section by The Qt Company to Licensee are subject to Licensee's compliance with Section 5.4 of this Agreement.
+
+For the avoidance of doubt, should the Licensee wish to distribute Licensed Software as a part of software development kit (SDK) for the purpose of developing Applications by Licensee´s customers for Licensee´s products, such distribution is subject to a separate Qt SDK distribution license agreement to be concluded with The Qt Company.
+
+5.4    Further Requirements
+
+The licenses granted in this Section 5 by The Qt Company to Licensee are subject to Licensee's compliance with Section 8 of this Agreement.
+
+6.    VERIFICATION
+The Qt Company or a certified auditor on The Qt Company's behalf, may, upon its reasonable request and at its expense, audit Licensee with respect to the use of the Licensed Software. Such audit may be conducted by mail, electronic means or through an in-person visit to Licensee's place of business.  Any such in-person audit shall be conducted during regular business hours at Licensee's facilities and shall not unreasonably interfere with Licensee's business activities. The Qt Company will not remove, copy, or redistribute any electronic material during the course of an audit.  If an audit reveals that Licensee is using the Licensed Software in a way that is in material violation of the terms of the Agreement, then Licensee shall pay The Qt Company's reasonable costs of conducting the audit.  In the case of a material violation, Licensee agrees to pay The Qt Company any amounts owing that are attributable to the unauthorized use. Alternatively, The Qt Company reserves the right, at The Qt Company's sole option, to terminate the licenses for the Licensed Software.
+
+7.    THIRD PARTY SOFTWARE
+The Licensed Software may provide links to third party libraries or code (collectively "Third Party Software") to implement various functions.  Third Party Software does not comprise part of the Licensed Software. In some cases, access to Third Party Software may be included along with the Licensed Software delivery as a convenience for development and testing only. Such source code and libraries may be listed in the ".../src/3rdparty" source tree delivered with the Licensed Software or documented in the Licensed Software where the Third Party Software is used, as may be amended from time to time, do not comprise the Licensed Software.  Licensee acknowledges (i) that some part of Third Party Software may require additional licensing of copyright and patents from the owners of such, and (ii) that distribution of any of the Licensed Software referencing any portion of a Third Party Software may require appropriate licensing from such third parties.
+
+8.    CONDITIONS FOR CREATING APPLICATIONS
+The licenses granted in this Agreement for Licensee to create, modify and distribute Applications is subject to all of the following conditions:  (i) all copies of the Applications Licensee creates must bear a valid copyright notice either Licensee's own or the copyright notice that appears on the Licensed Software;  (ii) Licensee may not remove or alter any copyright, trademark or other proprietary rights notice contained in any portion of the Licensed Software including but not limited to the About Boxes;  (iii) Licensee will indemnify and hold The Qt Company, its Affiliates, contractors, and its suppliers, harmless from and against any claims or liabilities arising out of the use, reproduction or distribution of Applications; (iv) Applications must be developed using a licensed, registered copy of the Licensed Software; (v) Applications must add primary and substantial functionality to the Licensed Software; (vi) Applications may not pass on functionality which in any way makes it possible for others to create software with the Licensed Software; however Licensee may use the Licensed Software's scripting and QML ("Qt Quick") functionality solely in order to enable scripting, themes and styles that augment the functionality and appearance of the Application(s) without adding primary and substantial functionality to the Application(s); (vii) Licensee may create Modified Software that breaks the source or binary compatibility with the Licensed Software. This includes, but is not limited to, changing the application programming interfaces ("API") by adding, changing or deleting any variable, method, or class signature in the Licensed Software, the inter-process QCop specification, and/or any inter-process protocols, services or standards in the Licensed Software libraries.  To the extent that Licensee breaks source or binary compatibility with the Licensed Software, Licensee acknowledges that The Qt Company's ability to provide Support may be prevented or limited and Licensee's ability to make use of Updates may be restricted; (viii) Applications may not compete with the Licensed Software; (ix) Licensee may not use The Qt Company's or any of its suppliers' names, logos, or trademarks to market Applications, except to state that Licensee's Application(s) was developed using the Licensed Software; and (x) each Designated User creating the Application(s) needs to have a separate license for the Licensed Software.
+
+NOTE:  If Licensee, or another third party, has, at any time, developed or distributed all (or any portions of) the Application(s) using an open source version of Qt licensed under the terms of the GNU Lesser General Public License, version 2.1 or later ("LGPL") or the GNU General Public License version 2.0 or later  ("GPL"), Licensee may contact The Qt Company via email to address sales@qt.io to ask for the necessary permission to  combine such development work with the Licensed Software. The Qt Company shall evaluate Licensee´s request, and respond to the request with estimated license costs and other applicable terms and details relating to the permission for the Licensee, depending on the actual situation in question.  Copies of the licenses referred to above are located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, https://www.gnu.org/licenses/lgpl-3.0.html, http://www.fsf.org/licensing/licenses/info/GPLv2.html, and http://www.gnu.org/copyleft/gpl-3.0.html.
+
+9. PRE-RELEASE CODE
+The Licensed Software may contain pre-release code and functionality marked or otherwise stated as "Technology Preview", "Alpha", "Beta" or similar. Such pre-release code may be present in order to provide experimental support for new platforms or preliminary version of new functionality. The pre-release code is not at the level of performance and compatibility of a final, generally available, product offering. The pre-release parts of the Licensed Software may not operate correctly and may be substantially modified prior to the first commercial product release, if any. The Qt Company is under no obligation to make pre-release code commercially available, or provide any Support or Updates relating thereto.
+
+10.    LIMITED WARRANTY AND WARRANTY DISCLAIMER
+The Qt Company hereby represents and warrants with respect to the Licensed Software that it has the power and authority to grant the rights and licenses granted to Licensee under this Agreement.  Except as set forth above, the Licensed Software is licensed to Licensee "as is".
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE.  THE QT COMPANY DOES NOT WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT IT IS WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE UNINTERRUPTED.  ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE RISK OF AND RESPONSIBILITY OF LICENSEE.
+11.    LIMITATION OF LIABILITY
+
+11.1 Risk Allocation
+If, The Qt Company's warranty disclaimer notwithstanding, The Qt Company is held to be liable to Licensee whether in contract, tort, or any other legal theory, based on the Licensed Software, The Qt Company's entire liability to Licensee and Licensee's exclusive remedy shall be, at The Qt Company's option, either (a) return of the price Licensee paid for the Licensed Software, or (b) repair or replacement of the Licensed Software, provided Licensee returns all copies of the Licensed Software to The Qt Company as originally delivered to Licensee.
+
+EXCEPT FOR INJURY TO PERSONS OR IN CASES OF INTENTIONAL MISCONDUCT AND IN CASE OF THE LICENSEE WITH RESPECT TO AMOUNTS PAYABLE UNDER SECTION 14 OR LICENSEE'S MATERIAL BREACH OF THIS AGREEMENT AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY IN CONTRACT, TORT OR OTHERWISE, WHATEVER THE CAUSE THEREOF, FOR ANY LOSS OF PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT.
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LIABILITY FOR SUCH DAMAGE SHALL BE EXCLUDED, EVEN IF THE EXCLUSIVE REMEDIES PROVIDED FOR IN THIS AGREEMENT FAIL OF THEIR ESSENTIAL PURPOSE.
+EXCEPT FOR INJURY TO PERSONS OR IN CASES OF INTENTIONAL MISCONDUCT AND IN CASE OF THE LICENSEE WITH RESPECT TO AMOUNTS PAYABLE UNDER SECTION 14 OR LICENSEE'S MATERIAL BREACH OF THIS AGREEMENT AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES RECEIVED FROM LICENSEE FOR THE LICENSED SOFTWARE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE EVENT RESULTING IN SUCH LIABILITY.
+THE PROVISIONS OF THIS SECTION 11 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT.
+
+11.2 No Third Party Representations, Warranties or Transfers
+Licensee shall make no representations or warranties concerning the Licensed Software on behalf of The Qt Company, nor shall Licensee sell, transfer, publish, disclose, display or otherwise make available the Licensed Software, or copies thereof, to any third party except as specifically set forth herein or in another written agreement with The Qt Company.  Any representation or warranty Licensee makes or purports to make on The Qt Company's behalf shall be void as to The Qt Company.
+11.3 Licensee´s Indemnification
+Licensee shall indemnify and hold harmless The Qt Company and its officers, directors, employees, representative, licensors, and suppliers from and against any claim, injury, judgment, settlement, loss or expense, including attorneys' fees, arising as a consequence of: (a) Licensee's breach of its warranties or any other provisions of this Agreement, including, but not limited to, (i) the failure of Licensee to comply with the provisions of this Section 11, (ii) any misrepresentations of Licensee in connection with The Qt Company or the Licensed Software, and (iii) any other wrongful conduct of Licensee, its employees, representatives, agents, or (b) the Device.
+
+12.    SUPPORT, UPDATES AND ONLINE SERVICES
+Licensee will be eligible to receive Support and Updates and to use the Online Services during the Supported Term, in accordance with The Qt Company's then current policies and procedures, if any. Such policies and procedures may be changed from time to time. For clarity, under the Limited Subscription License, the Licensee shall not be eligible to receive any Support for the Licensed Software.
+
+As for the Perpetual License, unless Licensee notifies The Qt Company in writing no less than 30 days prior to each expiry of Supported Term, Supported Term may, at the Qt Company's option be extended by Renewal Term, subject to due payments by Licensee and subject to The Qt Company's terms and conditions applicable at the time of extension.
+
+In the event Licensee selects not to have Supported Term extended, The Qt Company shall, following the expiry of Supported Term, no longer make the Licensed Software, Support, Updates or Online Services available to Licensee.
+
+Licensee shall be responsible for providing service and support to Licensee's Customers with respect to the Licensed Software.  Licensee, as appropriate, shall inform Licensee's Customers that all requests for support or service are to be made to Licensee, and not to The Qt Company.
+
+Updates shall be considered to be Licensed Software and governed by this Agreement as such, unless The Qt Company designates that a different agreement shall govern.  Licensee shall be responsible for distributing patches and fixes to Customers if and as The Qt Company reasonably requests.
+13.    CONFIDENTIALITY
+Each party acknowledges that during the Start-For-Free-Term and Supported Term of this Agreement it shall have access to information about the other party's business, business methods, business plans, customers, business relations, technology, and other information, including the terms of this Agreement, that is confidential and of great value to the other party, and the value of which would be significantly reduced if disclosed to third parties ("Confidential Information"). Accordingly, when a party (the "Receiving Party") receives Confidential Information from another party (the "Disclosing Party"), the Receiving Party shall, and shall obligate its employees and agents and employees and agents of its Affiliates to: (i) maintain the Confidential Information in strict confidence; (ii) not disclose the Confidential Information to a third party without the Disclosing Party's prior written approval; and (iii) not, directly or indirectly, use the Confidential Information for any purpose other than for exercising its rights and fulfilling its responsibilities pursuant to this Agreement. Each party shall take reasonable measures to protect the Confidential Information of the other party, which measures shall not be less than the measures taken by such party to protect its own confidential and proprietary information.
+
+"Confidential Information" shall not include information that (a) is or becomes generally known to the public through no act or omission of the Receiving Party; (b) was in the Receiving Party's lawful possession prior to the disclosure hereunder and was not subject to limitations on disclosure or use; (c) is developed by employees of the Receiving Party or other persons working for the Receiving Party who have not had access to the Confidential Information of the Disclosing Party, as proven by the written records of the Receiving Party or by persons who have not had access to the Confidential Information of the Disclosing Party as proven by the written records of the Receiving Party; (d) is lawfully disclosed to the Receiving Party without restrictions, by a third party not under an obligation of confidentiality; or (e) the Receiving Party is legally compelled to disclose the information, in which case the Receiving Party shall assert the privileged and confidential nature of the information and cooperate fully with the Disclosing Party to protect against and prevent disclosure of any Confidential Information and to limit the scope of disclosure and the dissemination of disclosed Confidential Information by all legally available means.
+
+The obligations of the Receiving Party under this Section shall continue during the Supported Term and for a period of five (5) years after expiration or termination of this Agreement.  To the extent that the terms of the Non-Disclosure Agreement between The Qt Company and Licensee conflict with the terms of this Section 13, this Section 13 shall be controlling over the terms of the Non-Disclosure Agreement.
+
+14 FEES, ORDERS, DELIVERY AND PAYMENT
+14.1 DISTRIBUTION LICENSE FEES
+The Distribution License provided under Section 5.3 is conditional on the Licensee purchasing the needed amount of Distribution Licenses separately from The Qt Company before distributing Devices to Customers. Distribution licenses are sold in License Packs subject to a fee.
+The License Fee for a Distribution License purchased by Licensee cannot be refunded or claimed as a credit, even on the ground that it is not distributed, by sale or otherwise, from Licensee to Customers or for any other reason.
+Licensee will have an account of Distribution Licenses that will be applied to each copy of Licensed Software that is bundled or integrated with any of the Devices or that is distributed to Customers.  Licensee may bundle, integrate and distribute copies of the Licensed Software so long as Licensee has Distribution Licenses paid for, but not yet used.  Each time Licensee bundles, integrates or distributes a copy of Licensed Software, then one Distribution License is used, and Licensee's account of available Distribution Licenses is decreased accordingly.
+14.2 DISTRIBUTION LICENSES ORDERED
+Licensee shall submit all purchase orders for Distribution Licenses to The Qt Company by email or any other method acceptable to The Qt Company (each such order is referred to herein as a "Purchase Order").  If The Qt Company wishes to accept the Purchase Order, The Qt Company may then confirm and return the Purchase Order to Licensee, whereupon the Purchase Order shall become binding between the Parties.  In the event of conflict or inconsistency between this Agreement and a Purchase Order, this Agreement shall control.
+14.3 PAYMENT TERMS
+The Qt Company will submit an invoice to Licensee any time after The Qt Company receives a subsequent purchase order(s) from Licensee, and delivers the goods or services described in the Agreement or purchase order to Licensee.  Licensee's payments for the Licensed Software and any other charges under this Agreement shall be paid by Licensee no later than thirty (30) days from the time The Qt Company mails its invoices to Licensee.  A late payment charge of the lower of (a) one percent per month; or (b) the highest interest rate allowed by applicable law, shall be charged on unpaid balances that remain past due for more than thirty (30) days.  The Qt Company shall have the right to suspend, terminate or withhold Distribution Licenses, License Certificates, deliveries and/or services should Licensee fail to make payment in a timely fashion.
+Licensee shall at all times maintain accurate and up-to-date written records of the number of copies of the Licensed Software that Licensee installs in each Device(s).
+As for the Limited Subscription License, the fees under this Agreement applicable for the Licensee, as further stated in www.qt.io, are subject to Licensee´s annual sales revenue being smaller than one hundred thousand (<100,000) USD. In case the Licensee´s annual sales revenue would increase up to one hundred thousand (100,000) USD or more, (i) the Licensee shall inform The Qt Company without undue delay in written form of such increase, and (ii) The Qt Company shall reserve the right to change applicable pricing for The Licensee, depending on The Qt Company´s then current pricing, as further stated in www.qt.io. The Licensee shall have the obligation, upon reasonable prior request by The Qt Company, to prove that its annual sales revenue is smaller than one hundred thousand (<100,000) USD in order for the Licensee to be entitled to continue using the Limited Subscription License.
+
+14.4 TAXES
+All amounts payable are gross amounts but exclusive of any value added tax, use tax, sales tax or similar tax. Licensee shall be entitled to withhold from payments any applicable withholding taxes and comply with all applicable tax and employment legislation.  Each party shall pay all taxes (including, but not limited to, taxes based upon its income) or levies imposed on it under applicable laws, regulations and tax treaties as a result of this Agreement and any payments made hereunder (including those required to be withheld or deducted from payments).  Each party shall furnish evidence of such paid taxes as is sufficient to enable the other party to obtain any credits available to it, including original withholding tax certificates.
+15    RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS
+15.1 LICENSEE'S RECORD-KEEPING
+Licensee shall at all times maintain accurate and up-to-date written records of Licensee's activities related to the Licensed Software and Distribution Licenses, including copying and distribution.  The records shall be adequate to determine Licensee's compliance with the provisions of this Agreement and to demonstrate the number of Distribution Licenses of the Licensed Software distributed by Licensee.  The records shall conform to good accounting practices commonly accepted in the industry and consistently applied.
+Licensee shall, within thirty (30) days from the end of each calendar quarter, deliver to The Qt Company a report detailing the number of copies of Licensed Software distributed by Licensee during that calendar quarter, and detailing also the number of undistributed copies of Licensed Software made by Licensee and remaining in its account (i.e., undistributed copies for which Distribution Licenses have been or need to be obtained from The Qt Company).  Such report shall contain such other information as The Qt Company shall require from time to time.
+15.2. THE QT COMPANY'S INSPECTION RIGHTS
+The Qt Company or an independent auditor on The Qt Company's behalf, may, upon at least five (5) business days' prior written notice and at its expense, audit Licensee with respect to the use of the Licensed Software, but not more frequently than once during each 6-month period.  Such audit may be conducted by mail, electronic means or through an in-person visit to Licensee's place of business.  Any such in-person audit shall be conducted during regular business hours at Licensee's facilities and shall not unreasonably interfere with Licensee's business activities. The Qt Company or the independent auditor shall be entitled to inspect Licensee's books and records that likely to contain information bearing on Licensee's compliance with this Agreement or the payments due to The Qt Company under this Agreement, including, but not limited to:  assembly logs, sales records, distribution records ("Licensee's Records") The Qt Company shall not remove, copy, or redistribute any electronic material during the course of an audit.
+If an audit reveals that Licensee is using the Licensed Software in a way that is in material violation of the terms of the Agreement, then Licensee shall pay The Qt Company's reasonable costs of conducting the audit.  In the case of a material violation, Licensee agrees to pay The Qt Company any amounts owing that are attributable to the unauthorized use.  In the alternative, The Qt Company reserves the right, at The Qt Company's sole option, to terminate the licenses for the Licensed Software.
+16.    GENERAL PROVISIONS
+16.1    No Assignment
+Licensee shall not be entitled to assign or transfer all or any of its rights, benefits and obligations under this Agreement without the prior written consent of The Qt Company, which shall not be unreasonably withheld. The Qt Company shall be entitled to assign or transfer any of its rights, benefits or obligations under this Agreement on an unrestricted basis.
+
+16.2    Termination
+16.2.1 Termination by The Qt Company
+The Qt Company shall have the right to terminate this Agreement upon thirty (30) days prior written notice if (i) the Licensee is in breach of any material obligation under this Agreement and the breaching Party fails to remedy such breach within such notice period; (ii) any Third Party Software license grant to The Qt Company terminates or expires; or (iii) Licensee or any of its Affiliates bring a suit before any court or administrative agency or otherwise assert a claim for infringement of Intellectual Property Rights owned or licensable by Licensee or its Affiliates against (a) The Qt Company or any of its Affiliates; or  (b) any other recipient of a license from The Qt Company with respect to the Licensed Software; or (c) any contractor, customer or distributor of a Party listed above in a or b; where such suit or claim relates to the use of the Licensed Software.
+16.2.2 Mutual right to Terminate
+Either party shall have the right to terminate this Agreement immediately upon written notice in the event that the other party becomes insolvent, files for any form of bankruptcy, makes any assignment for the benefit of creditors, has a receiver, administrative receiver or officer appointed over the whole or a substantial part of its assets, ceases to conduct business, or an act equivalent to any of the above occurs under the laws of the jurisdiction of the other party.
+
+16.2.3 Parties´ Rights and Duties upon Termination
+16.2.3.1 Licensed Software which has not been subject to Distribution
+
+Upon termination of the Licenses, Licensee shall cease using the Licensed Software and return to The Qt Company all copies of Licensed Software that were supplied by The Qt Company.  All other copies of Licensed Software in the possession or control of Licensee must be erased or destroyed.  An officer of Licensee must promptly deliver to The Qt Company a written confirmation that this has occurred.
+
+16.2.3.2 Licensed Software which has been distributed in connection with Licensed Products
+
+Upon termination or expiration of this Agreement, the following rights granted hereunder, shall terminate, as follows:
+a)   Licensee shall, within: (i) thirty (30) days if termination is based on Sections 16.2.1, 16.2.2, 15.2; or (ii) within six (6) months of the termination date, if termination is based on any other reason, discontinue all copying, embedding, production and distribution of any copies of the Licensed, and will cause any third parties who obtained from it the right to manufacture or distribution of copies of the Licensed Software to do likewise.
+b)   Any termination of this Agreement shall not affect any rights of an end-user to use the Licensed Software.
+c)   Licensee shall cease using the Licensed Software as provided for above, including without limitation all source code, master diskettes and tapes, user manuals for the Licensed Software and Documentation, and deliver such to The Qt Company and/or permanently destroy all copies of the Licensed Software and all materials relating to the Licensed Software, except that Licensee may retain and exploit only such copies of the Licensed Software as it may reasonably require in providing continued support to its end-user customers, and will certify that that is the case upon the request of the The Qt Company.
+
+16.3    Surviving Sections
+Any terms and conditions that by their nature or otherwise reasonably should survive a cancellation or termination of this Agreement shall also be deemed to survive.  Such surviving terms and conditions include, but are not limited to the Section 13.
+
+16.4    Entire Agreement
+ This Agreement constitutes the complete agreement between the parties and supersedes all prior or contemporaneous discussions, representations, and proposals, written or oral, with respect to the subject matters discussed herein, with the exception of the non-disclosure agreement executed by the parties in connection with this Agreement ("Non-Disclosure Agreement"), if any, shall be subject to Section 13. No modification of this Agreement shall be effective unless contained in a writing executed by an authorized representative of each party. No term or condition contained in Licensee's purchase order shall apply unless expressly accepted by The Qt Company in writing. If any provision of the Agreement is found void or unenforceable, the remainder shall remain valid and enforceable according to its terms. If any remedy provided is determined to have failed for its essential purpose, all limitations of liability and exclusions of damages set forth in this Agreement shall remain in effect.
+
+16.5    Force Majeure
+Neither party shall be liable to the other for any delay or non-performance of its obligations hereunder other than the obligation of paying the license fees in the event and to the extent that such delay or non-performance is due to an event of Force Majeure (as defined below).  If any event of Force Majeure results in a delay or non-performance of a party for a period of three (3) months or longer, then either party shall have the right to terminate this Agreement with immediate effect without any liability (except for the obligations of payment arising prior to the event of Force Majeure) towards the other party.  A "Force Majeure" event shall mean an act of God, terrorist attack or other catastrophic event of nature that prevents either party for fulfilling its obligations under this Agreement.
+
+16.6    Notices
+Any notice given by one party to the other shall be deemed properly given and deemed received if specifically acknowledged by the receiving party in writing or when successfully delivered to the recipient by hand, fax, or special courier during normal business hours on a business day to the addresses specified below.  Each communication and document made or delivered by one party to the other party pursuant to this Agreement shall be in the English language or accompanied by a translation thereof.
+
+Notices to The Qt Company shall be given to:
+    The Qt Company  Ltd
+    Attn: Legal
+    Valimotie 21
+    FI-00380 Helsinki
+    Finland
+    Fax:  +358 10 313 3700
+
+16.7    Export Control
+Licensee acknowledges that the Licensed Software may be subject to export control restrictions of various countries.  Licensee shall fully comply with all applicable export license restrictions and requirements as well as with all laws and regulations relating to the importation of the Licensed Software and/or Modified Software and/or Applications and shall procure all necessary governmental authorizations, including without limitation, all necessary licenses, approvals, permissions or consents, where necessary for the re-exportation of the Licensed Software, Modified Software or Applications.
+
+16.8 Personal Data
+
+For the purposes of this Agreement, personal data shall include but is not limited to: individual user´s name, email address, telephone number, profile, and any other information from which the individual user can be identified (“Personal Data”). Upon signing of this Agreement, the Licensee explicitly gives its consent to the process and transfer of any Personal Data relating to the Licensee or its Designated Users, for the purposes stated below.
+
+The Qt Company may pass Personal Data outside The Qt Company group (1) if and to the extent a third party service provider has a strict need-to-know basis for such Personal Data to be able to provide its services to The Qt Company, or (2) in order to comply with the law or requests of governmental entities. Given the global nature of The Qt Company´s business, processing information for such purposes may involve a cross-border transfer of Personal Data. In addition, The Qt Company may collect individual user´s IP address and browser cookies about the use of services or tools relating to Licensed Software, and visits to The Qt Company´s web pages.
+
+In processing and transferring Personal Data The Qt Company shall comply with all applicable European or foreign data protection laws as effective from time to time.
+
+16.9 Governing Law and Legal Venue
+This Agreement shall be construed and interpreted in accordance with the laws of Finland, excluding its choice of law provisions. Any disputes, controversy or claim arising out of or relating to this Agreement, or the breach, termination or validity thereof shall be shall be finally settled by arbitration in accordance with the Arbitration Rules of Finland Chamber of Commerce . The arbitration tribunal shall consist of one (1), or if either Party so requires, of three (3), arbitrators. The award shall be final and binding and enforceable in any court of competent jurisdiction. The arbitration shall be held in Helsinki, Finland and the process shall be conducted in the English language.
+
+16.10 No Implied License
+There are no implied licenses or other implied rights granted under this Agreement, and all rights, save for those expressly granted hereunder, shall remain with The Qt Company and its licensors.  In addition, no licenses or immunities are granted to the combination of the Licensed Software and/or Modified Software, as applicable, with any other software or hardware not delivered by The Qt Company under this Agreement.
+
+Appendix 1
+
+1. Parts of the Licensed Software that are permitted for distribution ("Redistributables")
+- The Licensed Software's essential and add-on libraries that have been included in an officially released version of the Licensed Software, in object code form
+- The Licensed Software's configuration tool ("qtconfig")
+- The Licensed Software's help tool in object code/executable form ("Qt Assistant")
+- The Licensed Software's internationalization tools in object code/executable form ("Qt Linguist", "lupdate", "lrelease")
+- The Licensed Software's designer tool ("Qt Designer")
+- The Licensed Software's IDE tool ("Qt Creator"), excluding any parts or plug-ins which are delivered to Licensee only in object code
+- The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" and "qmlviewer") in object code/executable form
+- The Licensed Software's installer framework
+
+2. Parts of the Licensed Software that are not permitted for distribution without a separate SDK distribution license agreement include, but are not limited to
+- The Licensed Software's source code and header files
+- The Licensed Software's documentation
+- The Licensed Software's documentation generation tool ("qdoc")
+- The Licensed Software's tool for writing makefiles ("qmake")
+- The Licensed Software's Meta Object Compiler ("moc")
+- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic")
+- The Licensed Software's Resource Compiler ("rcc")
+- The Licensed Software's generator (only in the case of Qt Jambi if applicable)
+- The Licensed Software's parts of the IDE tool ("Qt Creator") that are delivered to Licensee only in object code
+- The Licensed Software's Emulator
+- Build scripts, recipes and other material for creating the configuration of Licensed Software and/or 3rd party components, including the reference operating system configuration delivered in conjunction with the Licensed Software
+
+Appendix 2: Distribution Licensing
+
+I - Definitions
+The terms used in this Appendix 2 shall have the same meaning as defined in the main part of the Agreement.
+"Sublicensed Software" shall mean the Licensed Software, which is sublicensed to end-users (Sublicensees) in accordance with Section 5.3 of the Agreement.
+"Sublicensee" shall mean the end-user to which the Sublicensed Software is licensed.
+"Sublicense" shall mean the license given by Licensee to Sublicensee in accordance with Section 5.2 of the Agreement and this Appendix 2.
+II - Sublicensing
+The sublicensing referred to in Section 5.3 of the Agreement must satisfy the criteria set forth under sections 1 - 11 below:
+1.    Source code.
+Only the object code of the Sublicensed Software may be sublicensed. Unless authorized in a separate agreement with The Qt Company, the source code may not be sublicensed.
+2.    End-User Documentation.
+Sublicensee may be given the right to use the end-user Documentation, provided that such rights are limited to use in connection with the Sublicensed Software.  Whenever the context reasonably permits, any reference in this Appendix to Sublicensed Software shall also apply to the end-user Documentation.
+3.    Limitations on Numbers of Computers and Processors.
+The Sublicensee's right to use the Sublicensed Software must be limited so that each Sublicense can only be used on a single computer or processor within the possession and control of the Sublicensee. Each Sublicense may not withstanding the foregoing also cover additional computers or processors, but in such case, each additional computer or processor covered by the Sublicense shall require Licensee's purchase of one additional Distribution license from The Qt Company.
+4.    Limits on Use, Distribution and Derivative Works.
+The Sublicense and Sublicensee's rights must be limited to Sublicensee's internal use purposes only and must not include any license, right or authorization to distribute or disclose any copy or portion of the Sublicensed Software to any other person.  Sublicensee must not be given the right to modify or create derivative works based on the Sublicensed Software, and it must be stated explicitly in the Sublicense that such modification or creation is prohibited.
+
+5.    Copies.
+Sublicensee may be given the right to make copies of the Sublicensed Software, provided that any such copy: (a) is created as an essential step in the utilization of Sublicensed Software in accordance with the Sublicense, or (b) is only for archival purposes to back-up the licensed use of Sublicensed Software.  Sublicensee may also be given the right to make copies of Sublicensed Software to the extent reasonably needed to exercise rights under the Sublicense.  Sublicensee must be obliged under the Sublicense to make sure that all The Qt Company trademark, copyright and intellectual property notices are faithfully reproduced and included on copies made by Sublicensee.  Sublicensee may be given the right to make copies of the Documentation, but only as reasonably needed to facilitate the use of Sublicensed Software.  Sublicensee may not be given the right to make any other copies of Licensed Software or Documentation unless and except as permitted by The Qt Company in a separate, written agreement.
+6.    Other Versions and Updates.
+If Licensee is entitled to Updates in accordance with Section 12of the Agreement, such Updates may also be sublicensed, subject to the terms and conditions found in this Appendix 2.
+7.    Protection of Sublicensed Software.
+Except as expressly permitted in this Appendix 2 (or in another written agreement with The Qt Company), Sublicensee must not be given any rights to modify or create derivative works based on Sublicensed Software, or reproduce Sublicensed Software, or distribute any copies of Sublicensed Software, or disclose any Sublicensed Software to any third party, or decompile, disassemble or otherwise reverse engineer Sublicensed Software, or use any Sublicensed Software or information learned therefrom.  Sublicensee must as part of the contractual terms in the Sublicense acknowledge that The Qt Company and its licensors own the copyrights and other intellectual property in and to the Sublicensed Software.
+8.    Disclaimers Of Warranties.
+Licensee may not give any warranties regarding the Sublicensed Software to Sublicensee on behalf of The Qt Company.
+9.    Responsibility of Sublicensee.
+Sublicensee shall, as part of the Sublicense, be made responsible for decisions made and actions taken based on Sublicensed Software. Sublicensee shall as part of the contractual terms of the Sublicense be made aware that the Sublicensed Software is not designed, intended or licensed for use in or with systems, devices or products intended for surgical implant into the body or other applications intended to support or sustain life or for any aviation or nuclear reactor application or any other application in which the software or its failure, malfunction or inadequacy could directly or indirectly cause or contribute to personal injury or death or significant property damage.  It shall further be stated in the Sublicense that it is Sublicensee's responsibility to ascertain the suitability of Sublicensed Software for any situation or application.  It shall also be stated that the Sublicense defines a mutually agreed-upon allocation of risk and the Sublicense fees reflect such allocation of risk.
+10.    Termination.
+Licensee shall, as part of the terms of the Sublicense, be entitled to terminate the Sublicense granted to Sublicensee if Sublicensee breaches terms and conditions set to comply with this Appendix 2.  The Qt Company may instruct Licensee to terminate the Sublicense without undue delay if termination is warranted in accordance with the foregoing. Upon termination of the Sublicense, Sublicensee shall be obliged to immediately cease all use of Sublicensed Software and to destroy all copies of Sublicensed Software within the possession or control of Sublicensee.
+11.    Mandatory law.
+The requirements above shall not apply to the extent they contravene mandatory provisions of the law governing the Sublicense, but in such case, The Qt Company shall be notified about the changes.
+
diff --git a/meta-architech-extras/conf/layer.conf b/meta-architech-extras/conf/layer.conf
index 7aac55e..15ca0f8 100644
--- a/meta-architech-extras/conf/layer.conf
+++ b/meta-architech-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend
index fc1934d..6420f50 100644
--- a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend
+++ b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 0f39891..586b2b5 100644
--- a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG_remove = "gles2"
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend
new file mode 100644
index 0000000..ead9a7f
--- /dev/null
+++ b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DEPENDS_remove = "imx-gpu-viv"
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend
deleted file mode 100644
index df90624..0000000
--- a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DEPENDS_remove = "imx-gpu-viv"
diff --git a/meta-beagleboard-extras/conf/layer.conf b/meta-beagleboard-extras/conf/layer.conf
index 1f7639f..7307f55 100644
--- a/meta-beagleboard-extras/conf/layer.conf
+++ b/meta-beagleboard-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
+
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
new file mode 100644
index 0000000..66f031f
--- /dev/null
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
@@ -0,0 +1,133 @@
+From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Apr 2016 15:42:49 +0300
+Subject: [PATCH] Change "extern inline" to "static inline"
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+---
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
+ drivers/staging/rtl8712/ieee80211.h            |  4 ++--
+ lib/mpi/mpi-inline.h                           |  2 +-
+ lib/mpi/mpi-internal.h                         | 16 ++++++++--------
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+index 502bfdb..1c8d026 100644
+--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
++++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
+        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+ {
+        /*
+         * It is possible for both access points and our device to support
+@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
+        return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = IEEE80211_3ADDR_LEN;
+ 
+@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
+ 
+ extern const long ieee80211_wlan_frequencies[];
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+ {
+        ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
+ {
+        return ieee->scans;
+ }
+diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
+index 21515c3..7518061 100644
+--- a/drivers/staging/rtl8712/ieee80211.h
++++ b/drivers/staging/rtl8712/ieee80211.h
+@@ -734,7 +734,7 @@ enum ieee80211_state {
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = 24;
+ 
+diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
+index e2b3985..c245ea3 100644
+--- a/lib/mpi/mpi-inline.h
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 77adcf6..4566d11 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
+-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-sub.c --*/
+-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.1
+
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
new file mode 100644
index 0000000..13a89fb
--- /dev/null
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
@@ -0,0 +1,99 @@
+From 376075b9598d602950b73cc78743735585c0a18c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sasha.levin@oracle.com>
+Date: Mon, 13 Oct 2014 15:51:05 -0700
+Subject: [PATCH] kernel: add support for gcc 5
+
+commit 71458cfc782eafe4b27656e078d379a34e472adf upstream.
+
+We're missing include/linux/compiler-gcc5.h which is required now
+because gcc branched off to v5 in trunk.
+
+Just copy the relevant bits out of include/linux/compiler-gcc4.h,
+no new code is added as of now.
+
+This fixes a build error when using gcc 5.
+
+Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 insertions(+)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+new file mode 100644
+index 0000000..cdd1cc2
+--- /dev/null
++++ b/include/linux/compiler-gcc5.h
+@@ -0,0 +1,66 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used                         __attribute__((__used__))
++#define __must_check                   __attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)      __builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold                 __attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone      __attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ * Fixed in GCC 4.8.2 and later versions.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)        do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+1.9.1
+
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
index a945ea8..3c61e27 100644
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "\
@@ -26,6 +34,9 @@ SRC_URI += "\
     file://0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch \
     file://ARM-perf-add-support-for-perf-registers-API.diff \
     file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-kernel-add-support-for-gcc-5.patch \
+    file://0001-Change-extern-inline-to-static-inline.patch \
     "
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
@@ -37,4 +48,5 @@ do_configure_prepend() {
         -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
         -i ${WORKDIR}/defconfig
     echo "CONFIG_FHANDLE=y"  >> ${WORKDIR}/defconfig
+    echo "CONFIG_MOUSE_PS2=n"  >> ${WORKDIR}/defconfig
 }
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
index 5695561..26ae06e 100644
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
+++ b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
@@ -1,26 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "U-Boot script to start up BeagleBone Black"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 PR = "r0"
 
 COMPATIBLE_MACHINE = "(beaglebone)"
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
index e3b3382..f52a419 100644
--- a/meta-fsl-extras/conf/layer.conf
+++ b/meta-fsl-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
deleted file mode 100644
index 0a3cd76..0000000
--- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ec1c2b5f637145e2a473820401ab96ecf0f16def Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Mon, 8 Sep 2014 10:23:46 +0300
-Subject: [PATCH] fix glTexImage2D API
-
-internalformat should be GLint and not GLenum.
----
- usr/include/GLES2/gl2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/include/GLES2/gl2.h b/usr/include/GLES2/gl2.h
-index c0e3a44..5aa6c26 100755
---- a/usr/include/GLES2/gl2.h
-+++ b/usr/include/GLES2/gl2.h
-@@ -579,7 +579,7 @@ GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
- GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
--GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);
-+GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
- GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
- GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
- GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
--- 
-1.8.3.2
-
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
deleted file mode 100644
index 102fbfe..0000000
--- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-fix-glTexImage2D-API.patch \
-        "
diff --git a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend b/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend
index 837ce16..4c472db 100644
--- a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend
+++ b/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}:"
 
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend
index 74e5b59..fb5280c 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
@@ -26,3 +34,7 @@ SRC_URI += " \
 
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
+
+do_configure_prepend() {
+    echo "CONFIG_HID_MULTITOUCH=m"              >> ${WORKDIR}/defconfig
+}
diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_3.14-1.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_3.14-1.%.bbappend
new file mode 100644
index 0000000..c21fece
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_3.14-1.%.bbappend
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# kernel image files are not needed in the image
+RDEPENDS_kernel-base = ""
+
+do_configure_prepend() {
+    # FunctionFS for adb
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+
+    # Enable USB serial support
+    echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
+
+    echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
+    echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
+}
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
index 18b1b31..c21fece 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch
new file mode 100644
index 0000000..d1f5616
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch
@@ -0,0 +1,37 @@
+From 33a5a73cd846c0bbf6a507aa4e658c74815eb1d7 Mon Sep 17 00:00:00 2001
+From: Rainer Keller <Rainer.Keller@qt.io>
+Date: Wed, 4 May 2016 12:49:40 +0200
+Subject: [PATCH] Add recovery support
+
+---
+ include/configs/nitrogen6x.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
+index bbc613d..9c939e6 100644
+--- a/include/configs/nitrogen6x.h
++++ b/include/configs/nitrogen6x.h
+@@ -232,6 +232,11 @@
+        "clearenv=if sf probe || sf probe || sf probe 1 ; then " \
+                "sf erase 0xc0000 0x2000 && " \
+                "echo restored environment to factory default ; fi\0" \
++       "recovery_boot=setenv recovery true ; dtype=mmc ; setenv bootpart 3 ; " \
++               "for disk in 0 1 ; do " \
++                       "${dtype} dev ${disk} ; " \
++                       "load ${dtype} ${disk}:${bootpart} 10008000 /6x_bootscript && source 10008000 ; " \
++               "done\0" \
+        "bootcmd=for dtype in ${bootdevs}" \
+                "; do " \
+                        "if itest.s \"xusb\" == \"x${dtype}\" ; then " \
+@@ -245,6 +250,8 @@
+                                        "&& source 10008000 ; " \
+                        "done ; " \
+                "done; " \
++               "echo Startup failed, running recovery ; " \
++    "run recovery_boot ; " \
+                "setenv stdout serial,vga ; " \
+                "echo ; echo 6x_bootscript not found ; " \
+                "echo ; echo serial console at 115200, 8N1 ; echo ; " \
+-- 
+2.7.3
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
index 7487f7d..5f0d155 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
@@ -1,25 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \
+        file://0002-Add-recovery-support.patch \
         "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
index ec76540..c5201a0 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
index 7ab08e6..a01780a 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
diff --git a/meta-nuc-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 7bbff62..9cb2075 100644
--- a/meta-nuc-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Extends image_dd class to boot via GRUB-EFI and initramfs."
 LICENSE = "CLOSED"
diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf
new file mode 100644
index 0000000..3306ada
--- /dev/null
+++ b/meta-intel-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_intel"
+BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_intel = "20"
diff --git a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
index ca53537..ca53537 100644
--- a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg
+++ b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
diff --git a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index d002240..8a223fe 100644
--- a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://grub.cfg"
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
index 65ac248..65ac248 100644
--- a/meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
+++ b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
diff --git a/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
new file mode 100644
index 0000000..2879e65
--- /dev/null
+++ b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
@@ -0,0 +1,33 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://wlan-realtek.cfg \
+    "
diff --git a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
new file mode 100644
index 0000000..8770c65
--- /dev/null
+++ b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PACKAGECONFIG += "kms"
diff --git a/meta-nuc-extras/conf/layer.conf b/meta-nuc-extras/conf/layer.conf
deleted file mode 100644
index f0cb66f..0000000
--- a/meta-nuc-extras/conf/layer.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
-            ${LAYERDIR}/recipes*/*/*.bbappend \
-            "
-
-BBFILE_COLLECTIONS += "b2qt_nuc"
-BBFILE_PATTERN_b2qt_nuc := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nuc = "20"
diff --git a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend
deleted file mode 100644
index 55ac1a2..0000000
--- a/meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://wlan-realtek.cfg \
-    "
diff --git a/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend
deleted file mode 100644
index 2346521..0000000
--- a/meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-PACKAGECONFIG += "kms"
diff --git a/meta-nvidia-logan-extras/conf/layer.conf b/meta-nvidia-logan-extras/conf/layer.conf
deleted file mode 100644
index da03f5e..0000000
--- a/meta-nvidia-logan-extras/conf/layer.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
-            ${LAYERDIR}/recipes*/*/*.bbappend \
-"
-
-BBFILE_COLLECTIONS += "b2qt_nvidia-logan"
-BBFILE_PATTERN_b2qt_nvidia-logan := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_nvidia-logan = "20"
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
deleted file mode 100644
index c33ee23..0000000
--- a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DEPENDS += "graphics-headers"
-PACKAGECONFIG += "kms"
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
deleted file mode 100644
index 7f9ce03..0000000
--- a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM"
-
diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf
index 641e0f6..9e64b87 100644
--- a/meta-raspberrypi-extras/conf/layer.conf
+++ b/meta-raspberrypi-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
index da7a7b5..d2eb2b7 100644
--- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
+++ b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 do_deploy_append() {
     if [ "${RPI_FT5406}" = "1" ]; then
diff --git a/meta-renesas-extras/classes/renesas-module.bbclass b/meta-renesas-extras/classes/renesas-module.bbclass
new file mode 100644
index 0000000..a0b5014
--- /dev/null
+++ b/meta-renesas-extras/classes/renesas-module.bbclass
@@ -0,0 +1,79 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+### Unfortunately the kernel module recipes in meta-renesas/meta-rcar-gen2
+### are fairly broken, as they tend to install their include files into the
+### staging area. That breaks when recompiling the kernel and is just flaky
+### in general. Try to make things work reliably.
+
+inherit module
+addtask shared_workdir after do_compile
+
+EXTRA_OEMAKE += "ARCH=${ARCH}"
+
+export BUILDDIR = "${STAGING_DIR_HOST}"
+export LIBSHARED = "${STAGING_LIBDIR}"
+export KERNELSRC = "${STAGING_KERNEL_DIR}"
+export CROSS_COMPILE = "${TARGET_PREFIX}"
+export KERNELDIR = "${STAGING_KERNEL_BUILDDIR}"
+export LDFLAGS = ""
+export CP = "cp"
+
+MODULE_SOURCE_DIR ?= "${S}/drv/"
+
+do_compile() {
+    cd ${MODULE_SOURCE_DIR}
+    module_do_compile
+    cd -
+}
+
+deploy_build_deps() {
+    targetdir="$1"
+
+    install -d ${targetdir}/include
+    install ${MODULE_SOURCE_DIR}/Module.symvers $targetdir/include/${MODULE_NAME}.symvers
+
+    for header in ${MODULE_HEADERS} ; do
+        install -t ${targetdir}/include ${S}/${header}
+    done
+}
+
+do_shared_workdir () {
+    deploy_build_deps ${STAGING_KERNEL_BUILDDIR}
+}
+
+do_install() {
+    install -D ${MODULE_SOURCE_DIR}/${MODULE_NAME}${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/extra/${MODULE_NAME}${KERNEL_OBJECT_SUFFIX}
+    deploy_build_deps ${D}/usr/src/kernel
+}
+
+FILES_${PN}-dev = " \
+    /usr/src/kernel/include/${MODULE_NAME}.symvers \
+    /usr/src/kernel/include/*.h \
+"
diff --git a/meta-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf
new file mode 100644
index 0000000..4ad824c
--- /dev/null
+++ b/meta-renesas-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_renesas"
+BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_renesas = "20"
diff --git a/meta-renesas-extras/recipes/adbd/adbd.bbappend b/meta-renesas-extras/recipes/adbd/adbd.bbappend
new file mode 100644
index 0000000..6f7a3f5
--- /dev/null
+++ b/meta-renesas-extras/recipes/adbd/adbd.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/meta-renesas-extras/recipes/adbd/files/defaults b/meta-renesas-extras/recipes/adbd/files/defaults
new file mode 100644
index 0000000..d2a3cc0
--- /dev/null
+++ b/meta-renesas-extras/recipes/adbd/files/defaults
@@ -0,0 +1,4 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=no
diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb
new file mode 100755
index 0000000..6b48c83
--- /dev/null
+++ b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb
@@ -0,0 +1,58 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+LIC_FILES_CHKSUM = "\
+file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+file://include/GPL-COPYING;md5=ffa10f40b98be2c2bc9608f56827ed23 \
+file://include/MIT-COPYING;md5=5526ef6e21dc96a1dd89fac4bde9f995 \
+"
+
+DEPENDS = "mmngr-kernel-module"
+SRC_URI = "file://fdpm-kernel.tar.bz2"
+S = "${WORKDIR}/fdpm"
+
+do_configure[depends] += "mmngr-kernel-module:do_shared_workdir"
+
+inherit renesas-module
+
+FDPM_CFG_r8a7790 = "H2CONFIG"
+FDPM_CFG_r8a7791 = "M2CONFIG"
+FDPM_CFG_r8a7793 = "M2CONFIG"
+FDPM_CFG_r8a7794 = "E2CONFIG"
+
+MODULE_NAME = "fdpm"
+MODULE_HEADERS = "include/fdpm_drv.h include/fdpm_public.h include/fdpm_api.h"
+
+do_compile_prepend() {
+    export FDPM_CONFIG=${FDPM_CFG}
+    export FDPM_MMNGRDIR=${STAGING_KERNEL_BUILDDIR}/include
+    export FDPM_MMNGRSYMVERS=mmngr.symvers
+}
diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend
new file mode 100644
index 0000000..4ffe869
--- /dev/null
+++ b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/fdpm-module/files:"
diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend b/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend
new file mode 100644
index 0000000..1704972
--- /dev/null
+++ b/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_compile[depends] += "\
+    fdpm-kernel-module:do_shared_workdir \
+    mmngr-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/glibc/glibc_%.bbappend b/meta-renesas-extras/recipes/glibc/glibc_%.bbappend
new file mode 100644
index 0000000..e0d6c92
--- /dev/null
+++ b/meta-renesas-extras/recipes/glibc/glibc_%.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_install_append() {
+    echo "/usr/local/lib" >> ${D}${sysconfdir}/ld.so.conf
+}
diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
new file mode 100644
index 0000000..bc36d70
--- /dev/null
+++ b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
@@ -0,0 +1,34 @@
+From 54bba228ea52d01fd84941d97be23c03f9862b64 Mon Sep 17 00:00:00 2001
+From: Carlos Rafael Giani <dv@pseudoterminal.org>
+Date: Sat, 6 Apr 2013 01:22:22 +0200
+Subject: [PATCH] Disable yasm for libav when --disable-yasm
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Shane Wang <shane.wang@intel.com>
+Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 22ede88..ef3c050 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,6 +305,12 @@ else
+     emblibav_configure_args="$emblibav_configure_args --enable-gpl"
+   fi
+
++  AC_ARG_ENABLE(yasm,
++              [AC_HELP_STRING([--disable-yasm], [disable use of yasm assembler])])
++  if test "x$enable_yasm" = "xno"; then
++    emblibav_configure_args="$emblibav_configure_args --disable-yasm"
++  fi
++
+   # if we are cross-compiling, tell libav so
+   case $host in
+       *android*)
+-- 
+1.8.2
+
+
diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb
new file mode 100644
index 0000000..cfa9a66
--- /dev/null
+++ b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb
@@ -0,0 +1,27 @@
+DEFAULT_PREFERENCE = "-1"
+
+include recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
+                    file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+SRC_URI = " \
+    http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
+    file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
+    "
+SRC_URI[md5sum] = "58c7998a054d8d8ca041fa35738f72b6"
+SRC_URI[sha256sum] = "ebc7fbe10955f40df6ccc4bf689075e7e296205fc7ecd8ff383d43c5cdf5bcd6"
+LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
+  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
+  --ranlib='${RANLIB}' \
+  ${GSTREAMER_1_0_DEBUG}"
+
+S = "${WORKDIR}/gst-libav-${PV}"
+
+
diff --git a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
new file mode 100644
index 0000000..b421e1d
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+COMPATIBLE_MACHINE = ""
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg
new file mode 100644
index 0000000..1c60d89
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg
@@ -0,0 +1,89 @@
+# Drivers
+CONFIG_USB_RCAR_PHY=m
+CONFIG_USB_RCAR_GEN2_PHY=m
+CONFIG_USB_RENESAS_USBHS=m
+CONFIG_USB_RENESAS_USBHS_HCD=y
+CONFIG_USB_RENESAS_USBHS_UDC=y
+CONFIG_USB_OTG=y
+
+# FunctionFS for adb
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_ETH=y
+
+# Enable USB serial support
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_ACM=m
+
+# ConfigFS
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_G_NCM=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MASS_STORAGE=m
+
+# Newer inits like systemd need cgroup support
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+
+# Bluetooth bits
+CONFIG_BT_HIDP=y
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_RFKILL=m
+
+CONFIG_FHANDLE=y
+CONFIG_USB_NAMESPACES=m
+
+# HID support
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+# USB HID support
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+# needed for USB touchscreens
+CONFIG_HID_MULTITOUCH=y
+
+# additional configs needed for Genivi compliance
+CONFIG_EXPERIMENTAL=y
+CONFIG_ECRYPT_FS=y
+CONFIG_QUOTA=y
+CONFIG_BT=y
+
+# add uinput for automated testing
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend b/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
new file mode 100644
index 0000000..d5e05f0
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
@@ -0,0 +1,35 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " \
+file://b2qt.cfg \
+"
+
diff --git a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
new file mode 100644
index 0000000..0dd030a
--- /dev/null
+++ b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PROVIDES_remove = "virtual/libgles2 virtual/egl libgbm libgbm-dev"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb
new file mode 100755
index 0000000..b21afe4
--- /dev/null
+++ b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb
@@ -0,0 +1,54 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+LIC_FILES_CHKSUM = "\
+file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+"
+
+SRC_URI = "file://mmngr.tar.bz2"
+S = "${WORKDIR}/mmngr"
+
+inherit renesas-module
+
+MODULE_NAME = "mmngr"
+MODULE_HEADERS = "include/mmngr_public.h include/mmngr_private.h"
+
+MMNGR_CFG_r8a7790 = "MMNGR_LAGER"
+MMNGR_CFG_r8a7791 = "MMNGR_KOELSCH"
+MMNGR_CFG_r8a7793 = "MMNGR_GOSE"
+MMNGR_CFG_r8a7794 = "MMNGR_ALT"
+
+do_compile_prepend() {
+    export MMNGR_CONFIG=${MMNGR_CFG}
+    export MMNGR_SSP_CONFIG="MMNGR_SSP_DISABLE"
+}
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend
new file mode 100644
index 0000000..23815b7
--- /dev/null
+++ b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/mmngr-module/files:"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend
new file mode 100644
index 0000000..411da42
--- /dev/null
+++ b/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_compile[depends] += "mmngr-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb
new file mode 100755
index 0000000..46718d4
--- /dev/null
+++ b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb
@@ -0,0 +1,41 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+SRC_URI = "file://mmngrbuf.tar.bz2"
+LIC_FILES_CHKSUM = "file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+    file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 "
+
+inherit renesas-module
+
+S = "${WORKDIR}/mmngrbuf"
+
+MODULE_NAME = "mmngrbuf"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend
new file mode 100644
index 0000000..23815b7
--- /dev/null
+++ b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/mmngr-module/files:"
diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend
new file mode 100644
index 0000000..840e770
--- /dev/null
+++ b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_compile[depends] += "mmngrbuf-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend b/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend
new file mode 100644
index 0000000..995d265
--- /dev/null
+++ b/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend
@@ -0,0 +1,41 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# The recipe adds an unpack_append where it creates the folder, but by then
+# base.bbclass will have reported a non-existent directory warning.
+do_unpack_prepend() {
+    bb.utils.mkdirhier(d.getVar('S', True))
+}
+
+do_configure[depends] += "\
+    mmngr-kernel-module:do_shared_workdir \
+    vspm-kernel-module:do_shared_workdir \
+    s3ctl-kernel-module:do_shared_workdir \
+    fdpm-kernel-module:do_shared_workdir \
+    uvcs-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend b/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend
new file mode 100644
index 0000000..8770c65
--- /dev/null
+++ b/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PACKAGECONFIG += "kms"
diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb
new file mode 100755
index 0000000..6ff2fb8
--- /dev/null
+++ b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+LIC_FILES_CHKSUM = "file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378"
+SRC_URI = "file://s3ctl-kernel.tar.bz2"
+
+S = "${WORKDIR}/s3ctl"
+
+inherit renesas-module
+
+MODULE_NAME = "s3ctl"
+MODULE_HEADERS = "include/s3ctl_private.h"
diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend
new file mode 100644
index 0000000..38f22a8
--- /dev/null
+++ b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/s3ctl-module/files:"
diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend
new file mode 100644
index 0000000..51b2f42
--- /dev/null
+++ b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_compile[depends] += "s3ctl-kernel-module:do_shared_workdir"
diff --git a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb
new file mode 100755
index 0000000..0fe9aad
--- /dev/null
+++ b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+LIC_FILES_CHKSUM = "\
+file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+"
+
+SRC_URI = "file://uvcs-kernel.tar.bz2"
+S = "${WORKDIR}/uvcs"
+
+inherit renesas-module
+
+export UVCS_DRV_SRC_DIR = "${S}/source/uvcs_lkm"
+export UVCS_CMN_SRC_DIR = "${S}/source/uvcs_cmn"
+export UVCS_CMN_INC_DIR = "${S}/include"
+export DRV_CORE_SRC_DIR = "${S}/source/driver_core"
+
+MODULE_NAME = "uvcs_cmn"
+MODULE_HEADERS = "include/uvcs_cmn.h include/uvcs_types.h"
+MODULE_SOURCE_DIR = "${S}/source/makefile/linaro_4_7_3/"
diff --git a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend
new file mode 100644
index 0000000..f491bc1
--- /dev/null
+++ b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/uvcs-module/files:"
diff --git a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb
new file mode 100755
index 0000000..ff20028
--- /dev/null
+++ b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb
@@ -0,0 +1,61 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+LIC_FILES_CHKSUM = " \
+file://GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+"
+
+SRC_URI = " \
+    git://github.com/renesas-devel/vsp2driver.git;protocol=git;branch=RCAR-GEN2/1.0.0 \
+    file://vsp2drv-init \
+"
+SRCREV = "8cc362a6c961661e4655904f8d7731e501529d6c"
+S = "${WORKDIR}/git"
+
+DEPENDS = "vspm-kernel-module"
+do_configure[depends] += "vspm-kernel-module:do_shared_workdir"
+
+MODULE_NAME = "vsp2"
+INITSCRIPT_NAME = "vsp2drv"
+INITSCRIPT_PARAMS = "start 8 5 2 . stop 61 0 1 6 ."
+
+inherit renesas-module update-rc.d
+
+do_compile_prepend() {
+    export VSP2_VSPMDIR=${STAGING_KERNEL_BUILDDIR}/include
+    export VSP2_VSPMSYMVERS=vspm.symvers
+}
+
+do_install_append() {
+    install -D -m 0755 ${WORKDIR}/vsp2drv-init ${D}/${sysconfdir}/init.d/vsp2drv
+}
+
+FILES_${PN} += "/etc/init.d/vsp2drv"
diff --git a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend
new file mode 100644
index 0000000..509317a
--- /dev/null
+++ b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/vspm-module/files:"
diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb
new file mode 100755
index 0000000..05518fa
--- /dev/null
+++ b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb
@@ -0,0 +1,63 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE = "GPLv2 & MIT"
+LIC_FILES_CHKSUM = "\
+file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \
+"
+
+SRC_URI = "file://vspm-kernel.tar.bz2"
+S = "${WORKDIR}/vspm"
+
+inherit renesas-module
+
+MODULE_NAME = "vspm"
+MODULE_HEADERS = " \
+include/vspm_public.h \
+include/vsp_drv.h \
+include/tddmac_drv.h \
+include/vspm_if.h \
+"
+
+VSPM_CFG_r8a7790 = "H2CONFIG"
+VSPM_CFG_r8a7791 = "M2CONFIG"
+VSPM_CFG_r8a7793 = "M2CONFIG"
+VSPM_CFG_r8a7794 = "E2CONFIG"
+
+do_compile_prepend() {
+    export VSPM_CONFIG=${VSPM_CFG}
+}
+
+do_install_append() {
+    # Copy for vspm-user-module
+    install -t ${STAGING_INCDIR} ${S}/include/vspm_if.h
+}
+
+FILES_${PN}-dev += "/usr/include/vspm_if.h"
diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend
new file mode 100644
index 0000000..509317a
--- /dev/null
+++ b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/vspm-module/files:"
diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend
new file mode 100644
index 0000000..2c0744f
--- /dev/null
+++ b/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_compile[depends] += "vspm-kernel-module:do_shared_workdir"
diff --git a/meta-smx6-extras/conf/layer.conf b/meta-smx6-extras/conf/layer.conf
index 097fefe..566fb41 100644
--- a/meta-smx6-extras/conf/layer.conf
+++ b/meta-smx6-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
+
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch
new file mode 100644
index 0000000..064e28b
--- /dev/null
+++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch
@@ -0,0 +1,59 @@
+From eb38d22ea05961666878dfb88c68629eacfb1399 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Tue, 3 Sep 2013 22:27:26 -0400
+Subject: [PATCH] ARM: LLVMLinux: Change "extern inline" to "static inline" in
+ glue-cache.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+
+Author: Behan Webster <behanw@converseincode.com>
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+---
+ arch/arm/include/asm/glue-cache.h | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
+index c81adc0..a3c24cd 100644
+--- a/arch/arm/include/asm/glue-cache.h
++++ b/arch/arm/include/asm/glue-cache.h
+@@ -130,22 +130,22 @@
+ #endif
+ 
+ #ifndef __ASSEMBLER__
+-extern inline void nop_flush_icache_all(void) { }
+-extern inline void nop_flush_kern_cache_all(void) { }
+-extern inline void nop_flush_kern_cache_louis(void) { }
+-extern inline void nop_flush_user_cache_all(void) { }
+-extern inline void nop_flush_user_cache_range(unsigned long a,
++static inline void nop_flush_icache_all(void) { }
++static inline void nop_flush_kern_cache_all(void) { }
++static inline void nop_flush_kern_cache_louis(void) { }
++static inline void nop_flush_user_cache_all(void) { }
++static inline void nop_flush_user_cache_range(unsigned long a,
+                unsigned long b, unsigned int c) { }
+ 
+-extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
+-extern inline int nop_coherent_user_range(unsigned long a,
++static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
++static inline int nop_coherent_user_range(unsigned long a,
+                unsigned long b) { return 0; }
+-extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
++static inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
+ 
+-extern inline void nop_dma_flush_range(const void *a, const void *b) { }
++static inline void nop_dma_flush_range(const void *a, const void *b) { }
+ 
+-extern inline void nop_dma_map_area(const void *s, size_t l, int f) { }
+-extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
++static inline void nop_dma_map_area(const void *s, size_t l, int f) { }
++static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
+ #endif
+ 
+ #ifndef MULTI_CACHE
+-- 
+1.9.1
+
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch
new file mode 100644
index 0000000..c61a4dc
--- /dev/null
+++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch
@@ -0,0 +1,31 @@
+From 56e321cd19ee4909ca623ce1c351c966904123a9 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Fri, 4 Jan 2013 00:32:33 +0200
+Subject: [PATCH] arm: Export cache flush management symbols when !MULTI_CACHE
+
+When compiling a kernel without CONFIG_MULTI_CACHE enabled the
+dma access functions end up not being exported. Fix it.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ arch/arm/kernel/setup.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index 1e8b030..c6a9a61 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -1080,3 +1080,12 @@ const struct seq_operations cpuinfo_op = {
+        .stop   = c_stop,
+        .show   = c_show
+ };
++
++/* export the cache management functions */
++#ifndef MULTI_CACHE
++
++EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area));
++EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
++EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
++
++#endif
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
index 330a4f1..1bcbb80 100644
--- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
+++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
@@ -1,23 +1,38 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch \
+    file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
+    "
 
 do_configure_prepend() {
     sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
diff --git a/meta-tegra-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf
new file mode 100644
index 0000000..c170570
--- /dev/null
+++ b/meta-tegra-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+"
+
+BBFILE_COLLECTIONS += "b2qt_tegra"
+BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_tegra = "20"
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend b/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend
index 86f0571..3cfe234 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf b/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf
index a1e45b9..a1e45b9 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf
+++ b/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf
diff --git a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
new file mode 100644
index 0000000..4314a20
--- /dev/null
+++ b/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
@@ -0,0 +1,33 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PROVIDES = "virtual/egl virtual/libgles2"
+RPROVIDES_${PN} = "libegl libegl-dev libgles2 libgles2-dev"
+RCONFLICTS_${PN} = "libegl-mesa libegl-mesa-dev libgles2-mesa libgles2-mesa-dev"
+RREPLACES_${PN} = "libegl-mesa lbegl-mesa-dev libgles2-mesa libgles2-mesa-dev"
diff --git a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend
new file mode 100644
index 0000000..d3e2337
--- /dev/null
+++ b/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend
@@ -0,0 +1,35 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# WARNING: FILESEXTRAPATHS-variable, must always use _prepend (or _append)
+FILESEXTRAPATHS_tegra-x1_prepend = "__default:"
+FILESEXTRAPATHS_tegra-t18x_prepend = "__default:"
+
+# ERROR: QA Issue: Files/directories were installed but not shipped in any package
+FILES_${PN}-gk20a = "${FILES__${PN}-gk20a}"
diff --git a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
new file mode 100644
index 0000000..df91dfe
--- /dev/null
+++ b/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc
new file mode 100644
index 0000000..6fe139e
--- /dev/null
+++ b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libdrm
+Description: Userspace interface to kernel DRM services
+Version: 2.4.66
+Libs: -L${libdir} -ldrm
+Cflags: -I${includedir} -I${includedir}/libdrm
+
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend
new file mode 100644
index 0000000..f346a6b
--- /dev/null
+++ b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += " file://libdrm.pc"
+SRC_URI_remove_nvidia-logan = "file://${PLATFORM_TOPDIR}/include/drm_fourcc.h"
+
+do_install_append() {
+    install -d ${D}/usr/lib/pkgconfig
+    install -m 0776 ${WORKDIR}/libdrm.pc ${D}/usr/lib/pkgconfig/libdrm.pc
+}
+
+PACKAGES += "${PN}-dev"
diff --git a/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend
new file mode 100644
index 0000000..94178db
--- /dev/null
+++ b/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM"
+COMPATIBLE_MACHINE_aarch64 = "(.*)"
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
new file mode 100644
index 0000000..da1f5f7
--- /dev/null
+++ b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: egl
+Description: Mesa EGL library
+Requires.private:  libdrm >= 2.4.24   
+Version: 9.1.6
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} 
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
new file mode 100644
index 0000000..2cc22df
--- /dev/null
+++ b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
@@ -0,0 +1,49 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += " file://egl.pc"
+FILES_${PN} += "egl.pc"
+
+GRAPHICS_PACKAGES = " \
+    virtual/libgles2 \
+    virtual/libegl \
+    virtual/egl \
+    virtual/libgl \
+    virtual/libgles1 \
+    virtual/mesa \
+    libgbm \
+    libgbm-dev \
+    "
+
+do_install_append_tegra-t18x() {
+    install -d ${D}/usr/lib/pkgconfig
+    install -m 0775 ${WORKDIR}/egl.pc ${D}/${libdir}/pkgconfig
+}
diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf
index 80fba29..44583e9 100644
--- a/meta-ti-extras/conf/layer.conf
+++ b/meta-ti-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 3f5d3cb..3d909f9 100644
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
index e26f67f..0d557ce 100644
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
+++ b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
index 49f8f58..54dca0f 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "\
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
index e15ecf2..a9c3c0d 100644
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
index ca0b2ea..b638ddc 100644
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
+++ b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
index 4d96449..06eb3c7 100644
--- a/meta-toradex-extras/conf/layer.conf
+++ b/meta-toradex-extras/conf/layer.conf
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend b/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
index 9b56df1..dbeb030 100644
--- a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
+++ b/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
new file mode 100644
index 0000000..b696b19
--- /dev/null
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
@@ -0,0 +1,37 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# kernel image files are not needed in the image
+RDEPENDS_kernel-base = ""
+
+do_configure_prepend () {
+    # FunctionFS for adb
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
+}
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
index ce34400..dfc24a1 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -1,29 +1,33 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+############################################################################
 
-SRC_URI += " \
-        file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \
-        "
+RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
 
 do_configure_prepend () {
     # FunctionFS for adb
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
index 977ef47..5352ed7 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
index 4d7c307..b5d96b6 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
@@ -1,25 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 DEPENDS = "u-boot-mkimage-native"
 
 PV = "v2.6"
@@ -61,4 +70,4 @@ do_install[noexec] = "1"
 do_populate_sysroot[noexec] = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6)"
+COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)"
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
new file mode 100644
index 0000000..3e05a85
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
@@ -0,0 +1,6 @@
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 0
+
+setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
+setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}'
+echo 'enter "run update_uboot" to update the uboot'
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
new file mode 100644
index 0000000..0c16652
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
@@ -0,0 +1,6 @@
+#flash_mmc has been renamed to flash_blk, ensure compatibility when updating from older versions
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 0
+
+fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img
+source ${loadaddr}
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
new file mode 100644
index 0000000..501ad33
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
@@ -0,0 +1,12 @@
+diff -Naur git.orig/include/configs/colibri_imx7.h git/include/configs/colibri_imx7.h
+--- git.orig/include/configs/colibri_imx7.h     2016-07-15 12:31:35.915934824 +0300
++++ git/include/configs/colibri_imx7.h  2016-07-15 12:32:40.867937388 +0300
+@@ -248,7 +248,7 @@
+                "${board}/flash_eth.img && source ${loadaddr}\0" \
+        "setsdupdate=mmc rescan && setenv interface mmc && " \
+                "fatload ${interface} 0:1 ${loadaddr} " \
+-               "${board}/flash_blk.img && source ${loadaddr}\0" \
++               "/flash_blk.img && source ${loadaddr}\0" \
+        "setup=setenv setupargs " \
+                "console=tty1 console=${console}" \
+                ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
new file mode 100644
index 0000000..25476dd
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
@@ -0,0 +1,14 @@
+diff -Naur git.orig/include/configs/colibri_vf.h git/include/configs/colibri_vf.h
+--- git.orig/include/configs/colibri_vf.h       2016-07-15 12:05:41.263873456 +0300
++++ git/include/configs/colibri_vf.h    2016-07-15 12:06:19.759874976 +0300
+@@ -161,8 +161,8 @@
+        "sdargs=root=/dev/mmcblk0p2 rw rootwait\0"      \
+        "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
+        "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
+-       "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
+-       "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
++       "load mmc 0:1 ${kernel_addr_r} /${kernel_file} && " \
++       "load mmc 0:1 ${fdt_addr_r} /${soc}-colibri-${fdt_board}.dtb && " \
+        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ 
+ #define NFS_BOOTCMD \
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
index d7be9e2..9f98fc3 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PV = "v2015.04-v2.6b2.1+git${SRCPV}"
 SRCREV_b2qt = "90a974d34aaa85d5ce69f83067928592c5389990"
diff --git a/meta-vib3-extras/conf/layer.conf b/meta-vib3-extras/conf/layer.conf
new file mode 100644
index 0000000..1a2dadb
--- /dev/null
+++ b/meta-vib3-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+"
+
+BBFILE_COLLECTIONS += "b2qt_vib3"
+BBFILE_PATTERN_b2qt_vib3 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_vib3 = "20"
diff --git a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
new file mode 100644
index 0000000..30e2acc
--- /dev/null
+++ b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
@@ -0,0 +1,34 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+SRC_URI_remove = " \
+    file://${PLATFORM_TOPDIR}/lib-target/NETB_img.bin \
+    file://${PLATFORM_TOPDIR}/lib-target/nvhost_msenc031.fw \
+    file://${PLATFORM_TOPDIR}/lib-target/vic03_ucode.bin \
+"
diff --git a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
new file mode 100644
index 0000000..3ff042b
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
@@ -0,0 +1,9 @@
+
+# Use our kernel instead of yocto which defaults to mainline 3.10.
+# Commit id of our kernel's include/uapi directory in kernel tree -
+# 8c37e1bfe7dd26a9d4cf4510460a75264c906444
+SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
+
+# Extracting linux.tar.bz2 creates directories
+# <top>/vibrante-oss-src/kernel
+S = "${WORKDIR}/vibrante-oss-src/kernel"
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
+
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
new file mode 100644
index 0000000..66f031f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
@@ -0,0 +1,133 @@
+From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Apr 2016 15:42:49 +0300
+Subject: [PATCH] Change "extern inline" to "static inline"
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+---
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
+ drivers/staging/rtl8712/ieee80211.h            |  4 ++--
+ lib/mpi/mpi-inline.h                           |  2 +-
+ lib/mpi/mpi-internal.h                         | 16 ++++++++--------
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+index 502bfdb..1c8d026 100644
+--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
++++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
+        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+ {
+        /*
+         * It is possible for both access points and our device to support
+@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
+        return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = IEEE80211_3ADDR_LEN;
+ 
+@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
+ 
+ extern const long ieee80211_wlan_frequencies[];
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+ {
+        ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
+ {
+        return ieee->scans;
+ }
+diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
+index 21515c3..7518061 100644
+--- a/drivers/staging/rtl8712/ieee80211.h
++++ b/drivers/staging/rtl8712/ieee80211.h
+@@ -734,7 +734,7 @@ enum ieee80211_state {
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = 24;
+ 
+diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
+index e2b3985..c245ea3 100644
+--- a/lib/mpi/mpi-inline.h
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 77adcf6..4566d11 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
+-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-sub.c --*/
+-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.1
+
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
new file mode 100644
index 0000000..8bbc38b
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
@@ -0,0 +1,20 @@
+--- a/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 13:05:46.897056724 +0300
++++ b/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 12:55:28.053751626 +0300
+@@ -1021,7 +1021,7 @@
+ 
+ static void cl_dvfs_calibrate(struct tegra_cl_dvfs *cld)
+ {
+-       u32 val, data;
++       u32 val=0, data=0;
+        ktime_t now;
+        unsigned long rate;
+        unsigned long step = RATE_STEP(cld);
+@@ -3303,7 +3303,7 @@
+ 
+ static int monitor_get(void *data, u64 *val)
+ {
+-       u32 v, s;
++       u32 v=0, s=0;
+        unsigned long flags;
+        struct clk *c = (struct clk *)data;
+        struct tegra_cl_dvfs *cld = ((struct clk *)data)->u.dfll.cl_dvfs;
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
new file mode 100644
index 0000000..fc8fe9f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
@@ -0,0 +1,11 @@
+--- a/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:34.912235128 +0300
++++ b/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:55.739478254 +0300
+@@ -1331,7 +1331,7 @@
+  */
+ static void tegra12_cpu_clk_init(struct clk *c)
+ {
+-       c->state = (!is_lp_cluster() == (c->u.cpu.mode == MODE_G))? ON : OFF;
++       c->state = ((!is_lp_cluster()) == (c->u.cpu.mode == MODE_G))? ON : OFF;
+ }
+ 
+ static int tegra12_cpu_clk_enable(struct clk *c)
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
new file mode 100644
index 0000000..e59898d
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
@@ -0,0 +1,65 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "__default:${THISDIR}/${PN}:"
+
+DEPENDS_remove = "external-tegra-toolchain"
+do_kernel_defconfig[depends] = "kern-tools-native:do_populate_sysroot"
+
+SRC_URI += "\
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-Change-extern-inline-to-static-inline.patch \
+    file://Fix_compile_error_in_tegra_drivers.patch \
+    file://Fix_compiler_error_in_tegra12_lock.patch \
+    "
+
+do_compile_prepend () {
+    # Cross compiling exports
+    export ARCH=${TARGET_ARCH}
+    export CROSS_COMPILE=${CROSS_COMPILE}
+
+    echo "CONFIG_FHANDLE=y" >> ${B}/.config
+    make olddefconfig
+}
+
+do_install_append() {
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+
+python do_patch () {
+    bb.build.exec_func('patch_do_patch', d)
+}
diff --git a/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
new file mode 100644
index 0000000..4abb469
--- /dev/null
+++ b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DEPENDS += "graphics-headers"
+PACKAGECONFIG += "kms"
diff --git a/meta-vib4-extras/conf/layer.conf b/meta-vib4-extras/conf/layer.conf
new file mode 100644
index 0000000..525c018
--- /dev/null
+++ b/meta-vib4-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+"
+
+BBFILE_COLLECTIONS += "b2qt_vib4"
+BBFILE_PATTERN_b2qt_vib4 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_vib4 = "20"
diff --git a/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend
new file mode 100644
index 0000000..d7353bc
--- /dev/null
+++ b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend
@@ -0,0 +1,15 @@
+# Append --enable-kernel flag to configure flags
+# only for target build case.
+# We are setting this to kernel 3.18 to keep glibc
+# compatbile across all 3.18 series
+# We will not support < 3.18 for V4L:
+EXTRA_OECONF_append_class-target = " \
+    --enable-kernel=3.18 \
+"
+
+# Search $PWD/eglibc-2.18 for additional patches
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+# Placeholder for patches
+SRC_URI_append_class-target = " \
+"
diff --git a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
new file mode 100644
index 0000000..f2bdba1
--- /dev/null
+++ b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
@@ -0,0 +1,7 @@
+# Use our kernel instead of yocto which defaults to mainline 3.18
+SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
+PV = "3.18"
+
+# Extracting linux.tar.bz2 creates directories
+# <top>/vibrante-oss-src/kernel
+S = "${WORKDIR}/vibrante-oss-src/kernel"
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
new file mode 100644
index 0000000..07c9646
--- /dev/null
+++ b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
@@ -0,0 +1,65 @@
+
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_kernel_defconfig_prepend () {
+}
+
+do_compile_prepend () {
+    # cross_compile_exports
+    export ARCH=${KERNEL_ARCH}
+    export CROSS_COMPILE=${CROSS_COMPILE}
+
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
+    echo "CONFIG_USB_ACM=m"         >> ${B}/.config
+
+    make olddefconfig
+}
+
+do_install () {
+    kernel_do_install
+
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+
+do_deploy() {
+    kernel_do_deploy
+}
+
+do_compile () {
+    kernel_do_compile
+}
diff --git a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
new file mode 100644
index 0000000..629ccf4
--- /dev/null
+++ b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 97a29d6..b0e4060 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -208,10 +208,6 @@ AS_CASE([$CC], [*clang*],
+                -Wno-gnu-variable-sized-type-not-at-end \
+         ])])
+ 
+-AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
+-        [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
+-               -flto -ffat-lto-objects])],
+-        [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
+ AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
+ 
+ AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
+-- 
+2.5.0
+
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..dbeb030
--- /dev/null
+++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
new file mode 100644
index 0000000..f892961
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
@@ -0,0 +1,49 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+    file://wayland-client.pc \
+    file://wayland-cursor.pc \
+    file://wayland-egl.pc \
+    file://wayland-server.pc \
+    file://${PLATFORM_TOPDIR}/include/wayland-egl-core.h \
+    "
+
+FILES_${PN} += "${libdir}/pkgconfig"
+
+WAYLAND_PACKAGES += "wayland-dev"
+
+do_install_append() {
+    install -d ${D}${libdir}/pkgconfig
+    install -m 0776 ${WORKDIR}/*.pc ${D}${libdir}/pkgconfig
+    install -d ${D}${includedir}
+    install -m 0775 ${PLATFORM_TOPDIR}/include/wayland-egl-core.h ${D}${includedir}
+}
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
new file mode 100644
index 0000000..e639768
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+datarootdir=${prefix}/share
+pkgdatadir=/usr/share/wayland
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: Wayland Client
+Description: Wayland client side library
+Version: 1.6.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lwayland-client
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
new file mode 100644
index 0000000..36538ad
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: Wayland Cursor
+Description: Wayland cursor helper library
+Version: 1.6.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lwayland-cursor
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
new file mode 100644
index 0000000..dc8393f
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: wayland-egl
+Description: wayland-egl library
+Version: 9.1.6
+Libs: -L${libdir} -lwayland-egl
+Cflags: -I${includedir}
+
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
new file mode 100644
index 0000000..dab87b9
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+datarootdir=${prefix}/share
+pkgdatadir=/usr/share/wayland
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: Wayland Server
+Description: Server side implementation of the Wayland protocol
+Version: 1.6.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lwayland-server
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
new file mode 100644
index 0000000..0456023
--- /dev/null
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -0,0 +1,29 @@
+SUMMARY = "GammaRay Qt introspection probe"
+HOMEPAGE = "http://www.kdab.com/gammaray"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=5996517d53e3c2722d457fb633e970ed"
+
+inherit cmake_qt5
+
+SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
+
+BRANCH = "master"
+SRCREV = "6262eaeaee74109f9c1bd85de99c9b039d8938f5"
+PV = "master+git${SRCPV}"
+
+DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += " -DGAMMARAY_BUILD_UI=OFF -DGAMMARAY_CORE_ONLY_LAUNCHER=ON"
+
+FILES_${PN}-dev += " \
+    /usr/lib/cmake/* \
+    /usr/mkspecs/modules/* \
+"
+FILES_${PN}-dbg += " \
+    /usr/lib/.debug/* \
+    /usr/lib/gammaray/*/*/.debug \
+    /usr/lib/gammaray/*/*/styles/.debug \
+"
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
new file mode 100644
index 0000000..e9f3793
--- /dev/null
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Neptune
+After=dbus.service dbus-session.service systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml
+Restart=on-failure
+WorkingDirectory=/opt/neptune
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
new file mode 100644
index 0000000..66703c6
--- /dev/null
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -0,0 +1,71 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Neptune IVI UI"
+LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
+
+inherit qt5-module systemd
+require recipes-qt/qt5/qt5-git.inc
+
+QT_MODULE = "qt-apps-neptune-ui"
+QT_MODULE_BRANCH = "master"
+
+SRC_URI += " \
+    file://neptune.service \
+    "
+
+SRCREV = "3d36a7b8e53770c91db60cec9586ef572a2f2814"
+
+DEPENDS = "qtbase qtdeclarative"
+RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
+                  ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+
+do_configure_prepend() {
+    echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro
+}
+
+do_install_append() {
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/
+
+    install -m 0644 ${S}/Main*.qml ${D}/opt/neptune
+    install -m 0644 ${S}/MainWithCluster.qml ${D}/opt/neptune
+    install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune
+}
+
+PACKAGES =+ "${PN}-apps"
+RRECOMMENDS_${PN} += "${PN}-apps"
+
+FILES_${PN}-apps += "/opt/neptune/apps"
+FILES_${PN} += "\
+    /opt/neptune \
+    "
+
+SYSTEMD_SERVICE_${PN} = "neptune.service"
diff --git a/recipes-qt/automotive/qmllive-target/qmllive-target.patch b/recipes-qt/automotive/qmllive-target/qmllive-target.patch
new file mode 100644
index 0000000..e3f81fa
--- /dev/null
+++ b/recipes-qt/automotive/qmllive-target/qmllive-target.patch
@@ -0,0 +1,19 @@
+diff --git a/runtime.pro b/runtime.pro
+index 73dd6d7..e569b23 100644
+--- a/runtime.pro
++++ b/runtime.pro
+@@ -1,5 +1,4 @@
+ TARGET = qmlliveruntime
+-DESTDIR = ../../bin
+ 
+ QT *= widgets quick
+ osx: CONFIG -= app_bundle
+@@ -14,6 +13,6 @@ include(../src.pri)
+ RESOURCES += \
+     qml.qrc
+ 
+-
+-
++target.path += /usr/bin
++INSTALLS += target
+ 
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
new file mode 100644
index 0000000..7819941
--- /dev/null
+++ b/recipes-qt/automotive/qmllive-target_git.bb
@@ -0,0 +1,49 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "QML Live target runtime"
+
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c"
+
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
+
+QT_MODULE = "qt-apps-qmllive"
+QT_MODULE_BRANCH = "master"
+
+SRC_URI += " \
+    file://qmllive-target.patch \
+    "
+
+SRCREV = "d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
+
+S = "${WORKDIR}/git/src/runtime"
+
+DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
new file mode 100644
index 0000000..028df78
--- /dev/null
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -0,0 +1,62 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Qt component for application lifecycle management"
+LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
+
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
+
+SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76"
+
+DEPENDS = "qtbase qtdeclarative libyaml libarchive \
+           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+RDEPENDS_${PN} = "libcrypto"
+
+EXTRA_QMAKEVARS_PRE += "\
+    ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
+    -config enable-dummydata \
+    -config enable-ivi-logging \
+    -config install-prefix=/usr \
+    -config systemd-workaround \
+    -config hardware-id=neptune \
+    "
+
+do_install_append() {
+    install -m 0755 -d ${D}/opt/am/
+    install -m 0644 ${S}/template-opt/am/config.yaml ${D}/opt/am/
+}
+
+FILES_${PN} += "\
+    /opt/am \
+    ${libdir}/appman \
+    ${datadir}/dbus-1"
+FILES_${PN}-dbg += "${libdir}/appman/.debug"
+FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/*.prl"
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
new file mode 100644
index 0000000..0c50457
--- /dev/null
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -0,0 +1,43 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Qt IVI"
+LICENSE = "(GFDL-1.3 & BSD & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+                    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+                    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
+
+SRCREV = "ccc1f3af652e4f2785d9ac60eeae521130740b1a"
+
+DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
new file mode 100644
index 0000000..b06446e
--- /dev/null
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -0,0 +1,45 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Qt Web Browser"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
+
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
+
+QT_MODULE = "qt-apps-qtwebbrowser"
+QT_MODULE_BRANCH = "dev"
+
+SRCREV = "023733af5523a5ad84359926224fa106001215f4"
+
+DEPENDS = "qtbase qtdeclarative qtwebengine"
+
+FILES_${PN} += "/data/user/qt/qtwebbrowser-app"
+FILES_${PN}-dbg += "/data/user/qt/qtwebbrowser-app/.debug"
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index c9682a5..eafae4e 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Boot to Qt Appcontroller"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
 
 inherit qmake5
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
index cefd3a9..05d666d 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
@@ -2,4 +2,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
index ff4d0da..89e6cd4 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
@@ -4,4 +4,5 @@ env=QSG_RENDER_LOOP=basic
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
index e3b35f0..29d8b6a 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf
@@ -4,4 +4,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QTGLESSTREAM_DISPLAY=192.168.56.1
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
index c8cd106..1056ea0 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
@@ -1,7 +1,9 @@
 env=FB_MULTI_BUFFER=2
+env=QT_QPA_EGLFS_FORCEVSYNC=1
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
 env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
new file mode 100644
index 0000000..1fe8f14
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf
@@ -0,0 +1,8 @@
+env=QMLSCENE_DEVICE=softwarecontext
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_QPA_PLATFORM=linuxfb
+env=QSG_RENDER_LOOP=basic
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
+base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
index bc143da..200aa90 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
@@ -2,4 +2,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=1
 env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
 base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
new file mode 100644
index 0000000..64226cb
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
@@ -0,0 +1,7 @@
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QPA_EGLFS_FORCE888=0
+env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
+env=QSG_RENDER_LOOP=windows
+base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index c8423e1..eec5bc4 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Boot to Qt Demos"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40"
+LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
 inherit qmake5
 
@@ -34,15 +42,15 @@ SRC_URI = " \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
 
-PV = "5.6+git${SRCPV}"
+PV = "5.7+git${SRCPV}"
 
-BRANCH = "5.6"
+BRANCH = "5.7"
 BROWSER_BRANCH = "dev"
-QT_BRANCH = "5.6"
-SRCREV_demos = "2dcc014980437b87564b7f9f86a06894efa5ea75"
-SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
-SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
-SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc"
+QT_BRANCH = "5.7"
+SRCREV_demos = "cd9f0c40f30226c7ce1c3259aea8ebca08acfbb8"
+SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a"
+SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1"
+SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd"
 SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser"
 
 SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b"
@@ -87,18 +95,18 @@ do_install_append() {
     sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.qml
     sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.js
     sed -i 's/StyledSlider/Slider/g' ${D}/data/user/qt/canvas3d-planets/planets.qml
-    sed -i '39 i import QtQuick.Controls 1.2' ${D}/data/user/qt/canvas3d-planets/planets.qml
+    sed -i '/import QtCanvas3D/a import QtQuick.Controls 1.2' ${D}/data/user/qt/canvas3d-planets/planets.qml
 
     # Qt Quick Extras
-    cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/dashboard/qml ${D}/data/user/qt/enterprise-dashboard/
-    cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/dashboard/images ${D}/data/user/qt/enterprise-dashboard/
+    cp -r ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/dashboard/qml ${D}/data/user/qt/enterprise-dashboard/
+    cp -r ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/dashboard/images ${D}/data/user/qt/enterprise-dashboard/
 
-    cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/gallery/qml ${D}/data/user/qt/enterprise-gallery/
-    cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/gallery/images ${D}/data/user/qt/enterprise-gallery/
-    cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/gallery/fonts ${D}/data/user/qt/enterprise-gallery/
+    cp -r ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/gallery/qml ${D}/data/user/qt/enterprise-gallery/
+    cp -r ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/gallery/images ${D}/data/user/qt/enterprise-gallery/
+    cp -r ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/gallery/fonts ${D}/data/user/qt/enterprise-gallery/
 
-    cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/flat/images ${D}/data/user/qt/enterprise-flat-controls/
-    cp ${WORKDIR}/qtquickcontrols/examples/quick/extras/flat/*.qml ${D}/data/user/qt/enterprise-flat-controls/
+    cp -r ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/flat/images ${D}/data/user/qt/enterprise-flat-controls/
+    cp ${WORKDIR}/qtquickcontrols/examples/quickcontrols/extras/flat/*.qml ${D}/data/user/qt/enterprise-flat-controls/
 
     sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/enterprise-dashboard/qml/dashboard.qml ${D}/data/user/qt/enterprise-gallery/qml/gallery.qml
     sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/enterprise-dashboard/qml/dashboard.qml ${D}/data/user/qt/enterprise-gallery/qml/gallery.qml
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
index 7f4b083..0692fc0 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Proxy daemon for QtSimulator"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://proxy.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"
 
 inherit qmake5
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh
index 2864ffe..d73f1e7 100755
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh
@@ -1,24 +1,32 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DAEMON=/usr/bin/emulatorproxyd
 
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
index 7b51ece..b9acd13 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "SD-Card mount daemon for Emulator"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"
 
 inherit qmake5
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh
index 4e0f226..0849cc7 100755
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh
@@ -1,24 +1,32 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DAEMON=/usr/bin/sdcardmountd
 
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
index 3b1da08..9cd1f28 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Virtual input plugin for QtSimulator"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://qvinput.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"
 
 inherit qt5-module
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index bdcb293..e131b2a 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Boot to Qt Demo Launcher"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
+LICENSE = "(BSD & GPL-3.0) | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
@@ -34,7 +42,7 @@ SRC_URI += " \
     file://b2qt.service \
     "
 
-SRCREV = "f5aaf9297648b397ee8fecb0a494b4774e130422"
+SRCREV = "7ff96b74f8721dbaf50722561770815a4530b6a0"
 
 DEPENDS = "qtbase qtdeclarative \
            ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
index 5635756..89e4bbb 100755
--- a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
+++ b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
@@ -1,24 +1,32 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 case "$1" in
 start)
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
deleted file mode 100644
index ee26caf..0000000
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DESCRIPTION = "Boot to Qt Utils module"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17"
-
-inherit qt5-module
-require recipes-qt/qt5/qt5-git.inc
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \
-    "
-
-SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f"
-
-DEPENDS = "qtbase qtdeclarative wpa-supplicant"
-
-FILES_${PN}-examples-dbg = " \
-    /data/user/qt/.debug/* \
-    /data/user/qt/wifi-cpp/.debug/* \
-    "
-
-FILES_${PN}-examples = " \
-    /data/user/qt/wifi-cpp/wifi-cpp \
-    /data/user/qt/wifi-qml \
-    "
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index e3ca81c..d63df0e 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -1,41 +1,46 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Boot to Qt Wayland Demo Compositor"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://main.cpp;md5=56e7f80d726792929d5d089852de7cde;beginline=1;endline=39"
+LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
 
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 
 QT_MODULE = "qt-apps-boot2qt-demos"
 
-SRCREV = "b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c"
+SRCREV = "a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e"
 
 S = "${WORKDIR}/git/wayland/democompositor/"
 
 DEPENDS = "qtbase qtwayland"
-RDEPENDS_${PN} = "qtwayland (>= 5.7)"
 
-do_install_append() {
-    install -d -m0775 ${D}/usr/bin
-    install -m0775 ${B}/democompositor ${D}/usr/bin
-}
+FILES_${PN} += "/data/user/democompositor"
+FILES_${PN}-dbg += "/data/user/democompositor/.debug"
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
new file mode 100644
index 0000000..b60d9a0
--- /dev/null
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -0,0 +1,59 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "B2Qt Automotive Qt5 image"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+PR = "r0"
+
+DEPLOY_CONF_TYPE = "Automotive"
+
+IMAGE_FEATURES += "\
+        package-management \
+        ssh-server-dropbear \
+        tools-debug \
+        debug-tweaks \
+        hwcodecs \
+        "
+
+inherit core-image
+inherit bootfs-image
+inherit consistent_timestamps
+
+MACHINE_EXTRA_INSTALL_QT ?= ""
+
+IMAGE_INSTALL += "\
+    ${MACHINE_EXTRA_INSTALL_QT} \
+    packagegroup-b2qt-embedded-base \
+    packagegroup-b2qt-embedded-tools \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    packagegroup-b2qt-qt5-modules \
+    packagegroup-b2qt-automotive-addons \
+    "
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 2909e38..88b5d33 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "B2Qt embedded Qt5 image"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 PR = "r0"
 
 DEPLOY_CONF_TYPE = "Boot2Qt"
@@ -36,6 +44,7 @@ IMAGE_FEATURES += "\
 
 inherit core-image
 inherit bootfs-image
+inherit consistent_timestamps
 
 MACHINE_EXTRA_INSTALL_QT ?= ""
 
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
new file mode 100644
index 0000000..e74dd92
--- /dev/null
+++ b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
@@ -0,0 +1,39 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
+
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+
+inherit populate_b2qt_qt5_sdk
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
+                          packagegroup-b2qt-automotive-qt5-toolchain-target"
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 9b6bb87..65354ad 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -1,28 +1,36 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit populate_b2qt_qt5_sdk
 
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index ce323d3..d5ba0c2 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit nativesdk packagegroup qtquickcompiler
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 5857af2..391224e 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Automotive specific Qt packages"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 
 inherit packagegroup
 
@@ -28,10 +36,10 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
     gammaray \
+    qmllive-target \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
index 8a05757..ba99059 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Target packages for B2Qt Automotive Qt5 SDK"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit packagegroup
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index c784787..3d60eed 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Device Creation specific Qt packages"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 
 inherit packagegroup
 
@@ -28,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     b2qt-launcher \
     b2qt-demos \
     ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 66f055c..ec3125b 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit packagegroup qtquickcompiler
@@ -36,15 +44,19 @@ RDEPENDS_${PN} += " \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
-    qtcanvas3d \
+    qtcanvas3d-dev \
+    qtcharts-dev \
     qtconnectivity-dev \
+    qtdatavis3d-dev \
     qtdeclarative-dev \
     qtdeclarative-render2d-dev \
     qtdeclarative-staticdev \
+    qtdeviceutilities-dev \
     qtgraphicaleffects-dev \
     qtimageformats-dev \
     qtlocation-dev \
     qtmultimedia-dev \
+    qtotaupdate-dev \
     qtquickcontrols-dev \
     qtquickcontrols2-dev \
     qtsensors-dev \
@@ -53,14 +65,10 @@ RDEPENDS_${PN} += " \
     qtsvg-dev \
     qttools-dev \
     qttools-staticdev \
+    qtvirtualkeyboard-dev \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
-    \
-    b2qt-utils-dev \
-    qtcharts-dev \
-    qtdatavis3d-dev \
-    qtvirtualkeyboard-dev \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 7e8ce67..c63ddb8 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Qt5 modules"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 
 inherit packagegroup
 
@@ -29,7 +37,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     qt3d \
     qtbase \
-    qtbase-fonts \
     qtcanvas3d \
     qtcharts \
     qtconnectivity \
@@ -37,10 +44,12 @@ RDEPENDS_${PN} += " \
     qtdeclarative \
     qtdeclarative-render2d \
     qtdeclarative-tools \
+    qtdeviceutilities \
     qtgraphicaleffects \
     qtimageformats \
     qtlocation \
     qtmultimedia \
+    qtotaupdate \
     qtquickcontrols \
     qtquickcontrols2 \
     qtsensors \
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb
index 79fe2f8..57eae88 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/recipes-qt/qt5-addons/qtglesstream.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "QtGlesStream"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0"
 
 inherit qt5-module
diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
index 04a0b3a..47db6ca 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Qt Quick Compiler using prebuilt binaries from Qt SDK"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit allarch qmake5_paths
 
diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
index 447ad48..d15e167 100644
--- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb
+++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "QtSimulator"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17"
 
 inherit qt5-module
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 7debc2e..4c832e0 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -1,25 +1,33 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"
+SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
deleted file mode 100644
index c9d2223..0000000
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 10 Feb 2016 09:02:09 +0200
-Subject: [PATCH] Allow a tools-only build
-
----
- qt3d.pro | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/qt3d.pro b/qt3d.pro
-index a26e76d..263e3c4 100644
---- a/qt3d.pro
-+++ b/qt3d.pro
-@@ -1,4 +1,4 @@
--requires(contains(QT_CONFIG, opengl))
-+!tools-only:requires(contains(QT_CONFIG, opengl))
- 
- load(configure)
- qtCompileTest(assimp)
-@@ -17,3 +17,8 @@ load(qt_parts)
- 
- OTHER_FILES += \
-     sync.profile
-+
-+tools-only {
-+    sub_tools.depends -= sub_src
-+    SUBDIRS = sub_tools
-+}
--- 
-1.9.1
-
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 349ef9a..aa89e73 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 
@@ -25,4 +33,4 @@ SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
 
-SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33"
+SRCREV = "0eac16fbda846c951f9b3887199e72b66f5aacd7"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 4ab7742..bcd3aa2 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -1,25 +1,33 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"
+SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
 
diff --git a/recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri b/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
index cdb6204..cdb6204 100644
--- a/recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri
diff --git a/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri b/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
new file mode 100644
index 0000000..4597a84
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/tegra-t18x/oe-device-extra.pri
@@ -0,0 +1,11 @@
+TEGRA_T18X_CFLAGS       = -DWIN_INTERFACE_CUSTOM
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_CFLAGS           += $$TEGRA_T18X_CFLAGS
+QMAKE_CXXFLAGS         += $$TEGRA_T18X_CFLAGS
+
+QMAKE_PLATFORM         += boot2qt
+
+QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
+
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index cdb1566..4b0d206 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG_GL = "gles2 eglfs"
 PACKAGECONFIG += " \
@@ -45,7 +53,5 @@ do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
 
-SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"
+SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048"
 
-# Temporarily here, until merged upstream
-PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 2c3ba90..8c18714 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "85fe2daab5ed14655b456df8821c9f5f606fdc12"
+SRCREV = "8e34d6f5399a29d45f9402219f13b631e29fd4b0"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
deleted file mode 100644
index 359c43d..0000000
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DESCRIPTION = "Qt Charts"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3985;beginline=1;endline=17"
-
-inherit qt5-module qtquickcompiler
-require recipes-qt/qt5/qt5-git.inc
-
-SRCREV = "1474e311738e2676b65c4c40dc7ff0dbf4d6a5bd"
-
-DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend
new file mode 100644
index 0000000..fa83e28
--- /dev/null
+++ b/recipes-qt/qt5/qtcharts_git.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+inherit qtquickcompiler
+
+SRCREV = "da071825245a4ec1dc4904a9d3329db5a132c074"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index f57a619..c1a9bbd 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -1,22 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+SRCREV = "d884d20c5530b67fbd2fba35cdb71a9f969196be"
 
-SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
deleted file mode 100644
index 9b9f239..0000000
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DESCRIPTION = "Qt Data Visualization"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal.h;md5=80b80e41be7c22f5b90fc96163b7d1bf;beginline=1;endline=17"
-
-inherit qt5-module
-require recipes-qt/qt5/qt5-git.inc
-
-SRCREV = "4d4a9609fab58da304e4c13b9a37531116a4fadb"
-
-DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend
new file mode 100644
index 0000000..bb15587
--- /dev/null
+++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+SRCREV = "2523056490c3f7a35d176deb583ba46899fe260b"
diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
deleted file mode 100644
index 8597315..0000000
--- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DESCRIPTION = "Qt Quick 2D Rendender"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=1f253bc897054feebffbaf70ecd49af4;beginline=1;endline=17"
-
-inherit qt5-module
-require recipes-qt/qt5/qt5-git.inc
-
-SRCREV = "d09edf104dd05b472d3004484cc9bd47befb0a3d"
-
-DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
new file mode 100644
index 0000000..44e94d5
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+SRCREV = "fe2807312ff3d2285b51a4de363b1c1fb8d85f82"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index f46ba76..152892e 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6"
+SRCREV = "2a992040e2ef3f9dab087be3bfac05e28596672b"
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb
new file mode 100644
index 0000000..a4c0418
--- /dev/null
+++ b/recipes-qt/qt5/qtdeviceutilities.bb
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Qt Device Utilities"
+LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
+
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
+
+SRC_URI = " \
+    git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \
+    "
+
+SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c"
+
+DEPENDS = "qtbase qtdeclarative qtconnectivity"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index f164c73..8cc0676 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5"
+SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index afa85cb..14d86cb 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936"
+SRCREV = "11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index a318e4e..52c490e 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG += "gypsy"
 
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec"
+SRCREV = "de5be121d84b062f1b72c91dddc877e5e88babc0"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index fd551c6..4a71a0f 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
 
-SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5"
+SRCREV = "e4aef963cbd32274669af6b66158f6f0ca4ba3ed"
diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb
new file mode 100644
index 0000000..9cafd8c
--- /dev/null
+++ b/recipes-qt/qt5/qtotaupdate.bb
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Qt OTA Update module"
+LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
+
+QT_GIT = "git://github.com/qt"
+QT_MODULE_BRANCH = "master"
+
+SRCREV = "f48ab751dd43906d5b9492e3f124b94f189b9971"
+
+DEPENDS = "qtbase qtdeclarative ostree"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index e0091b4..4d0fb6a 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -1,36 +1,43 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Qt Quick Compiler"
-LICENSE = "QtEnterprise"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a1540f16ea705d;beginline=1;endline=17"
 
 inherit qt5-module
 
 SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
+    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
     "
 
-SRCREV = "382935b1c5c93fba9ff2f25b74ec6a5337ec62d0"
-BRANCH = "5.6"
+SRCREV = "033370939c8d969bfcb529745f643ee5d8a08790"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
deleted file mode 100644
index c6dec9f..0000000
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-require recipes-qt/qt5/qt5.inc
-require recipes-qt/qt5/qt5-git.inc
-
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects"
-
-SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244"
-
-FILES_${PN}-qmldesigner += " \
-    ${OE_QMAKE_PATH_QML}/*/*/*/designer \
-"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
new file mode 100644
index 0000000..3e796ed
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+SRCREV = "6f6e073815d5b05aba553b83809fb701541260c6"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index 895e4f8..d3ece15 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -1,24 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+############################################################################
 
-SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70"
+SRCREV = "84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index 4407369..d248cf0 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -1,25 +1,33 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e"
+SRCREV = "5a57beaaa5f637070ccbf30d79ad27861134c7a8"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
deleted file mode 100644
index e4ef3c7..0000000
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-require recipes-qt/qt5/qt5.inc
-require recipes-qt/qt5/qt5-git.inc
-
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
-"
-
-DEPENDS += "qtbase qtserialport"
-
-SRCREV = "0a4a5f7e1cbca7bd8b797603025534368de02cb7"
diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend
new file mode 100644
index 0000000..2d7e0ee
--- /dev/null
+++ b/recipes-qt/qt5/qtserialbus_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+SRCREV = "768b2d463663104daae44f564f09c3a10e2e6ad6"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 1bf4848..498aeb6 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8"
+SRCREV = "0b9f41c28cece4fe51011083e646aba405ec3a65"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 755a49b..d9ebe0b 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -1,22 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+SRCREV = "d3d3db5a75fe2ba992742e418bfefa25eddf7684"
 
-SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 45a8ea6..5e1f3d2 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -1,25 +1,33 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
+SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 44f6b33..6f2c016 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e"
+SRCREV = "8575ed82ff0dd43aed8f5de67b4cfef06fec8c33"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index d33921b..dc7250c 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119"
+SRCREV = "c4795ce81f9165a05e6f918066c671808447c539"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
deleted file mode 100644
index e7ab947..0000000
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-DESCRIPTION = "Qt Virtual Keyboard"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e83db02b9629bbd;beginline=1;endline=17"
-
-inherit qt5-module qtquickcompiler
-require recipes-qt/qt5/qt5-git.inc
-
-SRCREV = "13a199e6e2c5f27b0f12eff380df4f0c0d156e6e"
-
-DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
-
-PACKAGECONFIG ?= "lipi-toolkit lang-all"
-PACKAGECONFIG[t9write] = "CONFIG+=t9write"
-PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
-PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
-PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
-PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
-PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
-PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
-PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
-PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
-PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
-PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
-PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
-PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
-PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
-PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
-PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
-PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
-PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
-PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
-PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
-PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
-PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"
-
-EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
-EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"
-
-PACKAGES += "${PN}-dictionaries"
-RRECOMMENDS_${PN} += "${PN}-dictionaries"
-FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
-
-FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
-FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug"
-INSANE_SKIP_${PN} += "libdir"
-INSANE_SKIP_${PN}-dbg += "libdir"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
new file mode 100644
index 0000000..d1a1bbc
--- /dev/null
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
@@ -0,0 +1,34 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+inherit qtquickcompiler
+
+SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308"
+
+PACKAGECONFIG = "lipi-toolkit lang-all hunspell"
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
deleted file mode 100644
index a83d6dc..0000000
--- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-require recipes-qt/qt5/qtwayland-native_git.bb
-
-FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:"
-
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
-    file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2"
-PV = "5.7-wip+git${SRCPV}"
-QT_MODULE_BRANCH = "wip-compositor-api"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index b886d31..7661cbe 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8"
+SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
deleted file mode 100644
index fb59bba..0000000
--- a/recipes-qt/qt5/qtwayland_5.7-wip.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-require recipes-qt/qt5/qtwayland_git.bb
-
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
-    file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658"
-PV = "5.7-wip+git${SRCPV}"
-QT_MODULE_BRANCH = "wip-compositor-api"
-EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib"
-
-SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index b886d31..7661cbe 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8"
+SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index 7e87e21..e19dfe7 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de"
+SRCREV = "31eb0d8c7d78fe60dbad94091a56e97b4fcaa52b"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 35c9471..aadbc09 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 
@@ -25,5 +33,5 @@ SRC_URI_append_mx6 = " \
     file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
     "
 
-SRCREV_qtwebengine = "ec84507898e58a167b185ba674acf300cc695380"
-SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31"
+SRCREV_qtwebengine = "15ded5ca62f53a01f85a52326f0b335a8a012bbd"
+SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 274e4a4..69443dd 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34"
+SRCREV = "60cede232aca96f3f6852c54c0d97cf1771fb371"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 8594a95..b83ba05 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92"
+SRCREV = "89dbcc4f807015736a8ce3393b857735019d098d"
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index fa74a48..6e6fa1b 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Android Debug Bridge Daemon"
 HOMEPAGE = "http://developer.android.com/tools/help/adb.html"
diff --git a/recipes/adbd/files/nuc/defaults b/recipes/adbd/files/intel-corei7-64/defaults
index 0fbba4c..0fbba4c 100644
--- a/recipes/adbd/files/nuc/defaults
+++ b/recipes/adbd/files/intel-corei7-64/defaults
diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend
index 9b56df1..dbeb030 100644
--- a/recipes/alsa/alsa-state.bbappend
+++ b/recipes/alsa/alsa-state.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend
index e889a2d..48ed6ee 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/recipes/base-files/base-files_3.0.14.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "\
diff --git a/recipes/ca-certificates/ca-certificates_%.bbappend b/recipes/ca-certificates/ca-certificates_%.bbappend
index 0c31fb9..2e0abb1 100644
--- a/recipes/ca-certificates/ca-certificates_%.bbappend
+++ b/recipes/ca-certificates/ca-certificates_%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch"
 DEPENDS_class-native = "coreutils-native"
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
index d45ce18..eefd6a3 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
@@ -1,4 +1,4 @@
-From a934f6b3ef4c4ff5f36a79d11c9eed59b3ffa9ae Mon Sep 17 00:00:00 2001
+From ccc6013f1e55b67981fb336aba657aea1520aeda Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Tue, 20 Sep 2016 11:02:50 +0300
 Subject: [PATCH] Disable connman when booting over NFS
@@ -8,13 +8,13 @@ Subject: [PATCH] Disable connman when booting over NFS
  1 file changed, 1 insertion(+)
 
 diff --git a/src/connman.service.in b/src/connman.service.in
-index 7b6195e..3fc197a 100644
+index 8f7f342..8470f91 100644
 --- a/src/connman.service.in
 +++ b/src/connman.service.in
 @@ -3,6 +3,7 @@ Description=Connection service
- Requires=dbus.socket
- After=dbus.socket
- Before=remote-fs.target
+ After=dbus.service network-pre.target
+ Before=network.target remote-fs-pre.target
+ Wants=network.target remote-fs-pre.target
 +ConditionKernelCommandLine=!root=/dev/nfs
  
  [Service]
diff --git a/recipes/dbus/dbus/dbus-session.init b/recipes/dbus/dbus/dbus-session.init
index 11a6757..0690511 100644
--- a/recipes/dbus/dbus/dbus-session.init
+++ b/recipes/dbus/dbus/dbus-session.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          dbus
 # Required-Start:    $remote_fs $syslog
@@ -17,13 +17,16 @@
 # set -e
 
 # Source function library.
-. /etc/init.d/functions
+#. /etc/init.d/functions
 
 DAEMON=@bindir@/dbus-launch
 NAME=dbus-session
 ADDRESSFILE=/var/run/dbus/session_bus_address
 UUIDDIR=/var/lib/dbus
 DESC="session message bus"
+APPCONTROLLERPATH="/tmp/b2qt/appcontroller.conf.d"
+APPCONTROLLERADDRESSFILE="session_bus_address"
+
 
 test -x $DAEMON || exit 0
 
@@ -38,12 +41,18 @@ if [ -e $ADDRESSFILE ]; then
   . $ADDRESSFILE
 fi
 
+if [ ! -d $APPCONTROLLERPATH ]; then
+mkdir -p $APPCONTROLLERPATH
+fi
+
 test "$ENABLED" != "0" || exit 0
 
 start_it_up()
 {
   echo -n "Starting $DESC: "
   $DAEMON --auto-syntax > $ADDRESSFILE
+  ADDR=`cat $ADDRESSFILE|grep -i DBUS_SESSION_BUS_ADDRESS=`
+  echo "env=${ADDR%?}" |tr -d \' > ${APPCONTROLLERPATH}/${APPCONTROLLERADDRESSFILE}
   echo "$NAME."
 }
 
diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service
new file mode 100644
index 0000000..8dcf081
--- /dev/null
+++ b/recipes/dbus/dbus/dbus-session.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=D-BUS Session Message Bus.
+After=dbus.service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/dbus-session.init.sh start
+ExecStop=/usr/bin/dbus-session.init.sh stop
+Environment=HOME=/home/root
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index 6905df3..dde2927 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -1,46 +1,72 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+inherit systemd
 
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 SRC_URI += " \
     file://dbus-session.init \
+    file://dbus-session.service \
     file://dbus-session-address \
     "
-
 INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init"
 INITSCRIPT_NAME_${PN}-session-init = "dbus-session"
 INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ."
 
 PACKAGES =+ "${PN}-session-init"
+SYSTEMD_PACKAGES =+ "${PN}-session-init"
+
 FILES_${PN}-session-init = " \
     ${sysconfdir}/init.d/dbus-session \
     ${sysconfdir}/profile.d/dbus-session-address \
+    ${bindir}/dbus-session.init.sh \
+    ${systemd_unitdir}/system/dbus-session.service \
     "
 
 do_install_append_class-target() {
+    sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
+
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
         install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
     fi
+
+    if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -m 0755 -d ${D}${bindir}/
+        install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/
+
+        install -m 0755 -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/
+    fi
+
     install -d ${D}${sysconfdir}/profile.d
     install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/
 }
+
+SYSTEMD_SERVICE_${PN}-session-init = "dbus-session.service"
diff --git a/recipes/dracut/dracut_git.bbappend b/recipes/dracut/dracut_git.bbappend
index ca3437c..657e30a 100644
--- a/recipes/dracut/dracut_git.bbappend
+++ b/recipes/dracut/dracut_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PV = "044+git${SRCREV}"
 SRCREV = "1bc3e733f96033a508841e97fe08da7a12851782"
diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb
index e715f91..1c17d33 100644
--- a/recipes/fonts/otf-noto.bb
+++ b/recipes/fonts/otf-noto.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 SUMMARY = "Noto Sans CJK"
 SECTION = "fonts"
diff --git a/recipes/fonts/ttf-devanagari_2.94.0.bb b/recipes/fonts/ttf-devanagari_2.94.0.bb
index 513ef60..1073096 100644
--- a/recipes/fonts/ttf-devanagari_2.94.0.bb
+++ b/recipes/fonts/ttf-devanagari_2.94.0.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 SUMMARY = "Lohit Devanagari Fonts"
 SECTION = "fonts"
diff --git a/recipes/fonts/ttf-opensans.bb b/recipes/fonts/ttf-opensans.bb
index 814eadb..08e8421 100644
--- a/recipes/fonts/ttf-opensans.bb
+++ b/recipes/fonts/ttf-opensans.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 SUMMARY = "Open Sans Fonts"
 SECTION = "fonts"
diff --git a/recipes/gdb/gdb-cross-canadian_7.8.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
index b8a804f..b217805 100644
--- a/recipes/gdb/gdb-cross-canadian_7.8.1.bbappend
+++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
 RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python"
diff --git a/recipes/gperf/gperf_%.bbappend b/recipes/gperf/gperf_%.bbappend
index ffc1dcd..6f2651c 100644
--- a/recipes/gperf/gperf_%.bbappend
+++ b/recipes/gperf/gperf_%.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend b/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend
index 5912e52..f42e121 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.23.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG_append = " faad"
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend b/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
index 120546d..646faa5 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
+++ b/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 5912e52..f42e121 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG_append = " faad"
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
index 120546d..646faa5 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
+++ b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
index 00d6a82..e338316 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
+++ b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PACKAGECONFIG_append = " x264"
 FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/*.prs"
diff --git a/recipes/gypsy/gypsy_%.bbappend b/recipes/gypsy/gypsy_%.bbappend
new file mode 100644
index 0000000..c03c75b
--- /dev/null
+++ b/recipes/gypsy/gypsy_%.bbappend
@@ -0,0 +1,36 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+inherit bluetooth
+
+DEPENDS_remove = "bluez4"
+DEPENDS_append := " ${BLUEZ}"
+DEPENDS += "libgudev"
+
+PNBLACKLIST[gypsy] = ""
diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb
index 6faea05..e47c9c1 100644
--- a/recipes/hunspell/hunspell_1.3.2.bb
+++ b/recipes/hunspell/hunspell_1.3.2.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Hunspell"
 LICENSE = "LGPLv2"
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 05f2dbf..4a7f172 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "B2Qt on embedded Linux SDK image"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 IMAGE_FEATURES += "\
diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
index c1299e2..430999a 100644
--- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/recipes/initramfs-basic/init-basic.bb b/recipes/initramfs-basic/init-basic.bb
index 674e683..25039e7 100644
--- a/recipes/initramfs-basic/init-basic.bb
+++ b/recipes/initramfs-basic/init-basic.bb
@@ -1,26 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 SUMMARY = "Simple init script that mounts root filesystem by label."
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 SRC_URI = "file://init.sh"
 
 S = "${WORKDIR}"
diff --git a/recipes/initramfs-basic/initramfs-basic.bb b/recipes/initramfs-basic/initramfs-basic.bb
index 4bef9c8..50bd585 100644
--- a/recipes/initramfs-basic/initramfs-basic.bb
+++ b/recipes/initramfs-basic/initramfs-basic.bb
@@ -1,26 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Basic initramfs image. Useful as a template for more advanced functionality."
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 # findfs from busybox fails to do its jobs, the full version from util-linux-findfs works fine
 PACKAGE_INSTALL = "init-basic busybox util-linux-findfs ${ROOTFS_BOOTSTRAP_INSTALL}"
diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend
index d9c5e82..e2550b1 100644
--- a/recipes/initscripts/initscripts_1.0.bbappend
+++ b/recipes/initscripts/initscripts_1.0.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 do_configure_append() {
     sed -i -e "/echo/d" ${WORKDIR}/banner.sh
diff --git a/recipes/libgsystem/libgsystem.bb b/recipes/libgsystem/libgsystem.bb
index 53d8215..0e14055 100644
--- a/recipes/libgsystem/libgsystem.bb
+++ b/recipes/libgsystem/libgsystem.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 SUMMARY = "LibGSystem is a GIO-based library, targeted primarily for use by operating system components."
 
diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend
index 7e931a8..955c797 100644
--- a/recipes/libsdl/libsdl_1.2.15.bbappend
+++ b/recipes/libsdl/libsdl_1.2.15.bbappend
@@ -1,22 +1,30 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DEPENDS_remove = "virtual/libgl libglu"
diff --git a/recipes/libsoup-2.4/libsoup-2.4_2.46.0.bbappend b/recipes/libsoup-2.4/libsoup-2.4_2.46.0.bbappend
deleted file mode 100644
index fec4f94..0000000
--- a/recipes/libsoup-2.4/libsoup-2.4_2.46.0.bbappend
+++ /dev/null
@@ -1,27 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-# Remove this recipe when openembedded-core/meta/recipes-support/libsoup/
-# will be updated to 2.50.0 version or above.
-PV = "2.50.0"
-
-SRC_URI[md5sum] = "9a84d66e1b7ccd3bd340574b11eccc15"
-SRC_URI[sha256sum] = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"
diff --git a/recipes/linux-firmware/linux-firmware_git.bbappend b/recipes/linux-firmware/linux-firmware_git.bbappend
new file mode 100644
index 0000000..33bcc34
--- /dev/null
+++ b/recipes/linux-firmware/linux-firmware_git.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+LICENSE_CREATE_PACKAGE = "0"
diff --git a/recipes/linux/linux-yocto_3.%.bbappend b/recipes/linux/linux-yocto_3.%.bbappend
deleted file mode 100644
index 23b9d3a..0000000
--- a/recipes/linux/linux-yocto_3.%.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://snd_intel8x0.cfg \
-    "
-
-KMACHINE_emulator = "qemux86"
-COMPATIBLE_MACHINE_emulator = "emulator"
diff --git a/recipes/linux/linux-yocto_4.%.bbappend b/recipes/linux/linux-yocto_4.%.bbappend
new file mode 100644
index 0000000..3687f9b
--- /dev/null
+++ b/recipes/linux/linux-yocto_4.%.bbappend
@@ -0,0 +1,36 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://snd_intel8x0.cfg \
+    "
+
+KMACHINE_emulator = "qemux86"
+COMPATIBLE_MACHINE_emulator = "emulator"
diff --git a/recipes/meta/meta-environment.bbappend b/recipes/meta/meta-environment.bbappend
index 276868d..65cc6b3 100644
--- a/recipes/meta/meta-environment.bbappend
+++ b/recipes/meta/meta-environment.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 inherit image-buildinfo
 
diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
index 5c91810..d5f8ce7 100644
--- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
@@ -1,27 +1,36 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
 PR = "r0"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit populate_b2qt_sdk
 
diff --git a/recipes/opengldummy/opengldummy.bb b/recipes/opengldummy/opengldummy.bb
index 6636335..94b8e08 100644
--- a/recipes/opengldummy/opengldummy.bb
+++ b/recipes/opengldummy/opengldummy.bb
@@ -1,27 +1,36 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "OpenGL dummy library provides headers and a dummy library for EGL/GLES"
 SECTION = "devel"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 PV = "1.0.0"
 
diff --git a/recipes/opengldummy/opengldummy.inc b/recipes/opengldummy/opengldummy.inc
index a4966e8..720b310 100644
--- a/recipes/opengldummy/opengldummy.inc
+++ b/recipes/opengldummy/opengldummy.inc
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PROVIDES = "virtual/libgles2 virtual/libgles3 virtual/egl"
 
diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb
index 6c71739..eaeff28 100644
--- a/recipes/opengldummy/qtglesstream-dummy-client.bb
+++ b/recipes/opengldummy/qtglesstream-dummy-client.bb
@@ -1,27 +1,36 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "QtGlesStream dummy client provides headers and a dummy library for EGL/GLES"
 SECTION = "devel"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 PV = "1.0.0"
 SOLIBMAJOR = "1"
diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend
index b44097a..9d110a5 100644
--- a/recipes/openssl/openssl_1.%.bbappend
+++ b/recipes/openssl/openssl_1.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch"
diff --git a/recipes/os-release/os-release.bbappend b/recipes/os-release/os-release.bbappend
deleted file mode 100644
index 98e2d16..0000000
--- a/recipes/os-release/os-release.bbappend
+++ /dev/null
@@ -1,39 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-# Reported upstream https://bugzilla.yoctoproject.org/show_bug.cgi?id=9144
-python do_fix_quotes () {
-    with open(d.expand('${B}/os-release'), 'w') as f:
-        for field in d.getVar('OS_RELEASE_FIELDS', True).split():
-            value = d.getVar(field, True)
-            if value:
-                f.write('{0}="{1}"\n'.format(field, value))
-}
-
-do_verify_if_fixed_by_upstream () {
-    pretty_name_first_char=$(cat ${B}/os-release | grep "^PRETTY_NAME" | cut -f 2 -d '=' | cut -c1)
-    if [ "${pretty_name_first_char}" = "\"" ]] ; then
-        bbwarn "Issue appears to be fixed by upstream, remove this workaround."
-    fi
-}
-
-addtask do_verify_if_fixed_by_upstream after do_compile before do_install
-addtask do_fix_quotes after do_verify_if_fixed_by_upstream before do_install
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 4dbafd5..6e79395 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -1,25 +1,33 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
-SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees."
+SUMMARY = "Shared library with a reference command line tool for managing bootable, immutable, versioned filesystem trees."
 
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
@@ -28,18 +36,21 @@ inherit autotools pkgconfig systemd
 
 SRC_URI = " \
     git://github.com/GNOME/ostree.git \
-    file://0001-Allow-updating-files-on-the-boot-partition.patch \
-    file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
-    file://0003-Allow-updating-files-in-root-of-boot.patch \
-    file://0004-Mount-boot-partition.patch \
-    file://0005-Do-not-use-grub2-mkconfig.patch \
+    file://Fix-enable_rofiles_fuse-no-build.patch \
+    file://Mount-boot-partition.patch \
+    file://Allow-updating-files-in-the-boot-directory.patch \
+    file://u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
+    file://Create-firmware-convenience-symlinks.patch \
     "
 
-SRCREV = "efdb4d8f443768e59529c299290bee8b1f8f93c3"
+SRCREV = "v2016.5"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz"
+DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz systemd"
+# Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
+# The production image do not require bash for proper working.
+RDEPENDS_${PN} += "bash"
 RRECOMMENDS_${PN} += "gnupg"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
@@ -52,8 +63,10 @@ FILES_${PN} += "${systemd_unitdir}/system/ \
 EXTRA_OECONF = "--with-dracut \
                 --without-selinux \
                 --without-libarchive \
-                --with-grub2=no \
+                --with-builtin-grub2-mkconfig \
+                --enable-rofiles-fuse=no \
                 --enable-gtk-doc-html=no \
+                --enable-man=no \
                 --with-soup \
                 --enable-libsoup-client-certs"
 
diff --git a/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch b/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch
deleted file mode 100644
index 0905cc1..0000000
--- a/recipes/ostree/ostree/0001-Allow-updating-files-on-the-boot-partition.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bbb7a8ce89e3e13672c63fd4f1f19988fdf40014 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 17:37:54 +0100
-Subject: [PATCH 1/2] Allow updating files on the boot partition
-
-Until now OSTree copied only vmlinuz and initramfs
-binaries to the boot partition. This patch adds support
-for copying other files from the /boot directory of the
-tree.
-
-How this works:
-
-Ignore subdirectories, only files in root of the boot
-directory are copied. There is overhead of copying files
-to boot partition, therefore the amount of files in the
-boot/ should be kept to the minimum and subdirectories
-shouldn't really be necessary.
-
-Files on the boot partition are updated only with major
-releases, when kernel/initramfs bootcsum changes. Files
-that require frequent updates should not be stored here.
----
- src/libostree/ostree-sysroot-deploy.c | 53 +++++++++++++++++++++++++++++++++++
- 1 file changed, 53 insertions(+)
-
-diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index f7afe3d..4d6534d 100644
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -1340,6 +1340,59 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
-         }
-     }
- 
-+  {
-+    /* Copy other files that are stored in the boot directory. Lets keep this simple:
-+     *
-+     * - Ignore subdirectories, only files in root of the boot directory are copied. There is
-+     *   overhead of copying files to boot partition, therefore the amount of files in the boot/
-+     *   should be kept to the minimum and subdirectories shouldn't really be necessary.
-+     * - Files on the boot partition are updated only with major releases, when kernel/initramfs
-+     *   bootcsum changes. Files that require frequent updates should not be stored here.
-+     */
-+    g_autoptr(GFileEnumerator) dir_enum = NULL;
-+    g_autoptr(GFile) deployments_bootdir = g_file_get_child (deployment_dir, "boot");
-+    dir_enum = g_file_enumerate_children (deployments_bootdir, OSTREE_GIO_FAST_QUERYINFO,
-+                                          G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+                                          NULL, error);
-+    while (TRUE)
-+      {
-+        GFileInfo *file_info = NULL;
-+        g_autoptr(GFile) source_file = NULL;
-+        g_autoptr(GFile) dest_file = NULL;
-+        g_autoptr(GFile) symlink_target = NULL;
-+        GFileType type;
-+        const char *name;
-+
-+        if (!gs_file_enumerator_iterate (dir_enum, &file_info, NULL, cancellable, error))
-+          goto out;
-+        if (file_info == NULL)
-+          break;
-+
-+        type = g_file_info_get_file_type (file_info);
-+        name = g_file_info_get_name (file_info);
-+        if (type == G_FILE_TYPE_DIRECTORY)
-+          continue;
-+        if (type == G_FILE_TYPE_SYMBOLIC_LINK)
-+          {
-+            symlink_target = g_file_get_child (bootcsumdir, g_file_info_get_symlink_target(file_info));
-+            if (!g_file_query_exists (symlink_target, NULL))
-+              continue;
-+          }
-+        if (g_str_has_prefix (name, "vmlinuz-") || g_str_has_prefix (name, "initramfs-"))
-+          continue;
-+
-+        dest_file = g_file_get_child (bootcsumdir, name);
-+        if (!g_file_query_exists (dest_file, NULL))
-+          {
-+            source_file = g_file_enumerator_get_child (dir_enum, file_info);
-+            if (!gs_file_linkcopy_sync_data (source_file, dest_file,
-+                                             G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA,
-+                                             cancellable, error))
-+              goto out;
-+          }
-+      }
-+  }
-+
-   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
-     {
-       if (errno != ENOENT)
--- 
-2.1.4
-
diff --git a/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch b/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch
deleted file mode 100644
index d93da22..0000000
--- a/recipes/ostree/ostree/0003-Allow-updating-files-in-root-of-boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From f5a1391e64d4b17ed05fb47f23d5d35affb9f1fd Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 14:58:56 +0100
-Subject: [PATCH] Allow updating files in root of /boot
-
-It is common for u-boot based systems to search
-top level directory of the boot partiton for
-additional files that are required for booting.
-It can be difficult to change this search logic
-if it is hardcoded somewhere low in the stack or
-in u-boot env that is in read-only memory. To
-allow updating these files you need to add a
-symlink in your ostree sysroot:
-
-cd sysroot/boot
-ln -s loader/my-special-file my-special-file
-
-The bellow code will make sure that loader/my-special-file
-points to the correct target file version.
-
-This does not break the atomic property of update.
----
- src/libostree/ostree-bootloader-uboot.c | 65 +++++++++++++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
-
-diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index be1a40d..779c302 100644
---- a/src/libostree/ostree-bootloader-uboot.c
-+++ b/src/libostree/ostree-bootloader-uboot.c
-@@ -131,6 +131,71 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
-         }
-     }
- 
-+  {
-+       /* It is common for u-boot based systems to search top level directory of the boot
-+        * partiton for additional files that are required for booting. It can be difficult
-+        * to change this search logic if it is hardcoded somewhere low in the stack or in
-+        * u-boot env that is in read-only memory. To allow updating these files you need to
-+        * add a symlink in your ostree sysroot:
-+        *
-+        *    cd sysroot/boot
-+        *    ln -s loader/my-special-file my-special-file
-+        *
-+        * The bellow code will make sure that loader/my-special-file points to the correct
-+        * target file version.
-+        *
-+        */
-+       g_autoptr(GFile) child = NULL;
-+       int loader_fd;
-+       g_autoptr(GFileEnumerator) dir_enum = NULL;
-+       g_autoptr(GFile) real_boot = NULL;
-+       g_autofree char *loader_path = NULL;
-+       char buf[2048];
-+
-+       child = ot_gfile_resolve_path_printf (self->sysroot->path, "boot/loader.%d/", bootversion);
-+       loader_path = g_file_get_path(child);
-+       loader_fd = open (loader_path, O_RDONLY);
-+       if (loader_fd == -1) {
-+         perror("open");
-+         goto out;
-+       }
-+
-+       child = g_file_get_child (self->sysroot->path, "boot");
-+       dir_enum = g_file_enumerate_children (child, OSTREE_GIO_FAST_QUERYINFO,
-+                                             G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+                                             NULL, error);
-+
-+       while (TRUE) {
-+         const char *symlink_target, *name;
-+         GFileInfo *file_info = NULL;
-+
-+         if (!gs_file_enumerator_iterate (dir_enum, &file_info, NULL, cancellable, error)) {
-+           close(loader_fd);
-+           goto out;
-+         }
-+
-+         if (file_info == NULL)
-+           break;
-+
-+         if (g_file_info_get_is_symlink(file_info)) {
-+             symlink_target = g_file_info_get_symlink_target(file_info);
-+             if (g_str_has_prefix(symlink_target, "loader/")) {
-+                 name = g_file_info_get_name(file_info);
-+                 if (g_strcmp0 (name, "uEnv.txt") == 0)
-+                    continue;
-+
-+                 snprintf(buf, sizeof(buf), "%s/%s", loader_path, name);
-+                 remove(buf);
-+                 snprintf(buf, sizeof(buf), "..%s/%s", boot_path, name);
-+                  if (symlinkat(buf, loader_fd, name) == -1)
-+                    perror("symlinkat");
-+             }
-+         }
-+       }
-+
-+       close(loader_fd);
-+   }
-+
-   ret = TRUE;
- out:
-   return ret;
--- 
-2.1.4
-
diff --git a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
deleted file mode 100644
index 1414ff7..0000000
--- a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b613d60319beffc861f5b1faa906d2ee0c685f52 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Wed, 24 Feb 2016 18:12:27 +0100
-Subject: [PATCH] Do not use grub2-mkconfig.
-
-For details see: https://bugzilla.gnome.org/show_bug.cgi?id=762220
----
- src/libostree/ostree-bootloader-grub2.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
-index 1f89914..7cfb0dc 100644
---- a/src/libostree/ostree-bootloader-grub2.c
-+++ b/src/libostree/ostree-bootloader-grub2.c
-@@ -282,6 +282,8 @@ grub2_child_setup (gpointer user_data)
-     }
- }
- 
-+#define OSTREE_NO_GRUB2_MKCONFIG
-+
- static gboolean
- _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-                                        int                    bootversion,
-@@ -300,6 +302,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-   g_autoptr(GFile) config_path_efi_dir = NULL;
-   g_autofree char *grub2_mkconfig_chroot = NULL;
- 
-+#ifndef OSTREE_NO_GRUB2_MKCONFIG
-   if (ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
-       && g_file_has_parent (self->sysroot->path, NULL))
-     {
-@@ -322,7 +325,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-       tool_deployment_root = ostree_sysroot_get_deployment_directory (self->sysroot, tool_deployment);
-       grub2_mkconfig_chroot = g_file_get_path (tool_deployment_root);
-     }
--
-+#endif
-   if (self->is_efi)
-     {
-       config_path_efi_dir = g_file_get_parent (self->config_path_efi);
-@@ -337,9 +340,16 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
-                                                       bootversion);
-     }
- 
-+#ifdef OSTREE_NO_GRUB2_MKCONFIG
-+  procctx = gs_subprocess_context_newv ("ostree-grub-generator", "-o",
-+                                        gs_file_get_path_cached (new_config_path),
-+                                        NULL);
-+#else
-   procctx = gs_subprocess_context_newv ("grub2-mkconfig", "-o",
-                                         gs_file_get_path_cached (new_config_path),
-                                         NULL);
-+#endif
-+
-   child_env = g_environ_setenv (child_env, "_OSTREE_GRUB2_BOOTVERSION", bootversion_str, TRUE);
-   /* We have to pass our state to the child */
-   if (self->is_efi)
--- 
-2.7.0
-
diff --git a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
new file mode 100644
index 0000000..ffcc77c
--- /dev/null
+++ b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
@@ -0,0 +1,99 @@
+From 7f4549c6e94494460be06311c3a4d23ae684ab21 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Wed, 20 Apr 2016 13:58:27 +0200
+Subject: [PATCH 1/3] Allow updating files in the /boot directory.
+
+Until now OSTree copied only the vmlinuz and initramfs
+binaries to the boot/ directory (which in some setups
+might be on a separate partition). This patch adds
+support for copying other files from the deployment's
+/boot directory to the real /boot.
+
+How this works:
+
+Ignore subdirectories, only files in root of the boot
+directory are copied. There is overhead of copying files
+to boot/, therefore the amount of files in boot/ should
+be kept to the minimum and subdirectories shouldn't
+really be necessary.
+
+Files in the boot/ directory are updated only with major
+releases, when kernel/initramfs bootcsum changes. Files
+that require frequent updates should not be stored here.
+---
+ src/libostree/ostree-sysroot-deploy.c | 52 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 8877236..8cf080e 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -1295,6 +1295,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+   g_autofree char *version_key = NULL;
+   g_autofree char *ostree_kernel_arg = NULL;
+   g_autofree char *options_key = NULL;
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
+   GString *title_key;
+   __attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kargs = NULL;
+   const char *val;
+@@ -1361,6 +1362,57 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+         }
+     }
+ 
++
++  /* Copy other files that are stored in deployment's /usr/lib/ostree-boot. Lets keep this simple:
++   *
++   * - Ignore subdirectories. Only files in root of the /usr/lib/ostree-boot directory are copied.
++   *   There is an overhead of copying files to boot/, therefore the amount of files in a deployment's
++   *   usr/lib/ostree-boot should be kept to the minimum and subdirectories shouldn't really
++   *   be necessary.
++   *
++   * - Files in /boot are updated only with major releases, when kernel/initramfs
++   *   bootcsum changes. Files that require frequent updates should not be stored here.
++   */
++  if (!glnx_dirfd_iterator_init_take_fd (dup (tree_boot_dfd), &dfd_iter, error))
++    goto out;
++
++  while (TRUE)
++    {
++      struct dirent *dent;
++
++      if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
++        goto out;
++
++      if (dent == NULL)
++        break;
++
++      if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, 0) != 0)
++        {
++          if (errno == ENOENT)
++              continue;
++          glnx_set_error_from_errno (error);
++          goto out;
++        }
++
++      if (g_str_has_prefix (dent->d_name, "vmlinuz-") || g_str_has_prefix (dent->d_name, "initramfs-")
++              || !S_ISREG(stbuf.st_mode))
++        continue;
++
++      if (fstatat (bootcsum_dfd, dent->d_name, &stbuf, 0) != 0)
++        {
++          if (errno != ENOENT)
++            {
++              glnx_set_prefix_error_from_errno (error, "fstat %s", dent->d_name);
++              goto out;
++            }
++          if (!glnx_file_copy_at (tree_boot_dfd, dent->d_name, &stbuf,
++                                  bootcsum_dfd, dent->d_name, 0,
++                                  cancellable, error))
++            goto out;
++        }
++    }
++
++
+   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
+     {
+       if (errno != ENOENT)
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
new file mode 100644
index 0000000..960367c
--- /dev/null
+++ b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
@@ -0,0 +1,130 @@
+From 310ddd84dc353d93a2cc118725b459dba643cf0b Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Thu, 21 Apr 2016 16:54:05 +0200
+Subject: [PATCH 3/3] Create firmware convenience symlinks.
+
+Later this could be moved into utils or a similar
+location, if other boot loader backends will need
+this functionality.
+---
+ src/libostree/ostree-bootloader-uboot.c | 97 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 96 insertions(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
+index 9bcde9c..be5e8c5 100644
+--- a/src/libostree/ostree-bootloader-uboot.c
++++ b/src/libostree/ostree-bootloader-uboot.c
+@@ -66,6 +66,100 @@ _ostree_bootloader_uboot_get_name (OstreeBootloader *bootloader)
+   return "U-Boot";
+ }
+ 
++/* It is common for firmware to search / on the boot partition for additional
++ * files that are required for booting. It can be difficult to change this search
++ * logic if it is hardcoded somewhere low in the stack or is in a read-only memory.
++ * This issue can be solved from the OS installer, by creating a symlink in the
++ * following way:
++ *
++ *    cd sysroot/boot
++ *    ln -s loader/second-stage-bootloader second-stage-bootloader
++ *
++ * This function will make sure that loader/second-stage-bootloader points to the
++ * correct target file version. This function does nothing if boot/ does not contain
++ * symlink files pointing into loader/.
++ */
++static gboolean
++create_firmware_convenience_symlinks (OstreeBootloaderUboot     *self,
++                                      char                  *bootcsum_dir,
++                                      int                    bootversion,
++                                      GCancellable          *cancellable,
++                                      GError               **error)
++{
++  gboolean ret = FALSE;
++  glnx_fd_close int loader_dfd = -1;
++  glnx_fd_close int boot_dfd = -1;
++  g_autofree char *loader_dir = NULL;
++  g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
++
++  loader_dir = g_strdup_printf ("boot/loader.%d/", bootversion);
++  if (!glnx_opendirat (self->sysroot->sysroot_fd, loader_dir, FALSE, &loader_dfd, error))
++    goto out;
++  if (!glnx_opendirat (self->sysroot->sysroot_fd, "boot", FALSE, &boot_dfd, error))
++    goto out;
++  if (!glnx_dirfd_iterator_init_take_fd (dup (boot_dfd), &dfd_iter, error))
++    goto out;
++
++  while (TRUE) {
++    struct dirent *dent;
++    struct stat stbuf;
++
++    if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
++      goto out;
++    if (dent == NULL)
++      break;
++
++    if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) != 0)
++      {
++        if (errno == ENOENT)
++          continue;
++        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "fstatat");
++        goto out;
++      }
++
++    if (S_ISLNK(stbuf.st_mode))
++      {
++        char path_buffer[PATH_MAX];
++        g_autofree char *symlink_target = NULL;
++        symlink_target = glnx_readlinkat_malloc (boot_dfd, dent->d_name, cancellable, error);
++
++        if (g_str_has_prefix (symlink_target, "loader/"))
++          {
++            if (g_strcmp0 (dent->d_name, "uEnv.txt") == 0)
++              continue;
++
++            snprintf (path_buffer, sizeof(path_buffer), "%s/%s", bootcsum_dir, dent->d_name);
++            if (faccessat (boot_dfd, path_buffer + 1, F_OK, AT_SYMLINK_NOFOLLOW) == -1)
++              {
++                /* This bootcsum dir does not contain the final target, do nothing. */
++                if (errno == ENOENT)
++                  continue;
++                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "faccessat");
++                goto out;
++              }
++
++            /* In case 'ostree admin cleanup' was not run after an interrupted deployment */
++            if (unlinkat (loader_dfd, dent->d_name, 0) == -1 && errno != ENOENT)
++            {
++              g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "unlinkat");
++              goto out;
++            }
++            /* Complete the link chain to the current boot file version */
++            snprintf (path_buffer, sizeof(path_buffer), "..%s/%s", bootcsum_dir, dent->d_name);
++            if (symlinkat (path_buffer, loader_dfd, dent->d_name) == -1)
++              {
++                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "symlinkat");
++                goto out;
++              }
++          }
++      }
++  }
++
++  ret = TRUE;
++out:
++  return ret;
++}
++
+ static gboolean
+ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+                                         int                    bootversion,
+@@ -130,7 +224,8 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+         }
+     }
+ 
+-  ret = TRUE;
++  ret = create_firmware_convenience_symlinks (self, bootdir, bootversion, cancellable, error);
++
+ out:
+   return ret;
+ }
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
new file mode 100644
index 0000000..480fc21
--- /dev/null
+++ b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
@@ -0,0 +1,40 @@
+From b54643153cade28523cccee44fdddea2c94e0684 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Mon, 25 Apr 2016 13:57:03 +0200
+Subject: [PATCH] Fix --enable_rofiles_fuse=no build
+
+---
+ Makefile.am  | 2 ++
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 488d4b6..e49b7c5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -71,7 +71,9 @@ include Makefile-otutil.am
+ include Makefile-libostree.am
+ include Makefile-ostree.am
+ include Makefile-switchroot.am
++if BUILDOPT_FUSE
+ include src/rofiles-fuse/Makefile-inc.am
++endif
+ include Makefile-tests.am
+ include Makefile-boot.am
+ include Makefile-man.am
+diff --git a/configure.ac b/configure.ac
+index dca9f53..6af60e8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse,
+               [AS_HELP_STRING([--enable-rofiles-fuse],
+                               [generate rofiles-fuse helper [default=yes]])],,
+               enable_rofiles_fuse=yes)
+-AS_IF([ test $enable_rofiles_fuse != xno ], [
++AS_IF([ test x$enable_rofiles_fuse != xno ], [
+     PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
+ ], [enable_rofiles_fuse=no])
+ AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)
+-- 
+2.7.4
+
diff --git a/recipes/ostree/ostree/0004-Mount-boot-partition.patch b/recipes/ostree/ostree/Mount-boot-partition.patch
index a81f731..a81f731 100644
--- a/recipes/ostree/ostree/0004-Mount-boot-partition.patch
+++ b/recipes/ostree/ostree/Mount-boot-partition.patch
diff --git a/recipes/ostree/ostree/0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
index 08855de..501f8d4 100644
--- a/recipes/ostree/ostree/0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
+++ b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
@@ -1,18 +1,24 @@
-From 5ee49772b001b9757d6cb21fcc587d5ddc66cdb7 Mon Sep 17 00:00:00 2001
+From 86184e5a266b087ba222b03141b491241e27e284 Mon Sep 17 00:00:00 2001
 From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 5 Nov 2015 17:39:16 +0100
-Subject: [PATCH 2/2] u-boot: Merge ostree's and systems uEnv.txt
+Date: Thu, 21 Apr 2016 14:28:38 +0200
+Subject: [PATCH 2/3] u-boot: Merge ostree's and systems uEnv.txt
 
-This allows for simpler u-boot scripts and is
-a proper fix for:
+This allow for simpler u-boot scripts and is a proper
+fix for: https://bugzilla.gnome.org/show_bug.cgi?id=755787
 
-https://bugzilla.gnome.org/show_bug.cgi?id=755787
+With this patch admin can now:
+
+1) Edit /usr/lib/ostree-boot/uEnv.txt
+
+2) Download the update to a target. And during the deploy
+   process OSTree will prepend its env (loader/uEnv.txt)
+   to the system's uEnv.txt
 ---
- src/libostree/ostree-bootloader-uboot.c | 42 ++++++++++++++++++++++++++++++---
- 1 file changed, 39 insertions(+), 3 deletions(-)
+ src/libostree/ostree-bootloader-uboot.c | 41 ++++++++++++++++++++++++++++++---
+ 1 file changed, 38 insertions(+), 3 deletions(-)
 
 diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index f67e9bd..be1a40d 100644
+index f67e9bd..9bcde9c 100644
 --- a/src/libostree/ostree-bootloader-uboot.c
 +++ b/src/libostree/ostree-bootloader-uboot.c
 @@ -29,6 +29,10 @@
@@ -34,9 +40,9 @@ index f67e9bd..be1a40d 100644
    g_autoptr(GPtrArray) boot_loader_configs = NULL;
    OstreeBootconfigParser *config;
    const char *val;
-+  g_autofree char *boot_path = NULL;
++  g_autofree char *bootdir = NULL;
 +  g_autoptr(GFile) uenv_file = NULL;
-+  char uenv_path[2048];
++  char uenv_path[PATH_MAX];
  
    if (!_ostree_sysroot_read_boot_loader_configs (self->sysroot, bootversion, &boot_loader_configs,
                                                   cancellable, error))
@@ -54,26 +60,25 @@ index f67e9bd..be1a40d 100644
      }
    g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image=%s", val));
  
-+  boot_path = strndup (val, strlen (val) - strlen ("/vmlinuz"));
-+  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s", boot_path));
++  bootdir = strndup (val, strrchr(val, '/') - val);
++  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s/", bootdir));
 +
    val = ostree_bootconfig_parser_get (config, "initrd");
    if (val)
      g_ptr_array_add (new_lines, g_strdup_printf ("ramdisk_image=%s", val));
-@@ -97,7 +108,32 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+@@ -97,7 +108,31 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
    if (val)
      g_ptr_array_add (new_lines, g_strdup_printf ("bootargs=%s", val));
  
 -  return TRUE;
-+  /* Merge with user's uEnv.txt if it exists */
-+  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", boot_path);
++  /* Append user's uEnv.txt if it exists */
++  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", bootdir);
 +  uenv_file = g_file_get_child (self->sysroot->path, uenv_path);
 +  if (g_file_query_exists (uenv_file, cancellable))
 +    {
 +      g_autoptr(GInputStream) instream = NULL;
 +      g_autoptr(GDataInputStream) datastream = NULL;
 +      gsize len;
-+
 +      instream = (GInputStream*)g_file_read (uenv_file, cancellable, error);
 +      if (!instream)
 +        goto out;
@@ -95,5 +100,5 @@ index f67e9bd..be1a40d 100644
  
  static gboolean
 -- 
-2.1.4
+2.7.4
 
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index a0de5e1..2fb2b60 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -1,27 +1,35 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK"
 PR = "r0"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 
 inherit nativesdk packagegroup
 
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 8d993d9..55394d6 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Packagegroup for B2Qt embedded Linux image"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit packagegroup
@@ -28,7 +36,6 @@ inherit packagegroup
 RDEPENDS_${PN} = "\
         kernel-modules \
         adbd \
-        psplash \
         openssh-sftp-server \
         openssl \
         openssl-misc \
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
index 04a64e7..bb11277 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit packagegroup
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb
index ae9ef68..af291c7 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit packagegroup
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index 13935bd..31e0cb4 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -1,29 +1,38 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK"
 PR = "r0"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 
 inherit packagegroup
+inherit bluetooth
 
 RDEPENDS_${PN} += "\
     packagegroup-core-standalone-sdk-target \
@@ -51,6 +60,6 @@ RDEPENDS_${PN} += "\
     libevent-dev \
     ostree-dev \
     ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \
     ${MACHINE_EXTRA_INSTALL_SDK} \
     "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 3555902..17b278c 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -1,26 +1,34 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image"
-LICENSE = "CLOSED"
+LICENSE = "The-Qt-Company-DCLA-2.1"
 PR = "r0"
 
 inherit packagegroup
@@ -35,5 +43,6 @@ RDEPENDS_${PN} = "\
         ntp \
         connman-client \
         iproute2 \
+        rsync \
         ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
         "
diff --git a/recipes/perf/perf.bbappend b/recipes/perf/perf.bbappend
index c48e88e..487cd41 100644
--- a/recipes/perf/perf.bbappend
+++ b/recipes/perf/perf.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 PERF_FEATURES_ENABLE = "perf-libunwind"
 EXTRA_OEMAKE_remove = "NO_DWARF=1"
diff --git a/recipes/perl/perl_5.%.bbappend b/recipes/perl/perl_5.%.bbappend
index c8ac824..5f4baf7 100644
--- a/recipes/perl/perl_5.%.bbappend
+++ b/recipes/perl/perl_5.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 do_install_append_class-nativesdk () {
     sed -i -e 's|$OECORE_NATIVE_SYSROOT/|${SDKPATHNATIVE}|g' ${D}${bindir}/perl
diff --git a/recipes/psplash/files/qt.png b/recipes/psplash/files/qt.png
deleted file mode 100644
index 99c5d9d..0000000
--- a/recipes/psplash/files/qt.png
+++ /dev/null
diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend
deleted file mode 100644
index aa2c0d5..0000000
--- a/recipes/psplash/psplash_git.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SPLASH_IMAGES = "file://qt.png;outsuffix=default"
-
diff --git a/recipes/python/nativesdk-prebuild-python.bb b/recipes/python/nativesdk-prebuild-python.bb
index f67f634..496f4eb 100644
--- a/recipes/python/nativesdk-prebuild-python.bb
+++ b/recipes/python/nativesdk-prebuild-python.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 LICENSE = "PSFv2"
 
diff --git a/recipes/samba/samba_4.1.12.bbappend b/recipes/samba/samba_4.1.12.bbappend
new file mode 100644
index 0000000..4a86809
--- /dev/null
+++ b/recipes/samba/samba_4.1.12.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DEPENDS += "perl"
+
diff --git a/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
new file mode 100644
index 0000000..ed58b50
--- /dev/null
+++ b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
@@ -0,0 +1,27 @@
+From 6a7105e23d8be76094b90d814eab9135e2cc4b8a Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Tue, 21 Jun 2016 15:26:47 +0200
+Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted
+ mounts too"
+
+This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index fda4d65..3944232 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -337,7 +337,7 @@ static int mount_add_device_links(Mount *m) {
+ 
+         assert(m);
+ 
+-        p = get_mount_parameters(m);
++        p = get_mount_parameters_fragment(m);
+         if (!p)
+                 return 0;
+ 
+-- 
+2.7.4
+
diff --git a/recipes/systemd/systemd_%.bbappend b/recipes/systemd/systemd_%.bbappend
index 87b998b..0877135 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/recipes/systemd/systemd_%.bbappend
@@ -1,25 +1,44 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"
 
 do_install_append() {
     # remove login from tty1
     rm -f ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
 }
+
+do_verify_patch_required() {
+    if [ -n "$(cat ${S}/NEWS | grep "CHANGES WITH 229")" ]; then
+        bbwarn "systemd: The 0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch patch is not required anymore."
+    fi
+}
+
+addtask do_verify_patch_required after do_fetch before do_configure
diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend
index b1696e6..bb44f9f 100644
--- a/recipes/udev/udev_182.bbappend
+++ b/recipes/udev/udev_182.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend
index 0a967ad..bf72dee 100644
--- a/recipes/v86d/v86d_0.1.10.bbappend
+++ b/recipes/v86d/v86d_0.1.10.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/recipes/virtualbox/mount-vboxsf_4.3.30.bb b/recipes/virtualbox/mount-vboxsf_4.3.30.bb
index 73dd40c..71b7595 100644
--- a/recipes/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/recipes/virtualbox/mount-vboxsf_4.3.30.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "VirtualBox Guest Additions for Linux: mount"
 LICENSE = "GPLv2"
diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb b/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb
index d1b3347..6fa6963 100644
--- a/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb
+++ b/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 DESCRIPTION = "Kernel drivers for the VirtualBox guest additions"
 LICENSE = "GPLv2"
diff --git a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch
deleted file mode 100644
index 9e5fe4d..0000000
--- a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The wayland-scanner built for the nativesdk cannot be run during the build,
-so instead use the wayland-scanner from native build.
-
-Upstream-Status: Pending
-
-Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
----
- Makefile.am | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/Makefile.am b/Makefile.am
-index c15d8b8..45f7133 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -62,7 +62,7 @@ nodist_libwayland_client_la_SOURCES =         \
- pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
- 
- if ENABLE_SCANNER
--wayland_scanner = $(top_builddir)/wayland-scanner
-+wayland_scanner = wayland-scanner
- bin_PROGRAMS = wayland-scanner
- wayland_scanner_SOURCES = src/scanner.c
- wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
--- 
-1.9.1
-
diff --git a/recipes/wayland/wayland_1.%.bbappend b/recipes/wayland/wayland_1.%.bbappend
deleted file mode 100644
index 4497942..0000000
--- a/recipes/wayland/wayland_1.%.bbappend
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_class-nativesdk = " \
-    file://disable-macro-checks-not-used-for-scanner.patch \
-    file://0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch \
-    "
-
-EXTRA_OECONF_class-nativesdk = "--disable-documentation --enable-scanner"
-DEPENDS_class-nativesdk = "libffi-nativesdk wayland-native"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/wayland/weston/0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch b/recipes/wayland/weston/0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch
deleted file mode 100644
index 1bb9253..0000000
--- a/recipes/wayland/weston/0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c4633014fff25d32926129a8b028124c6338bb2b Mon Sep 17 00:00:00 2001
-From: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
-Date: Wed, 19 Aug 2015 09:04:46 +0300
-Subject: [PATCH 1/1] Adapt changes made in libinput/src/evdev.c for touch
- frame emission.
-
----
- src/evdev.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 888dfbd..daa5d72 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -359,12 +359,36 @@ evdev_process_absolute(struct evdev_device *device,
-        }
- }
- 
-+static inline int
-+evdev_need_touch_frame(struct evdev_device *device)
-+{
-+       if (!(device->seat_caps & EVDEV_SEAT_TOUCH))
-+               return 0;
-+
-+       switch (device->pending_event) {
-+       case EVDEV_NONE:
-+       case EVDEV_RELATIVE_MOTION:
-+               break;
-+       case EVDEV_ABSOLUTE_MT_DOWN:
-+       case EVDEV_ABSOLUTE_MT_MOTION:
-+       case EVDEV_ABSOLUTE_MT_UP:
-+       case EVDEV_ABSOLUTE_TOUCH_DOWN:
-+       case EVDEV_ABSOLUTE_TOUCH_UP:
-+       case EVDEV_ABSOLUTE_MOTION:
-+               return 1;
-+       }
-+
-+       return 0;
-+}
-+
- static void
- fallback_process(struct evdev_dispatch *dispatch,
-                 struct evdev_device *device,
-                 struct input_event *event,
-                 uint32_t time)
- {
-+       int need_frame = 0;
-+
-        switch (event->type) {
-        case EV_REL:
-                evdev_process_relative(device, event, time);
-@@ -376,7 +400,10 @@ fallback_process(struct evdev_dispatch *dispatch,
-                evdev_process_key(device, event, time);
-                break;
-        case EV_SYN:
-+               need_frame = evdev_need_touch_frame(device);
-                evdev_flush_pending_event(device, time);
-+               if (need_frame)
-+                       notify_touch_frame(device->seat);
-                break;
-        }
- }
--- 
-2.1.4
-
diff --git a/recipes/wayland/weston_1.%.bbappend b/recipes/wayland/weston_1.%.bbappend
deleted file mode 100644
index 6e91467..0000000
--- a/recipes/wayland/weston_1.%.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " \
-file://0001-Adapt-changes-made-in-libinput-src-evdev.c-for-touch.patch \
-"
-
diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend
index 34df95e..e880897 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend
+++ b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 do_install_append () {
     install -d ${D}${includedir}/wpa-supplicant
diff --git a/recipes/x264/x264_git.bbappend b/recipes/x264/x264_git.bbappend
index 0e0e10a..128563a 100644
--- a/recipes/x264/x264_git.bbappend
+++ b/recipes/x264/x264_git.bbappend
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 # Workaround: at the sha version defined by tibidabo, the x264 recipe
 # defines a nonexisting SRCREV sha.
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index d3502ba..0b56d53 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -1,24 +1,32 @@
 #!/bin/bash
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 while test -n "$1"; do
   case "$1" in
diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index 1044d2a..22fd7ce 100755
--- a/scripts/configure-qtcreator.sh
+++ b/scripts/configure-qtcreator.sh
@@ -1,24 +1,32 @@
 #!/bin/bash
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 set -e
 
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 973aa69..ad454d1 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -11,45 +11,46 @@
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
   <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
+  <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
   <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
-           revision="c9f0a99050ec0050f0dbcd55d0cd2ab18848113f"
+           revision="40376446904ae3529be41737fed9a0b650ed167d"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="902964a4da26e46018d2a8d17dcdda1ac4627a39"
+           revision="8ab04afbffb4bc5184cfe0655049de6f44269990"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="8d3770b5fe81d13212d84151664ceb080fc60302"
+           revision="9955f170ad32bc8d6915d1dc2b6b19a8181a6363"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="0cfd9b1a41b38a2f7c1cfcbc2abe046e3737ae31"/>
+           revision="bf2d66bbb26afbf4c22744af925daa53f61d98e1"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="c9f259a4bf8472dfa3ff75f1c3fcbe5e0ded7aaf"
+           revision="c9e576bdae8c481f5a836531c7865fe8b8a5a36f"
            path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
+           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="0a222c70845d19a2213ac36803361e8531768cca"
+           revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
            path="sources/meta-ti"
            groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="a42a1706de91ed03ae8798c7f9e70c30cebcf7de"
+           revision="e82417d33b8147f65141ef937d56735d80ee7207"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="b292f6204912ace18e30b7683748a311c5dfa780"
+           revision="dd074c47af53948041f6c5671e519fbf815b0980"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -59,7 +60,7 @@
            groups="notdefault,external,bbb"/>
   <project name="meta-toradex"
            remote="toradex"
-           revision="eca5937408c75a997b160bd1b92e1496b07421cf"
+           revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
            path="sources/meta-toradex"
            groups="notdefault,external,toradex"/>
   <project name="meta-tibidabo"
@@ -69,25 +70,40 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="29a1746ea844e1d99571cbf5533f0ff581191b16"
+           revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
            path="sources/meta-intel"
-           groups="notdefault,external,nuc"/>
+           groups="notdefault,external,intel"/>
+  <project name="meta-renesas"
+           remote="yocto"
+           revision="b7843bd6a2835e5199cab9ba196c5e67b15acaed"
+           path="sources/meta-renesas"
+           groups="notdefault,external,renesas"/>
 
-  <project name="meta-tegra"
+  <project name="nvidia-layer"
            remote="playground"
-           revision="3125d29a5c58a471b67104d1bff965df38eb3115"
-           path="sources/meta-tegra"
+           revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7"
+           path="sources/nvidia-layer"
            groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
            path="sources/jetson-tk1-pro"
            groups="notdefault,internal"/>
+  <project name="vibrante-t186"
+           remote="playground"
+           revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f"
+           path="sources/vibrante-t186"
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
-           revision="2c09deaa156df5ec8613806d6f659bc1fa89e123"
+           revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
            path="sources/meta-smx6"
            groups="notdefault,internal"/>
+  <project name="renesas-rcar-gen2"
+           remote="playground"
+           revision="93b2464ca1c6200a1bdf2afcabac0c2c7e9bdf6d"
+           path="sources/renesas-rcar-gen2"
+           groups="notdefault,internal"/>
 
 </manifest>
 
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_jethro.xml
index 7a618e5..829ffcb 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_jethro.xml
@@ -17,29 +17,29 @@
 
   <project name="poky"
            remote="yocto"
-           revision="fido"
+           revision="jethro"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="master-mingw"
+           revision="5.7"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="fido"/>
+           revision="jethro"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
+           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="fido"
+           revision="master"
            path="sources/meta-ti"
            groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
@@ -49,7 +49,7 @@
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -69,25 +69,40 @@
            groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
-           revision="fido"
+           revision="jethro"
            path="sources/meta-intel"
-           groups="notdefault,external,nuc"/>
+           groups="notdefault,external,intel"/>
+  <project name="meta-renesas"
+           remote="yocto"
+           revision="master"
+           path="sources/meta-renesas"
+           groups="notdefault,external,renesas"/>
 
-  <project name="meta-tegra"
+  <project name="nvidia-layer"
            remote="playground"
            revision="master"
-           path="sources/meta-tegra"
+           path="sources/nvidia-layer"
            groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="master"
            path="sources/jetson-tk1-pro"
            groups="notdefault,internal"/>
+  <project name="vibrante-t186"
+           remote="playground"
+           revision="master"
+           path="sources/vibrante-t186"
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="fido"
            path="sources/meta-smx6"
            groups="notdefault,internal"/>
+  <project name="renesas-rcar-gen2"
+           remote="playground"
+           revision="master"
+           path="sources/renesas-rcar-gen2"
+           groups="notdefault,internal"/>
 
 </manifest>
 
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 56aadc0..5ee1ad0 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -1,24 +1,32 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 while test -n "$1"; do
   case "$1" in
@@ -48,10 +56,10 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
-    apalis-imx6|colibri-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)
@@ -66,15 +74,21 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     beaglebone)
       LAYERSCONF="bblayers.conf.bbb.sample"
     ;;
-    raspberrypi|raspberrypi2)
+    raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
-    nuc)
-      LAYERSCONF="bblayers.conf.nuc.sample"
+    intel-corei7-64)
+      LAYERSCONF="bblayers.conf.intel.sample"
     ;;
     nvidia-logan)
       LAYERSCONF="bblayers.conf.nvidia-logan.sample"
     ;;
+    tegra-x1|tegra-t18x)
+      LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
+    ;;
+    alt|gose|koelsch|lager|porter|silk|stout)
+      LAYERSCONF="bblayers.conf.rcar-gen2.sample"
+    ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
     ;;
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index 824cb3e..d4087c3 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -1,24 +1,32 @@
 #!/bin/bash
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 if [ $# -ne 1 ]; then
     echo "Usage: $0 <qt5.git>"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 2a87217..96189ea 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -1,29 +1,37 @@
 #!/bin/sh
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## Commercial License Usage
 ## Licensees holding valid commercial Qt licenses may use this file in
 ## accordance with the commercial license agreement provided with the
 ## Software or, alternatively, in accordance with the terms contained in
 ## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 set -x
 set -e
 
-RELEASE=5.6
+RELEASE=5.7
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
 if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then
@@ -33,10 +41,11 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif [ ${MACHINE} == "nvidia-logan" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
+elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \
+    && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
-    $PWD/tmp/deploy/images/${MACHINE}/zImage
+    $PWD/tmp/deploy/images/${MACHINE}/*Image
 fi
 
 if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then