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 /meta-boot2qt-distro/conf | |
parent | 61d26a79857a51d80b273fecabad24fbd288d5b9 (diff) | |
download | meta-boot2qt-2f17ab34687ef100c4390057dd220ab431ec8ff8.tar.gz |
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>
Diffstat (limited to 'meta-boot2qt-distro/conf')
-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 0000000..f6e3fd7 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/ci.inc | |||
@@ -0,0 +1,30 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2018 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | 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 0000000..a7ed514 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/qemuarm64.conf | |||
@@ -0,0 +1,30 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2018 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | 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 0000000..a7ed514 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf | |||
@@ -0,0 +1,30 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2018 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | include conf/distro/include/ci.inc | ||