diff options
Diffstat (limited to 'classes/opie.bbclass')
| -rw-r--r-- | classes/opie.bbclass | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 55b3a9cb6e..bd1bbaf578 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -15,10 +15,16 @@ inherit palmtop +OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" + DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" # to be consistent, put all targets into workdir -EXTRA_QMAKEVARS_POST_append = " DESTDIR=${S}" +# NOTE: leave one space at the end, other files are expecting that +EXTRA_QMAKEVARS_POST += " DESTDIR=${S} " + +# Opie standard TAG value +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" # plan for later: # add common scopes for opie applications, see qmake-native/common.pro @@ -49,6 +55,7 @@ python opie_do_opie_install() { "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: @@ -72,7 +79,8 @@ python opie_do_opie_install() { 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 ) + 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: @@ -82,14 +90,15 @@ python opie_do_opie_install() { os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) ) if APPTYPE == "binary": - os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) + 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/bin/" % ( D, palmtopdir ) ) - os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) ) + 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 -addtask opie_install after do_compile before do_populate_staging +addtask opie_install after do_compile before do_package |