summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-27 12:34:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-28 23:32:16 +0000
commitab0f46400c113c0d893be872727a67739d5e794d (patch)
tree67d0e9dc84bccdb51a642efec451a2e69b06494b /meta/classes
parente6e0ac4fb8d98b2043e19e76d5c7409a74236e86 (diff)
downloadpoky-ab0f46400c113c0d893be872727a67739d5e794d.tar.gz
gzip/pigz/expat/image: Simplify gzip-native/pigz-native
With recipe specific sysroots, the gzip-replacement-native dance/class is obsolete, simplify the code accordingly. (From OE-Core rev: 39865fdf3698a130f792d41853f9c9ca1901e335) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/gzipnative.bbclass5
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/image_types.bbclass2
3 files changed, 1 insertions, 8 deletions
diff --git a/meta/classes/gzipnative.bbclass b/meta/classes/gzipnative.bbclass
deleted file mode 100644
index 326cbbb6f6..0000000000
--- a/meta/classes/gzipnative.bbclass
+++ /dev/null
@@ -1,5 +0,0 @@
1EXTRANATIVEPATH += "pigz-native gzip-native"
2DEPENDS += "gzip-native"
3
4# tar may get run by do_unpack or do_populate_lic which could call gzip
5do_unpack[depends] += "gzip-native:do_populate_sysroot"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 71b7ebc958..4d50601bb2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -9,8 +9,6 @@ TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"
9TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}" 9TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}"
10POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks; " 10POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks; "
11 11
12inherit gzipnative
13
14LICENSE = "MIT" 12LICENSE = "MIT"
15PACKAGES = "" 13PACKAGES = ""
16DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross" 14DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross"
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 50545d9fdf..d3c7326b19 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -359,7 +359,7 @@ CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}
359CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum" 359CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum"
360CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" 360CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap"
361CONVERSION_DEPENDS_lzma = "xz-native" 361CONVERSION_DEPENDS_lzma = "xz-native"
362CONVERSION_DEPENDS_gz = "" 362CONVERSION_DEPENDS_gz = "pigz-native"
363CONVERSION_DEPENDS_bz2 = "pbzip2-native" 363CONVERSION_DEPENDS_bz2 = "pbzip2-native"
364CONVERSION_DEPENDS_xz = "xz-native" 364CONVERSION_DEPENDS_xz = "xz-native"
365CONVERSION_DEPENDS_lz4 = "lz4-native" 365CONVERSION_DEPENDS_lz4 = "lz4-native"