From: Grazvydas Ignotas <notasas@gmail.com>
Date: Mon, 6 Jul 2015 14:07:42 +0000 (+0300)
Subject: pandora-libpnd: fix deps and lib install
X-Git-Tag: sz_172rc~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=4cecdfa316aeab2d2c7c5b11706c3827c3d43fda

pandora-libpnd: fix deps and lib install

- properly strips the .so and symlinks .so.1 instead of making a copy
- avoids circular deps between pandora-libpnd-*
---

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index b1fcd87..e19df5e 100755
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r74"
+PR = "r75"
 
 PARALLEL_MAKE = ""
 
@@ -25,8 +25,6 @@ TARGET_CFLAGS += "-Wall -I./include -I${STAGING_INCDIR}/usr/include -I${STAGING_
 
 PACKAGES =+ "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
 
-RDEPENDS_${PN} += "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
-
 INITSCRIPT_PACKAGES = "${PN}-pndnotifyd ${PN}-pndevmapperd"
 
 INITSCRIPT_NAME_${PN}-pndnotifyd = "pndnotifyd-init"
@@ -35,8 +33,10 @@ INITSCRIPT_PARAMS_${PN}-pndnotifyd = "start 30 5 3 . stop 40 0 1 6 ."
 INITSCRIPT_NAME_${PN}-pndevmapperd = "pndevmapperd-init"
 INITSCRIPT_PARAMS_${PN}-pndevmapperd = "start 30 5 3 . stop 40 0 1 6 ."
 
-RDEPENDS_${PN}-pndnotifyd += "${PN}"
-RDEPENDS_${PN}-pndevmapperd += "${PN}"
+# not needed - done by OE
+#RDEPENDS_${PN}-pndnotifyd += "${PN}"
+#RDEPENDS_${PN}-pndevmapperd += "${PN}"
+#RDEPENDS_${PN}-minimenu += "${PN}"
 
 do_compile_prepend() {
           cd ${S}/
@@ -56,8 +56,7 @@ do_install() {
           install -m 0644 ${S}/deployment/etc/pandora/conf/mmenu.conf ${D}${sysconfdir}/pandora/conf/mmenu.conf
 
           install -d ${D}${libdir}/
-          install -m 0644 ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
-          install -m 0644 ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
+          oe_libinstall -C ${S}/deployment/usr/lib/ libpnd ${D}/${libdir}/
 
           install -d ${D}${bindir}/
           install -m 0755 ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
@@ -106,3 +105,5 @@ FILES_${PN}-doc += "${libdir}/libpnd.txt "
 FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
 
 CONFFILES_${PN} += ${sysconfdir}/pandora/conf/eventmap
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index bb40715..113b583 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Task file for default core/console apps and libs in the Pandora i
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r44"
+PR = "r45"
 
 inherit task 
 
@@ -64,7 +64,9 @@ PAM = " \
 "
 
 PANDORA_LIBS = " \
-  pandora-libpnd lsof \
+  pandora-libpnd \
+  pandora-libpnd-pndnotifyd pandora-libpnd-pndevmapperd \
+  lsof \
   omap3-deviceid \
   pandora-skel \
   pandora-state \