From 1995c3a85e93372ab9c7a6fac817e9674bbe09fa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 1 Aug 2012 00:13:14 +0100 Subject: 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 --- classes/opie.bbclass | 128 +++++++++++++-------------- classes/opie_i18n.bbclass | 84 +++++++++--------- recipes-opie/opie-help-en/opie-help-en.inc | 6 +- recipes-opie/opie-reader/opie-reader.inc | 16 ++-- recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb | 4 +- recipes-qtopia/qpf-fonts/qpf.inc | 20 ++--- 6 files changed, 129 insertions(+), 129 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" : ( "", "/apps/Applications" ), - "Multimedia" : ( "", "/apps/Applications" ), - "Games" : ( "", "/apps/Games" ), - "Settings" : ( "", "/apps/Settings" ), - "Pim" : ( "", "/apps/1Pim" ), - "Examples" : ( "", "/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 == "": - APPTYPE = "quicklaunch" - else: - APPTYPE = "plugin" - - appmap = { "binary":"/bin", "quicklaunch":"/plugins/application" } - if 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" : ( "", "/apps/Applications" ), + "Multimedia" : ( "", "/apps/Applications" ), + "Games" : ( "", "/apps/Games" ), + "Settings" : ( "", "/apps/Settings" ), + "Pim" : ( "", "/apps/1Pim" ), + "Examples" : ( "", "/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 == "": + APPTYPE = "quicklaunch" + else: + APPTYPE = "plugin" + + appmap = { "binary":"/bin", "quicklaunch":"/plugins/application" } + if 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 diff --git a/classes/opie_i18n.bbclass b/classes/opie_i18n.bbclass index 121533f..85ac0a8 100644 --- a/classes/opie_i18n.bbclass +++ b/classes/opie_i18n.bbclass @@ -13,45 +13,45 @@ inherit palmtop-defs I18N_STATS = "1" SRC_URI += "${OPIE_GIT};protocol=git;subpath=i18n" DEPENDS += "opie-i18n" - + die () { printf "opie_18n: ERROR: $1\n" exit 1 -} +} python do_build_opie_i18n_data() { - import os, bb, re - workdir = bb.data.getVar("WORKDIR", d, 1) - packages = bb.data.getVar("PACKAGES", d, 1) - files = bb.data.getVar("FILES", d, 1) - section = bb.data.getVar("SECTION", d, 1) - pn = bb.data.getVar("PN", d, 1) - rdepends = bb.data.getVar("RDEPENDS", d, 1) - - if os.path.exists(workdir + "/PACKAGES.tmp"): - fd = open(workdir + "/PACKAGES.tmp", 'r') - lines = fd.readlines() - fd.close() - - bb.data.setVar('PACKAGES', " ".join(lines).lower() + " " + packages, d) - - fd = open(workdir + "/FILES.tmp", 'r') - lines = fd.readlines() - fd.close() - - for l in lines: - x = re.split("\#", l) - bb.data.setVar('FILES_%s' % x[0].lower(), " " + x[1].strip('\n'), d) - bb.data.setVar('SECTION_%s' % x[0].lower(), "opie/translations", d) - bb.data.setVar('RDEPENDS_%s' % x[0].lower(), pn, d) - - bb.data.setVar('SECTION_%s' % pn, section, d) - bb.data.setVar('RDEPENDS', rdepends, d) - else: - bb.note("No translations found for package " + pn) + import os, bb, re + workdir = bb.data.getVar("WORKDIR", d, 1) + packages = bb.data.getVar("PACKAGES", d, 1) + files = bb.data.getVar("FILES", d, 1) + section = bb.data.getVar("SECTION", d, 1) + pn = bb.data.getVar("PN", d, 1) + rdepends = bb.data.getVar("RDEPENDS", d, 1) + + if os.path.exists(workdir + "/PACKAGES.tmp"): + fd = open(workdir + "/PACKAGES.tmp", 'r') + lines = fd.readlines() + fd.close() + + bb.data.setVar('PACKAGES', " ".join(lines).lower() + " " + packages, d) + + fd = open(workdir + "/FILES.tmp", 'r') + lines = fd.readlines() + fd.close() + + for l in lines: + x = re.split("\#", l) + bb.data.setVar('FILES_%s' % x[0].lower(), " " + x[1].strip('\n'), d) + bb.data.setVar('SECTION_%s' % x[0].lower(), "opie/translations", d) + bb.data.setVar('RDEPENDS_%s' % x[0].lower(), pn, d) + + bb.data.setVar('SECTION_%s' % pn, section, d) + bb.data.setVar('RDEPENDS', rdepends, d) + else: + bb.note("No translations found for package " + pn) } - + do_build_opie_i18n () { cd "${WORKDIR}/i18n" || die "ERROR:\nCouldn't find Opies i18n sources in ${PN}/i18n\nMake sure that or is *below* !" @@ -65,7 +65,7 @@ do_build_opie_i18n () { printf "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file\n" else echo "I18N Datafiles: ${I18N_FILES} (provided by .bb)" - fi + fi rm -f "${WORKDIR}/FILES.tmp" "${WORKDIR}/PACKAGES.tmp" @@ -78,7 +78,7 @@ do_build_opie_i18n () { do printf "\tCompiling [$ts_file]\n" cd "${WORKDIR}/i18n/`dirname $ts_file`" || die "[${WORKDIR}/i18n/`dirname $ts_file`] not found" - opie-lrelease "`basename $ts_file`" || die "lrelease failed! Make sure that or is *below* !" + opie-lrelease "`basename $ts_file`" || die "lrelease failed! Make sure that or is *below* !" # $lang is the language as in de_DE, $lang_sane replaces "_" with "-" # to allow packaging as "_" is not allowed in a package name @@ -86,15 +86,15 @@ do_build_opie_i18n () { lang_sane="`echo "$ts_file" | sed -n "s#\(.*\)/\(.*\)#\1#p"|sed s/\_/\-/`" printf "\tPackaging [`basename $ts_file`] for language [$lang]\n" - install -d ${D}${palmtopdir}/i18n/$lang + install -d ${D}${palmtopdir}/i18n/$lang install -m 0644 ${WORKDIR}/i18n/$lang/.directory ${D}${palmtopdir}/i18n/$lang/ install -m 0644 ${WORKDIR}/i18n/$lang/*.qm "${D}${palmtopdir}/i18n/$lang/" - + # As it is not possible to modify OE vars from within a _shell_ function, # some major hacking was needed. These two files will be read by the python # function do_build_opie_i18n_data() which sets the variables FILES_* and # PACKAGES as needed. - echo -n "${PN}-${lang_sane} " >> "${WORKDIR}/PACKAGES.tmp" + echo -n "${PN}-${lang_sane} " >> "${WORKDIR}/PACKAGES.tmp" printf "${PN}-${lang_sane}#${palmtopdir}/i18n/$lang" >> "${WORKDIR}/FILES.tmp\n" ts_found_something=1 @@ -107,12 +107,12 @@ do_build_opie_i18n () { ts_found_something="" ts_found="$ts_found $file" fi - + # Only used for debugging purposes - test "${I18N_STATS}" = 1 && cd "${WORKDIR}/i18n" + test "${I18N_STATS}" = 1 && cd "${WORKDIR}/i18n" printf "Completed [$file]\n\n\n" - done + done qt_dirs="apps bin etc lib pics plugins share sounds" @@ -123,7 +123,7 @@ do_build_opie_i18n () { # If we don't adjust FILES to exclude the i18n directory, we will end up with - # _lots_ of empty i18n/$lang directories in the original .ipk. + # _lots_ of empty i18n/$lang directories in the original .ipk. if (echo "${FILES}" | egrep "${palmtopdir}/? |${palmtopdir}/?$") &>/dev/null then echo "NOTE: FILES was set to ${palmtopdir} which would include the i18n directory" @@ -142,7 +142,7 @@ do_build_opie_i18n () { echo "NOTE:" printf "Since FILES is empty, i'll add all directories below ${palmtopdir} to it,\nexcluding i18n: ( $qt_dirs )\n" echo "${PN}#$FILES $dir_" >> "${WORKDIR}/FILES.tmp" - fi + fi if ! test -e "${WORKDIR}/PACKAGES.tmp" -a "${I18N_STATS}" = 1 then diff --git a/recipes-opie/opie-help-en/opie-help-en.inc b/recipes-opie/opie-help-en/opie-help-en.inc index 1ad39b1..30295f3 100644 --- a/recipes-opie/opie-help-en/opie-help-en.inc +++ b/recipes-opie/opie-help-en/opie-help-en.inc @@ -24,7 +24,7 @@ do_install() { } python populate_packages_prepend () { - help_dir = bb.data.expand('${palmtopdir}/help/en/html/', d) - - do_split_packages(d, help_dir, file_regex='^(.*)\.html$', output_pattern='opie-%s-help-en', description='Opie Help for %s - English', aux_files_pattern=help_dir + '%s/*') + help_dir = bb.data.expand('${palmtopdir}/help/en/html/', d) + + do_split_packages(d, help_dir, file_regex='^(.*)\.html$', output_pattern='opie-%s-help-en', description='Opie Help for %s - English', aux_files_pattern=help_dir + '%s/*') } diff --git a/recipes-opie/opie-reader/opie-reader.inc b/recipes-opie/opie-reader/opie-reader.inc index 6e82e5f..9a2ce76 100644 --- a/recipes-opie/opie-reader/opie-reader.inc +++ b/recipes-opie/opie-reader/opie-reader.inc @@ -53,13 +53,13 @@ do_install() { } python populate_packages_prepend () { - print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d ) - plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d) - for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]: - dir = plugindir + '/' + dir - do_split_packages(d, dir, - '^lib(.*)\.so$', 'opie-reader-' + type + '-%s', - 'Opie reader %s ' + type, - prepend=True) + print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d ) + plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d) + for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]: + dir = plugindir + '/' + dir + do_split_packages(d, dir, + '^lib(.*)\.so$', 'opie-reader-' + type + '-%s', + 'Opie reader %s ' + type, + prepend=True) } diff --git a/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb b/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb index a820d9e..fe66408 100644 --- a/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb +++ b/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb @@ -45,8 +45,8 @@ PACKAGES_DYNAMIC = "libgaim-protocol-*" #FIXME: use do_packages to create individual packages for each of the plugins python populate_packages_prepend () { - plugindir = bb.data.expand('${libdir}/gaim', d) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'libgaim-protocol-%s', 'GAIM plugin for %s protocol', extra_depends='' ) + plugindir = bb.data.expand('${libdir}/gaim', d) + do_split_packages(d, plugindir, '^lib(.*)\.so$', 'libgaim-protocol-%s', 'GAIM plugin for %s protocol', extra_depends='' ) } PACKAGES += "libgaim-plugins" diff --git a/recipes-qtopia/qpf-fonts/qpf.inc b/recipes-qtopia/qpf-fonts/qpf.inc index 7fcb5a0..cec191d 100644 --- a/recipes-qtopia/qpf-fonts/qpf.inc +++ b/recipes-qtopia/qpf-fonts/qpf.inc @@ -19,16 +19,16 @@ pkg_postrm_fonts() { } python populate_packages_prepend() { - postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) - postrm = bb.data.getVar('pkg_postrm_fonts', d, 1) - fontdir = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts' - pkgregex = "^([a-z-]*_[0-9]*).*.qpf$" - pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s' - pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s' - - do_split_packages(d, root=fontdir, file_regex=pkgregex, output_pattern=pkgpattern, - description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, - extra_depends='qpf-font-common') + postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) + postrm = bb.data.getVar('pkg_postrm_fonts', d, 1) + fontdir = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts' + pkgregex = "^([a-z-]*_[0-9]*).*.qpf$" + pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s' + pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s' + + do_split_packages(d, root=fontdir, file_regex=pkgregex, output_pattern=pkgpattern, + description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, + extra_depends='qpf-font-common') } PACKAGE_ARCH = "all" -- cgit 1.2.3-korg