Convert tab indentation in python functions into four-space

(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
author: Richard Purdie <richard.purdie@linuxfoundation.org> 2012-07-11 17:33:43 +0000
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2012-07-19 10:24:50 +0100
commit: bfd279de3275abbfaf3e630383ec244131e0375f (patch)
tree: 0d1c90461a890d21444f5d2afb13c52b302427f1 /meta/classes/package_rpm.bbclass
parent: 99203edda6f0b09d817454d656c100b7a8806b18 (diff)
download: poky-bfd279de3275abbfaf3e630383ec244131e0375f.tar.gz
1 files changed, 590 insertions, 590 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2a2991768b..b20df0f243 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -9,11 +9,11 @@ PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"
 PKGWRITEDIRSRPM = "${DEPLOY_DIR}/sources/deploy-srpm"
 python package_rpm_fn () {
-        d.setVar('PKGFN', d.getVar('PKG'))
+    d.setVar('PKGFN', d.getVar('PKG'))
 }
 python package_rpm_install () {
-        bb.fatal("package_rpm_install not implemented!")
+    bb.fatal("package_rpm_install not implemented!")
 }
 RPMCONF_TARGET_BASE = "${DEPLOY_DIR_RPM}/solvedb"
@@ -547,601 +547,601 @@ EOF
 }
 python write_specfile () {
-        import textwrap
+    import textwrap
-        import oe.packagedata
+    import oe.packagedata
-        # append information for logs and patches to %prep
+    # append information for logs and patches to %prep
-        def add_prep(d,spec_files_bottom):
+    def add_prep(d,spec_files_bottom):
-                if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
+        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
-                        spec_files_bottom.append('%%prep -n %s' % d.getVar('PN', True) )
+            spec_files_bottom.append('%%prep -n %s' % d.getVar('PN', True) )
-                        spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"")
+            spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"")
-                        spec_files_bottom.append('')
+            spec_files_bottom.append('')
-        # get the name of tarball for sources, patches and logs
+    # get the name of tarball for sources, patches and logs
-        def get_tarballs(d):
+    def get_tarballs(d):
-                if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
+        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
-                        return get_package(d)
+            return get_package(d)
    
