diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-01 00:13:14 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-01 00:07:36 +0100 |
commit | 1995c3a85e93372ab9c7a6fac817e9674bbe09fa (patch) | |
tree | 86fac10c4b8b97740ceb1e14779a0edcc443c5e5 /classes/opie.bbclass | |
parent | b8f6e24538bb8b6913dd9b5831b35e5e71365bc1 (diff) | |
download | meta-opie-1995c3a85e93372ab9c7a6fac817e9674bbe09fa.tar.gz |
Fix whitespace issues
Ensure we use only four spaces in all python functions; this avoids
warnings and errors triggered by the recent cleanup in OE-Core.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'classes/opie.bbclass')
-rw-r--r-- | classes/opie.bbclass | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index df2b2a2..d48acb2 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -35,72 +35,72 @@ do_configure_prepend() { # python opie_do_opie_install() { - import os, shutil - section = bb.data.getVar( "SECTION", d ).split( '/' )[1] or "Applications" - section = section.title() - if section in ( "Base", "Libs" ): - bb.note( "Section = Base or Libs. Target won't be installed automatically." ) - return - - # SECTION : BINDIR DESKTOPDIR - dirmap = { "Applets" : ( "/plugins/applets", None ), - "Applications" : ( "<BINDIR>", "/apps/Applications" ), - "Multimedia" : ( "<BINDIR>", "/apps/Applications" ), - "Games" : ( "<BINDIR>", "/apps/Games" ), - "Settings" : ( "<BINDIR>", "/apps/Settings" ), - "Pim" : ( "<BINDIR>", "/apps/1Pim" ), - "Examples" : ( "<BINDIR>", "/apps/Examples" ), - "Shell" : ( "/bin", "/apps/Opie-SH" ), - "Codecs" : ( "/plugins/codecs", None ), - "Decorations" : ( "/plugins/decorations", None ), - "Inputmethods" : ( "/plugins/inputmethods", None ), - "Fontfactories" : ( "/plugins/fontfactories", None ), - "Security" : ( "/plugins/security", None ), - "Styles" : ( "/plugins/styles", None ), - "Today" : ( "/plugins/today", None ), - "Datebook" : ( "/plugins/holidays", None ), - "Networksettings" : ( "/plugins/networksettings", None ) } - - if section not in dirmap: - raise ValueError, "Unknown section '%s'. Valid sections are: %s" % ( section, dirmap.keys() ) - - bindir, desktopdir = dirmap[section] - APPNAME = bb.data.getVar( "APPNAME", d, True ) or bb.data.getVar( "PN", d, True ) - APPTYPE = bb.data.getVar( "APPTYPE", d, True ) - if not APPTYPE: - if bindir == "<BINDIR>": - APPTYPE = "quicklaunch" - else: - APPTYPE = "plugin" - - appmap = { "binary":"/bin", "quicklaunch":"/plugins/application" } - if bindir == "<BINDIR>": bindir = appmap[APPTYPE] - - bb.note( "Section='%s', bindir='%s', desktopdir='%s', name='%s', type='%s'" % + import os, shutil + section = bb.data.getVar( "SECTION", d ).split( '/' )[1] or "Applications" + section = section.title() + if section in ( "Base", "Libs" ): + bb.note( "Section = Base or Libs. Target won't be installed automatically." ) + return + + # SECTION : BINDIR DESKTOPDIR + dirmap = { "Applets" : ( "/plugins/applets", None ), + "Applications" : ( "<BINDIR>", "/apps/Applications" ), + "Multimedia" : ( "<BINDIR>", "/apps/Applications" ), + "Games" : ( "<BINDIR>", "/apps/Games" ), + "Settings" : ( "<BINDIR>", "/apps/Settings" ), + "Pim" : ( "<BINDIR>", "/apps/1Pim" ), + "Examples" : ( "<BINDIR>", "/apps/Examples" ), + "Shell" : ( "/bin", "/apps/Opie-SH" ), + "Codecs" : ( "/plugins/codecs", None ), + "Decorations" : ( "/plugins/decorations", None ), + "Inputmethods" : ( "/plugins/inputmethods", None ), + "Fontfactories" : ( "/plugins/fontfactories", None ), + "Security" : ( "/plugins/security", None ), + "Styles" : ( "/plugins/styles", None ), + "Today" : ( "/plugins/today", None ), + "Datebook" : ( "/plugins/holidays", None ), + "Networksettings" : ( "/plugins/networksettings", None ) } + + if section not in dirmap: + raise ValueError, "Unknown section '%s'. Valid sections are: %s" % ( section, dirmap.keys() ) + + bindir, desktopdir = dirmap[section] + APPNAME = bb.data.getVar( "APPNAME", d, True ) or bb.data.getVar( "PN", d, True ) + APPTYPE = bb.data.getVar( "APPTYPE", d, True ) + if not APPTYPE: + if bindir == "<BINDIR>": + APPTYPE = "quicklaunch" + else: + APPTYPE = "plugin" + + appmap = { "binary":"/bin", "quicklaunch":"/plugins/application" } + if bindir == "<BINDIR>": bindir = appmap[APPTYPE] + + bb.note( "Section='%s', bindir='%s', desktopdir='%s', name='%s', type='%s'" % ( section, bindir, desktopdir, APPNAME, APPTYPE ) ) - S = bb.data.getVar( "S", d, 1 ) - D = "%s/image" % bb.data.getVar( "WORKDIR", d, True ) - WORKDIR = bb.data.getVar( "WORKDIR", d, True ) - palmtopdir = bb.data.getVar( "palmtopdir", d, True ) - gnubindir = bb.data.getVar( "bindir", d, True ) - APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir ) - - if desktopdir is not None: - os.system( "install -d %s%s%s/" % ( D, palmtopdir, desktopdir ) ) - os.system( "install -m 0644 %s/%s.desktop %s%s%s/" % ( APPDESKTOP, APPNAME, D, palmtopdir, desktopdir ) ) - - os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) ) - - if APPTYPE == "binary": - os.system( "install -d %s%s/" % ( D, gnubindir ) ) - os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) ) - elif APPTYPE == "quicklaunch": - os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) - os.system( "install -d %s%s/" % ( D, gnubindir ) ) - os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) ) - elif APPTYPE == "plugin": - os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) + S = bb.data.getVar( "S", d, 1 ) + D = "%s/image" % bb.data.getVar( "WORKDIR", d, True ) + WORKDIR = bb.data.getVar( "WORKDIR", d, True ) + palmtopdir = bb.data.getVar( "palmtopdir", d, True ) + gnubindir = bb.data.getVar( "bindir", d, True ) + APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir ) + + if desktopdir is not None: + os.system( "install -d %s%s%s/" % ( D, palmtopdir, desktopdir ) ) + os.system( "install -m 0644 %s/%s.desktop %s%s%s/" % ( APPDESKTOP, APPNAME, D, palmtopdir, desktopdir ) ) + + os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) ) + + if APPTYPE == "binary": + os.system( "install -d %s%s/" % ( D, gnubindir ) ) + os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) ) + elif APPTYPE == "quicklaunch": + os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) + os.system( "install -d %s%s/" % ( D, gnubindir ) ) + os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) ) + elif APPTYPE == "plugin": + os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) } EXPORT_FUNCTIONS do_opie_install |