summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2017-01-18 10:31:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-19 06:49:00 -0800
commit1b8f485c2431582abd5f709ea4cc919477bec97b (patch)
tree6819e57e585fe47e0e74d77be9af99a49780ca03
parentb57e93c5c8653c983c28a037c0d4824b739285d9 (diff)
downloadopenembedded-core-contrib-1b8f485c2431582abd5f709ea4cc919477bec97b.tar.gz
openembedded-core-contrib-1b8f485c2431582abd5f709ea4cc919477bec97b.tar.bz2
openembedded-core-contrib-1b8f485c2431582abd5f709ea4cc919477bec97b.zip
image-container.bbclass: Add the "container" IMAGE_FSTYPES
The "container" fstype does very little other than pick tar.bz2 as the actual image type and disable installation of ROOTFS_BOOTSTRAP_INSTALL. [YOCTO #9502] (From OE-Core rev: e45f074b792a43aa2fd84a5a3f0e20bf1d88ad7e) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image-container.bbclass3
-rw-r--r--meta/classes/image.bbclass3
-rw-r--r--meta/classes/image_types.bbclass1
3 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/image-container.bbclass b/meta/classes/image-container.bbclass
new file mode 100644
index 0000000000..a10ee326ce
--- /dev/null
+++ b/meta/classes/image-container.bbclass
@@ -0,0 +1,3 @@
+ROOTFS_BOOTSTRAP_INSTALL = ""
+IMAGE_TYPES_MASKED += "container"
+IMAGE_TYPEDEP_container = "tar.bz2"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5c9dc62861..127e62d5d9 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -142,6 +142,9 @@ inherit ${IMAGE_TYPE_live}
IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2", "hdddirect"], "image-vm", "", d)}'
inherit ${IMAGE_TYPE_vm}
+IMAGE_TYPE_container = '${@bb.utils.contains("IMAGE_FSTYPES", "container", "image-container", "", d)}'
+inherit ${IMAGE_TYPE_container}
+
def build_uboot(d):
if 'u-boot' in (d.getVar('IMAGE_FSTYPES') or ''):
return "image_types_uboot"
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index fd19112a12..d2eb99dbb7 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -242,6 +242,7 @@ IMAGE_TYPES = " \
hdddirect \
elf \
wic wic.gz wic.bz2 wic.lzma \
+ container \
"
# Compression is a special case of conversion. The old variable