[oe-commits] Thomas Zimmermann : shr/merge: fix last package for shr-image

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: cf42f13354c40d0e48196297b662ea82d6a6950b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cf42f13354c40d0e48196297b662ea82d6a6950b

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Mon Oct 12 15:18:09 2009 +0000

shr/merge: fix last package for shr-image

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 classes/openmoko2.bbclass                          |   10 ++++++++--
 .../openmoko2/openmoko-icon-theme-standard2_svn.bb |    6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index ef734e4..3294026 100644
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -6,12 +6,18 @@ OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
 
 def openmoko_two_get_license(d):
     import bb
-    openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    if bb.data.getVar('SECTION', d, 1).find("/") != -1 :
+        openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    else :
+    	section = bb.data.getVar('SECTION', d, 1)
     return "LGPL GPL".split()[section != "libs"]
 
 def openmoko_two_get_subdir(d):
     import bb
-    openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    if bb.data.getVar('SECTION', d, 1).find("/") != -1 :
+       openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    else :
+    	section = bb.data.getVar('SECTION', d, 1)
     if section == 'base': return ""
     elif section == 'libs': return "libraries"
     elif section in 'apps tools pim'.split(): return "applications"
diff --git a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb
index 79b2d93..e145fb2 100644
--- a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -9,9 +9,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=ico
 S = "${WORKDIR}/icons"
 
 pkg_postinst_${PN} () {
-#    if [ "x$D" != "x" ]; then
-#        exit 1
-#    fi
+    if [ "x$D" != "x" ]; then
+        exit 1
+    fi
     gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
 }