From 344c2f97025c6504ec986600498121bb83aaeb8f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 2 Mar 2018 13:08:39 +0200 Subject: 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 --- .../recipes-bsp/alsa/alsa-state.bbappend | 30 +++++++++++++++++ .../alsa/alsa-state/emulator/asound.conf | 4 +++ .../alsa/alsa-state/raspberrypi/asound.conf | 9 +++++ meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup | 3 ++ .../recipes-bsp/v86d/v86d/uvesafb.options.conf | 1 + .../recipes-bsp/v86d/v86d_0.1.10.bbappend | 39 ++++++++++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend create mode 100644 meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf create mode 100644 meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf create mode 100755 meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup create mode 100644 meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf create mode 100644 meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend (limited to 'meta-boot2qt-distro/recipes-bsp') diff --git a/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.bbappend new file mode 100644 index 0000000..dbeb030 --- /dev/null +++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state.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$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf new file mode 100644 index 0000000..edd2e82 --- /dev/null +++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/emulator/asound.conf @@ -0,0 +1,4 @@ +pcm.!default { + type plug + slave.pcm "dmix" +} diff --git a/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf new file mode 100644 index 0000000..83f7f9a --- /dev/null +++ b/meta-boot2qt-distro/recipes-bsp/alsa/alsa-state/raspberrypi/asound.conf @@ -0,0 +1,9 @@ +pcm.!default { + type hw + card 0 +} + +ctl.!default { + type hw + card 0 +} diff --git a/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup new file mode 100755 index 0000000..064e080 --- /dev/null +++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/fbsetup @@ -0,0 +1,3 @@ +#!/bin/sh + +/sbin/modprobe uvesafb mode_option=800x600-32 mtrr=3 scroll=ywrap diff --git a/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf new file mode 100644 index 0000000..7d0dc96 --- /dev/null +++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d/uvesafb.options.conf @@ -0,0 +1 @@ +options uvesafb mode_option=800x600-32 mtrr=3 scroll=ywrap diff --git a/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend b/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend new file mode 100644 index 0000000..bf72dee --- /dev/null +++ b/meta-boot2qt-distro/recipes-bsp/v86d/v86d_0.1.10.bbappend @@ -0,0 +1,39 @@ +############################################################################ +## +## 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://uvesafb.options.conf" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 ${WORKDIR}/uvesafb.options.conf ${D}${sysconfdir}/modprobe.d/uvesafb.conf + fi +} -- cgit v1.2.3-54-g00ecf