git.openpandora.org
/
openpandora.oe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora-libpnd: bump for updated pnd_run.sh
[openpandora.oe.git]
/
recipes
/
pandora-system
/
pandora-libpnd.bb
diff --git
a/recipes/pandora-system/pandora-libpnd.bb
b/recipes/pandora-system/pandora-libpnd.bb
index
b507a7d
..
d579131
100755
(executable)
--- 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"
DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
LICENSE = "lGPL"
-PR = "r
5
6"
+PR = "r
7
6"
PARALLEL_MAKE = ""
PARALLEL_MAKE = ""
@@
-14,7
+14,7
@@
SRC_URI = " \
file://op_pnd_run.desktop \
"
file://op_pnd_run.desktop \
"
-SRCREV = "
cd8c5f0fa1845ac31bb155e405e9fdedd9dc0022
"
+SRCREV = "
a6968a769ad2d91403bafafed82a6b8873f3e2e9
"
S = "${WORKDIR}/git"
S = "${WORKDIR}/git"
@@
-25,8
+25,6
@@
TARGET_CFLAGS += "-Wall -I./include -I${STAGING_INCDIR}/usr/include -I${STAGING_
PACKAGES =+ "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
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"
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 ."
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}/
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/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
install -d ${D}${bindir}/
install -m 0755 ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
@@
-76,7
+75,9
@@
do_install() {
install -d ${D}${sysconfdir}/pandora/mmenu/
install -d ${D}${sysconfdir}/pandora/mmenu/skins/
install -d ${D}${sysconfdir}/pandora/mmenu/skins/default/
install -d ${D}${sysconfdir}/pandora/mmenu/
install -d ${D}${sysconfdir}/pandora/mmenu/skins/
install -d ${D}${sysconfdir}/pandora/mmenu/skins/default/
+ install -d ${D}${sysconfdir}/pandora/mmenu/skins/clean/
install -m 0755 ${S}/deployment/etc/pandora/mmenu/skins/default/* ${D}${sysconfdir}/pandora/mmenu/skins/default
install -m 0755 ${S}/deployment/etc/pandora/mmenu/skins/default/* ${D}${sysconfdir}/pandora/mmenu/skins/default
+ install -m 0755 ${S}/deployment/etc/pandora/mmenu/skins/clean/* ${D}${sysconfdir}/pandora/mmenu/skins/clean
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/rc.pndnotifyd ${D}${sysconfdir}/init.d/pndnotifyd-init
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/rc.pndnotifyd ${D}${sysconfdir}/init.d/pndnotifyd-init
@@
-102,3
+103,7
@@
FILES_${PN}-doc += "${libdir}/libpnd.txt "
# Mop up remaining files.
FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
# Mop up remaining files.
FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+
+CONFFILES_${PN} += ${sysconfdir}/pandora/conf/eventmap
+
+NATIVE_INSTALL_WORKS = "1"