diff options
author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-08-01 15:59:20 +0200 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-08-03 08:47:19 +0000 |
commit | 2f17ab34687ef100c4390057dd220ab431ec8ff8 (patch) | |
tree | 9487be388f0a6f1bd42327d1bf2ca44b338026ac | |
parent | 61d26a79857a51d80b273fecabad24fbd288d5b9 (diff) |
Add libnss-mdns
We need mdns to resolve .local while testing qt network stack in CI.
Otherwise the tests would not see announced services.
Relates to qt/qtbase 5c5af7155ae989664919de1f10ac17121fa12a36
and qt/qt5 e99fe6b35439577318916ba2d8b28a2d6be2cdfc.
Change-Id: I480f457f4b39876788ed2e00f6fdcc0a72bfe90f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | meta-boot2qt-distro/conf/distro/include/ci.inc | 30 | ||||
-rw-r--r-- | meta-boot2qt-distro/conf/distro/include/qemuarm64.conf | 30 | ||||
-rw-r--r-- | meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf | 30 |
3 files changed, 90 insertions, 0 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/ci.inc b/meta-boot2qt-distro/conf/distro/include/ci.inc new file mode 100644 index 00000000..f6e3fd7f --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/ci.inc @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +MACHINE_EXTRA_INSTALL += "libnss-mdns" diff --git a/meta-boot2qt-distro/conf/distro/include/qemuarm64.conf b/meta-boot2qt-distro/conf/distro/include/qemuarm64.conf new file mode 100644 index 00000000..a7ed5142 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/qemuarm64.conf @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +include conf/distro/include/ci.inc diff --git a/meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf b/meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf new file mode 100644 index 00000000..a7ed5142 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +include conf/distro/include/ci.inc |