Commit ae2012e3 authored by Florent Revest's avatar Florent Revest

Fixes -dbg packages

parent 0efc95dd
...@@ -14,6 +14,4 @@ inherit cmake ...@@ -14,6 +14,4 @@ inherit cmake
DEPENDS+=" tut udev " DEPENDS+=" tut udev "
EXTRA_OECMAKE=" -DVERSION=0.1.17" EXTRA_OECMAKE=" -DVERSION=0.1.17"
do_install_append() { FILES_${PN}-dbg += "/opt /usr/lib/cmake/cor"
rm -rf ${D}/opt
}
...@@ -34,5 +34,6 @@ do_install_append() { ...@@ -34,5 +34,6 @@ do_install_append() {
ln -s ../dsme.service ${D}/lib/systemd/system/multi-user.target.wants/dsme.service ln -s ../dsme.service ${D}/lib/systemd/system/multi-user.target.wants/dsme.service
install -d ${D}/var/lib/dsme install -d ${D}/var/lib/dsme
[ ! -f ${D}/var/lib/dsme/alarm_queue_status ] && echo 0 > ${D}/var/lib/dsme/alarm_queue_status [ ! -f ${D}/var/lib/dsme/alarm_queue_status ] && echo 0 > ${D}/var/lib/dsme/alarm_queue_status
rm -rf ${D}/opt
} }
FILES_${PN}-dbg += "/opt"
...@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/nemomobile/libdsme.git" ...@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/nemomobile/libdsme.git"
LICENSE = "LGPL-2.1+" LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS += " glib-2.0 " DEPENDS += " glib-2.0 libcheck"
SRC_URI = "git://github.com/nemomobile/libdsme.git;protocol=https \ SRC_URI = "git://github.com/nemomobile/libdsme.git;protocol=https \
file://001-Allows-custom-cflags.patch \ file://001-Allows-custom-cflags.patch \
...@@ -15,5 +15,6 @@ S = "${WORKDIR}/git" ...@@ -15,5 +15,6 @@ S = "${WORKDIR}/git"
do_install() { do_install() {
oe_runmake install DESTDIR=${D} oe_runmake install DESTDIR=${D}
rm -rf ${D}/opt
} }
FILES_${PN}-dbg += "/opt"
...@@ -15,7 +15,4 @@ inherit autotools pkgconfig ...@@ -15,7 +15,4 @@ inherit autotools pkgconfig
B = "${WORKDIR}/git" B = "${WORKDIR}/git"
do_install_append() { FILES_${PN}-dbg += "/opt"
rm -rf ${D}/opt
}
...@@ -15,6 +15,8 @@ inherit qmake5 ...@@ -15,6 +15,8 @@ inherit qmake5
do_install_append() { do_install_append() {
mv ${D}/lib/* ${D}/usr/lib/ mv ${D}/lib/* ${D}/usr/lib/
mv ${D}/include/* ${D}/usr/include/ mv ${D}/include/* ${D}/usr/include/
rmdir ${D}/include/ rmdir ${D}/include/ ${D}/lib/
rm -rf ${D}/opt/
} }
FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/ngf"
FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/ngf/.debug/"
...@@ -14,3 +14,5 @@ DEPENDS += " qtbase libresource dbus virtual/libgles2" ...@@ -14,3 +14,5 @@ DEPENDS += " qtbase libresource dbus virtual/libgles2"
inherit qmake5 inherit qmake5
B = "${WORKDIR}/git" B = "${WORKDIR}/git"
FILES_${PN}-dbg += "/usr/lib/libresourceqt-qt5-tests /usr/share"
...@@ -16,4 +16,5 @@ do_install() { ...@@ -16,4 +16,5 @@ do_install() {
oe_runmake install DESTDIR=${D} oe_runmake install DESTDIR=${D}
} }
FILES_${PN} += " /run/mce /lib/systemd/system "
FILES_${PN}-dbg += "/usr/lib/mce/modules/.debug" FILES_${PN}-dbg += "/usr/lib/mce/modules/.debug"
...@@ -15,6 +15,8 @@ B = "${WORKDIR}/git" ...@@ -15,6 +15,8 @@ B = "${WORKDIR}/git"
# Out of dir build breaks mlite5.pc installation # Out of dir build breaks mlite5.pc installation
do_install_append() { do_install_append() {
rm -rf ${D}/opt cd src/
cp *.h MDConfGroup MNotificationGroup MRemoteAction MExport MDesktopEntry MNotification MGConfItem ${D}/usr/include/mlite5/
} }
FILES_${PN}-dbg += "/opt"
...@@ -14,7 +14,4 @@ inherit cmake_qt5 ...@@ -14,7 +14,4 @@ inherit cmake_qt5
EXTRA_OECMAKE=" -DVERSION=0.2.6 -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_DIR_NATIVE}/usr/bin/qt5/" EXTRA_OECMAKE=" -DVERSION=0.2.6 -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_DIR_NATIVE}/usr/bin/qt5/"
do_install_append() { FILES_${PN}-dbg += "/opt"
rm -rf ${D}/opt
}
From a2e0de9de81bd52d1382b1dc4d309168b633dbd8 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Mon, 13 Jul 2015 15:36:26 +0200
Subject: [PATCH 1/1] Disable resourcepolicy plugin
---
src/plugins/plugins.pro | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index dc19791..6dc28d4 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -59,7 +59,3 @@ mac:!simulator {
config_avfoundation: SUBDIRS += avfoundation
}
-config_resourcepolicy {
- SUBDIRS += resourcepolicy
-}
-
--
2.1.4
FILESEXTRAPATHS_prepend := "${THISDIR}/qtmultimedia:"
SRC_URI += "file://0001-Disable-resourcepolicy-plugin.patch"
...@@ -16,3 +16,10 @@ inherit cmake_qt5 ...@@ -16,3 +16,10 @@ inherit cmake_qt5
B = "${WORKDIR}/git" B = "${WORKDIR}/git"
EXTRA_OECMAKE=" -DVERSION=0.2.51 -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_DIR_NATIVE}/usr/bin/qt5/" EXTRA_OECMAKE=" -DVERSION=0.2.51 -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_DIR_NATIVE}/usr/bin/qt5/"
do_install_append() {
rm ${D}/usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so
}
FILES_${PN} += "/usr/lib/qt5/qml/Mer/State/"
FILES_${PN}-dbg += "/usr/lib/qt5/qml/Mer/State/.debug/"
...@@ -52,3 +52,5 @@ do_install_append() { ...@@ -52,3 +52,5 @@ do_install_append() {
install -m 644 -D systemd/usb-rescue-mode-off.service ${D}/lib/systemd/system/graphical.target.wants/usb-rescue-mode-off.service install -m 644 -D systemd/usb-rescue-mode-off.service ${D}/lib/systemd/system/graphical.target.wants/usb-rescue-mode-off.service
install -m 644 -D systemd/usb-moded.conf ${D}/etc/tmpfiles.d/usb-moded.conf install -m 644 -D systemd/usb-moded.conf ${D}/etc/tmpfiles.d/usb-moded.conf
} }
FILES_${PN} += " /lib/systemd/system "
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