Commit 22dd2dc2 authored by Marko Saukko's avatar Marko Saukko

Drop boardname support from ssu.

[ssu] Drop boardname support from ssu. Fixes JB#22308

Boardname has not been used in a long time and all other components
dropped the support months ago. After dropping this from ssu the
boardname package is no longer installed to the images and executed
during startup etc.
Signed-off-by: default avatarMarko Saukko <marko.saukko@jolla.com>
parent 9d6b9ea9
......@@ -13,10 +13,6 @@
#
# Valid categories for determining the model:
# - file.exists -- checks for existince of a file in the filesystem
# - boardname.equals -- compares with boardname
# - boardname.contains -- searches for substring in boardname
# NOTE: only use boardname if none of the other options match
# use the boardname command to set/check the current value
# - hwrelease.device -- Compares MER_HA_DEVICE in /etc/hw-release
# - cpuinfo.contains -- searches /proc/cpuinfo for a string
# - uname-release.contains -- searches the kernels release string for
......
......@@ -29,7 +29,7 @@ SOURCES = \
CONFIG += link_pkgconfig
QT += network xml dbus
PKGCONFIG += libsystemd-journal boardname libshadowutils
PKGCONFIG += libsystemd-journal libshadowutils
install_headers.files = $${public_headers}
......
......@@ -15,10 +15,6 @@
#include <sys/utsname.h>
extern "C" {
#include <boardname.h>
}
#include "sandbox_p.h"
#include "ssudeviceinfo.h"
#include "ssucoreconfig.h"
......@@ -157,7 +153,6 @@ QString SsuDeviceInfo::deviceModel(){
QDir dir;
QFile procCpuinfo;
QStringList keys;
QStringList sections;
if (!cachedModel.isEmpty())
return cachedModel;
......@@ -176,33 +171,6 @@ QString SsuDeviceInfo::deviceModel(){
boardMappings->endGroup();
if (!cachedModel.isEmpty()) return cachedModel;
// check if boardname matches/contains
QString boardName(getboardname());
boardName = boardName.trimmed();
sections.clear();
sections << "boardname.equals" << "boardname.contains";
foreach (const QString &section, sections){
boardMappings->beginGroup(section);
keys = boardMappings->allKeys();
foreach (const QString &key, keys){
QString value = boardMappings->value(key).toString();
if (section.endsWith(".contains")){
if (boardName.contains(value)){
cachedModel = key;
break;
}
} else if (section.endsWith(".equals")){
if (boardName == value){
cachedModel = key;
break;
}
}
}
boardMappings->endGroup();
if (!cachedModel.isEmpty()) break;
}
if (!cachedModel.isEmpty()) return cachedModel;
// check if the device can be identified by a string in /proc/cpuinfo
procCpuinfo.setFileName(Sandbox::map("/proc/cpuinfo"));
procCpuinfo.open(QIODevice::ReadOnly | QIODevice::Text);
......
Name: ssu
Version: 0.39.6
Version: 0.40.5
Release: 1
Summary: SSU enabler for RND
Group: System/Base
License: GPLv2
Source0: %{name}-%{version}.tar.gz
URL: https://github.com/nemomobile/ssu
BuildRequires: pkgconfig(boardname)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment