1 files changed, 139 insertions, 139 deletions

diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 700ea53911..c4596bffce 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -54,146 +54,146 @@ syslinux_hddimg_install() {
 }
 
 python build_syslinux_menu () {
-        import copy
-        import sys
-
-        workdir = d.getVar('WORKDIR', True)
-        if not workdir:
-                bb.error("WORKDIR is not defined")
-                return
-                
-        labels = d.getVar('LABELS', True)
-        if not labels:
-                bb.debug(1, "LABELS not defined, nothing to do")
-                return
-        
-        if labels == []:
-                bb.debug(1, "No labels, nothing to do")
-                return
-
-        cfile = d.getVar('SYSLINUXMENU', True)
-        if not cfile:
-                raise bb.build.FuncFailed('Unable to read SYSLINUXMENU')
-
-        try:
-                cfgfile = file(cfile, 'w')
-        except OSError:
-                raise bb.build.funcFailed('Unable to open %s' % (cfile))
-
-        # Beep the speaker and Clear the screen
-        cfgfile.write('\x07\x0C')
-
-        # The title should be configurable
-        cfgfile.write('Linux Boot Menu\n')
-        cfgfile.write('The following targets are available on this image:\n')
-        cfgfile.write('\n')
-
-        for label in labels.split():
-                from copy import deepcopy
-                localdata = deepcopy(d)
-
-                overrides = localdata.getVar('OVERRIDES')
-                if not overrides:
-                        raise bb.build.FuncFailed('OVERRIDES not defined')
-                overrides = localdata.expand(overrides)
-        
-                localdata.setVar('OVERRIDES', label + ':' + overrides)
-                bb.data.update_data(localdata)
-
-                usage = localdata.getVar('USAGE', True)
-                cfgfile.write('  \x0F\x30\x3E%16s\x0F\x30\x37: ' % (label))
-                cfgfile.write('%s\n' % (usage))
-
-                del localdata
-
-        cfgfile.write('\n')
-        cfgfile.close()
+    import copy
+    import sys
+
+    workdir = d.getVar('WORKDIR', True)
+    if not workdir:
+        bb.error("WORKDIR is not defined")
+        return
+        
+    labels = d.getVar('LABELS', True)
+    if not labels:
+        bb.debug(1, "LABELS not defined, nothing to do")
+        return
+    
+    if labels == []:
+        bb.debug(1, "No labels, nothing to do")
+        return
+
+    cfile = d.getVar('SYSLINUXMENU', True)
+    if not cfile:
+        raise bb.build.FuncFailed('Unable to read SYSLINUXMENU')
+
+    try:
+        cfgfile = file(cfile, 'w')
+    except OSError:
+        raise bb.build.funcFailed('Unable to open %s' % (cfile))
+
+    # Beep the speaker and Clear the screen
+    cfgfile.write('\x07\x0C')
+
+    # The title should be configurable
+    cfgfile.write('Linux Boot Menu\n')
+    cfgfile.write('The following targets are available on this image:\n')
+    cfgfile.write('\n')
+
+    for label in labels.split():
+        from copy import deepcopy
+        localdata = deepcopy(d)
+
+        overrides = localdata.getVar('OVERRIDES')
+        if not overrides:
+            raise bb.build.FuncFailed('OVERRIDES not defined')
+        overrides = localdata.expand(overrides)
+    
+        localdata.setVar('OVERRIDES', label + ':' + overrides)
+        bb.data.update_data(localdata)
+
+        usage = localdata.getVar('USAGE', True)
+        cfgfile.write('  \x0F\x30\x3E%16s\x0F\x30\x37: ' % (label))
+        cfgfile.write('%s\n' % (usage))
+
+        del localdata
+
+    cfgfile.write('\n')
+    cfgfile.close()
 }
 
 python build_syslinux_cfg () {
-        import copy
-        import sys
-
-        workdir = d.getVar('WORKDIR', True)
-        if not workdir:
-                bb.error("WORKDIR not defined, unable to package")
-                return
-                
-        labels = d.getVar('LABELS', True)
-        if not labels:
-                bb.debug(1, "LABELS not defined, nothing to do")
-                return
-        
-        if labels == []:
-                bb.debug(1, "No labels, nothing to do")
-                return
-
-        cfile = d.getVar('SYSLINUXCFG', True)
-        if not cfile:
-                raise bb.build.FuncFailed('Unable to read SYSLINUXCFG')
-
-        try:
-                cfgfile = file(cfile, 'w')
-        except OSError:
-                raise bb.build.funcFailed('Unable to open %s' % (cfile))
-
-        cfgfile.write('# Automatically created by OE\n')
-
-        opts = d.getVar('SYSLINUX_OPTS', True)
-
-        if opts:
-                for opt in opts.split(';'):
-                        cfgfile.write('%s\n' % opt)
-
-        cfgfile.write('ALLOWOPTIONS 1\n');
-        cfgfile.write('DEFAULT %s\n' % (labels.split()[0]))
-
-        timeout = d.getVar('SYSLINUX_TIMEOUT', True)
-
-        if timeout:
-                cfgfile.write('TIMEOUT %s\n' % timeout)
-        else:
-                cfgfile.write('TIMEOUT 50\n')
-
-        prompt = d.getVar('SYSLINUX_PROMPT', True)
-        if prompt:
-                cfgfile.write('PROMPT %s\n' % prompt)
-        else:
-                cfgfile.write('PROMPT 1\n')
-
-        menu = d.getVar('AUTO_SYSLINUXMENU', True)
-
-        # This is ugly.  My bad.
-
-        if menu:
-                bb.build.exec_func('build_syslinux_menu', d)
-                mfile = d.getVar('SYSLINUXMENU', True)
-                cfgfile.write('DISPLAY %s\n' % (mfile.split('/')[-1]) )
-        
-        for label in labels.split():
-                localdata = bb.data.createCopy(d)
-
-                overrides = localdata.getVar('OVERRIDES', True)
-                if not overrides:
-                        raise bb.build.FuncFailed('OVERRIDES not defined')
-        
-                localdata.setVar('OVERRIDES', label + ':' + overrides)
-                bb.data.update_data(localdata)
-        
-                cfgfile.write('LABEL %s\nKERNEL /vmlinuz\n' % (label))
-
-                append = localdata.getVar('APPEND', True)
-                initrd = localdata.getVar('INITRD', True)
-
-                if append:
-                        cfgfile.write('APPEND ')
-
-                        if initrd:
-                                cfgfile.write('initrd=/initrd ')
-
-                        cfgfile.write('LABEL=%s '% (label))
-
-                        cfgfile.write('%s\n' % (append))
-
-        cfgfile.close()
+    import copy
+    import sys
+
+    workdir = d.getVar('WORKDIR', True)
+    if not workdir:
+        bb.error("WORKDIR not defined, unable to package")
+        return
+        
+    labels = d.getVar('LABELS', True)
+    if not labels:
+        bb.debug(1, "LABELS not defined, nothing to do")
+        return
+    
+    if labels == []:
+        bb.debug(1, "No labels, nothing to do")
+        return
+
+    cfile = d.getVar('SYSLINUXCFG', True)
+    if not cfile:
+        raise bb.build.FuncFailed('Unable to read SYSLINUXCFG')
+
+    try:
+        cfgfile = file(cfile, 'w')
+    except OSError:
+        raise bb.build.funcFailed('Unable to open %s' % (cfile))
+
+    cfgfile.write('# Automatically created by OE\n')
+
+    opts = d.getVar('SYSLINUX_OPTS', True)
+
+    if opts:
+        for opt in opts.split(';'):
+            cfgfile.write('%s\n' % opt)
+
+    cfgfile.write('ALLOWOPTIONS 1\n');
+    cfgfile.write('DEFAULT %s\n' % (labels.split()[0]))
+
+    timeout = d.getVar('SYSLINUX_TIMEOUT', True)
+
+    if timeout:
+        cfgfile.write('TIMEOUT %s\n' % timeout)
+    else:
+        cfgfile.write('TIMEOUT 50\n')
+
+    prompt = d.getVar('SYSLINUX_PROMPT', True)
+    if prompt:
+        cfgfile.write('PROMPT %s\n' % prompt)
+    else:
+        cfgfile.write('PROMPT 1\n')
+
+    menu = d.getVar('AUTO_SYSLINUXMENU', True)
+
+    # This is ugly.  My bad.
+
+    if menu:
+        bb.build.exec_func('build_syslinux_menu', d)
+        mfile = d.getVar('SYSLINUXMENU', True)
+        cfgfile.write('DISPLAY %s\n' % (mfile.split('/')[-1]) )
+    
+    for label in labels.split():
+        localdata = bb.data.createCopy(d)
+
+        overrides = localdata.getVar('OVERRIDES', True)
+        if not overrides:
+            raise bb.build.FuncFailed('OVERRIDES not defined')
+    
+        localdata.setVar('OVERRIDES', label + ':' + overrides)
+        bb.data.update_data(localdata)
+    
+        cfgfile.write('LABEL %s\nKERNEL /vmlinuz\n' % (label))
+
+        append = localdata.getVar('APPEND', True)
+        initrd = localdata.getVar('INITRD', True)
+
+        if append:
+            cfgfile.write('APPEND ')
+
+            if initrd:
+                cfgfile.write('initrd=/initrd ')
+
+            cfgfile.write('LABEL=%s '% (label))
+
+            cfgfile.write('%s\n' % (append))
+
+    cfgfile.close()
 }