[oe-commits] Paul Eggleton : opie-security: move do_install customisations to .inc file

[git version control]

Module: openembedded.git
Branch: master
Commit: 6fde2fa6261825fc898c23995f9d32711290d55a
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=6fde2fa6261825fc898c23995f9d32711290d55a

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jun  4 14:02:06 2011 +0100

opie-security: move do_install customisations to .inc file

Small tidy-up now older version that required this has been removed.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 recipes/opie-security/opie-security.inc      |    2 +-
 recipes/opie-security/opie-security_1.2.5.bb |   12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/recipes/opie-security/opie-security.inc b/recipes/opie-security/opie-security.inc
index b9fbbbd..b707ff8 100644
--- a/recipes/opie-security/opie-security.inc
+++ b/recipes/opie-security/opie-security.inc
@@ -12,7 +12,7 @@ inherit opie
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
 
-	for icon in Security.png lock.png multiauth.png sync.png users.png;
+	for icon in Security.png lock.png multiauth.png sync.png users.png ownerinfo.png;
 	do
 	    install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/
 	done
diff --git a/recipes/opie-security/opie-security_1.2.5.bb b/recipes/opie-security/opie-security_1.2.5.bb
index c5a055d..b20474a 100644
--- a/recipes/opie-security/opie-security_1.2.5.bb
+++ b/recipes/opie-security/opie-security_1.2.5.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_core_settings_security.tar.bz2;name=split_core_settings_security \
            http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics \
@@ -12,13 +12,3 @@ SRC_URI[split_pics.sha256sum] = "0a7aab6d0bce04d6a9c257d768d8a1a481d38ba527d6e6e
 SRC_URI[split_apps.md5sum] = "c765d13427e4dc8ee396e4dfed2dbe73"
 SRC_URI[split_apps.sha256sum] = "0fea454d8d286f7febc7449e4a06f73e941e8b22e9bab904a32e57f35479862a"
 
-# FILES plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-
-        for icon in Security.png lock.png multiauth.png sync.png users.png ownerinfo.png;
-        do
-            install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/
-        done
-}
-