Split meta-boot2qt layer

Move distro specific recipes to own layer and leave only new recipes
and bbclasses to meta-boot2qt layer. This makes it easier to include
meta-boot2qt to your own distro layer to get access e.g., QDB and
QBSP recipes that might be useful even without boot2qt distro.

Task-number: QTBUG-65871
Change-Id: I6c353774dd1668b00f2d05aa262ad866b90bdef6
Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>

8 files changed, 280 insertions, 0 deletions

diff --git a/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend
new file mode 100644
index 0000000..06dc61d
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf.bbappend
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2017 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}:"
+
+CONNMAN_SETTINGS_DIR := "${localstatedir}/lib/connman"
+
+FILES_${PN} += "${CONNMAN_SETTINGS_DIR}/settings"
+
+SRC_URI += "file://settings \
+          "
+
+do_install_append() {
+    install -d ${D}/${CONNMAN_SETTINGS_DIR}
+    install -m 0644 ${WORKDIR}/settings ${D}/${CONNMAN_SETTINGS_DIR}/settings
+}
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings
new file mode 100644
index 0000000..edfedd4
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/connman-conf/connman-conf/settings
@@ -0,0 +1,5 @@
+[global]
+OfflineMode=false
+
+[Gadget]
+Enable=true
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
new file mode 100644
index 0000000..fda246a
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
@@ -0,0 +1,24 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch"
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
new file mode 100644
index 0000000..f893746
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
@@ -0,0 +1,21 @@
+From df70770f33280a915abb413678088a078d82341a 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
+
+---
+ src/connman.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/connman.service.in b/src/connman.service.in
+index 09dfec9..4132cf7 100644
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
+ After=dbus.service network-pre.target systemd-sysusers.service
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
++ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
new file mode 100644
index 0000000..8b46666
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
@@ -0,0 +1,11 @@
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -7,6 +7,7 @@
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
+ Conflicts=systemd-resolved.service
++ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus
+
diff --git a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
new file mode 100644
index 0000000..9aa9648
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
@@ -0,0 +1,96 @@
+From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 9 Sep 2015 13:37:28 +0300
+Subject: [PATCH] Support SYSROOT in c_rehash
+
+update-ca-certificates is ran during image creation, which in turn runs
+c_rehash. Since the symlinks in /etc/ssl/certs/ are pointing to absolute
+location, c_rehash does not find the actual files. Add support for SYSROOT
+environment variable and use it to locate the actual files during image
+creation.
+
+Upstream-status: Pending
+---
+ tools/c_rehash.in | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index 92cb503..f3d2703 100644
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
+@@ -7,6 +7,7 @@ my $dir;
+ my $prefix;
+ 
+ my $openssl = $ENV{OPENSSL} || "openssl";
++my $sysroot = $ENV{SYSROOT} || "";
+ my $pwd;
+ my $verbose = 0;
+ my $symlink_exists=eval {symlink("",""); 1};
+@@ -101,16 +102,17 @@ sub hash_dir {
+                }
+        }
+        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
++               $fullname = $sysroot . readlink($fname);
+                # Check to see if certificates and/or CRLs present.
+-               my ($cert, $crl) = check_file($fname);
++               my ($cert, $crl) = check_file($fullname);
+                if(!$cert && !$crl) {
+                        print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
+                        next;
+                }
+-               link_hash_cert($fname) if($cert);
+-               link_hash_cert_old($fname) if($cert);
+-               link_hash_crl($fname) if($crl);
+-               link_hash_crl_old($fname) if($crl);
++               link_hash_cert($fname, $fullname) if($cert);
++               link_hash_cert_old($fname, $fullname) if($cert);
++               link_hash_crl($fname, $fullname) if($crl);
++               link_hash_crl_old($fname, $fullname) if($crl);
+        }
+ }
+ 
+@@ -143,9 +145,10 @@ sub check_file {
+ 
+ sub link_hash_cert {
+                my $fname = $_[0];
+-               my $x509hash = $_[1] || '-subject_hash';
+-               $fname =~ s/'/'\\''/g;
+-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
++               my $fullname = $_[1];
++               my $x509hash = $_[2] || '-subject_hash';
++               $fullname =~ s/'/'\\''/g;
++               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
+                chomp $hash;
+                chomp $fprint;
+                $fprint =~ s/^.*=//;
+@@ -176,11 +179,11 @@ sub link_hash_cert {
+ }
+ 
+ sub link_hash_cert_old {
+-               link_hash_cert($_[0], '-subject_hash_old');
++               link_hash_cert($_[0], $_[1], '-subject_hash_old');
+ }
+ 
+ sub link_hash_crl_old {
+-               link_hash_crl($_[0], '-hash_old');
++               link_hash_crl($_[0], $_[1], '-hash_old');
+ }
+ 
+ 
+@@ -188,9 +191,10 @@ sub link_hash_crl_old {
+ 
+ sub link_hash_crl {
+                my $fname = $_[0];
+-               my $crlhash = $_[1] || "-hash";
+-               $fname =~ s/'/'\\''/g;
+-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
++               my $fullname = $_[1];
++               my $crlhash = $_[2] || "-hash";
++               $fullname =~ s/'/'\\''/g;
++               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
+                chomp $hash;
+                chomp $fprint;
+                $fprint =~ s/^.*=//;
+-- 
+1.9.1
+
diff --git a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
new file mode 100644
index 0000000..bac366d
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
@@ -0,0 +1,34 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch"
+
+PACKAGECONFIG += "perl"
+
diff --git a/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend b/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
new file mode 100644
index 0000000..e880897
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend
@@ -0,0 +1,47 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_install_append () {
+    install -d ${D}${includedir}/wpa-supplicant
+
+    install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/
+
+    install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/
+    install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/
+}
+
+FILES_${PN}-dev += "${includedir}/wpa-supplicant/*"
+