-        # append the name of tarball to key word 'SOURCE' in xxx.spec.
+    # append the name of tarball to key word 'SOURCE' in xxx.spec.
-        def tail_source(d,source_list=[],patch_list=None):
+    def tail_source(d,source_list=[],patch_list=None):
-                if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
+        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
-                        source_number = 0
+            source_number = 0
-                        patch_number = 0
+            patch_number = 0
-                        for source in source_list:
+            for source in source_list:
-                                spec_preamble_top.append('Source' + str(source_number) + ': %s' % source)
+                spec_preamble_top.append('Source' + str(source_number) + ': %s' % source)
-                                source_number += 1
+                source_number += 1
-                        if patch_list:
+            if patch_list:
-                                for patch in patch_list:
+                for patch in patch_list:
-                                        print_deps(patch, "Patch" + str(patch_number), spec_preamble_top, d)
+                    print_deps(patch, "Patch" + str(patch_number), spec_preamble_top, d)
-                                        patch_number += 1
+                    patch_number += 1
-        # We need a simple way to remove the MLPREFIX from the package name,
+    # We need a simple way to remove the MLPREFIX from the package name,
-        # and dependency information...
+    # and dependency information...
-        def strip_multilib(name, d):
+    def strip_multilib(name, d):
-                multilibs = d.getVar('MULTILIBS', True) or ""
+        multilibs = d.getVar('MULTILIBS', True) or ""
-                for ext in multilibs.split():
+        for ext in multilibs.split():
-                        eext = ext.split(':')
+            eext = ext.split(':')
-                        if len(eext) > 1 and eext[0] == 'multilib' and name and name.find(eext[1] + '-') >= 0:
+            if len(eext) > 1 and eext[0] == 'multilib' and name and name.find(eext[1] + '-') >= 0:
-                                name = "".join(name.split(eext[1] + '-'))
+                name = "".join(name.split(eext[1] + '-'))
-                return name
+        return name
-#               ml = d.getVar("MLPREFIX", True)
+#        ml = d.getVar("MLPREFIX", True)
-#               if ml and name and len(ml) != 0 and name.find(ml) == 0:
+#        if ml and name and len(ml) != 0 and name.find(ml) == 0:
-#                       return ml.join(name.split(ml, 1)[1:])
+#            return ml.join(name.split(ml, 1)[1:])
-#               return name
+#        return name
-        # In RPM, dependencies are of the format: pkg <>= Epoch:Version-Release
+    # In RPM, dependencies are of the format: pkg <>= Epoch:Version-Release
-        # This format is similar to OE, however there are restrictions on the
+    # This format is similar to OE, however there are restrictions on the
-        # characters that can be in a field.  In the Version field, "-"
+    # characters that can be in a field.  In the Version field, "-"
-        # characters are not allowed.  "-" is allowed in the Release field.
+    # characters are not allowed.  "-" is allowed in the Release field.
-        #
+    #
-        # We translate the "-" in the version to a "+", by loading the PKGV
+    # We translate the "-" in the version to a "+", by loading the PKGV
-        # from the dependent recipe, replacing the - with a +, and then using
+    # from the dependent recipe, replacing the - with a +, and then using
-        # that value to do a replace inside of this recipe's dependencies.
+    # that value to do a replace inside of this recipe's dependencies.
-        # This preserves the "-" separator between the version and release, as
+    # This preserves the "-" separator between the version and release, as
-        # well as any "-" characters inside of the release field.
+    # well as any "-" characters inside of the release field.
-        #
+    #
-        # All of this has to happen BEFORE the mapping_rename_hook as
+    # All of this has to happen BEFORE the mapping_rename_hook as
-        # after renaming we cannot look up the dependencies in the packagedata
+    # after renaming we cannot look up the dependencies in the packagedata
-        # store.
+    # store.
-        def translate_vers(varname, d):
+    def translate_vers(varname, d):
-                depends = d.getVar(varname, True)
+        depends = d.getVar(varname, True)
-                if depends:
+        if depends:
-                        depends_dict = bb.utils.explode_dep_versions(depends)
+            depends_dict = bb.utils.explode_dep_versions(depends)
-                        newdeps_dict = {}
+            newdeps_dict = {}
-                        for dep in depends_dict:
+            for dep in depends_dict:
-                                ver = depends_dict[dep]
+                ver = depends_dict[dep]
-                                if dep and ver:
+                if dep and ver:
-                                        if '-' in ver:
+                    if '-' in ver:
-                                                subd = oe.packagedata.read_subpkgdata_dict(dep, d)
+                        subd = oe.packagedata.read_subpkgdata_dict(dep, d)
-                                                if 'PKGV' in subd:
+                        if 'PKGV' in subd:
-                                                        pv = subd['PKGV']
+                            pv = subd['PKGV']
-                                                        reppv = pv.replace('-', '+')
+                            reppv = pv.replace('-', '+')
-                                                        ver = ver.replace(pv, reppv)
+                            ver = ver.replace(pv, reppv)
-                                newdeps_dict[dep] = ver
+                newdeps_dict[dep] = ver
-                        depends = bb.utils.join_deps(newdeps_dict)
+            depends = bb.utils.join_deps(newdeps_dict)
-                        d.setVar(varname, depends.strip())
+            d.setVar(varname, depends.strip())
-        # We need to change the style the dependency from BB to RPM
+    # We need to change the style the dependency from BB to RPM
-        # This needs to happen AFTER the mapping_rename_hook
+    # This needs to happen AFTER the mapping_rename_hook
-        def print_deps(variable, tag, array, d):
+    def print_deps(variable, tag, array, d):
-                depends = variable
+        depends = variable
-                if depends:
+        if depends:
-                        depends_dict = bb.utils.explode_dep_versions(depends)
+            depends_dict = bb.utils.explode_dep_versions(depends)
-                        for dep in depends_dict:
+            for dep in depends_dict:
-                                ver = depends_dict[dep]
+                ver = depends_dict[dep]
-                                if dep and ver:
+                if dep and ver:
-                                        ver = ver.replace('(', '')
+                    ver = ver.replace('(', '')
-                                        ver = ver.replace(')', '')
+                    ver = ver.replace(')', '')
-                                        array.append("%s: %s %s" % (tag, dep, ver))
+                    array.append("%s: %s %s" % (tag, dep, ver))
-                                else:
+                else:
-                                        array.append("%s: %s" % (tag, dep))
+                    array.append("%s: %s" % (tag, dep))
-        def walk_files(walkpath, target, conffiles):
+    def walk_files(walkpath, target, conffiles):
-                import os
+        import os
-                for rootpath, dirs, files in os.walk(walkpath):
+        for rootpath, dirs, files in os.walk(walkpath):
-                        path = rootpath.replace(walkpath, "")
+            path = rootpath.replace(walkpath, "")
-                        for dir in dirs:
+            for dir in dirs:
-                                # All packages own the directories their files are in...
+                # All packages own the directories their files are in...
-                                target.append('%dir "' + path + '/' + dir + '"')
+                target.append('%dir "' + path + '/' + dir + '"')
-                        for file in files:
+            for file in files:
-                                if conffiles.count(path + '/' + file):
+                if conffiles.count(path + '/' + file):
-                                        target.append('%config "' + path + '/' + file + '"')
+                    target.append('%config "' + path + '/' + file + '"')
-                                else:
+                else:
-                                        target.append('"' + path + '/' + file + '"')
+                    target.append('"' + path + '/' + file + '"')
-        # Prevent the prerm/postrm scripts from being run during an upgrade
+    # Prevent the prerm/postrm scripts from being run during an upgrade
-        def wrap_uninstall(scriptvar):
+    def wrap_uninstall(scriptvar):
-                scr = scriptvar.strip()
+        scr = scriptvar.strip()
-                if scr.startswith("#!"):
+        if scr.startswith("#!"):
-                        pos = scr.find("\n") + 1
+            pos = scr.find("\n") + 1
-                else:
+        else:
-                        pos = 0
+            pos = 0
-                scr = scr[:pos] + 'if [ "$1" = "0" ] ; then\n' + scr[pos:] + '\nfi'
+        scr = scr[:pos] + 'if [ "$1" = "0" ] ; then\n' + scr[pos:] + '\nfi'
-                return scr
+        return scr
-        packages = d.getVar('PACKAGES', True)
+    packages = d.getVar('PACKAGES', True)
-        if not packages or packages == '':
+    if not packages or packages == '':
-                bb.debug(1, "No packages; nothing to do")
+        bb.debug(1, "No packages; nothing to do")
-                return
+        return
-        pkgdest = d.getVar('PKGDEST', True)
+    pkgdest = d.getVar('PKGDEST', True)
-        if not pkgdest:
+    if not pkgdest:
-                bb.fatal("No PKGDEST")
+        bb.fatal("No PKGDEST")
-                return
+        return
-        outspecfile = d.getVar('OUTSPECFILE', True)
+    outspecfile = d.getVar('OUTSPECFILE', True)
-        if not outspecfile:
+    if not outspecfile:
-                bb.fatal("No OUTSPECFILE")
+        bb.fatal("No OUTSPECFILE")
-                return
+        return
-        # Construct the SPEC file...
+    # Construct the SPEC file...
-        srcname    = strip_multilib(d.getVar('PN', True), d)
+    srcname    = strip_multilib(d.getVar('PN', True), d)
-        srcsummary = (d.getVar('SUMMARY', True) or d.getVar('DESCRIPTION', True) or ".")
+    srcsummary = (d.getVar('SUMMARY', True) or d.getVar('DESCRIPTION', True) or ".")
-        srcversion = d.getVar('PKGV', True).replace('-', '+')
+    srcversion = d.getVar('PKGV', True).replace('-', '+')
-        srcrelease = d.getVar('PKGR', True)
+    srcrelease = d.getVar('PKGR', True)
-        srcepoch   = (d.getVar('PKGE', True) or "")
+    srcepoch   = (d.getVar('PKGE', True) or "")
-        srclicense = d.getVar('LICENSE', True)
+    srclicense = d.getVar('LICENSE', True)
-        srcsection = d.getVar('SECTION', True)
+    srcsection = d.getVar('SECTION', True)
-        srcmaintainer  = d.getVar('MAINTAINER', True)
+    srcmaintainer  = d.getVar('MAINTAINER', True)
-        srchomepage    = d.getVar('HOMEPAGE', True)
+    srchomepage    = d.getVar('HOMEPAGE', True)
-        srcdescription = d.getVar('DESCRIPTION', True) or "."
+    srcdescription = d.getVar('DESCRIPTION', True) or "."
-        srcdepends     = strip_multilib(d.getVar('DEPENDS', True), d)
+    srcdepends     = strip_multilib(d.getVar('DEPENDS', True), d)
-        srcrdepends    = []
+    srcrdepends    = []
-        srcrrecommends = []
+    srcrrecommends = []
-        srcrsuggests   = []
+    srcrsuggests   = []
-        srcrprovides   = []
+    srcrprovides   = []
-        srcrreplaces   = []
+    srcrreplaces   = []
-        srcrconflicts  = []
+    srcrconflicts  = []
-        srcrobsoletes  = []
+    srcrobsoletes  = []
-        srcpreinst  = []
+    srcpreinst  = []
-        srcpostinst = []
+    srcpostinst = []
-        srcprerm    = []
+    srcprerm    = []
-        srcpostrm   = []
+    srcpostrm   = []
-        spec_preamble_top = []
+    spec_preamble_top = []
-        spec_preamble_bottom = []
+    spec_preamble_bottom = []
-        spec_scriptlets_top = []
+    spec_scriptlets_top = []
-        spec_scriptlets_bottom = []
+    spec_scriptlets_bottom = []
-        spec_files_top = []
+    spec_files_top = []
-        spec_files_bottom = []
+    spec_files_bottom = []
-        for pkg in packages.split():
+    for pkg in packages.split():
-                localdata = bb.data.createCopy(d)
+        localdata = bb.data.createCopy(d)
-                root = "%s/%s" % (pkgdest, pkg)
+        root = "%s/%s" % (pkgdest, pkg)
-                lf = bb.utils.lockfile(root + ".lock")
+        lf = bb.utils.lockfile(root + ".lock")
-                localdata.setVar('ROOT', '')
+        localdata.setVar('ROOT', '')
-                localdata.setVar('ROOT_%s' % pkg, root)
+        localdata.setVar('ROOT_%s' % pkg, root)
-                pkgname = localdata.getVar('PKG_%s' % pkg, True)
+        pkgname = localdata.getVar('PKG_%s' % pkg, True)
-                if not pkgname:
+        if not pkgname:
-                        pkgname = pkg
+            pkgname = pkg
-                localdata.setVar('PKG', pkgname)
+        localdata.setVar('PKG', pkgname)
-                localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', pkg)
-                bb.data.update_data(localdata)
+        bb.data.update_data(localdata)
-                conffiles = (localdata.getVar('CONFFILES', True) or "").split()
+        conffiles = (localdata.getVar('CONFFILES', True) or "").split()
-                splitname    = strip_multilib(pkgname, d)
+        splitname    = strip_multilib(pkgname, d)
-                splitsummary = (localdata.getVar('SUMMARY', True) or localdata.getVar('DESCRIPTION', True) or ".")
+        splitsummary = (localdata.getVar('SUMMARY', True) or localdata.getVar('DESCRIPTION', True) or ".")
-                splitversion = (localdata.getVar('PKGV', True) or "").replace('-', '+')
+        splitversion = (localdata.getVar('PKGV', True) or "").replace('-', '+')
-                splitrelease = (localdata.getVar('PKGR', True) or "")
+        splitrelease = (localdata.getVar('PKGR', True) or "")
-                splitepoch   = (localdata.getVar('PKGE', True) or "")
+        splitepoch   = (localdata.getVar('PKGE', True) or "")
-                splitlicense = (localdata.getVar('LICENSE', True) or "")
+        splitlicense = (localdata.getVar('LICENSE', True) or "")
-                splitsection = (localdata.getVar('SECTION', True) or "")
+        splitsection = (localdata.getVar('SECTION', True) or "")
-                splitdescription = (localdata.getVar('DESCRIPTION', True) or ".")
+        splitdescription = (localdata.getVar('DESCRIPTION', True) or ".")
-                translate_vers('RDEPENDS', localdata)
+        translate_vers('RDEPENDS', localdata)
-                translate_vers('RRECOMMENDS', localdata)
+        translate_vers('RRECOMMENDS', localdata)
-                translate_vers('RSUGGESTS', localdata)
+        translate_vers('RSUGGESTS', localdata)
-                translate_vers('RPROVIDES', localdata)
+        translate_vers('RPROVIDES', localdata)
-                translate_vers('RREPLACES', localdata)
+        translate_vers('RREPLACES', localdata)
-                translate_vers('RCONFLICTS', localdata)
+        translate_vers('RCONFLICTS', localdata)
-                # Map the dependencies into their final form
+        # Map the dependencies into their final form
-                mapping_rename_hook(localdata)
+        mapping_rename_hook(localdata)
-                splitrdepends    = strip_multilib(localdata.getVar('RDEPENDS', True), d) or ""
+        splitrdepends    = strip_multilib(localdata.getVar('RDEPENDS', True), d) or ""
-                splitrrecommends = strip_multilib(localdata.getVar('RRECOMMENDS', True), d) or ""
+        splitrrecommends = strip_multilib(localdata.getVar('RRECOMMENDS', True), d) or ""
-                splitrsuggests   = strip_multilib(localdata.getVar('RSUGGESTS', True), d) or ""
+        splitrsuggests   = strip_multilib(localdata.getVar('RSUGGESTS', True), d) or ""
-                splitrprovides   = strip_multilib(localdata.getVar('RPROVIDES', True), d) or ""
+        splitrprovides   = strip_multilib(localdata.getVar('RPROVIDES', True), d) or ""
-                splitrreplaces   = strip_multilib(localdata.getVar('RREPLACES', True), d) or ""
+        splitrreplaces   = strip_multilib(localdata.getVar('RREPLACES', True), d) or ""
-                splitrconflicts  = strip_multilib(localdata.getVar('RCONFLICTS', True), d) or ""
+        splitrconflicts  = strip_multilib(localdata.getVar('RCONFLICTS', True), d) or ""
-                splitrobsoletes  = []
+        splitrobsoletes  = []
-                # Gather special src/first package data
+        # Gather special src/first package data
-                if srcname == splitname:
+        if srcname == splitname:
-                        srcrdepends    = splitrdepends
+            srcrdepends    = splitrdepends
-                        srcrrecommends = splitrrecommends
+            srcrrecommends = splitrrecommends
-                        srcrsuggests   = splitrsuggests
+            srcrsuggests   = splitrsuggests
-                        srcrprovides   = splitrprovides
+            srcrprovides   = splitrprovides
-                        srcrreplaces   = splitrreplaces
+            srcrreplaces   = splitrreplaces
-                        srcrconflicts  = splitrconflicts
+            srcrconflicts  = splitrconflicts
-                        srcpreinst  = localdata.getVar('pkg_preinst', True)
+            srcpreinst  = localdata.getVar('pkg_preinst', True)
-                        srcpostinst = localdata.getVar('pkg_postinst', True)
+            srcpostinst = localdata.getVar('pkg_postinst', True)
-                        srcprerm    = localdata.getVar('pkg_prerm', True)
+            srcprerm    = localdata.getVar('pkg_prerm', True)
-                        srcpostrm   = localdata.getVar('pkg_postrm', True)
+            srcpostrm   = localdata.getVar('pkg_postrm', True)
-                        file_list = []
+            file_list = []
-                        walk_files(root, file_list, conffiles)
+            walk_files(root, file_list, conffiles)
-                        if not file_list and localdata.getVar('ALLOW_EMPTY') != "1":
+            if not file_list and localdata.getVar('ALLOW_EMPTY') != "1":
-                                bb.note("Not creating empty RPM package for %s" % splitname)
+                bb.note("Not creating empty RPM package for %s" % splitname)
-                        else:
+            else:
-                                bb.note("Creating RPM package for %s" % splitname)
+                bb.note("Creating RPM package for %s" % splitname)
-                                spec_files_top.append('%files')
+                spec_files_top.append('%files')
-                                spec_files_top.append('%defattr(-,-,-,-)')
+                spec_files_top.append('%defattr(-,-,-,-)')
-                                if file_list:
+                if file_list:
-                                        bb.note("Creating RPM package for %s" % splitname)
+                    bb.note("Creating RPM package for %s" % splitname)
-                                        spec_files_top.extend(file_list)
+                    spec_files_top.extend(file_list)
-                                else:
+                else:
-                                        bb.note("Creating EMPTY RPM Package for %s" % splitname)
+                    bb.note("Creating EMPTY RPM Package for %s" % splitname)
-                                spec_files_top.append('')
+                spec_files_top.append('')
-                        bb.utils.unlockfile(lf)
+            bb.utils.unlockfile(lf)
-                        continue
+            continue
-                # Process subpackage data
+        # Process subpackage data
-                spec_preamble_bottom.append('%%package -n %s' % splitname)
+        spec_preamble_bottom.append('%%package -n %s' % splitname)
-                spec_preamble_bottom.append('Summary: %s' % splitsummary)
+        spec_preamble_bottom.append('Summary: %s' % splitsummary)
-                if srcversion != splitversion:
+        if srcversion != splitversion:
-                        spec_preamble_bottom.append('Version: %s' % splitversion)
+            spec_preamble_bottom.append('Version: %s' % splitversion)
-                if srcrelease != splitrelease:
+        if srcrelease != splitrelease:
-                        spec_preamble_bottom.append('Release: %s' % splitrelease)
+            spec_preamble_bottom.append('Release: %s' % splitrelease)
-                if srcepoch != splitepoch:
+        if srcepoch != splitepoch:
-                        spec_preamble_bottom.append('Epoch: %s' % splitepoch)
+            spec_preamble_bottom.append('Epoch: %s' % splitepoch)
-                if srclicense != splitlicense:
+        if srclicense != splitlicense:
-                        spec_preamble_bottom.append('License: %s' % splitlicense)
+            spec_preamble_bottom.append('License: %s' % splitlicense)
-                spec_preamble_bottom.append('Group: %s' % splitsection)
+        spec_preamble_bottom.append('Group: %s' % splitsection)
-                # Replaces == Obsoletes && Provides
+        # Replaces == Obsoletes && Provides
-                if splitrreplaces and splitrreplaces.strip() != "":
+        if splitrreplaces and splitrreplaces.strip() != "":
-                        for dep in splitrreplaces.split(','):
+            for dep in splitrreplaces.split(','):
-                                if splitrprovides:
+                if splitrprovides:
-                                        splitrprovides = splitrprovides + ", " + dep
+                    splitrprovides = splitrprovides + ", " + dep
-                                else:
+                else:
-                                        splitrprovides = dep
+                    splitrprovides = dep
-                                if splitrobsoletes:
+                if splitrobsoletes:
-                                        splitrobsoletes = splitrobsoletes + ", " + dep
+                    splitrobsoletes = splitrobsoletes + ", " + dep
-                                else:
+                else:
-                                        splitrobsoletes = dep
+                    splitrobsoletes = dep
-                print_deps(splitrdepends,       "Requires", spec_preamble_bottom, d)
+        print_deps(splitrdepends, "Requires", spec_preamble_bottom, d)
-                # Suggests in RPM are like recommends in OE-core!
+        # Suggests in RPM are like recommends in OE-core!
-                print_deps(splitrrecommends,    "Suggests", spec_preamble_bottom, d)
+        print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d)
-                # While there is no analog for suggests... (So call them recommends for now)
+        # While there is no analog for suggests... (So call them recommends for now)
-                print_deps(splitrsuggests,      "Recommends", spec_preamble_bottom, d)
+        print_deps(splitrsuggests,  "Recommends", spec_preamble_bottom, d)
-                print_deps(splitrprovides,      "Provides", spec_preamble_bottom, d)
+        print_deps(splitrprovides,  "Provides", spec_preamble_bottom, d)
-                print_deps(splitrobsoletes,     "Obsoletes", spec_preamble_bottom, d)
+        print_deps(splitrobsoletes, "Obsoletes", spec_preamble_bottom, d)
-                # conflicts can not be in a provide!  We will need to filter it.
+        # conflicts can not be in a provide!  We will need to filter it.
-                if splitrconflicts:
+        if splitrconflicts:
-                        depends_dict = bb.utils.explode_dep_versions(splitrconflicts)
+            depends_dict = bb.utils.explode_dep_versions(splitrconflicts)
-                        newdeps_dict = {}
+            newdeps_dict = {}
-                        for dep in depends_dict:
+            for dep in depends_dict:
-                                if dep not in splitrprovides:
+                if dep not in splitrprovides:
-                                        newdeps_dict[dep] = depends_dict[dep]
+                    newdeps_dict[dep] = depends_dict[dep]
-                        if newdeps_dict:
+            if newdeps_dict:
-                                splitrconflicts = bb.utils.join_deps(newdeps_dict)
+                splitrconflicts = bb.utils.join_deps(newdeps_dict)
-                        else:
+            else:
-                                splitrconflicts = ""
+                splitrconflicts = ""
-                print_deps(splitrconflicts,     "Conflicts", spec_preamble_bottom, d)
+        print_deps(splitrconflicts,  "Conflicts", spec_preamble_bottom, d)
-                spec_preamble_bottom.append('')
+        spec_preamble_bottom.append('')
-                spec_preamble_bottom.append('%%description -n %s' % splitname)
+        spec_preamble_bottom.append('%%description -n %s' % splitname)
-                dedent_text = textwrap.dedent(splitdescription).strip()
+        dedent_text = textwrap.dedent(splitdescription).strip()
-                spec_preamble_bottom.append('%s' % textwrap.fill(dedent_text, width=75))
+        spec_preamble_bottom.append('%s' % textwrap.fill(dedent_text, width=75))
-                spec_preamble_bottom.append('')
+        spec_preamble_bottom.append('')
-                # Now process scriptlets
+        # Now process scriptlets
-                for script in ["preinst", "postinst", "prerm", "postrm"]:
+        for script in ["preinst", "postinst", "prerm", "postrm"]:
-                        scriptvar = localdata.getVar('pkg_%s' % script, True)
+            scriptvar = localdata.getVar('pkg_%s' % script, True)
-                        if not scriptvar:
+            if not scriptvar:
-                                continue
+                continue
-                        if script == 'preinst':
+            if script == 'preinst':
-                                spec_scriptlets_bottom.append('%%pre -n %s' % splitname)
+                spec_scriptlets_bottom.append('%%pre -n %s' % splitname)
-                        elif script == 'postinst':
+            elif script == 'postinst':
-                                spec_scriptlets_bottom.append('%%post -n %s' % splitname)
+                spec_scriptlets_bottom.append('%%post -n %s' % splitname)
-                        elif script == 'prerm':
+            elif script == 'prerm':
-                                spec_scriptlets_bottom.append('%%preun -n %s' % splitname)
+                spec_scriptlets_bottom.append('%%preun -n %s' % splitname)
-                                scriptvar = wrap_uninstall(scriptvar)
+                scriptvar = wrap_uninstall(scriptvar)
-                        elif script == 'postrm':
+            elif script == 'postrm':
-                                spec_scriptlets_bottom.append('%%postun -n %s' % splitname)
+                spec_scriptlets_bottom.append('%%postun -n %s' % splitname)
-                                scriptvar = wrap_uninstall(scriptvar)
+                scriptvar = wrap_uninstall(scriptvar)
-                        spec_scriptlets_bottom.append('# %s - %s' % (splitname, script))
+            spec_scriptlets_bottom.append('# %s - %s' % (splitname, script))
-                        spec_scriptlets_bottom.append(scriptvar)
+            spec_scriptlets_bottom.append(scriptvar)
-                        spec_scriptlets_bottom.append('')
+            spec_scriptlets_bottom.append('')
-                # Now process files
+        # Now process files
-                file_list = []
+        file_list = []
-                walk_files(root, file_list, conffiles)
+        walk_files(root, file_list, conffiles)
-                if not file_list and localdata.getVar('ALLOW_EMPTY') != "1":
+        if not file_list and localdata.getVar('ALLOW_EMPTY') != "1":
-                        bb.note("Not creating empty RPM package for %s" % splitname)
+            bb.note("Not creating empty RPM package for %s" % splitname)
-                else:
+        else:
-                        spec_files_bottom.append('%%files -n %s' % splitname)
+            spec_files_bottom.append('%%files -n %s' % splitname)
-                        spec_files_bottom.append('%defattr(-,-,-,-)')
+            spec_files_bottom.append('%defattr(-,-,-,-)')
-                        if file_list:
+            if file_list:
-                                bb.note("Creating RPM package for %s" % splitname)
+                bb.note("Creating RPM package for %s" % splitname)
-                                spec_files_bottom.extend(file_list)
+                spec_files_bottom.extend(file_list)
-                        else:
+            else:
-                                bb.note("Creating EMPTY RPM Package for %s" % splitname)
+                bb.note("Creating EMPTY RPM Package for %s" % splitname)
-                        spec_files_bottom.append('')
+            spec_files_bottom.append('')
-                del localdata
+        del localdata
-                bb.utils.unlockfile(lf)
+        bb.utils.unlockfile(lf)
-        
-        add_prep(d,spec_files_bottom)
-        spec_preamble_top.append('Summary: %s' % srcsummary)
-        spec_preamble_top.append('Name: %s' % srcname)
-        spec_preamble_top.append('Version: %s' % srcversion)
-        spec_preamble_top.append('Release: %s' % srcrelease)
-        if srcepoch and srcepoch.strip() != "":
-                spec_preamble_top.append('Epoch: %s' % srcepoch)
-        spec_preamble_top.append('License: %s' % srclicense)
-        spec_preamble_top.append('Group: %s' % srcsection)
-        spec_preamble_top.append('Packager: %s' % srcmaintainer)
-        spec_preamble_top.append('URL: %s' % srchomepage)
-        source_list = get_tarballs(d)
-        tail_source(d,source_list,None)
-        # Replaces == Obsoletes && Provides
-        if srcrreplaces and srcrreplaces.strip() != "":
-                for dep in srcrreplaces.split(','):
-                        if srcrprovides:
-                                srcrprovides = srcrprovides + ", " + dep
-                        else:
-                                srcrprovides = dep
-                        if srcrobsoletes:
-                                srcrobsoletes = srcrobsoletes + ", " + dep
-                        else:
-                                srcrobsoletes = dep
-        print_deps(srcdepends,          "BuildRequires", spec_preamble_top, d)
-        print_deps(srcrdepends,         "Requires", spec_preamble_top, d)
-        # Suggests in RPM are like recommends in OE-core!
-        print_deps(srcrrecommends,      "Suggests", spec_preamble_top, d)
-        # While there is no analog for suggests... (So call them recommends for now)
-        print_deps(srcrsuggests,        "Recommends", spec_preamble_top, d)
-        print_deps(srcrprovides,        "Provides", spec_preamble_top, d)
-        print_deps(srcrobsoletes,       "Obsoletes", spec_preamble_top, d)
    
