wic: move 2 APIs to wic.engine
Moved find_canned and get_custom_config APIs to engine module. Removed empty wic.utils.misc module. [YOCTO #10619] (From OE-Core rev: 10e9afac46575d3f557b7cb505daa31ce9ce85fa) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
759c24c404
commit
2d6f96048e
|
@ -32,7 +32,6 @@ import os
|
|||
import sys
|
||||
|
||||
from wic import msger, creator
|
||||
from wic.utils import misc
|
||||
from wic.plugin import pluginmgr
|
||||
from wic.utils.oe import misc
|
||||
|
||||
|
@ -226,3 +225,35 @@ def wic_list(args, scripts_path):
|
|||
return True
|
||||
|
||||
return False
|
||||
|
||||
def find_canned(scripts_path, file_name):
|
||||
"""
|
||||
Find a file either by its path or by name in the canned files dir.
|
||||
|
||||
Return None if not found
|
||||
"""
|
||||
if os.path.exists(file_name):
|
||||
return file_name
|
||||
|
||||
layers_canned_wks_dir = build_canned_image_list(scripts_path)
|
||||
for canned_wks_dir in layers_canned_wks_dir:
|
||||
for root, dirs, files in os.walk(canned_wks_dir):
|
||||
for fname in files:
|
||||
if fname == file_name:
|
||||
fullpath = os.path.join(canned_wks_dir, fname)
|
||||
return fullpath
|
||||
|
||||
def get_custom_config(boot_file):
|
||||
"""
|
||||
Get the custom configuration to be used for the bootloader.
|
||||
|
||||
Return None if the file can't be found.
|
||||
"""
|
||||
# Get the scripts path of poky
|
||||
scripts_path = os.path.abspath("%s/../.." % os.path.dirname(__file__))
|
||||
|
||||
cfg_file = find_canned(scripts_path, boot_file)
|
||||
if cfg_file:
|
||||
with open(cfg_file, "r") as f:
|
||||
config = f.read()
|
||||
return config
|
||||
|
|
|
@ -30,8 +30,8 @@ import shlex
|
|||
from argparse import ArgumentParser, ArgumentError, ArgumentTypeError
|
||||
|
||||
from wic import msger
|
||||
from wic.engine import find_canned
|
||||
from wic.partition import Partition
|
||||
from wic.utils.misc import find_canned
|
||||
|
||||
class KickStartError(Exception):
|
||||
"""Custom exception."""
|
||||
|
|
|
@ -28,8 +28,8 @@ import os
|
|||
import shutil
|
||||
|
||||
from wic import msger
|
||||
from wic.engine import get_custom_config
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.misc import get_custom_config
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
|
||||
BOOTDD_EXTRA_SPACE
|
||||
|
||||
|
|
|
@ -26,10 +26,10 @@
|
|||
|
||||
import os
|
||||
|
||||
from wic.utils.errors import ImageError
|
||||
from wic import msger
|
||||
from wic.engine import get_custom_config
|
||||
from wic.utils import runner
|
||||
from wic.utils.misc import get_custom_config
|
||||
from wic.utils.errors import ImageError
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \
|
||||
get_bitbake_var, BOOTDD_EXTRA_SPACE
|
||||
|
|
|
@ -26,8 +26,8 @@ import shutil
|
|||
import glob
|
||||
|
||||
from wic import msger
|
||||
from wic.engine import get_custom_config
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.misc import get_custom_config
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
|
||||
|
||||
class IsoImagePlugin(SourcePlugin):
|
||||
|
|
|
@ -1,56 +0,0 @@
|
|||
#!/usr/bin/env python -tt
|
||||
#
|
||||
# Copyright (c) 2010, 2011 Intel Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
import os
|
||||
import time
|
||||
import wic.engine
|
||||
|
||||
def find_canned(scripts_path, file_name):
|
||||
"""
|
||||
Find a file either by its path or by name in the canned files dir.
|
||||
|
||||
Return None if not found
|
||||
"""
|
||||
if os.path.exists(file_name):
|
||||
return file_name
|
||||
|
||||
layers_canned_wks_dir = wic.engine.build_canned_image_list(scripts_path)
|
||||
for canned_wks_dir in layers_canned_wks_dir:
|
||||
for root, dirs, files in os.walk(canned_wks_dir):
|
||||
for fname in files:
|
||||
if fname == file_name:
|
||||
fullpath = os.path.join(canned_wks_dir, fname)
|
||||
return fullpath
|
||||
|
||||
def get_custom_config(boot_file):
|
||||
"""
|
||||
Get the custom configuration to be used for the bootloader.
|
||||
|
||||
Return None if the file can't be found.
|
||||
"""
|
||||
scripts_path = os.path.abspath(os.path.dirname(__file__))
|
||||
# Get the scripts path of poky
|
||||
for x in range(0, 3):
|
||||
scripts_path = os.path.dirname(scripts_path)
|
||||
|
||||
cfg_file = find_canned(scripts_path, boot_file)
|
||||
if cfg_file:
|
||||
with open(cfg_file, "r") as f:
|
||||
config = f.read()
|
||||
return config
|
||||
|
||||
return None
|
Loading…
Reference in New Issue