summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-02 13:58:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-03 12:43:25 +0100
commit7d4bb40905fab38fb3db1d0e17afbc803622f00c (patch)
treefea3791bf21dce5d7693ce0a695e49a5579b25b4 /scripts/lib
parent77561e719181d58289687373eebadce764f838a7 (diff)
downloadpoky-7d4bb40905fab38fb3db1d0e17afbc803622f00c.tar.gz
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/image/__init__.py22
-rw-r--r--scripts/lib/wic/canned-wks/directdisk-gpt.wks (renamed from scripts/lib/image/canned-wks/directdisk-gpt.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks (renamed from scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/directdisk.wks (renamed from scripts/lib/image/canned-wks/directdisk.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/mkefidisk.wks (renamed from scripts/lib/image/canned-wks/mkefidisk.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/mkgummidisk.wks (renamed from scripts/lib/image/canned-wks/mkgummidisk.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/mkhybridiso.wks (renamed from scripts/lib/image/canned-wks/mkhybridiso.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/qemux86-directdisk.wks (renamed from scripts/lib/image/canned-wks/qemux86-directdisk.wks)0
-rw-r--r--scripts/lib/wic/canned-wks/sdimage-bootpart.wks (renamed from scripts/lib/image/canned-wks/sdimage-bootpart.wks)0
-rw-r--r--scripts/lib/wic/config/wic.conf (renamed from scripts/lib/image/config/wic.conf)0
-rw-r--r--scripts/lib/wic/engine.py (renamed from scripts/lib/image/engine.py)2
-rw-r--r--scripts/lib/wic/help.py (renamed from scripts/lib/image/help.py)4
12 files changed, 3 insertions, 25 deletions
diff --git a/scripts/lib/image/__init__.py b/scripts/lib/image/__init__.py
deleted file mode 100644
index 1ff814e761..0000000000
--- a/scripts/lib/image/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
1#
2# OpenEmbedded Image tools library
3#
4# Copyright (c) 2013, Intel Corporation.
5# All rights reserved.
6#
7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License version 2 as
9# published by the Free Software Foundation.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License along
17# with this program; if not, write to the Free Software Foundation, Inc.,
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19#
20# AUTHORS
21# Tom Zanussi <tom.zanussi (at] linux.intel.com>
22#
diff --git a/scripts/lib/image/canned-wks/directdisk-gpt.wks b/scripts/lib/wic/canned-wks/directdisk-gpt.wks
index ea01cf3752..ea01cf3752 100644
--- a/scripts/lib/image/canned-wks/directdisk-gpt.wks
+++ b/scripts/lib/wic/canned-wks/directdisk-gpt.wks
diff --git a/scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks b/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
index 8a81f8f519..8a81f8f519 100644
--- a/scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks
+++ b/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
diff --git a/scripts/lib/image/canned-wks/directdisk.wks b/scripts/lib/wic/canned-wks/directdisk.wks
index af4c9eadaf..af4c9eadaf 100644
--- a/scripts/lib/image/canned-wks/directdisk.wks
+++ b/scripts/lib/wic/canned-wks/directdisk.wks
diff --git a/scripts/lib/image/canned-wks/mkefidisk.wks b/scripts/lib/wic/canned-wks/mkefidisk.wks
index 696e94e3d7..696e94e3d7 100644
--- a/scripts/lib/image/canned-wks/mkefidisk.wks
+++ b/scripts/lib/wic/canned-wks/mkefidisk.wks
diff --git a/scripts/lib/image/canned-wks/mkgummidisk.wks b/scripts/lib/wic/canned-wks/mkgummidisk.wks
index 66a22f60bd..66a22f60bd 100644
--- a/scripts/lib/image/canned-wks/mkgummidisk.wks
+++ b/scripts/lib/wic/canned-wks/mkgummidisk.wks
diff --git a/scripts/lib/image/canned-wks/mkhybridiso.wks b/scripts/lib/wic/canned-wks/mkhybridiso.wks
index 9d34e9b477..9d34e9b477 100644
--- a/scripts/lib/image/canned-wks/mkhybridiso.wks
+++ b/scripts/lib/wic/canned-wks/mkhybridiso.wks
diff --git a/scripts/lib/image/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
index 8fc38b54d0..8fc38b54d0 100644
--- a/scripts/lib/image/canned-wks/qemux86-directdisk.wks
+++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
diff --git a/scripts/lib/image/canned-wks/sdimage-bootpart.wks b/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
index 7ffd632f4a..7ffd632f4a 100644
--- a/scripts/lib/image/canned-wks/sdimage-bootpart.wks
+++ b/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
diff --git a/scripts/lib/image/config/wic.conf b/scripts/lib/wic/config/wic.conf
index a51bcb55eb..a51bcb55eb 100644
--- a/scripts/lib/image/config/wic.conf
+++ b/scripts/lib/wic/config/wic.conf
diff --git a/scripts/lib/image/engine.py b/scripts/lib/wic/engine.py
index 73e8f8b599..a034841a7a 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -52,7 +52,7 @@ def verify_build_env():
52 return True 52 return True
53 53
54 54
55CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts 55CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts
56SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR 56SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
57 57
58def build_canned_image_list(dl): 58def build_canned_image_list(dl):
diff --git a/scripts/lib/image/help.py b/scripts/lib/wic/help.py
index 717d84755f..cd2176d151 100644
--- a/scripts/lib/image/help.py
+++ b/scripts/lib/wic/help.py
@@ -288,7 +288,7 @@ DESCRIPTION
288 288
289 The first form enumerates all the available 'canned' images. 289 The first form enumerates all the available 'canned' images.
290 These are actually just the set of .wks files that have been moved 290 These are actually just the set of .wks files that have been moved
291 into the /scripts/lib/image/canned-wks directory). 291 into the /scripts/lib/wic/canned-wks directory).
292 292
293 The second form lists the detailed help information for a specific 293 The second form lists the detailed help information for a specific
294 'canned' image. 294 'canned' image.
@@ -591,7 +591,7 @@ DESCRIPTION
591 NATIVE_SYSROOT: ... 591 NATIVE_SYSROOT: ...
592 592
593 The image(s) were created using OE kickstart file: 593 The image(s) were created using OE kickstart file:
594 .../scripts/lib/image/canned-wks/directdisk.wks 594 .../scripts/lib/wic/canned-wks/directdisk.wks
595 595
596 The output shows the name and location of the image created, and 596 The output shows the name and location of the image created, and
597 so that you know exactly what was used to generate the image, each 597 so that you know exactly what was used to generate the image, each