-        # conflicts can not be in a provide!  We will need to filter it.
+    add_prep(d,spec_files_bottom)
-        if srcrconflicts:
+    spec_preamble_top.append('Summary: %s' % srcsummary)
-                depends_dict = bb.utils.explode_dep_versions(srcrconflicts)
+    spec_preamble_top.append('Name: %s' % srcname)
-                newdeps_dict = {}
+    spec_preamble_top.append('Version: %s' % srcversion)
-                for dep in depends_dict:
+    spec_preamble_top.append('Release: %s' % srcrelease)
-                        if dep not in srcrprovides:
+    if srcepoch and srcepoch.strip() != "":
-                                newdeps_dict[dep] = depends_dict[dep]
+        spec_preamble_top.append('Epoch: %s' % srcepoch)
-                if newdeps_dict:
+    spec_preamble_top.append('License: %s' % srclicense)
-                        srcrconflicts = bb.utils.join_deps(newdeps_dict)
+    spec_preamble_top.append('Group: %s' % srcsection)
-                else:
+    spec_preamble_top.append('Packager: %s' % srcmaintainer)
-                        srcrconflicts = ""
+    spec_preamble_top.append('URL: %s' % srchomepage)
+    source_list = get_tarballs(d)
-        print_deps(srcrconflicts,       "Conflicts", spec_preamble_top, d)
+    tail_source(d,source_list,None)
-        spec_preamble_top.append('')
+    # Replaces == Obsoletes && Provides
+    if srcrreplaces and srcrreplaces.strip() != "":
-        spec_preamble_top.append('%description')
+        for dep in srcrreplaces.split(','):
-        dedent_text = textwrap.dedent(srcdescription).strip()
+            if srcrprovides:
-        spec_preamble_top.append('%s' % textwrap.fill(dedent_text, width=75))
+                srcrprovides = srcrprovides + ", " + dep
+            else:
-        spec_preamble_top.append('')
+                srcrprovides = dep
+            if srcrobsoletes:
-        if srcpreinst:
+                srcrobsoletes = srcrobsoletes + ", " + dep
-                spec_scriptlets_top.append('%pre')
+            else:
-                spec_scriptlets_top.append('# %s - preinst' % srcname)
+                srcrobsoletes = dep
-                spec_scriptlets_top.append(srcpreinst)
-                spec_scriptlets_top.append('')
+    print_deps(srcdepends, "BuildRequires", spec_preamble_top, d)
-        if srcpostinst:
+    print_deps(srcrdepends, "Requires", spec_preamble_top, d)
-                spec_scriptlets_top.append('%post')
+    # Suggests in RPM are like recommends in OE-core!
-                spec_scriptlets_top.append('# %s - postinst' % srcname)
+    print_deps(srcrrecommends, "Suggests", spec_preamble_top, d)
-                spec_scriptlets_top.append(srcpostinst)
+    # While there is no analog for suggests... (So call them recommends for now)
-                spec_scriptlets_top.append('')
+    print_deps(srcrsuggests, "Recommends", spec_preamble_top, d)
-        if srcprerm:
+    print_deps(srcrprovides, "Provides", spec_preamble_top, d)
-                spec_scriptlets_top.append('%preun')
+    print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d)
-                spec_scriptlets_top.append('# %s - prerm' % srcname)
+    
-                scriptvar = wrap_uninstall(srcprerm)
+    # conflicts can not be in a provide!  We will need to filter it.
-                spec_scriptlets_top.append(scriptvar)
+    if srcrconflicts:
-                spec_scriptlets_top.append('')
+        depends_dict = bb.utils.explode_dep_versions(srcrconflicts)
-        if srcpostrm:
+        newdeps_dict = {}
-                spec_scriptlets_top.append('%postun')
+        for dep in depends_dict:
-                spec_scriptlets_top.append('# %s - postrm' % srcname)
+            if dep not in srcrprovides:
-                scriptvar = wrap_uninstall(srcpostrm)
+                newdeps_dict[dep] = depends_dict[dep]
-                spec_scriptlets_top.append(scriptvar)
+        if newdeps_dict:
-                spec_scriptlets_top.append('')
+            srcrconflicts = bb.utils.join_deps(newdeps_dict)
+        else:
-        # Write the SPEC file
+            srcrconflicts = ""
-        try:
-                from __builtin__ import file
+    print_deps(srcrconflicts, "Conflicts", spec_preamble_top, d)
-                specfile = file(outspecfile, 'w')
-        except OSError:
+    spec_preamble_top.append('')
-                raise bb.build.FuncFailed("unable to open spec file for writing.")
+    spec_preamble_top.append('%description')
-        # RPMSPEC_PREAMBLE is a way to add arbitrary text to the top
+    dedent_text = textwrap.dedent(srcdescription).strip()
-        # of the generated spec file
+    spec_preamble_top.append('%s' % textwrap.fill(dedent_text, width=75))
-        external_preamble = d.getVar("RPMSPEC_PREAMBLE", True)
-        if external_preamble:
+    spec_preamble_top.append('')
-                specfile.write(external_preamble + "\n")
+    if srcpreinst:
-        for line in spec_preamble_top:
+        spec_scriptlets_top.append('%pre')
-                specfile.write(line + "\n")
+        spec_scriptlets_top.append('# %s - preinst' % srcname)
+        spec_scriptlets_top.append(srcpreinst)
-        for line in spec_preamble_bottom:
+        spec_scriptlets_top.append('')
-                specfile.write(line + "\n")
+    if srcpostinst:
+        spec_scriptlets_top.append('%post')
-        for line in spec_scriptlets_top:
+        spec_scriptlets_top.append('# %s - postinst' % srcname)
-                specfile.write(line + "\n")
+        spec_scriptlets_top.append(srcpostinst)
+        spec_scriptlets_top.append('')
-        for line in spec_scriptlets_bottom:
+    if srcprerm:
-                specfile.write(line + "\n")
+        spec_scriptlets_top.append('%preun')
+        spec_scriptlets_top.append('# %s - prerm' % srcname)
-        for line in spec_files_top:
+        scriptvar = wrap_uninstall(srcprerm)
-                specfile.write(line + "\n")
+        spec_scriptlets_top.append(scriptvar)
+        spec_scriptlets_top.append('')
-        for line in spec_files_bottom:
+    if srcpostrm:
-                specfile.write(line + "\n")
+        spec_scriptlets_top.append('%postun')
+        spec_scriptlets_top.append('# %s - postrm' % srcname)
-        specfile.close()
+        scriptvar = wrap_uninstall(srcpostrm)
+        spec_scriptlets_top.append(scriptvar)
+        spec_scriptlets_top.append('')
+    # Write the SPEC file
+    try:
+        from __builtin__ import file
+        specfile = file(outspecfile, 'w')
+    except OSError:
+        raise bb.build.FuncFailed("unable to open spec file for writing.")
+    # RPMSPEC_PREAMBLE is a way to add arbitrary text to the top
+    # of the generated spec file
+    external_preamble = d.getVar("RPMSPEC_PREAMBLE", True)
+    if external_preamble:
+        specfile.write(external_preamble + "\n")
+    for line in spec_preamble_top:
+        specfile.write(line + "\n")
+    for line in spec_preamble_bottom:
+        specfile.write(line + "\n")
+    for line in spec_scriptlets_top:
+        specfile.write(line + "\n")
+    for line in spec_scriptlets_bottom:
+        specfile.write(line + "\n")
+    for line in spec_files_top:
+        specfile.write(line + "\n")
+    for line in spec_files_bottom:
+        specfile.write(line + "\n")
+    specfile.close()
 }
 python do_package_rpm () {
-        import os
+    import os
-        
+    
-        def creat_srpm_dir(d):
+    def creat_srpm_dir(d):
-                if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
+        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
-                        clean_licenses = get_licenses(d)
+            clean_licenses = get_licenses(d)
-                        pkgwritesrpmdir = bb.data.expand('${PKGWRITEDIRSRPM}/${PACKAGE_ARCH_EXTEND}', d)
+            pkgwritesrpmdir = bb.data.expand('${PKGWRITEDIRSRPM}/${PACKAGE_ARCH_EXTEND}', d)
-                        pkgwritesrpmdir = pkgwritesrpmdir + '/' + clean_licenses
+            pkgwritesrpmdir = pkgwritesrpmdir + '/' + clean_licenses
-                        bb.mkdirhier(pkgwritesrpmdir)
+            bb.mkdirhier(pkgwritesrpmdir)
-                        os.chmod(pkgwritesrpmdir, 0755)
+            os.chmod(pkgwritesrpmdir, 0755)
-                        return pkgwritesrpmdir
+            return pkgwritesrpmdir
            
-        # We need a simple way to remove the MLPREFIX from the package name,
+    # We need a simple way to remove the MLPREFIX from the package name,
-        # and dependency information...
+    # and dependency information...
-        def strip_multilib(name, d):
+    def strip_multilib(name, d):
-                ml = d.getVar("MLPREFIX", True)
+        ml = d.getVar("MLPREFIX", True)
-                if ml and name and len(ml) != 0 and name.find(ml) >= 0:
+        if ml and name and len(ml) != 0 and name.find(ml) >= 0:
-                        return "".join(name.split(ml))
+            return "".join(name.split(ml))
-                return name
+        return name
-        workdir = d.getVar('WORKDIR', True)
+    workdir = d.getVar('WORKDIR', True)
-        outdir = d.getVar('DEPLOY_DIR_IPK', True)
+    outdir = d.getVar('DEPLOY_DIR_IPK', True)
-        tmpdir = d.getVar('TMPDIR', True)
+    tmpdir = d.getVar('TMPDIR', True)
-        pkgd = d.getVar('PKGD', True)
+    pkgd = d.getVar('PKGD', True)
-        pkgdest = d.getVar('PKGDEST', True)
+    pkgdest = d.getVar('PKGDEST', True)
-        if not workdir or not outdir or not pkgd or not tmpdir:
+    if not workdir or not outdir or not pkgd or not tmpdir:
-                bb.error("Variables incorrectly set, unable to package")
+        bb.error("Variables incorrectly set, unable to package")
-                return
+        return
-        packages = d.getVar('PACKAGES', True)
+    packages = d.getVar('PACKAGES', True)
-        if not packages or packages == '':
+    if not packages or packages == '':
-                bb.debug(1, "No packages; nothing to do")
+        bb.debug(1, "No packages; nothing to do")
-                return
+        return
-        # Construct the spec file...
+    # Construct the spec file...
-        srcname    = strip_multilib(d.getVar('PN', True), d)
+    srcname    = strip_multilib(d.getVar('PN', True), d)
-        outspecfile = workdir + "/" + srcname + ".spec"
+    outspecfile = workdir + "/" + srcname + ".spec"
-        d.setVar('OUTSPECFILE', outspecfile)
+    d.setVar('OUTSPECFILE', outspecfile)
-        bb.build.exec_func('write_specfile', d)
+    bb.build.exec_func('write_specfile', d)
-        # Construct per file dependencies file
+    # Construct per file dependencies file
-        def dump_filerdeps(varname, outfile, d):
+    def dump_filerdeps(varname, outfile, d):
-                outfile.write("#!/usr/bin/env python\n\n")
+        outfile.write("#!/usr/bin/env python\n\n")
-                outfile.write("# Dependency table\n")
+        outfile.write("# Dependency table\n")
-                outfile.write('deps = {\n')
+        outfile.write('deps = {\n')
-                for pkg in packages.split():
+        for pkg in packages.split():
-                        dependsflist_key = 'FILE' + varname + 'FLIST' + "_" + pkg
+            dependsflist_key = 'FILE' + varname + 'FLIST' + "_" + pkg
-                        dependsflist = (d.getVar(dependsflist_key, True) or "")
+            dependsflist = (d.getVar(dependsflist_key, True) or "")
-                        for dfile in dependsflist.split():
+            for dfile in dependsflist.split():
-                                key = "FILE" + varname + "_" + dfile + "_" + pkg
+                key = "FILE" + varname + "_" + dfile + "_" + pkg
-                                depends_dict = bb.utils.explode_dep_versions(d.getVar(key, True) or "")
+                depends_dict = bb.utils.explode_dep_versions(d.getVar(key, True) or "")
-                                file = dfile.replace("@underscore@", "_")
+                file = dfile.replace("@underscore@", "_")
-                                file = file.replace("@closebrace@", "]")
+                file = file.replace("@closebrace@", "]")
-                                file = file.replace("@openbrace@", "[")
+                file = file.replace("@openbrace@", "[")
-                                file = file.replace("@tab@", "\t")
+                file = file.replace("@tab@", "\t")
-                                file = file.replace("@space@", " ")
+                file = file.replace("@space@", " ")
-                                file = file.replace("@at@", "@")
+                file = file.replace("@at@", "@")
-                                outfile.write('"' + pkgd + file + '" : "')
+                outfile.write('"' + pkgd + file + '" : "')
-                                for dep in depends_dict:
+                for dep in depends_dict:
-                                        ver = depends_dict[dep]
+                    ver = depends_dict[dep]
-                                        if dep and ver:
+                    if dep and ver:
-                                                ver = ver.replace("(","")
+                        ver = ver.replace("(","")
-                                                ver = ver.replace(")","")
+                        ver = ver.replace(")","")
-                                                outfile.write(dep + " " + ver + " ")
+                        outfile.write(dep + " " + ver + " ")
-                                        else:
+                    else:
-                                                outfile.write(dep + " ")
+                        outfile.write(dep + " ")
-                                outfile.write('",\n')
+                outfile.write('",\n')
-                outfile.write('}\n\n')
+        outfile.write('}\n\n')
-                outfile.write("import sys\n")
+        outfile.write("import sys\n")
-                outfile.write("while 1:\n")
+        outfile.write("while 1:\n")
-                outfile.write("\tline = sys.stdin.readline().strip()\n")
+        outfile.write("\tline = sys.stdin.readline().strip()\n")
-                outfile.write("\tif not line:\n")
+        outfile.write("\tif not line:\n")
-                outfile.write("\t\tsys.exit(0)\n")
+        outfile.write("\t\tsys.exit(0)\n")
-                outfile.write("\tif line in deps:\n")
+        outfile.write("\tif line in deps:\n")
-                outfile.write("\t\tprint(deps[line] + '\\n')\n")
+        outfile.write("\t\tprint(deps[line] + '\\n')\n")
-        # OE-core dependencies a.k.a. RPM requires
+    # OE-core dependencies a.k.a. RPM requires
-        outdepends = workdir + "/" + srcname + ".requires"
+    outdepends = workdir + "/" + srcname + ".requires"
-        try:
+    try:
-                from __builtin__ import file
+        from __builtin__ import file
-                dependsfile = file(outdepends, 'w')
+        dependsfile = file(outdepends, 'w')
-        except OSError:
+    except OSError:
-                raise bb.build.FuncFailed("unable to open spec file for writing.")
+        raise bb.build.FuncFailed("unable to open spec file for writing.")
-        dump_filerdeps('RDEPENDS', dependsfile, d)
+    dump_filerdeps('RDEPENDS', dependsfile, d)
-        dependsfile.close()
+    dependsfile.close()
-        os.chmod(outdepends, 0755)
+    os.chmod(outdepends, 0755)
-        # OE-core / RPM Provides
+    # OE-core / RPM Provides
-        outprovides = workdir + "/" + srcname + ".provides"
+    outprovides = workdir + "/" + srcname + ".provides"
-        try:
+    try:
-                from __builtin__ import file
+        from __builtin__ import file
-                providesfile = file(outprovides, 'w')
+        providesfile = file(outprovides, 'w')
-        except OSError:
+    except OSError:
-                raise bb.build.FuncFailed("unable to open spec file for writing.")
+        raise bb.build.FuncFailed("unable to open spec file for writing.")
-        dump_filerdeps('RPROVIDES', providesfile, d)
+    dump_filerdeps('RPROVIDES', providesfile, d)
-        providesfile.close()
+    providesfile.close()
-        os.chmod(outprovides, 0755)
+    os.chmod(outprovides, 0755)
-        # Setup the rpmbuild arguments...
+    # Setup the rpmbuild arguments...
-        rpmbuild = d.getVar('RPMBUILD', True)
+    rpmbuild = d.getVar('RPMBUILD', True)
-        targetsys = d.getVar('TARGET_SYS', True)
+    targetsys = d.getVar('TARGET_SYS', True)
-        targetvendor = d.getVar('TARGET_VENDOR', True)
+    targetvendor = d.getVar('TARGET_VENDOR', True)
-        package_arch = d.getVar('PACKAGE_ARCH', True) or ""
+    package_arch = d.getVar('PACKAGE_ARCH', True) or ""
-        if package_arch not in "all any noarch".split():
+    if package_arch not in "all any noarch".split():
-                ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_")
+        ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_")
-                d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch)
+        d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch)
-        else:
+    else:
-                d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
+        d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
-        pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
+    pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
-        pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}')
+    pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}')
-        magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc')
+    magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc')
-        bb.mkdirhier(pkgwritedir)
+    bb.mkdirhier(pkgwritedir)
-        os.chmod(pkgwritedir, 0755)
+    os.chmod(pkgwritedir, 0755)
-        cmd = rpmbuild
+    cmd = rpmbuild
-        cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd
+    cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd
-        cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
+    cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
-        cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
+    cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
-        cmd = cmd + " --define '_use_internal_dependency_generator 0'"
+    cmd = cmd + " --define '_use_internal_dependency_generator 0'"
-        cmd = cmd + " --define '__find_requires " + outdepends + "'"
+    cmd = cmd + " --define '__find_requires " + outdepends + "'"
-        cmd = cmd + " --define '__find_provides " + outprovides + "'"
+    cmd = cmd + " --define '__find_provides " + outprovides + "'"
-        cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
+    cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
-        cmd = cmd + " --define 'debug_package %{nil}'"
+    cmd = cmd + " --define 'debug_package %{nil}'"
-        cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
+    cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
-        cmd = cmd + " --define '_tmppath " + workdir + "'"
+    cmd = cmd + " --define '_tmppath " + workdir + "'"
-        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
+    if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
-                cmdsrpm = cmd + " --define '_sourcedir " + workdir + "' --define '_srcrpmdir " + creat_srpm_dir(d) + "'"
+        cmdsrpm = cmd + " --define '_sourcedir " + workdir + "' --define '_srcrpmdir " + creat_srpm_dir(d) + "'"
-                cmdsrpm = 'fakeroot ' + cmdsrpm + " -bs " + outspecfile
+        cmdsrpm = 'fakeroot ' + cmdsrpm + " -bs " + outspecfile
-        cmd = cmd + " -bb " + outspecfile
+    cmd = cmd + " -bb " + outspecfile
    # Build the source rpm package !
