wic: get rid of scripts/lib/image
Moved content of scripts/lib/image/ to scripts/lib/wic as one directory with the same name as a tool is self-explanatory and less confusing than two. (From OE-Core rev: 5dc02d572794298b3362378cea3d7da654456c44) 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
77561e7191
commit
7d4bb40905
|
@ -1,22 +0,0 @@
|
||||||
#
|
|
||||||
# OpenEmbedded Image tools library
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# AUTHORS
|
|
||||||
# Tom Zanussi <tom.zanussi (at] linux.intel.com>
|
|
||||||
#
|
|
|
@ -52,7 +52,7 @@ def verify_build_env():
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts
|
CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts
|
||||||
SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
|
SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
|
||||||
|
|
||||||
def build_canned_image_list(dl):
|
def build_canned_image_list(dl):
|
|
@ -288,7 +288,7 @@ DESCRIPTION
|
||||||
|
|
||||||
The first form enumerates all the available 'canned' images.
|
The first form enumerates all the available 'canned' images.
|
||||||
These are actually just the set of .wks files that have been moved
|
These are actually just the set of .wks files that have been moved
|
||||||
into the /scripts/lib/image/canned-wks directory).
|
into the /scripts/lib/wic/canned-wks directory).
|
||||||
|
|
||||||
The second form lists the detailed help information for a specific
|
The second form lists the detailed help information for a specific
|
||||||
'canned' image.
|
'canned' image.
|
||||||
|
@ -591,7 +591,7 @@ DESCRIPTION
|
||||||
NATIVE_SYSROOT: ...
|
NATIVE_SYSROOT: ...
|
||||||
|
|
||||||
The image(s) were created using OE kickstart file:
|
The image(s) were created using OE kickstart file:
|
||||||
.../scripts/lib/image/canned-wks/directdisk.wks
|
.../scripts/lib/wic/canned-wks/directdisk.wks
|
||||||
|
|
||||||
The output shows the name and location of the image created, and
|
The output shows the name and location of the image created, and
|
||||||
so that you know exactly what was used to generate the image, each
|
so that you know exactly what was used to generate the image, each
|
|
@ -54,8 +54,8 @@ else:
|
||||||
|
|
||||||
from wic.utils.oe.misc import get_bitbake_var, BB_VARS
|
from wic.utils.oe.misc import get_bitbake_var, BB_VARS
|
||||||
from wic.utils.errors import WicError
|
from wic.utils.errors import WicError
|
||||||
from image import engine
|
from wic import engine
|
||||||
from image import help as hlp
|
from wic import help as hlp
|
||||||
|
|
||||||
def rootfs_dir_to_args(krootfs_dir):
|
def rootfs_dir_to_args(krootfs_dir):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue