From e630a1db10a1539f2a4152cad5b0fb1231bc94d3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 24 Aug 2017 16:25:38 +0300 Subject: intel: apply kernel configs for correct recipe Change-Id: Ief6c873061fdff0e5628e69dbf76f33b9837a8a1 Reviewed-by: Mikko Gronoff --- .../recipes/linux/linux-intel/b2qt.cfg | 1 + .../recipes/linux/linux-intel/wlan-realtek.cfg | 9 ++++++ .../recipes/linux/linux-intel_%.bbappend | 34 ++++++++++++++++++++++ .../recipes/linux/linux-yocto/b2qt.cfg | 1 - .../recipes/linux/linux-yocto/wlan-realtek.cfg | 9 ------ .../recipes/linux/linux-yocto_4.%.bbappend | 34 ---------------------- 6 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg create mode 100644 meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg create mode 100644 meta-intel-extras/recipes/linux/linux-intel_%.bbappend delete mode 100644 meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg delete mode 100644 meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg delete mode 100644 meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend diff --git a/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg b/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg new file mode 100644 index 0000000..7902798 --- /dev/null +++ b/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg @@ -0,0 +1 @@ +CONFIG_HID_MULTITOUCH=m diff --git a/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg new file mode 100644 index 0000000..65ac248 --- /dev/null +++ b/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg @@ -0,0 +1,9 @@ +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_DEBUG=n +CONFIG_RTL8723AE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8192CU=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8188EE=m diff --git a/meta-intel-extras/recipes/linux/linux-intel_%.bbappend b/meta-intel-extras/recipes/linux/linux-intel_%.bbappend new file mode 100644 index 0000000..a61cf4d --- /dev/null +++ b/meta-intel-extras/recipes/linux/linux-intel_%.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://wlan-realtek.cfg \ + file://b2qt.cfg \ + " diff --git a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg b/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg deleted file mode 100644 index 7902798..0000000 --- a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HID_MULTITOUCH=m diff --git a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg deleted file mode 100644 index 65ac248..0000000 --- a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_DEBUG=n -CONFIG_RTL8723AE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8192CU=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8188EE=m diff --git a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend deleted file mode 100644 index a61cf4d..0000000 --- a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://wlan-realtek.cfg \ - file://b2qt.cfg \ - " -- cgit v1.2.3-54-g00ecf