-        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
+    if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
-                d.setVar('SBUILDSPEC', cmdsrpm + "\n")
+        d.setVar('SBUILDSPEC', cmdsrpm + "\n")
-                d.setVarFlag('SBUILDSPEC', 'func', '1')
+        d.setVarFlag('SBUILDSPEC', 'func', '1')
-                bb.build.exec_func('SBUILDSPEC', d)
+        bb.build.exec_func('SBUILDSPEC', d)
-        # Build the rpm package!
+    # Build the rpm package!
-        d.setVar('BUILDSPEC', cmd + "\n")
+    d.setVar('BUILDSPEC', cmd + "\n")
-        d.setVarFlag('BUILDSPEC', 'func', '1')
+    d.setVarFlag('BUILDSPEC', 'func', '1')
-        bb.build.exec_func('BUILDSPEC', d)
+    bb.build.exec_func('BUILDSPEC', d)
 }
 python () {
@@ -1161,13 +1161,13 @@ do_package_write_rpm[sstate-outputdirs] = "${DEPLOY_DIR_RPM}"
 do_package_write_rpm[sstate-lockfile-shared] += "${DEPLOY_DIR_RPM}/rpm.lock"
 python do_package_write_rpm_setscene () {
-        sstate_setscene(d)
+    sstate_setscene(d)
 }
 addtask do_package_write_rpm_setscene
 python do_package_write_rpm () {
-        bb.build.exec_func("read_subpackage_metadata", d)
+    bb.build.exec_func("read_subpackage_metadata", d)
-        bb.build.exec_func("do_package_rpm", d)
+    bb.build.exec_func("do_package_rpm", d)
 }
 do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
author	Richard Purdie <richard.purdie@linuxfoundation.org>	2012-07-11 17:33:43 +0000
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2012-07-19 10:24:50 +0100
commit	bfd279de3275abbfaf3e630383ec244131e0375f (patch)
tree	0d1c90461a890d21444f5d2afb13c52b302427f1 /meta/classes/package_rpm.bbclass
parent	99203edda6f0b09d817454d656c100b7a8806b18 (diff)
download	poky-bfd279de3275abbfaf3e630383ec244131e0375f.tar.gz