mirror of
https://git.yoctoproject.org/poky
synced 2026-06-14 05:19:57 +00:00
wic: flatten directory structure
Moved misc.py from wic/utils/ to wic/ Removed wic/utils directory (From OE-Core rev: df906f3caa0721756f5ed48fa657e62e05ae2aa3) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
committed by
Richard Purdie
Richard Purdie
parent
f9b476ebcd
commit
dd7e0ae43d
@@ -0,0 +1,230 @@
|
||||
# ex:ts=4:sw=4:sts=4:et
|
||||
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
||||
#
|
||||
# Copyright (c) 2013, Intel Corporation.
|
||||
# All rights reserved.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License version 2 as
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# 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.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# DESCRIPTION
|
||||
# This module provides a place to collect various wic-related utils
|
||||
# for the OpenEmbedded Image Tools.
|
||||
#
|
||||
# AUTHORS
|
||||
# Tom Zanussi <tom.zanussi (at] linux.intel.com>
|
||||
#
|
||||
"""Miscellaneous functions."""
|
||||
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
|
||||
from collections import defaultdict
|
||||
from distutils import spawn
|
||||
|
||||
from wic import WicError
|
||||
from wic.utils import runner
|
||||
|
||||
logger = logging.getLogger('wic')
|
||||
|
||||
# executable -> recipe pairs for exec_native_cmd
|
||||
NATIVE_RECIPES = {"bmaptool": "bmap-tools",
|
||||
"grub-mkimage": "grub-efi",
|
||||
"isohybrid": "syslinux",
|
||||
"mcopy": "mtools",
|
||||
"mkdosfs": "dosfstools",
|
||||
"mkisofs": "cdrtools",
|
||||
"mkfs.btrfs": "btrfs-tools",
|
||||
"mkfs.ext2": "e2fsprogs",
|
||||
"mkfs.ext3": "e2fsprogs",
|
||||
"mkfs.ext4": "e2fsprogs",
|
||||
"mkfs.vfat": "dosfstools",
|
||||
"mksquashfs": "squashfs-tools",
|
||||
"mkswap": "util-linux",
|
||||
"mmd": "syslinux",
|
||||
"parted": "parted",
|
||||
"sfdisk": "util-linux",
|
||||
"sgdisk": "gptfdisk",
|
||||
"syslinux": "syslinux"
|
||||
}
|
||||
|
||||
def _exec_cmd(cmd_and_args, as_shell=False):
|
||||
"""
|
||||
Execute command, catching stderr, stdout
|
||||
|
||||
Need to execute as_shell if the command uses wildcards
|
||||
"""
|
||||
logger.debug("_exec_cmd: %s", cmd_and_args)
|
||||
args = cmd_and_args.split()
|
||||
logger.debug(args)
|
||||
|
||||
if as_shell:
|
||||
ret, out = runner.runtool(cmd_and_args)
|
||||
else:
|
||||
ret, out = runner.runtool(args)
|
||||
out = out.strip()
|
||||
if ret != 0:
|
||||
raise WicError("_exec_cmd: %s returned '%s' instead of 0\noutput: %s" % \
|
||||
(cmd_and_args, ret, out))
|
||||
|
||||
logger.debug("_exec_cmd: output for %s (rc = %d): %s",
|
||||
cmd_and_args, ret, out)
|
||||
|
||||
return ret, out
|
||||
|
||||
|
||||
def exec_cmd(cmd_and_args, as_shell=False):
|
||||
"""
|
||||
Execute command, return output
|
||||
"""
|
||||
return _exec_cmd(cmd_and_args, as_shell)[1]
|
||||
|
||||
|
||||
def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""):
|
||||
"""
|
||||
Execute native command, catching stderr, stdout
|
||||
|
||||
Need to execute as_shell if the command uses wildcards
|
||||
|
||||
Always need to execute native commands as_shell
|
||||
"""
|
||||
# The reason -1 is used is because there may be "export" commands.
|
||||
args = cmd_and_args.split(';')[-1].split()
|
||||
logger.debug(args)
|
||||
|
||||
if pseudo:
|
||||
cmd_and_args = pseudo + cmd_and_args
|
||||
|
||||
wtools_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
|
||||
|
||||
native_paths = \
|
||||
"%s/sbin:%s/usr/sbin:%s/usr/bin:%s/sbin:%s/usr/sbin:%s/usr/bin" % \
|
||||
(wtools_sysroot, wtools_sysroot, wtools_sysroot,
|
||||
native_sysroot, native_sysroot, native_sysroot)
|
||||
native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
|
||||
(native_paths, cmd_and_args)
|
||||
logger.debug("exec_native_cmd: %s", native_cmd_and_args)
|
||||
|
||||
# If the command isn't in the native sysroot say we failed.
|
||||
if spawn.find_executable(args[0], native_paths):
|
||||
ret, out = _exec_cmd(native_cmd_and_args, True)
|
||||
else:
|
||||
ret = 127
|
||||
out = "can't find native executable %s in %s" % (args[0], native_paths)
|
||||
|
||||
prog = args[0]
|
||||
# shell command-not-found
|
||||
if ret == 127 \
|
||||
or (pseudo and ret == 1 and out == "Can't find '%s' in $PATH." % prog):
|
||||
msg = "A native program %s required to build the image "\
|
||||
"was not found (see details above).\n\n" % prog
|
||||
recipe = NATIVE_RECIPES.get(prog)
|
||||
if recipe:
|
||||
msg += "Please make sure wic-tools have %s-native in its DEPENDS, bake it with 'bitbake wic-tools' "\
|
||||
"and try again.\n" % recipe
|
||||
else:
|
||||
msg += "Wic failed to find a recipe to build native %s. Please "\
|
||||
"file a bug against wic.\n" % prog
|
||||
raise WicError(msg)
|
||||
|
||||
return ret, out
|
||||
|
||||
BOOTDD_EXTRA_SPACE = 16384
|
||||
|
||||
class BitbakeVars(defaultdict):
|
||||
"""
|
||||
Container for Bitbake variables.
|
||||
"""
|
||||
def __init__(self):
|
||||
defaultdict.__init__(self, dict)
|
||||
|
||||
# default_image and vars_dir attributes should be set from outside
|
||||
self.default_image = None
|
||||
self.vars_dir = None
|
||||
|
||||
def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")):
|
||||
"""
|
||||
Parse one line from bitbake -e output or from .env file.
|
||||
Put result key-value pair into the storage.
|
||||
"""
|
||||
if "=" not in line:
|
||||
return
|
||||
match = matcher.match(line)
|
||||
if not match:
|
||||
return
|
||||
key, val = match.groups()
|
||||
self[image][key] = val.strip('"')
|
||||
|
||||
def get_var(self, var, image=None, cache=True):
|
||||
"""
|
||||
Get bitbake variable from 'bitbake -e' output or from .env file.
|
||||
This is a lazy method, i.e. it runs bitbake or parses file only when
|
||||
only when variable is requested. It also caches results.
|
||||
"""
|
||||
if not image:
|
||||
image = self.default_image
|
||||
|
||||
if image not in self:
|
||||
if image and self.vars_dir:
|
||||
fname = os.path.join(self.vars_dir, image + '.env')
|
||||
if os.path.isfile(fname):
|
||||
# parse .env file
|
||||
with open(fname) as varsfile:
|
||||
for line in varsfile:
|
||||
self._parse_line(line, image)
|
||||
else:
|
||||
print("Couldn't get bitbake variable from %s." % fname)
|
||||
print("File %s doesn't exist." % fname)
|
||||
return
|
||||
else:
|
||||
# Get bitbake -e output
|
||||
cmd = "bitbake -e"
|
||||
if image:
|
||||
cmd += " %s" % image
|
||||
|
||||
log_level = logger.getEffectiveLevel()
|
||||
logger.setLevel(logging.INFO)
|
||||
ret, lines = _exec_cmd(cmd)
|
||||
logger.setLevel(log_level)
|
||||
|
||||
if ret:
|
||||
logger.error("Couldn't get '%s' output.", cmd)
|
||||
logger.error("Bitbake failed with error:\n%s\n", lines)
|
||||
return
|
||||
|
||||
# Parse bitbake -e output
|
||||
for line in lines.split('\n'):
|
||||
self._parse_line(line, image)
|
||||
|
||||
# Make first image a default set of variables
|
||||
if cache:
|
||||
images = [key for key in self if key]
|
||||
if len(images) == 1:
|
||||
self[None] = self[image]
|
||||
|
||||
result = self[image].get(var)
|
||||
if not cache:
|
||||
self.pop(image, None)
|
||||
|
||||
return result
|
||||
|
||||
# Create BB_VARS singleton
|
||||
BB_VARS = BitbakeVars()
|
||||
|
||||
def get_bitbake_var(var, image=None, cache=True):
|
||||
"""
|
||||
Provide old get_bitbake_var API by wrapping
|
||||
get_var method of BB_VARS singleton.
|
||||
"""
|
||||
return BB_VARS.get_var(var, image, cache)
|
||||
Reference in New Issue
Block a user