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>

13 files changed, 5 insertions, 27 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 @@
-#
-# 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>
-#
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():
     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
 
 def 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
 
     The first form enumerates all the available 'canned' images.
     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
     'canned' image.
@@ -591,7 +591,7 @@ DESCRIPTION
       NATIVE_SYSROOT:  ...
 
       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
     so that you know exactly what was used to generate the image, each
diff --git a/scripts/wic b/scripts/wic
index 25b0d676fd..94028e2b08 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -54,8 +54,8 @@ else:
 
 from wic.utils.oe.misc import get_bitbake_var, BB_VARS
 from wic.utils.errors import WicError
-from image import engine
-from image import help as hlp
+from wic import engine
+from wic import help as hlp
 
 def rootfs_dir_to_args(krootfs_dir):
     """