diff options
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r-- | meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/files/0001-mconf-menuconfig.patch | 48 | ||||
-rw-r--r-- | meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/files/0001-mconf-menuconfig.patch b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/files/0001-mconf-menuconfig.patch new file mode 100644 index 000000000..3dc71ff22 --- /dev/null +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/files/0001-mconf-menuconfig.patch @@ -0,0 +1,48 @@ +From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Mon, 2 Jul 2018 23:10:28 -0400 +Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location + +In some cross build environments such as the Yocto Project build +environment it provides an ncurses library that is compiled +differently than the host's version. This causes display corruption +problems when the host's curses includes are used instead of the +includes from the provided compiler are overridden. There is a second +case where there is no curses libraries at all on the host system and +menuconfig will just fail entirely. + +The solution is simply to allow an override variable in +check-lxdialog.sh for environments such as the Yocto Project. Adding +a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing +compiling and linking against the right headers and libraries. + +Signed-off-by: Jas /*
* Copyright (C) 2016 The Qt Company Ltd.
* Copyright (C) 2019 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import QtQuick 2.11
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.4
import AGL.Demo.Controls 1.0
import ".."
SettingPage {
id: root
icon: '/wired/images/HMI_Settings_WiredIcon.svg'
title: 'Wired'
readonly property bool isWired: true
Component {
id: wiredDevice
MouseArea {
height: 120
width: ListView.view.width
Column {
anchors.left: parent.left
anchors.leftMargin: 5
id: networkName
Label {
id: networkNameText
text: service
color: '#66FF99'
font.pixelSize: 38
font.bold: sstate === "ready"
|| sstate === "online"
}
Label {
visible: sstate === "ready"
|| sstate === "online"
text: "connected, " + address
font.pixelSize: 18
color: "white"
}
}
Column {
anchors.left: networkName.right
anchors.leftMargin: 50
Button {
visible: sstate === "ready"
|| sstate === "online"
font.pixelSize: 18
text: "CONFIGURE"
onClicked: {
customconf.activeStatic = Qt.binding(function() { return (sroute[0] === "dhcp")? false : true })
customconf.activeAddress = Qt.binding(function() { return sroute[1]? sroute[1] : "0.0.0.0" })
customconf.activeNetmask = Qt.binding(function() { return sroute[2]? sroute[2] : "255.255.255.255" })
customconf.activeGateway = Qt.binding(function() { return sroute[3]? sroute[3] : "0.0.0.0" })
customconf.activeManualNS = Qt.binding(function() { return (nservers[0] === "auto")? false : true })
customconf.activeNSList = Qt.binding(function() { return nservers[1]? nservers[1] : "0.0.0.0" })
customconf.open()
}
ConfigDialog {
id: customconf
parent: Overlay.overlay
maxpwidth: 744
maxpheight: 744
xpos: (parent.width - maxpwidth)/2
ypos: (parent.height - maxpheight)
serviceName: service
activeAddress: address
activeNetmask: sroute[2]
activeGateway: sroute[3]
activeStatic: false
activeManualNS: false
activeNSList: nservers[1]
onFinished: {
if (!((sroute[0] === newaa[0]) &&
(sroute[1] === newaa[1]) &&
(sroute[2] === newaa[2]) &&
(sroute[3] === newaa[3]))) {
network.configureAddress(svc, newaa);
}
if (!((nservers[0] === newna[0]) &&
(nservers[1] === newna[1]))) {
network.configureNameServer(svc, newna);
}
}
}
}
}
onClicked: {
if ((sstate === "ready") || (sstate === "online")) {
console.log("Disconnecting from ->", service)
networkNameText.font.italic = 1
network.disconnect(service)
} else {
console.log("Connecting to ->", service)
networkNameText.font.italic = 1
network.connect(service)
}
}
Image {
source: '../images/HMI_Settings_DividingLine.svg'
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: -15
visible: model.index > 0
}
}
}
ListView {
id: view
anchors.fill: parent
anchors.margins: 100
model: WiredNetworkModel
delegate: wiredDevice
clip: true
}
Connections {
target: network
onInputRequest: {
console.log("Only unauthenticated access implemented for wired")
}
}
}
|