summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-08-19 17:35:53 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-25 22:54:49 +0100
commite1ab8392d1a683bb8860fbb20d7eff9c56827a14 (patch)
tree6125f23c48fdcc05e611577ced384d118664a165 /meta
parentffcc52e90d4d4bae565e7982048bba622064752a (diff)
downloadopenembedded-core-contrib-e1ab8392d1a683bb8860fbb20d7eff9c56827a14.tar.gz
openembedded-core-contrib-e1ab8392d1a683bb8860fbb20d7eff9c56827a14.tar.bz2
openembedded-core-contrib-e1ab8392d1a683bb8860fbb20d7eff9c56827a14.zip
image_types: use COMPRESSIONTYPES variable for backward compatibility
Recent renaming of COMPRESSIONTYPES variable can break recipes that still use it. Including value of COMPRESSIONTYPES variable into CONVERSIONTYPES should prevent this. (From OE-Core rev: 5b00d9bf5ebf2350e4a4d09b436193efba80a85c) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image_types.bbclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 4d928667e8..2e852af70a 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -316,7 +316,13 @@ IMAGE_TYPES = " \
wic wic.gz wic.bz2 wic.lzma \
"
-CONVERSIONTYPES = "gz bz2 lzma xz lz4 zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap"
+# Compression is a special case of conversion. The old variable
+# names are still supported for backward-compatibility. When defining
+# new compression or conversion commands, use CONVERSIONTYPES and
+# CONVERSION_CMD/DEPENDS.
+COMPRESSIONTYPES ?= ""
+
+CONVERSIONTYPES = "gz bz2 lzma xz lz4 zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap ${COMPRESSIONTYPES}"
CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz"
CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"