[recipes-nemomobile] Modify Asteroids recipes to fit for nemomobile.

Add TARGET_USERNAME variable to define username on target distro. Layer can be now used by others also.

recipes-nemomobile/buteo/buteo-mtp/0002-Start-buteo-mtp-as-ceres-by-default.patch

-From c1c48f251912140b7fde76e14aaa43ab4ffcaafb Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Sun, 30 Oct 2016 15:03:33 +0100
-Subject: [PATCH] Start buteo-mtp as ceres by default
-
----
- init/systemd/buteo-mtp                                | 3 +--
- mts/platform/storage/fsstorageplugin/phone-memory.xml | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/init/systemd/buteo-mtp b/init/systemd/buteo-mtp
-index 275f426..6e66f89 100755
---- a/init/systemd/buteo-mtp
-+++ b/init/systemd/buteo-mtp
-@@ -1,7 +1,6 @@
- #!/bin/sh
- 
--DEF_UID=$(grep "^UID_MIN" /etc/login.defs |  tr -s " " | cut -d " " -f2)
--DEVICEUSER=$(getent passwd $DEF_UID | sed 's/:.*//')
-+DEVICEUSER=ceres
- 
- case $1 in
-     "start")
-diff --git a/mts/platform/storage/fsstorageplugin/phone-memory.xml b/mts/platform/storage/fsstorageplugin/phone-memory.xml
-index 1bd73fb..32b3b39 100644
---- a/mts/platform/storage/fsstorageplugin/phone-memory.xml
-+++ b/mts/platform/storage/fsstorageplugin/phone-memory.xml
-@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<storage name="media" path="/home/nemo" description="Phone Memory">
-+<storage name="media" path="/home/ceres" description="Phone Memory">
-     <blacklist>homedir-blacklist.conf</blacklist>
- </storage>
--- 
-2.10.1
-

recipes-nemomobile/buteo/buteo-mtp/0004-fsstorageplugin-Expose-Watch-Memory-instead-of-Phone.patch

-From af0d09e1f2f5143216ad6b1a08b20cbdf0661d75 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Fri, 5 May 2017 17:34:18 +0200
-Subject: [PATCH] fsstorageplugin: Expose Watch Memory instead of Phone Memory
- + SD Card
-
----
- mts/platform/storage/fsstorageplugin/fsstorageplugin.pro               | 2 +-
- mts/platform/storage/fsstorageplugin/sd-card.xml                       | 3 ---
- .../storage/fsstorageplugin/{phone-memory.xml => watch-memory.xml}     | 2 +-
- 3 files changed, 2 insertions(+), 5 deletions(-)
- delete mode 100644 mts/platform/storage/fsstorageplugin/sd-card.xml
- rename mts/platform/storage/fsstorageplugin/{phone-memory.xml => watch-memory.xml} (62%)
-
-diff --git a/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro b/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro
-index 218a398..12fc919 100644
---- a/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro
-+++ b/mts/platform/storage/fsstorageplugin/fsstorageplugin.pro
-@@ -50,7 +50,7 @@ LIBS    += -lmeegomtp
- target.path = /usr/lib/mtp
- 
- configuration.path = /etc/fsstorage.d
--configuration.files = phone-memory.xml homedir-blacklist.conf sd-card.xml
-+configuration.files = watch-memory.xml homedir-blacklist.conf
- 
- INSTALLS += target configuration
- 
-diff --git a/mts/platform/storage/fsstorageplugin/sd-card.xml b/mts/platform/storage/fsstorageplugin/sd-card.xml
-deleted file mode 100644
-index a625537..0000000
---- a/mts/platform/storage/fsstorageplugin/sd-card.xml
-+++ /dev/null
-@@ -1,3 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<storage name="sdcard" blockdev="/dev/mmcblk1" description="SD Card">
--</storage>
-diff --git a/mts/platform/storage/fsstorageplugin/phone-memory.xml b/mts/platform/storage/fsstorageplugin/watch-memory.xml
-similarity index 62%
-rename from mts/platform/storage/fsstorageplugin/phone-memory.xml
-rename to mts/platform/storage/fsstorageplugin/watch-memory.xml
-index 32b3b39..3f3df56 100644
---- a/mts/platform/storage/fsstorageplugin/phone-memory.xml
-+++ b/mts/platform/storage/fsstorageplugin/watch-memory.xml
-@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<storage name="media" path="/home/ceres" description="Phone Memory">
-+<storage name="media" path="/home/ceres" description="Watch Memory">
-     <blacklist>homedir-blacklist.conf</blacklist>
- </storage>
--- 
-2.11.0
-

recipes-nemomobile/buteo/buteo-mtp_git.bb

@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://mtpserver/mtpserver.cpp;beginline=1;endline=30;md5=a2
 
 SRC_URI = "git://git.merproject.org/mer-core/buteo-mtp.git;protocol=https \
            file://0001-Remove-dependency-to-SSU-and-tests.patch \
-           file://0002-Start-buteo-mtp-as-ceres-by-default.patch \
            file://0003-Fixes-some-dependencies-to-contextkit-bash-and-syste.patch \
-           file://0004-fsstorageplugin-Expose-Watch-Memory-instead-of-Phone.patch \
            file://0005-mtp1descriptors-redine-htole16-htole32.-to-make-sure.patch \
            file://0006-FSStoragePlugin-Make-sure-the-inotify_event-s-flexib.patch"
 SRCREV = "394df0cedd490f79b6eb2f4a22a2e2813d129432"

recipes-nemomobile/dsme/dsme_git.bb

@@ -18,7 +18,7 @@ B = "${WORKDIR}/git"
 EXTRA_OECONF= " --disable-poweron-timer --disable-upstart --enable-systemd --enable-runlevel --enable-pwrkeymonitor --disable-validatorlistener --disable-static --includedir=${STAGING_INCDIR} --oldincludedir=${STAGING_INCDIR}"
 
 do_configure_prepend() {
-    sed -i "s@<policy user=\"root\">@<policy user=\"ceres\">@" dsme/dsme.conf
+    sed -i "s@<policy user=\"root\">@<policy user=\"${TARGET_USERNAME}\">@" dsme/dsme.conf
     sed -i "s@-L/lib -lsystemd-daemon@-lsystemd@" dsme/Makefile.am
     sed -i "s@LDFLAGS \= \-pthread@LDFLAGS \= \-L${STAGING_DIR_TARGET}/usr/lib \-pthread@" modules/Makefile.am
 }

recipes-nemomobile/geoclue-providers/geoclue-provider-hybris/0001-DeviceControl-Power-the-device-on-by-default-tempora.patch

-From f512355db376657ff16976803971ef411b45c259 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Tue, 3 Oct 2017 21:39:45 +0200
-Subject: [PATCH 1/2] DeviceControl: Power the device on by default (temporary)
-
----
- devicecontrol.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/devicecontrol.cpp b/devicecontrol.cpp
-index fe03d27..ce3d578 100644
---- a/devicecontrol.cpp
-+++ b/devicecontrol.cpp
-@@ -17,7 +17,7 @@
- #include <QtDBus/QDBusVariant>
- 
- DeviceControl::DeviceControl(QObject *parent)
--:   QObject(parent), m_powered(false)
-+:   QObject(parent), m_powered(true)
- {
-     new DeviceAdaptor(this);
- }
--- 
-2.7.4
-

recipes-nemomobile/geoclue-providers/geoclue-provider-hybris_git.bb

-SUMMARY = "Libhybris backend for GeoClue"
-HOMEPAGE = "https://github.com/mer-hybris/geoclue-providers-hybris"
-LICENSE = "LGPL-2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "git://github.com/mer-hybris/geoclue-providers-hybris.git;protocol=https \
-           file://0001-DeviceControl-Power-the-device-on-by-default-tempora.patch"
-SRCREV = "29ec9933d09beefcc7ef24b83ef046f0150ec31e"
-PR = "r1"
-PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-DEPENDS += "geoclue libhybris libconnman-qt5 libqofono qofonoext"
-inherit qmake5
-
-do_install_append() {
-    chmod 04755 ${D}/usr/libexec/geoclue-hybris
-}
-
-FILES_${PN} += "/usr/share/dbus-1 /usr/share/geoclue-providers"

recipes-nemomobile/glacier-camera/glacier-camera_git.bb

