aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-02 13:58:07 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-02 23:46:50 +0100
commit0be568537072d9b0027a0d3a532fc4696184453b (patch)
treef77d28dfcc4ab647f5ddf6ef8e04adda5bcd4d37 /scripts/lib
parenteae139af81262b457cfb8ddf45a99523cc8a41cc (diff)
downloadopenembedded-core-contrib-0be568537072d9b0027a0d3a532fc4696184453b.tar.gz
wic: remove micboot.py
Moved functionaly of micboot.py Mic_Bootloader class to Wic_Bootloader class of wicboot.py module. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/micboot.py50
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/wicboot.py23
2 files changed, 15 insertions, 58 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/micboot.py b/scripts/lib/wic/kickstart/custom_commands/micboot.py
deleted file mode 100644
index 1fa282b2f6..0000000000
--- a/scripts/lib/wic/kickstart/custom_commands/micboot.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python -tt
-#
-# Copyright (c) 2008, 2009, 2010 Intel, Inc.
-#
-# Anas Nashif
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; version 2 of the License
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc., 59
-# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-from pykickstart.base import *
-from pykickstart.errors import *
-from pykickstart.options import *
-from pykickstart.commands.bootloader import *
-
-class Mic_Bootloader(F8_Bootloader):
- def __init__(self, writePriority=10, appendLine="", driveorder=None,
- forceLBA=False, location="", md5pass="", password="",
- upgrade=False, menus=""):
- F8_Bootloader.__init__(self, writePriority, appendLine, driveorder,
- forceLBA, location, md5pass, password, upgrade)
-
- self.menus = ""
- self.ptable = "msdos"
-
- def _getArgsAsStr(self):
- ret = F8_Bootloader._getArgsAsStr(self)
-
- if self.menus == "":
- ret += " --menus=%s" %(self.menus,)
- if self.ptable:
- ret += " --ptable=\"%s\"" %(self.ptable,)
- return ret
-
- def _getParser(self):
- op = F8_Bootloader._getParser(self)
- op.add_option("--menus", dest="menus")
- op.add_option("--ptable", dest="ptable", choices=("msdos", "gpt"),
- default="msdos")
- return op
-
diff --git a/scripts/lib/wic/kickstart/custom_commands/wicboot.py b/scripts/lib/wic/kickstart/custom_commands/wicboot.py
index f1914169d8..eefd574880 100644
--- a/scripts/lib/wic/kickstart/custom_commands/wicboot.py
+++ b/scripts/lib/wic/kickstart/custom_commands/wicboot.py
@@ -27,29 +27,36 @@
from pykickstart.base import *
from pykickstart.errors import *
from pykickstart.options import *
-from pykickstart.commands.bootloader import *
+from pykickstart.commands.bootloader import F8_Bootloader
-from wic.kickstart.custom_commands.micboot import *
-
-class Wic_Bootloader(Mic_Bootloader):
+class Wic_Bootloader(F8_Bootloader):
def __init__(self, writePriority=10, appendLine="", driveorder=None,
forceLBA=False, location="", md5pass="", password="",
upgrade=False, menus=""):
- Mic_Bootloader.__init__(self, writePriority, appendLine, driveorder,
- forceLBA, location, md5pass, password, upgrade)
+ F8_Bootloader.__init__(self, writePriority, appendLine, driveorder,
+ forceLBA, location, md5pass, password, upgrade)
+ self.menus = ""
+ self.ptable = "msdos"
self.source = ""
def _getArgsAsStr(self):
- retval = Mic_Bootloader._getArgsAsStr(self)
+ retval = F8_Bootloader._getArgsAsStr(self)
+ if self.menus == "":
+ retval += " --menus=%s" %(self.menus,)
+ if self.ptable:
+ retval += " --ptable=\"%s\"" %(self.ptable,)
if self.source:
retval += " --source=%s" % self.source
return retval
def _getParser(self):
- op = Mic_Bootloader._getParser(self)
+ op = F8_Bootloader._getParser(self)
+ op.add_option("--menus", dest="menus")
+ op.add_option("--ptable", dest="ptable", choices=("msdos", "gpt"),
+ default="msdos")
# use specified source plugin to implement bootloader-specific methods
op.add_option("--source", type="string", action="store",
dest="source", default=None)