72 files changed, 1267 insertions, 883 deletions
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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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.service network-pre.target
- After=dbus.socket
+ Before=network.target remote-fs-pre.target
- Before=remote-fs.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..dbd6fcd
--- /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 start
+ExecStop=/usr/bin/dbus-session.init stop
+Environment=HOME=/home/root
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index 6905df3..f9f1345 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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 \
+    ${systemd_unitdir}/system/dbus-session.service \
    "
 do_install_append_class-target() {
+    sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init
    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 ${D}${sysconfdir}/init.d/dbus-session
-        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 ${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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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 7caf8ec..c868329 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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://Fix-enable_rofiles_fuse-no-build.patch \
-    file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
+    file://Mount-boot-partition.patch \
-    file://0003-Allow-updating-files-in-root-of-boot.patch \
+    file://Allow-updating-files-in-the-boot-directory.patch \
-    file://0004-Mount-boot-partition.patch \
+    file://u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
-    file://0005-Do-not-use-grub2-mkconfig.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
+Date: Thu, 21 Apr 2016 14:28:38 +0200
-Subject: [PATCH 2/2] u-boot: Merge ostree's and systems uEnv.txt
+Subject: [PATCH 2/3] u-boot: Merge ostree's and systems uEnv.txt
-This allows for simpler u-boot scripts and is
+This allow for simpler u-boot scripts and is a proper
-a proper fix for:
+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 ++++++++++++++++++++++++++++++---
+ src/libostree/ostree-bootloader-uboot.c | 41 ++++++++++++++++++++++++++++++---
- 1 file changed, 39 insertions(+), 3 deletions(-)
+ 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"));
+  bootdir = strndup (val, strrchr(val, '/') - val);
-+  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s", boot_path));
+  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 */
+  /* Append user's uEnv.txt if it exists */
-+  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", boot_path);
+  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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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..0e77368 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend
index aa2c0d5..0cbff06 100644
--- a/recipes/psplash/psplash_git.bbappend
+++ b/recipes/psplash/psplash_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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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/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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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
+## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## 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.