+# Copyright (C) 2017 Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Glacier camera"
+HOMEPAGE = ""
+LICENSE = "GPLv2"
+SECTION = "Graphics"
+DEPENDS += "qtdeclarative qtquickcontrols-nemo nemo-qml-plugin-settings"
+PV = "0.1+${SRCREV}"
+S = "${WORKDIR}/git"
+SRC_URI[md5sum] = "b45b9956398363c4cac8bc82271f6c08"
+SRC_URI[sha256sum] = "4affa0ce432c768f29fa3a35d92586326c9f341e0eef2392aa0b158de8ca470c"
+RDEPENDS_${PN} = "nemo-qml-plugin-settings"
+LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=18;md5=73c460b05f70256352defb3bcfe539cc"
+SRC_URI = "git://github.com/nemomobile-ux/glacier-camera.git;protocol=https"
+SRCREV = "e451c7b3f5ea8f4c74e119929856851ae22c2f79"
+inherit qmake5

recipes-nemomobile/glacier-settings/glacier-settings/0001-Glacier-settings-Install-languages-in-usr-share-supp.patch

+From 2a1bcf7077121ba26be7047070c9bc482bcfadf4 Mon Sep 17 00:00:00 2001
+From: Eetu <eetu.kahelin@protonmail.com>
+Date: Tue, 20 Nov 2018 12:28:39 +0200
+Subject: [PATCH] [Glacier-settings] Install languages in
+ /usr/share/supported-languages
+
+---
+ glacier-settings.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glacier-settings.pro b/glacier-settings.pro
+index d81f293..5d9987a 100644
+--- a/glacier-settings.pro
++++ b/glacier-settings.pro
+@@ -90,7 +90,7 @@ keyboardplugin.files =  qml/plugins/keyboard/keyboard.qml \
+ keyboardplugin.path = /usr/share/glacier-settings/qml/plugins/keyboard
+ 
+ languageconfigs.files = configs/supported-languages/*
+-languageconfigs.path = /usr/share/jolla-supported-languages/
++languageconfigs.path = /usr/share/supported-languages/
+ 
+ pluginconfigs.files = qml/plugins/example/example.json \
+                       qml/plugins/bluez4/bluez4.json \

recipes-nemomobile/glacier-settings/glacier-settings_git.bb

+# Copyright (C) 2017 Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Glacier settings software"
+HOMEPAGE = "https://github.com/nemomobile-ux/glacier-settings"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://src/main.cpp;begin=1;end=18;md5=695266788af160cddbc58e6ca785dc17"
+
+SECTION = "Settings"
+
+
+SRC_URI = "git://github.com/nemomobile-ux/glacier-settings.git;protocol=https;branch=master \
+           file://0001-Glacier-settings-Install-languages-in-usr-share-supp.patch \
+           "
+SRCREV = "0ac46f2f8fab4f1d54c475557250fb84b043b484"
+PR = "r1"
+PV = "+git${SRCREV}"
+S = "${WORKDIR}/git"
+
+inherit qmake5
+
+DEPENDS = "nemo-qml-plugin-systemsettings libglacierapp"
+RDEPENDS_${PN} = "nemo-qml-plugin-systemsettings kf5bluezqt nemo-qml-plugin-settings libconnman-qt5 mapplauncherd-booster-qtcomponents libglacierapp qtquickcontrols-nemo nemo-qml-plugin-configuration"
+
+FILES_${PN} += "/usr/share/mapplauncherd/privileges.d/glacier-settings.privileges \
+    /usr/share/glacier-settings/qml/plugins/developermode \
+    /usr/share/glacier-settings/plugins/developermode.json \
+    /usr/share/glacier-settings/plugins/keyboard.json \
+    /usr/share/glacier-settings/qml/plugins/keyboard \
+    /usr/share/glacier-settings/plugins/bluez4.json \
+    /usr/share/glacier-settings/qml/plugins/bluez4 \
+    /usr/share/supported-languages"
+

recipes-nemomobile/libglacierapp/libglacierapp_git.bb

+SUMMARY = "Glacier Application library"
+HOMEPAGE = "https://github.com/nemomobile-ux/libglacierapp.git"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://src/glacierapp.cpp;beginline=1;endline=18;md5=73c460b05f70256352defb3bcfe539cc"
+SRC_URI = "git://github.com/nemomobile-ux/libglacierapp.git;protocol=https"
+SRCREV = "${AUTOREV}"
+PR = "r2"
+PV = "0.1.1+git${SRCPV}"
+S = "${WORKDIR}/git"
+inherit qmake5
+
+DEPENDS = "qtquickcontrols"
+
+
+FILES_${PN} += "/usr/lib /usr/lib/pkgconfig /usr/share /usr/share/glacierexample"

recipes-nemomobile/libsignon-qt5/libsignon-qt5_git.bb

@@ -4,7 +4,7 @@ LICENSE = "LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
 
 SRC_URI = "git://gitlab.com/accounts-sso/signond.git;protocol=https"
-SRCREV = "4212b454da1cab2ef36f8def1b3d75cab0506a71"
+SRCREV = "4d195e4dc7a47ff5cb51e36a83d4d05808c5befe"
 PR = "r1"
 PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"

recipes-nemomobile/lipstick/lipstick/0001-Revert-Remove-some-hardware-composer-stuff-for-rpi.patch

+From c60c33719d3dec6d2597daf0ca5087b8fe7b3cb4 Mon Sep 17 00:00:00 2001
+From: Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+Date: Tue, 14 Mar 2017 16:05:55 +0200
+Subject: [PATCH] Revert "Remove some hardware composer stuff for rpi"
+
+This reverts commit 0a32634ec10cd778a3e83d403ac9b4657234fa0e.
+---
+ lipstick.pro                |   2 +-
+ src/compositor/hwcimage.cpp | 111 ++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 109 insertions(+), 4 deletions(-)
+
+diff --git a/lipstick.pro b/lipstick.pro
+index 28f07219..78ee362d 100644
+--- a/lipstick.pro
++++ b/lipstick.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE = subdirs
+-SUBDIRS += src plugin tools
++SUBDIRS += src plugin tools tests doc
+ 
+ plugin.depends = src
+ tools.depends = src
+diff --git a/src/compositor/hwcimage.cpp b/src/compositor/hwcimage.cpp
+index eae2d2cf..6b1bf296 100644
+--- a/src/compositor/hwcimage.cpp
++++ b/src/compositor/hwcimage.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include <math.h>
+ 
++static bool hwcimage_is_enabled();
+ 
+ #define HWCIMAGE_LOAD_EVENT ((QEvent::Type) (QEvent::User + 1))
+ 
+@@ -144,6 +145,10 @@ HwcImage::~HwcImage()
+   */
+ void HwcImage::setRotationHandler(QQuickItem *item)
+ {
++    if (!hwcimage_is_enabled()) {
++        qCDebug(LIPSTICK_LOG_HWC, "HwcImage ignoring rotation handler as HWC is disabled");
++        return;
++    }
+ 
+     if (m_rotationHandler == item)
+         return;
+@@ -461,6 +466,11 @@ QMatrix4x4 HwcImage::reverseTransform() const
+ QSGNode *HwcImage::updatePaintNode(QSGNode *old, UpdatePaintNodeData *)
+ {
+ 
++    if (!hwcimage_is_enabled()) {
++        qCDebug(LIPSTICK_LOG_HWC) << "HwcImage" << this << "updating paint node without HWC support";
++        return updateActualPaintNode(old);
++    }
++
+     /*
+         When we're using hwcomposer, we replace the image with a slightly more
+         complex subtree. There is an HwcNode which is where we put the buffer
+@@ -512,16 +522,104 @@ QSGNode *HwcImage::updatePaintNode(QSGNode *old, UpdatePaintNodeData *)
+ }
+ 
+ 
++// from hybris_nativebuffer.h in libhybris
++#define HYBRIS_USAGE_SW_WRITE_RARELY    0x00000020
++#define HYBRIS_USAGE_HW_TEXTURE         0x00000100
++#define HYBRIS_USAGE_HW_COMPOSER        0x00000800
++#define HYBRIS_PIXEL_FORMAT_RGBA_8888   1
++#define HYBRIS_PIXEL_FORMAT_RGB_888     3
++#define HYBRIS_PIXEL_FORMAT_BGRA_8888   5
++
++#define EGL_NATIVE_BUFFER_HYBRIS        0x3140
++
++extern "C" {
++    typedef EGLBoolean (EGLAPIENTRYP _eglHybrisCreateNativeBuffer)(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint *stride, EGLClientBuffer *buffer);
++    typedef EGLBoolean (EGLAPIENTRYP _eglHybrisLockNativeBuffer)(EGLClientBuffer buffer, EGLint usage, EGLint l, EGLint t, EGLint w, EGLint h, void **vaddr);
++    typedef EGLBoolean (EGLAPIENTRYP _eglHybrisUnlockNativeBuffer)(EGLClientBuffer buffer);
++    typedef EGLBoolean (EGLAPIENTRYP _eglHybrisReleaseNativeBuffer)(EGLClientBuffer buffer);
++    typedef EGLBoolean (EGLAPIENTRYP _eglHybrisNativeBufferHandle)(EGLDisplay dpy, EGLClientBuffer buffer, void **handle);
++
++    typedef void (EGLAPIENTRYP _glEGLImageTargetTexture2DOESlipstick)(GLenum target, EGLImageKHR image);
++    typedef EGLImageKHR (EGLAPIENTRYP _eglCreateImageKHR)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attribs);
++    typedef EGLBoolean (EGLAPIENTRYP _eglDestroyImageKHR)(EGLDisplay dpy, EGLImageKHR image);
++}
++
++static _glEGLImageTargetTexture2DOESlipstick glEGLImageTargetTexture2DOESlipstick = 0;
++static _eglCreateImageKHR eglCreateImageKHR = 0;
++static _eglDestroyImageKHR eglDestroyImageKHR = 0;
++
++static _eglHybrisCreateNativeBuffer eglHybrisCreateNativeBuffer = 0;
++static _eglHybrisLockNativeBuffer eglHybrisLockNativeBuffer = 0;
++static _eglHybrisUnlockNativeBuffer eglHybrisUnlockNativeBuffer = 0;
++static _eglHybrisReleaseNativeBuffer eglHybrisReleaseNativeBuffer = 0;
++static _eglHybrisNativeBufferHandle eglHybrisNativeBufferHandle = 0;
++
++static void hwcimage_initialize()
++{
++    static bool initialized = false;
++    if (initialized)
++        return;
++    initialized = true;
++
++    glEGLImageTargetTexture2DOESlipstick = (_glEGLImageTargetTexture2DOESlipstick) eglGetProcAddress("glEGLImageTargetTexture2DOES");
++    eglCreateImageKHR = (_eglCreateImageKHR) eglGetProcAddress("eglCreateImageKHR");
++    eglDestroyImageKHR = (_eglDestroyImageKHR) eglGetProcAddress("eglDestroyImageKHR");
++    eglHybrisCreateNativeBuffer = (_eglHybrisCreateNativeBuffer) eglGetProcAddress("eglHybrisCreateNativeBuffer");
++    eglHybrisLockNativeBuffer = (_eglHybrisLockNativeBuffer) eglGetProcAddress("eglHybrisLockNativeBuffer");
++    eglHybrisUnlockNativeBuffer = (_eglHybrisUnlockNativeBuffer) eglGetProcAddress("eglHybrisUnlockNativeBuffer");
++    eglHybrisReleaseNativeBuffer = (_eglHybrisReleaseNativeBuffer) eglGetProcAddress("eglHybrisReleaseNativeBuffer");
++    eglHybrisNativeBufferHandle = (_eglHybrisNativeBufferHandle) eglGetProcAddress("eglHybrisNativeBufferHandle");
++}
++
++static bool hwcimage_is_enabled()
++{
++    if (!HwcRenderStage::isHwcEnabled())
++        return false;
++
++    // Check for availablility of EGL_HYBRIS_native_buffer support, which we
++    // need to do hwc layering of background images...
++    static int hybrisBuffers = -1;
++    if (hybrisBuffers < 0) {
++        if (strstr(eglQueryString(eglGetDisplay(EGL_DEFAULT_DISPLAY), EGL_EXTENSIONS), "EGL_HYBRIS_native_buffer2") == 0) {
++            qCDebug(LIPSTICK_LOG_HWC, "Missing required EGL extensions: 'EGL_HYBRIS_native_buffer2'");
++            hybrisBuffers = 0;
++        } else {
++            hybrisBuffers = 1;
++        }
++    }
++    return hybrisBuffers == 1;
++}
+ 
+ QSGTexture *HwcImageTexture::create(const QImage &image, QQuickWindow *window)
+ {
+-    EGLClientBuffer buffer = 0;
++    hwcimage_initialize();
++
++    if (!hwcimage_is_enabled())
++        return 0;
+ 
++    EGLClientBuffer buffer = 0;
+     int width = image.width();
+     int height = image.height();
++    int usage = HYBRIS_USAGE_SW_WRITE_RARELY | HYBRIS_USAGE_HW_TEXTURE | HYBRIS_USAGE_HW_COMPOSER;
++    int stride = 0;
++    int format = HYBRIS_PIXEL_FORMAT_BGRA_8888;
++    char *data;
++
++    eglHybrisCreateNativeBuffer(width, height, usage, format, &stride, &buffer);
++    Q_ASSERT(buffer);
++    eglHybrisLockNativeBuffer(buffer, HYBRIS_USAGE_SW_WRITE_RARELY, 0, 0, width, height, (void **) &data);
++    Q_ASSERT(data);
++
++    const int dbpl = stride * 4;
++    const int bpl = qMin(dbpl, image.bytesPerLine());
++    for (int y=0; y<height; ++y)
++        memcpy(data + y * dbpl, image.constScanLine(y), bpl);
++
++    eglHybrisUnlockNativeBuffer(buffer);
++
+     EGLImageKHR eglImage = eglCreateImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY),
+                                              EGL_NO_CONTEXT,
+-                                             EGL_IMAGE_BRCM_MULTIMEDIA,
++                                             EGL_NATIVE_BUFFER_HYBRIS,
+                                              buffer,
+                                              0);
+     Q_ASSERT(eglImage);
+@@ -554,6 +652,7 @@ HwcImageTexture::~HwcImageTexture()
+     Q_ASSERT(m_id == 0); // Should have been deleted via release().
+ 
+     eglDestroyImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY), m_image);
++    eglHybrisReleaseNativeBuffer(m_buffer);
+     qCDebug(LIPSTICK_LOG_HWC,
+             "HwcImageTexture(%p) destroyed, size=(%d x %d), texId=%d, buffer=%p, image=%p",
+             this, m_size.width(), m_size.height(), m_id, m_buffer, m_image);
+@@ -563,6 +662,10 @@ void HwcImageTexture::bind()
+ {
+     glBindTexture(GL_TEXTURE_2D, m_id);
+     updateBindOptions(!m_bound);
++    if (!m_bound) {
++        m_bound = true;
++        glEGLImageTargetTexture2DOESlipstick(GL_TEXTURE_2D, m_image);
++    }
+ }
+ 
+ void hwcimage_delete_texture(void *, void *callbackData)
+@@ -589,7 +692,9 @@ void HwcImageTexture::release()
+ 
+ void *HwcImageTexture::handle() const
+ {
+-    return (void*)m_buffer;
++    void *h;
++    eglHybrisNativeBufferHandle(eglGetCurrentDisplay(), m_buffer, &h);
++    return h;
+ }
+ 
+ 
+-- 
+2.11.1
+

recipes-nemomobile/lipstick/lipstick/0003-Disable-USB-mode-notifications-on-connect.patch

-From 67b4066d4e1ce6c048f3b6ebf805a52a87864339 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Thu, 13 Apr 2017 11:48:18 +0200
-Subject: [PATCH] Disable USB mode notifications on connect
-
----
- src/notificationcategories/device.added.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/notificationcategories/device.added.conf b/src/notificationcategories/device.added.conf
-index 2fd6df9a..c2b407d3 100644
---- a/src/notificationcategories/device.added.conf
-+++ b/src/notificationcategories/device.added.conf
-@@ -1,4 +1,4 @@
- x-nemo-icon=ios-usb
--urgency=2
-+urgency=0
- transient=true
- x-nemo-feedback=accessory_connected

recipes-nemomobile/lipstick/lipstick/0004-ScreenshotService-Use-system-bus-to-workaround-the-s.patch

-From 57bf37e865fbe12123202965ec4278c171544c29 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Sun, 30 Jul 2017 20:22:22 +0100
-Subject: [PATCH] ScreenshotService: Use system bus to workaround the
- sessionBus not being registered correctly
-
----
- src/homeapplication.cpp             | 3 +--
- tools/screenshottool/screenshottool | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/homeapplication.cpp b/src/homeapplication.cpp
-index f9e9be5a..72bbc596 100644
---- a/src/homeapplication.cpp
-+++ b/src/homeapplication.cpp
-@@ -119,9 +119,8 @@ HomeApplication::HomeApplication(int &argc, char **argv, const QString &qmlPath)
- 
-     m_screenshotService = new ScreenshotService(this);
-     new ScreenshotServiceAdaptor(m_screenshotService);
--    QDBusConnection sessionBus = QDBusConnection::sessionBus();
- 
--    registerDBusObject(sessionBus, LIPSTICK_DBUS_SCREENSHOT_PATH, m_screenshotService);
-+    registerDBusObject(systemBus, LIPSTICK_DBUS_SCREENSHOT_PATH, m_screenshotService);
- 
-     // Setting up the context and engine things
-     qmlEngine->rootContext()->setContextProperty("initialSize", QGuiApplication::primaryScreen()->size());
-diff --git a/tools/screenshottool/screenshottool b/tools/screenshottool/screenshottool
-index 64d6b9a9..56fd45a8 100755
---- a/tools/screenshottool/screenshottool
-+++ b/tools/screenshottool/screenshottool
-@@ -15,5 +15,5 @@ else
- fi
- 
- sleep "${DELAY}"
--dbus-send --type=method_call --dest=org.nemomobile.lipstick /org/nemomobile/lipstick/screenshot org.nemomobile.lipstick.saveScreenshot "string:${SCREENSHOTPATH}"
-+dbus-send --system --type=method_call --dest=org.nemomobile.lipstick /org/nemomobile/lipstick/screenshot org.nemomobile.lipstick.saveScreenshot "string:${SCREENSHOTPATH}"
- notificationtool -o add -c device.added "" "" "" "Screenshot saved to $SCREENSHOTPATH"

recipes-nemomobile/lipstick/lipstick/0005-BluetoothAgent-Advertise-less-hardware-capabilities-.patch

-From acddfe3f153994db5bade9b79283ed9f77943b53 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Sun, 6 Aug 2017 10:51:50 +0100
-Subject: [PATCH] BluetoothAgent: Advertise less hardware capabilities to make
- sure the Keyboard will not be asked on a watch
-
----
- src/bluetoothagent.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bluetoothagent.cpp b/src/bluetoothagent.cpp
-index d71d415e..06797109 100644
---- a/src/bluetoothagent.cpp
-+++ b/src/bluetoothagent.cpp
-@@ -28,7 +28,7 @@
- #include "lipstickqmlpath.h"
- #include "bluetoothagent.h"
- 
--#define AGENT_CAPABILITY        "KeyboardDisplay"
-+#define AGENT_CAPABILITY        "DisplayYesNo"
- 
- BluetoothAgent::BluetoothAgent(QObject *parent) : QObject(parent), window(0)
- {

recipes-nemomobile/lipstick/lipstick_git.bb

@@ -5,38 +5,31 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24"
 
 SRC_URI = "git://github.com/AsteroidOS/lipstick.git;protocol=https \
     file://0001-Disables-tests-and-doc.patch \
-    file://0002-notificationcategories-use-ion-icons.patch \
-    file://0003-Disable-USB-mode-notifications-on-connect.patch \
-    file://0004-ScreenshotService-Use-system-bus-to-workaround-the-s.patch \
-    file://0005-BluetoothAgent-Advertise-less-hardware-capabilities-.patch \
     file://Notifications/"
-SRCREV = "${AUTOREV}"
+
+SRCREV = "cf9b21228764dc87bbe22c3d187e322c793a4930"
 PR = "r1"
 PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEPENDS += "qtbase qtsensors qtdeclarative qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland nemo-keepalive qttools-native"
-RDEPENDS_${PN} += "${PN}-locale"
+DEPENDS += "qtbase qtsensors qtdeclarative qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland qttools-native nemo-keepalive"
 
 inherit qmake5
 
 do_install_append() {
     install -d ${D}/usr/share/icons/hicolor/86x86/apps/
     
-    rm -r ${D}/usr/share/translations/source/
     cd ${S}/i18n/
     lrelease -idbased *.ts
     cp -r *.qm ${D}/usr/share/translations/
     
-    install -d ${D}/home/ceres/.local/share/system/privileged/Notifications/
-    cp -r ${WORKDIR}/Notifications/* ${D}/home/ceres/.local/share/system/privileged/Notifications/
+    install -d ${D}/home/${TARGET_USERNAME}/.local/share/system/privileged/Notifications/
+    cp -r ${WORKDIR}/Notifications/* ${D}/home/${TARGET_USERNAME}/.local/share/system/privileged/Notifications/
 }
-
-FILES_${PN} += "/usr/lib/qml/org/nemomobile/lipstick/liblipstickplugin.so /usr/lib/qml/org/nemomobile/lipstick/qmldir /usr/share/icons/hicolor/86x86/apps/ /home/ceres/.local/share/system/privileged/Notifications"
+INSANE_SKIP_${PN} = "pkgconfig dev-deps"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/lipstick/liblipstickplugin.so /usr/lib/qml/org/nemomobile/lipstick/qmldir /usr/share/icons/hicolor/86x86/apps/ /home/${TARGET_USERNAME}/.local/share/system/privileged/Notifications"
 FILES_${PN}-dev += "/usr/lib/liblipstick-qt5.prl"
 FILES_${PN}-dbg += "/usr/lib/qml/org/nemomobile/lipstick/.debug"
 FILES_${PN}-locale += "/usr/share/translations"
-
-INSANE_SKIP_${PN} += "dev-deps host-user-contaminated"

recipes-nemomobile/literm/literm_git.bb

+# Copyright (C) 2017 Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Sexy terminal"
+HOMEPAGE = "https://github.com/rburchell/literm"
+LICENSE = "GPLv2"
+SECTION = "Utilities"
+DEPENDS += "qtdeclarative"
+PV = "0.1+${SRCPV}"
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/rburchell/literm.git;protocol=https"
+SRCREV = "${AUTOREV}"
+LIC_FILES_CHKSUM = "file://COPYING;beginline=1;endline=341;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+inherit qmake5
+do_install_append() {
+    install -d ${D}/usr/share/applications
+    cp ${S}/literm.desktop.nemo ${D}/usr/share/applications/literm.desktop
+    sed -i "s/literm/\/usr\/bin\/invoker --type=nemomobile -s \/usr\/bin\/literm -mobile -fullscreen/" ${D}/usr/share/applications/literm.desktop
+}

recipes-nemomobile/mapplauncherd/mapplauncherd-booster-qtcomponents/booster-qtcomponents-qt5.service

 [Unit]
 Description=Application launch booster for Qt Components on QtQuick2
-Requires=dbus.socket asteroid-launcher.service
-After=asteroid-launcher.service
+After=pre-user-session.target
+Requires=dbus.socket pre-user-session.target
 ConditionUser=!root
 
 [Service]

recipes-nemomobile/mapplauncherd/mapplauncherd-booster-qtcomponents/preload.qml

 import QtQuick 2.6
-import org.asteroid.controls 1.0
+import QtQuick.Controls 1.3
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
 
-Application {
-    BorderGestureArea { }
-    CircularSpinner { }
-    HandWritingKeyboard { }
-    IconButton { }
-    Indicator { }
-    Label {}
-    LayerStack { }
-    Marquee { }
-    PageDot { }
-    Spinner { }
-    StatusPage { }
+ApplicationWindow {
+    Button { }
+    Label { }
+    Slider { }
     Switch { }
+    InverseMouseArea { }
+    Component {
+        Item {
+            HeaderToolsLayout { }
+            TextArea { }
             TextField { }
+            Page { 
+    		Header { }
+            }
+            ButtonRow { }
+            DatePicker { }
+            GlacierRoller {
+                GlacierRollerItem { }
+            }
+            Spinner { }
+            ListView { 
+                ListViewItemWithActions { }
+                ScrollDecorator { }
+            }
+            IconButton { }
+            Tab { }
+            ToolBar { }
+        }
+    }
 }
 

recipes-nemomobile/mce/mce-plugin-libhybris_git.bb

-SUMMARY = "libhybris plugin for the Nemomobile's MCE."
-HOMEPAGE = "https://github.com/nemomobile/mce-plugin-libhybris.git"
-LICENSE = "LGPL-2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "git://github.com/nemomobile/mce-plugin-libhybris.git;protocol=https"
-SRCREV = "b2f6330fdd4af9b11a6be64d93c976851f0ba567"
-PR = "r1"
-PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-DEPENDS += "mce"
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}

recipes-nemomobile/mce/mce/builtin-gconf.values

+/system/osso/dsm/display/color_profile=hardcoded
+/system/osso/dsm/display/display_never_blank=1
+/system/osso/dsm/display/display_brightness=60
+/system/osso/dsm/display/max_display_brightness_levels=100
+/system/osso/dsm/display/inhibit_blank_mode=3
+/system/osso/dsm/locks/tklock_blank_disable=1

recipes-nemomobile/mce/mce_git.bb

@@ -7,9 +7,9 @@ SRC_URI = "git://git.merproject.org/mer-core/mce.git;protocol=https \
     file://0001-Fixes_build.patch \
     file://0002-Display-Sets-default-brightness-to-100.patch \
     file://0003-Display-Sets-dimming-timeout-to-10-sec-and-blanking-.patch \
-    file://0004-event-input-Double-tap-emulation-Adapts-the-state-ma.patch \
     file://mce.service"
-SRC_URI_append_qemux86 = " file://0005-Keep-screen-on-by-default-on-emulator.patch"
+SRC_URI_append_qemux86 = " file://0005-Keep-screen-on-by-default-on-emulator.patch \
+    file://builtin-gconf.values"
 SRCREV = "0510206026438b9de0d6a0f4d46e0c5674d37398"
 PR = "r1"
 PV = "+git${SRCPV}"
@@ -21,7 +21,12 @@ do_install() {
     oe_runmake install DESTDIR=${D}
     cp ../mce.service ${D}/lib/systemd/system/mce.service
     rm -r ${D}/var/run/
+    mkdir -p ${D}/var/lib/mce
 }
 
-FILES_${PN} += " /run/mce /lib/systemd/system "
+do_install_append_qemux86 () {
+    cp ../builtin-gconf.values ${D}/var/lib/mce
+}
+FILES_${PN} += " /run/mce /lib/systemd/system /var/lib/mce"
 FILES_${PN}-dbg += "/usr/lib/mce/modules/.debug"
+

recipes-nemomobile/mlite/mlite_git.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/mnotification.cpp;beginline=1;endline=18;md5=5dd5
 
 SRC_URI = "git://git.merproject.org/mer-core/mlite.git;protocol=https \
            file://0001-MDesktopEntry-Allow-dynamic-locale-switch-by-disabli.patch"
-SRCREV = "16dbe04def90ad6e347c80c2b4e81443b03571b1"
+SRCREV = "52f231ae8deec4d3a6dd119d23c844030f015cf2"
 PR = "r1"
 PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"

recipes-nemomobile/nemo-qml-plugins/libcontacts/0001-patch.patch

+From f8a035cdcbc3c82a9a5b5611305f873f2b2c0363 Mon Sep 17 00:00:00 2001
+From: Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+Date: Wed, 6 Sep 2017 19:33:06 +0300
+Subject: [PATCH] patch
+
+---
+ libcontacts.pro |  2 +-
+ src/src.pro     | 10 +++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libcontacts.pro b/libcontacts.pro
+index bc178f4..f213945 100644
+--- a/libcontacts.pro
++++ b/libcontacts.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE = subdirs
+-SUBDIRS = src tests translations
++SUBDIRS = src 
+ OTHER_FILES += rpm/libcontacts-qt5.spec
+ 
+ tests.depends = src
+diff --git a/src/src.pro b/src/src.pro
+index 335dc3e..b916b3d 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,12 +6,12 @@ CONFIG += create_pc create_prl no_install_prl
+ 
+ # 'contacts' is too generic for the target name - use 'contactcache'
+ TARGET = $${PACKAGENAME}
+-target.path = $$PREFIX/lib
++target.path = /usr/lib
+ INSTALLS += target
+ 
+ # version for generated pkgconfig files is defined in the spec file
+-QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include/$${PACKAGENAME}
+-QMAKE_PKGCONFIG_LIBDIR = $$PREFIX/lib
++QMAKE_PKGCONFIG_INCDIR = /usr/include/$${PACKAGENAME}
++QMAKE_PKGCONFIG_LIBDIR = /usr/lib
+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ 
+ CONFIG += link_pkgconfig
+@@ -26,7 +26,7 @@ PKGCONFIG += mlocale5 mce
+ DEFINES += CONTACTCACHE_BUILD
+ 
+ # We need access to QtContacts private headers
+-QT += contacts-private
++QT += contacts-private dbus
+ 
+ # We need the moc output for ContactManagerEngine from sqlite-extensions
+ extensionsIncludePath = $$system(pkg-config --cflags-only-I qtcontacts-sqlite-qt5-extensions)
+@@ -62,5 +62,5 @@ headers.files = \
+     $$PWD/synchronizelists.h \
+     $$PWD/seasidenamegrouper.h \
+     $$PWD/seasidepropertyhandler.h
+-headers.path = $$PREFIX/include/$$TARGET
++headers.path = /usr/include/$$TARGET
+ INSTALLS += headers
+-- 
+2.13.3
+

recipes-nemomobile/nemo-qml-plugins/libcontacts_git.bb

+SUMMARY = "QML Plugin for contacts on Nemo"
+HOMEPAGE = "https://git.merproject.org/mer-core/nemo-qml-plugin-contacts"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://src/seasidecache.cpp;beginline=1;endline=31;md5=bcbb827372d72ea4e42de457e3575a9d"
+
+SRC_URI = "git://git.merproject.org/mer-core/libcontacts.git;protocol=https file://0001-patch.patch"
+# file://0001-Do-not-build-daemon.patch"
+SRCREV = "1b8bbe3d4190a73790fa9ef49f13bea1072fe90b"
+PR = "r1"
+PV = "+git${SRCREV}"
+S = "${WORKDIR}/git"
+inherit autotools-brokensep qmake5 pkgconfig
+DEPENDS += "qtdeclarative qtbase qtpim nemo-qml-plugin-contacts-sqlite libmlocale mce dbus"
+FILES_${PN} += "/usr/lib /usr/include /usr/lib/pkgconfig"

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-contacts-sqlite/0001-fix-pro-file.patch

+From 4354741c3828e7e562111427f2bdd57a448f1e26 Mon Sep 17 00:00:00 2001
+From: Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+Date: Wed, 6 Sep 2017 18:49:19 +0300
+Subject: [PATCH] patch
+
+---
+ qtcontacts-sqlite.pro |  3 +--
+ src/engine/engine.pro | 10 +++++-----
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/qtcontacts-sqlite.pro b/qtcontacts-sqlite.pro
+index 6ae3cad..ad9500f 100644
+--- a/qtcontacts-sqlite.pro
++++ b/qtcontacts-sqlite.pro
+@@ -1,7 +1,6 @@
+ TEMPLATE = subdirs
+ SUBDIRS = \
+-        src \
+-        tests
++        src 
+ OTHER_FILES += rpm/qtcontacts-sqlite-qt5.spec
+ 
+ tests.depends = src
+diff --git a/src/engine/engine.pro b/src/engine/engine.pro
+index 905511c..fb3d1b0 100644
+--- a/src/engine/engine.pro
++++ b/src/engine/engine.pro
+@@ -18,7 +18,7 @@ DEFINES += 'QTCONTACTS_SQLITE_DATABASE_NAME=\'\"contacts.db\"\''
+ DEFINES += SORT_PRESENCE_BY_AVAILABILITY
+ 
+ INCLUDEPATH += \
+-        ../extensions
++        $$PWD/../extensions
+ 
+ HEADERS += \
+         memorytable_p.h \
+@@ -52,12 +52,12 @@ INSTALLS += target
+ 
+ PACKAGENAME=qtcontacts-sqlite-qt5-extensions
+ 
+-headers.path = $${PREFIX}/include/$${PACKAGENAME}
+-headers.files = ../extensions/*
+-headers.depends = ../extensions/*
++headers.path = /usr/include/$${PACKAGENAME}
++headers.files = ../../../git/src/extensions/*
++headers.depends = ../../../git/src/extensions/*
+ INSTALLS += headers
+ 
+-pkgconfig.path = $${PREFIX}/lib/pkgconfig
++pkgconfig.path = /usr/lib/pkgconfig
+ pkgconfig.files = ../$${PACKAGENAME}.pc
+ INSTALLS += pkgconfig
+ 
+-- 
+2.13.3
+

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-contacts-sqlite_git.bb

+SUMMARY = "QML Plugin for contacts on Nemo"
+HOMEPAGE = "https://git.merproject.org/mer-core/nemo-qml-plugin-contacts"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://src/engine/contactid.cpp;beginline=1;endline=31;md5=f8c85a4530dff183f906f55efc59b98d"
+
+SRC_URI = "git://git.merproject.org/mer-core/qtcontacts-sqlite.git;protocol=https \
+           file://0001-fix-pro-file.patch \
+"
+# file://0001-Do-not-build-daemon.patch"
+SRCREV = "56a2909d9f8cf74a378e5779380a2460dabc106b"
+PR = "r1"
+PV = "+git${SRCPV}"
+S = "${WORKDIR}/git"
+do_compile_append() {
+    cp -r ${S}/src/extensions ${WORKDIR}/src/
+}
+inherit qmake5 pkgconfig
+DEPENDS += "qtdeclarative qtbase qtpim"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/contacts /usr/lib/plugins/contacts"

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-contacts_git.bb

+SUMMARY = "QML Plugin for contacts on Nemo"
+HOMEPAGE = "https://git.merproject.org/mer-core/nemo-qml-plugin-contacts"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://src/plugin.cpp;beginline=1;endline=31;md5=99bfde884fbd54d5f6958982e31a4237"
+
+SRC_URI = "git://git.merproject.org/mer-core/nemo-qml-plugin-contacts.git;protocol=https"
+# file://0001-Do-not-build-daemon.patch"
+SRCREV = "6d2dcf3c52085403a3e63dcc84dbed2f70ed2151"
+PR = "r1"
+PV = "+git${SRCREV}"
+S = "${WORKDIR}/git"
+inherit autotools-brokensep qmake5 pkgconfig
+RDEPENDS_${PN} = "libcontacts"
+DEPENDS += "qtdeclarative qtbase qtpim nemo-qml-plugin-contacts-sqlite libcontacts libmlocale"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/contacts"

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-devicelock/0001-Modify-libsystemd-name.patch

+From df675fdfa4a0db3c2621bc5b4c93d7d458451aec Mon Sep 17 00:00:00 2001
+From: Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+Date: Sun, 19 Mar 2017 15:21:35 +0200
+Subject: [PATCH] Modify libsystemd name
+
+---
+ src/daemon/daemon.pro                             | 2 +-
+ src/nemo-devicelock/host/host.pro                 | 2 +-
+ src/nemo-devicelock/host/nemo-devicelock-host.prf | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/daemon/daemon.pro b/src/daemon/daemon.pro
+index 8c54b65..15831ec 100644
+--- a/src/daemon/daemon.pro
++++ b/src/daemon/daemon.pro
+@@ -12,7 +12,7 @@ PKGCONFIG += \
+         dbus-1 \
+         keepalive \
+         nemodbus \
+-        libsystemd-daemon
++        libsystemd
+ 
+ INCLUDEPATH += \
+         $$PWD/../ \
+diff --git a/src/nemo-devicelock/host/host.pro b/src/nemo-devicelock/host/host.pro
+index 87d6841..70e9f1b 100644
+--- a/src/nemo-devicelock/host/host.pro
++++ b/src/nemo-devicelock/host/host.pro
+@@ -12,7 +12,7 @@ QT += dbus
+ PKGCONFIG += \
+         dbus-1 \
+         keepalive \
+-        libsystemd-daemon
++        libsystemd
+ 
+ INCLUDEPATH += \
+         $$PWD/.. \
+diff --git a/src/nemo-devicelock/host/nemo-devicelock-host.prf b/src/nemo-devicelock/host/nemo-devicelock-host.prf
+index 344c0b7..41033fd 100644
+--- a/src/nemo-devicelock/host/nemo-devicelock-host.prf
++++ b/src/nemo-devicelock/host/nemo-devicelock-host.prf
+@@ -7,7 +7,7 @@ CONFIG *= \
+ 
+ PKGCONFIG += \
+         dbus-1 \
+-        libsystemd-daemon \
++        libsystemd \
+         keepalive \
+         nemodbus \
+         nemodevicelock \
+-- 
+2.11.1
+

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-devicelock/0001-OUT_PWD.patch

+From ac668b5026d692ba5ddf30662f85fa382db11729 Mon Sep 17 00:00:00 2001
+From: Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+Date: Thu, 1 Jun 2017 10:36:44 +0300
+Subject: [PATCH] OUT_PWD
+
+---
+ src/daemon/daemon.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/daemon.pro b/src/daemon/daemon.pro
+index af921f3..d51f863 100644
+--- a/src/daemon/daemon.pro
++++ b/src/daemon/daemon.pro
+@@ -24,7 +24,7 @@ DEPENDPATH += \
+         $$PWD/../nemo-devicelock/host
+ 
+ PRE_TARGETDEPS += \ \
+-        $$PWD/../nemo-devicelock/host/libnemodevicelock-host.a
++        $$OUT_PWD/../nemo-devicelock/host/libnemodevicelock-host.a
+ 
+ LIBS += \
+         -L$$OUT_PWD/../nemo-devicelock/host -lnemodevicelock-host\
+-- 
+2.11.1
+

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-devicelock/0001-Use-libsystemd-instead-of-libsystemd-daemon.patch

-From e9f6d8790f6a7a89eb75d9c6d480eaba668903ac Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Thu, 28 Sep 2017 23:42:23 +0200
-Subject: [PATCH] Use libsystemd instead of libsystemd-daemon
-
----
- src/hostlib/hostlib.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hostlib/hostlib.pro b/src/hostlib/hostlib.pro
-index 9cc66f6..88adb94 100644
---- a/src/hostlib/hostlib.pro
-+++ b/src/hostlib/hostlib.pro
-@@ -15,7 +15,7 @@ QT += dbus
- PKGCONFIG += \
-         dbus-1 \
-         keepalive \
--        libsystemd-daemon \
-+        libsystemd \
-         mlite5
- 
- INCLUDEPATH += \
--- 
-2.7.4
-

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-devicelock_git.bb

 SUMMARY = "QML Plugin for devicelock on Nemo"
-HOMEPAGE = "https://git.merproject.org/mer-core/nemo-qml-plugin-devicelock.git"
+HOMEPAGE = "https://git.merproject.org/mer-core/nemo-qml-plugin-devicelock"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://src/plugin/plugin.cpp;beginline=1;endline=31;md5=7abcb4ac64856fce624f8f11084f659f"
 
 SRC_URI = "git://git.merproject.org/mer-core/nemo-qml-plugin-devicelock.git;protocol=https \
-           file://0001-Use-libsystemd-instead-of-libsystemd-daemon.patch"
-SRCREV = "acc349bee2deb3ea287df8deeeff2bff17203048"
+    file://0001-Modify-libsystemd-name.patch \
+    file://0001-OUT_PWD.patch"
+      
+SRCREV = "2b44347e1768f8f11d769b6dd2a50c6f15ea632f"
 PR = "r1"
 PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"
-inherit qmake5
 
-B = "${S}"
-
-do_compile_append() {
-     sed -i "s@-L${S}/src/hostlib/../lib @@" ./src/hostlib/pkgconfig/nemodevicelock-host.pc
-}
+inherit qmake5
 
-DEPENDS += "qtdeclarative nemo-keepalive nemo-qml-plugin-dbus mlite dbus"
+DEPENDS += "qtdeclarative mlite dbus nemo-keepalive nemo-qml-plugin-dbus"
+RDEPENDS_${PN} += "nemo-qml-plugin-dbus"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/policy/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/devicelock /lib/systemd/system /etc/dbus-1"
 
-FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/devicelock/.debug"
-FILES_${PN} += "/usr/lib/qml/org/nemomobile/devicelock/ /lib/systemd/system/"

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-settings_git.bb

+# Copyright (C) 2017 Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Nemo settings plugin"
+HOMEPAGE = ""
+LICENSE = "GPLv2"
+SECTION = "Utilities"
+DEPENDS += "qtdeclarative"
+PV = "0.1+${SRCREV}"
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://src/settings.cpp;beginline=1;endline=18;md5=73c460b05f70256352defb3bcfe539cc"
+SRC_URI = "git://github.com/nemomobile-ux/nemo-qml-plugins-settings.git;protocol=https"
+SRCREV = "bde850e92aa6167d6ccf0839d1383d1b6c960415"
+inherit qmake5
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/settings"

recipes-nemomobile/nemo-themes/meegotouch-theme-darko_git.bb

+SUMMARY = "Darko Theme for MeegoTouch"
+HOMEPAGE = "https://github.com/nemomobile/meegotouch-theme-darko"
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=88f871534ad2268001f05f4790685ea5"
+
+SRC_URI = "git://github.com/nemomobile/meegotouch-theme-darko;protocol=https"
+SRCREV = "756f041714943d6e3c24e9ea1fc1149d83192f5a"
+PR = "r1"
+PV = "+git${SRCREV}"
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} += "nemo-theme-default"
+
+do_install() {
+    mkdir -p ${D}/usr/share/themes/darko/meegotouch/icons/
+    install -m 644 index.theme ${D}/usr/share/themes/darko/
+
+    install -m 644 meegotouch/icons/* ${D}/usr/share/themes/darko/meegotouch/icons/
+    install -m 644 blanco/meegotouch/icons/* ${D}/usr/share/themes/darko/meegotouch/icons
+
+    mkdir -p ${D}/usr/share/themes/darko/meegotouch/libmeegotouchviews/style/
+    install -m 644 meegotouch/libmeegotouchviews/style/* ${D}/usr/share/themes/darko/meegotouch/libmeegotouchviews/style/
+
+    mkdir -p ${D}/usr/share/themes/darko/meegotouch/libmeegotouchhome/style/
+    install -m 644 meegotouch/libmeegotouchhome/style/* ${D}/usr/share/themes/darko/meegotouch/libmeegotouchhome/style/
+    install -m 644 meegotouch/libmeegotouchhome/libmeegotouchhome.conf ${D}/usr/share/themes/darko/meegotouch/libmeegotouchhome/
+
+    mkdir -p ${D}/usr/share/themes/darko/meegotouch/meegotouchhome/style/
+    install -m 644 meegotouch/meegotouchhome/style/meegotouchhome.css ${D}/usr/share/themes/darko/meegotouch/meegotouchhome/style/
+
+    mkdir -p ${D}/usr/share/themes/base/meegotouch/icons/
+    install -m 644 meegotouch/icons/icon-l-meegotouchtheme-darko.png ${D}/usr/share/themes/base/meegotouch/icons/
+
+    mkdir -p ${D}/usr/share/sounds/darko/stereo/
+    install -m 644 sounds/darko/stereo/* ${D}/usr/share/sounds/darko/stereo/
+}
+
+FILES_${PN} = "/usr/"

recipes-nemomobile/nemo-themes/nemo-theme-default_git.bb

+SUMMARY = "Default Theme for Nemo"
+HOMEPAGE = "https://github.com/nemomobile-ux/nemo-theme-default.git"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://lgpl/LICENSE.LGPL;md5=9bddd653c11e4620e98b7c15dce0f89c"
+
+SRC_URI = "git://github.com/nemomobile/nemo-theme-default.git;protocol=https"
+SRCREV = "2ba6211c92d445f066660d35cb29d7c0bb15b2f4"
+PR = "r1"
+PV = "+git${SRCREV}"
+S = "${WORKDIR}/git"
+inherit qmake5
+DEPENDS += "qtbase"
+
+FILES_${PN} = "/usr/ /etc/"

recipes-nemomobile/nemo-themes/nemo-theme-glacier_git.bb

+SUMMARY = "Glacier Theme for Nemo"
+HOMEPAGE = "https://github.com/nemomobile-ux/nemo-theme-glacier.git"
+LICENSE = "CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = "file://cc3/LICENSE.md;md5=cf7e5cf784e962ee361c8d468cebf569"
+
+SRC_URI = "git://github.com/nemomobile-ux/nemo-theme-glacier.git;protocol=https"
+SRCREV = "54efddf8a3d37c1197dfed04f5f0c1f21fd9779c"
+PR = "r1"
+PV = "+git${SRCPV}"
+S = "${WORKDIR}/git"
+inherit qmake5
+
+DEPENDS += "qtbase"
+
+do_install_append() {
+    cd ${D}/usr/share/themes/glacier/meegotouch/icons/
+    ln -sf icon-app-terminal.png icon-l-terminal.png
+    ln -sf icon-app-settings.png icon-l-settings.png
+    ln -sf icon-app-screenshot.png icon-launcher-screenshot.png
+}
+
+FILES_${PN} = "/usr/"

recipes-nemomobile/ngfd/ngfd-plugin-droid-vibrator/50-droid-vibrator.ini

-[droid-vibrator]
-
-# For each string in EFFECT_LIST define a sequence
-EFFECT_LIST = touch,short,strong,long,notice,message,attention,alarm,ringtone,default
-
-# Sequence has following syntax:
-#  sequence_name = <action>=<value>
-#
-# Actions:
-#   on       - Run vibra for value ms
-#   pause    - Pause for value ms
-#   repeat   - Repeat for value times, or forever for forever
-#
-# For example, to have vibra run twice for 200ms and pause for 100ms:
-# vibra = on=200,pause=100,repeat=1
-#
-
-# Used for notifications
-short    = on=300
-strong   = on=500,pause=300,repeat=1
-
-touch    = on=70
-long     = on=800
-notice   = on=100,pause=500,repeat=1
-message  = on=200,pause=200,repeat=1
-attention= on=100,pause=100,repeat=2
-alarm    = on=1000,pause=500,repeat=forever
-ringtone = on=2000,pause=500,repeat=forever
-default  = on=66

recipes-nemomobile/ngfd/ngfd-plugin-droid-vibrator_git.bb

-SUMMARY = "Nemomobile's non graphical feedback daemon's hybris plugin"
-HOMEPAGE = "https://github.com/mer-hybris/ngfd-plugin-droid-vibrator"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI = "git://github.com/mer-hybris/ngfd-plugin-droid-vibrator.git;protocol=https \
-           file://50-droid-vibrator.ini"
-SRCREV = "d841e43dac31bebca3763001ac0ed958271aeb18"
-PR = "r1"
-PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
-B = "${S}"
-
-DEPENDS += "ngfd libhybris"
-
-do_install_append () {
-    install -d ${D}/usr/share/ngfd/plugins.d/
-    cp ${WORKDIR}/50-droid-vibrator.ini ${D}/usr/share/ngfd/plugins.d/
-}
-
-inherit cmake
-
-FILES_${PN} += "/usr/lib/ngf/ /usr/share/ngfd/plugins.d/"
-FILES_${PN}-dbg += "/usr/lib/ngf/.debug/"

recipes-nemomobile/ngfd/ngfd_git.bb

@@ -32,7 +32,6 @@ do_install_append() {
         ln -s /usr/lib/systemd/user/ngfd.service ${D}/usr/lib/systemd/user/default.target.wants/ngfd.service
     fi
 
-    rm -r ${D}/usr/share/ngfd/events.d/
     cp -r ../events.d/ ${D}/usr/share/ngfd/events.d/
 
     cp ../50-ffmemless.ini ${D}/usr/share/ngfd/plugins.d/

recipes-nemomobile/qtfeedback-plugins/qt-mobility-haptics-ffmemless_git.bb

+SUMMARY = "Nemomobile's qt-mobility-haptics-ffmemless"
+HOMEPAGE = "https://git.merproject.org/mer-core/qt-mobility-haptics-ffmemless"
+LICENSE = "LGPL-2.1+"
+LIC_FILES_CHKSUM = "file://qfeedback.cpp;beginline=1;endline=38;md5=a8726eef46a2a09f5773ba508cad12a2"
+
+SRC_URI = "git://git.merproject.org/mer-core/qt-mobility-haptics-ffmemless.git;protocol=https"
+SRCREV = "d7ea915d2fb42a38967861fbbf6153077f4cedd8"
+PR = "r1"
+PV = "+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+DEPENDS += "qtfeedback libprofile-qt"
+inherit qmake5
+
+do_configure_prepend() {
+    sed -i "s@I/usr/include/profile-qt5@I${STAGING_INCDIR}/profile-qt5@" ${S}/ffmemless.pro
+}
+
+FILES_${PN} += "/usr/lib/plugins/feedback/"
+FILES_${PN}-dbg += "/usr/lib/plugins/feedback/.debug/"

recipes-nemomobile/sensorfw/sensorfw_git.bb

@@ -12,8 +12,6 @@ S = "${WORKDIR}/git"
 
 inherit qmake5
 
-EXTRA_QMAKEVARS_PRE = "CONFIG+=autohybris"
-
 do_configure_prepend() {
     sed -i '/include( doc\/doc.pri )/d' ../git/sensorfw.pro
     sed -i 's:-L/usr/lib ::' ../git/core/hybris.pro

recipes-nemomobile/statefs/statefs-providers/0001-64-bit-patch.patch

+From bf1cf30c2fb42c45826f771ed5342a7cc2b727cf Mon Sep 17 00:00:00 2001
+From: Aleksi Suomalainen <suomalainen.aleksi@gmail.com>
+Date: Wed, 23 May 2018 14:50:49 +0300
+Subject: [PATCH] 64 bit patch
+
+---
+ src/ofono/provider_ofono.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ofono/provider_ofono.cpp b/src/ofono/provider_ofono.cpp
+index 4459e64..7a04936 100644
+--- a/src/ofono/provider_ofono.cpp
++++ b/src/ofono/provider_ofono.cpp
+@@ -984,7 +984,7 @@ void Bridge::setup_callManager(QString const &path)
+     auto process_calls = [this](PathPropertiesArray const &calls) {
+         for (auto it = calls.begin(); it != calls.end(); ++it)
+             calls_.insert(std::get<0>(*it).path());
+-        updateProperty(Property::CallCount, calls_.size());
++        updateProperty(Property::CallCount, (qulonglong)calls_.size());
+     };
+ 
+     callManager_.reset(new VoiceCallManager(service_name, path, bus_));
+@@ -992,13 +992,13 @@ void Bridge::setup_callManager(QString const &path)
+     connect(callManager_.get(), &VoiceCallManager::CallAdded
+             , [this](QDBusObjectPath const &n, QVariantMap const &) {
+                     calls_.insert(n.path());
+-                    updateProperty(Property::CallCount, calls_.size());
++                    updateProperty(Property::CallCount, (qulonglong)calls_.size());
+             });
+ 
+     connect(callManager_.get(), &VoiceCallManager::CallRemoved
+             , [this](QDBusObjectPath const &n) {
+                     calls_.erase(n.path());
+-                    updateProperty(Property::CallCount, calls_.size());
++                    updateProperty(Property::CallCount, (qulonglong)calls_.size());
+             });
+ 
+     async(this, callManager_->GetCalls(), process_calls);
+-- 
+2.17.0
+

recipes-nemomobile/statefs/statefs-providers_git.bb

@@ -4,6 +4,7 @@ LICENSE = "LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9d1d95673c01a94e06648bf72ecda12d"
 
 SRC_URI = "git://git.merproject.org/mer-core/statefs-providers.git;protocol=https"
+SRC_URI_append_qemux86-64 = " file://0001-64-bit-patch.patch "
 SRCREV = "c5205f324fdc6de828522e86e53e53cd1ba7e004"
 PR = "r1"
 PV = "+git${SRCPV}"

recipes-nemomobile/timed/timed/timed-qt5.conf

@@ -2,7 +2,7 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 
-  <policy user="ceres">
+  <policy user="nemo">
     <allow own="com.nokia.time"/>
     <allow own="com.nokia.timed.backup"/>
     <allow own="com.nokia.voland.signal"/>

recipes-nemomobile/timed/timed_git.bb

@@ -19,7 +19,6 @@ B = "${S}"
 do_configure_prepend() {
     mkdir -p src/h/timed-qt5/
     cp src/lib/qmacro.h src/h/timed-qt5/qmacro.h
-    sed -i "s@<policy user=\"nemo\">@<policy user=\"ceres\">@" src/server/timed-qt5.conf src/server/timed.conf tests/ut_networktime/fakeofono/org.fakeofono.conf
     cp ${WORKDIR}/timed-qt5.service ${S}/src/server/timed-qt5.service
 }
 

recipes-nemomobile/usb-moded/usb-moded/buteo-session.service

 [Unit]
-Description=Starts the buteo-session.service as ceres
+Description=Starts the buteo-session.service as user
 DefaultDependencies=no
 After=local-fs.target
 Conflicts=shutdown.target

recipes-nemomobile/usb-moded/usb-moded/init_ffs

-#!/bin/sh
-
-echo "0" > /sys/class/android_usb/android0/enable
-
-manufacturer="$(cat /system/build.prop | grep -o 'ro.product.manufacturer=.*' | cut -d'=' -f 2)"
-model="$(cat /system/build.prop | grep -o 'ro.product.model=.*' | cut -d'=' -f 2)"
-serial="$(cat /proc/cmdline | sed 's/.*androidboot.serialno=//' | sed 's/ .*//')"
-
-echo $serial       > /sys/class/android_usb/android0/iSerial
-echo $manufacturer > /sys/class/android_usb/android0/iManufacturer
-echo $model        > /sys/class/android_usb/android0/iProduct
-
-echo "1" >  /sys/class/android_usb/android0/enable

recipes-nemomobile/usb-moded/usb-moded/usb-moded.service

@@ -10,7 +10,6 @@ Type=dbus
 TimeoutSec=15
 EnvironmentFile=-/var/lib/environment/usb-moded/*.conf
 EnvironmentFile=-/run/usb-moded/*.conf
-ExecStartPre=/usr/bin/init_ffs
 ExecStart=/usr/sbin/usb_moded --systemd --force-syslog $USB_MODED_ARGS
 Restart=always
 ExecReload=/bin/kill -HUP $MAINPID

recipes-nemomobile/usb-moded/usb-moded/usb-moded/dyn-modes/adb_mode.ini

-[mode]
-name = adb_mode
-module = none
-appsync = 1
-
-[options]
-sysfs_path = /sys/class/android_usb/android0/functions
-sysfs_value = adb
-android_extra_sysfs_path =  /sys/class/android_usb/android0/f_ffs/aliases
-android_extra_sysfs_value = adb
-sysfs_reset_value = none
-softconnect_path = /sys/class/android_usb/android0/enable
-softconnect = 1
-softconnect_disconnect = 0
-idProduct = 0A03

recipes-nemomobile/usb-moded/usb-moded/usb-moded/dyn-modes/developer_mode.ini

-[mode]
-name = developer_mode
-module = none
-network = 1
-network_interface = rndis0
-appsync = 1
-
-[options]
-sysfs_path = /sys/class/android_usb/android0/functions
-sysfs_value = rndis
-sysfs_reset_value = none
-softconnect_path = /sys/class/android_usb/android0/enable
-softconnect = 1
-softconnect_disconnect = 0
-idProduct = 0A02
-dhcp_server = 1

recipes-nemomobile/usb-moded/usb-moded/usb-moded/dyn-modes/mtp_mode.ini

-[mode]
-name = mtp_mode
-module = none
-appsync = 1
-
-[options]
-sysfs_path = /sys/class/android_usb/android0/functions
-sysfs_value = ffs,mtp
-sysfs_reset_value = none
-softconnect_path = /sys/class/android_usb/android0/enable
-softconnect = 1
-softconnect_disconnect = 0

recipes-nemomobile/usb-moded/usb-moded/usb-moded/run/adb-prepare.ini

-[info]
-name = adbd-prepare.service
-mode = adb_mode
-systemd = 1

recipes-nemomobile/usb-moded/usb-moded/usb-moded/run/adb-startserver.ini

-[info]
-name = android-tools-adbd.service
-mode = adb_mode
-systemd = 1
-post = 1

recipes-nemomobile/usb-moded/usb-moded_git.bb

@@ -8,8 +8,7 @@ SRC_URI = "git://github.com/philippedeswert/usb-moded.git;protocol=https \
            file://com.meego.usb_moded.service \
            file://udhcp-daemon.service \
            file://buteo-session.service \
-           file://usb-moded \
-           file://init_ffs"
+           file://usb-moded"
 SRCREV = "67da3f291e7594271bf5ed9faf44e6a8d8ed93e6"
 PR = "r1"
 PV = "+git${SRCPV}"
@@ -24,9 +23,6 @@ RDEPENDS_${PN} += "buteo-mtp"
 
 do_configure_prepend() {
     sed -i "s@systemd-daemon@systemd@" configure.ac
-    sed -i "s@shell@ceres@g" systemd/adbd-functionfs.sh
-    sed -i "s@ adbd.service@ android-tools-adbd.service@" ${S}/systemd/adbd-prepare.service
-    sed -i "s@umount adb@umount /dev/usb-ffs/adb@" ${S}/systemd/adbd-prepare.service
 }
 
 do_install_append() {
@@ -41,10 +37,8 @@ do_install_append() {
     echo "options g_file_storage stall=0 removable=1" > ${D}/etc/modprobe.d/usb_moded.conf
     install -d ${D}/etc/usb-moded
     install -d ${D}/etc/usb-moded/run
-    install -d ${D}/etc/usb-moded/dyn-modes
     install -m 644 -D ../usb-moded/usb-moded.ini ${D}/etc/usb-moded/usb-moded.ini
     install -m 644 -D ../usb-moded/run/* ${D}/etc/usb-moded/run/
-    install -m 644 -D ../usb-moded/dyn-modes/* ${D}/etc/usb-moded/dyn-modes/
 
     touch ${D}/etc/modprobe.d/g_ether.conf
     touch ${D}/etc/udhcpd.conf
@@ -60,16 +54,8 @@ do_install_append() {
 
     install -m 644 -D systemd/usb-moded.conf ${D}/etc/tmpfiles.d/usb-moded.conf
 
-    install -m 755 -D systemd/adbd-functionfs.sh ${D}/usr/sbin/adbd-functionfs.sh
-    install -m 644 -D systemd/adbd-prepare.service ${D}/lib/systemd/system/adbd-prepare.service
-
-    install -d ${D}/usr/bin/
-    cp ../init_ffs ${D}/usr/bin/init_ffs
-
     install -d ${D}/var/lib/misc/
     touch ${D}/var/lib/misc/udhcpd.leases
 }
 
 FILES_${PN} += " /lib/systemd/system /usr/share/dbus-1/services/ /var/lib/misc/udhcpd.leases"
-
-INSANE_SKIP_${PN} = "ldflags"