diff --git a/.gitignore b/.gitignore index a3d254f..9cf57a4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ doc/latex /rndssucli/ssuproxy.cpp /rndssucli/ssuproxy.h /.nodocs +ssucli/ssuproxy.h diff --git a/board-mappings.ini b/board-mappings.ini index a6553b9..295a94f 100644 --- a/board-mappings.ini +++ b/board-mappings.ini @@ -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 diff --git a/libssu/libssu.pro b/libssu/libssu.pro index e712653..667f9b3 100644 --- a/libssu/libssu.pro +++ b/libssu/libssu.pro @@ -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} diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp index a3029a1..8de63fd 100644 --- a/libssu/ssudeviceinfo.cpp +++ b/libssu/ssudeviceinfo.cpp @@ -15,10 +15,6 @@ #include -extern "C" { -#include -} - #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 §ion, 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); diff --git a/rpm/ssu.spec b/rpm/ssu.spec index 194f70e..f7e1e67 100644 --- a/rpm/ssu.spec +++ b/rpm/ssu.spec @@ -1,12 +1,11 @@ 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) diff --git a/ssucli/ssuproxy.h b/ssucli/ssuproxy.h deleted file mode 100644 index ae61d07..0000000 --- a/ssucli/ssuproxy.h +++ /dev/null @@ -1,178 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -c SsuProxy -p ssucli/ssuproxy.h:ssucli/ssuproxy.cpp dbus/org.nemo.ssu.xml - * - * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - * - * This is an auto-generated file. - * Do not edit! All changes made to it will be lost. - */ - -#ifndef SSUPROXY_H_1383958410 -#define SSUPROXY_H_1383958410 - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Proxy class for interface org.nemo.ssu - */ -class SsuProxy: public QDBusAbstractInterface -{ - Q_OBJECT -public: - static inline const char *staticInterfaceName() - { return "org.nemo.ssu"; } - -public: - SsuProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - - ~SsuProxy(); - -public Q_SLOTS: // METHODS - inline QDBusPendingReply<> addRepo(const QString &repo, const QString &url) - { - QList argumentList; - argumentList << QVariant::fromValue(repo) << QVariant::fromValue(url); - return asyncCallWithArgumentList(QLatin1String("addRepo"), argumentList); - } - - inline QDBusPendingReply deviceFamily() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("deviceFamily"), argumentList); - } - - inline QDBusPendingReply deviceMode() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("deviceMode"), argumentList); - } - - inline QDBusPendingReply deviceModel() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("deviceModel"), argumentList); - } - - inline QDBusPendingReply deviceUid() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("deviceUid"), argumentList); - } - - inline QDBusPendingReply deviceVariant() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("deviceVariant"), argumentList); - } - - inline QDBusPendingReply displayName(int type) - { - QList argumentList; - argumentList << QVariant::fromValue(type); - return asyncCallWithArgumentList(QLatin1String("displayName"), argumentList); - } - - inline QDBusPendingReply error() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("error"), argumentList); - } - - inline QDBusPendingReply flavour() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("flavour"), argumentList); - } - - inline QDBusPendingReply isRegistered() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("isRegistered"), argumentList); - } - - inline QDBusPendingReply lastError() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("lastError"), argumentList); - } - - inline QDBusPendingReply<> modifyRepo(int action, const QString &repo) - { - QList argumentList; - argumentList << QVariant::fromValue(action) << QVariant::fromValue(repo); - return asyncCallWithArgumentList(QLatin1String("modifyRepo"), argumentList); - } - - inline QDBusPendingReply<> quit() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("quit"), argumentList); - } - - inline QDBusPendingReply<> registerDevice(const QString &username, const QString &password) - { - QList argumentList; - argumentList << QVariant::fromValue(username) << QVariant::fromValue(password); - return asyncCallWithArgumentList(QLatin1String("registerDevice"), argumentList); - } - - inline QDBusPendingReply release(bool rnd) - { - QList argumentList; - argumentList << QVariant::fromValue(rnd); - return asyncCallWithArgumentList(QLatin1String("release"), argumentList); - } - - inline QDBusPendingReply<> setDeviceMode(int mode) - { - QList argumentList; - argumentList << QVariant::fromValue(mode); - return asyncCallWithArgumentList(QLatin1String("setDeviceMode"), argumentList); - } - - inline QDBusPendingReply<> setFlavour(const QString &flavour) - { - QList argumentList; - argumentList << QVariant::fromValue(flavour); - return asyncCallWithArgumentList(QLatin1String("setFlavour"), argumentList); - } - - inline QDBusPendingReply<> setRelease(const QString &release, bool rnd) - { - QList argumentList; - argumentList << QVariant::fromValue(release) << QVariant::fromValue(rnd); - return asyncCallWithArgumentList(QLatin1String("setRelease"), argumentList); - } - - inline QDBusPendingReply<> unregisterDevice() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("unregisterDevice"), argumentList); - } - - inline QDBusPendingReply<> updateRepos() - { - QList argumentList; - return asyncCallWithArgumentList(QLatin1String("updateRepos"), argumentList); - } - -Q_SIGNALS: // SIGNALS - void credentialsChanged(); - void done(); - void registrationStatusChanged(); -}; - -namespace org { - namespace nemo { - typedef ::SsuProxy ssu; - } -} -#endif