diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/gzipnative.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-core/expat/expat.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/gzip/gzip_1.8.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-extended/pigz/pigz_2.3.4.bb | 2 |
6 files changed, 4 insertions, 14 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 @@ -EXTRANATIVEPATH += "pigz-native gzip-native" -DEPENDS += "gzip-native" - -# tar may get run by do_unpack or do_populate_lic which could call gzip -do_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}" TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}" POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks; " -inherit gzipnative - LICENSE = "MIT" PACKAGES = "" DEPENDS += "${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} CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum" CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" CONVERSION_DEPENDS_lzma = "xz-native" -CONVERSION_DEPENDS_gz = "" +CONVERSION_DEPENDS_gz = "pigz-native" CONVERSION_DEPENDS_bz2 = "pbzip2-native" CONVERSION_DEPENDS_xz = "xz-native" CONVERSION_DEPENDS_lz4 = "lz4-native" diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc index fe9d7e74f0..9fa0ca2eb3 100644 --- a/meta/recipes-core/expat/expat.inc +++ b/meta/recipes-core/expat/expat.inc @@ -7,12 +7,12 @@ LICENSE = "MIT" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://autotools.patch \ " - -inherit autotools lib_package gzipnative +inherit autotools lib_package # This package uses an archive format known to have issue with some # versions of gzip -do_unpack[depends] += "gzip-native:do_populate_sysroot" +DEPENDS += "pigz-native" +do_unpack[depends] += "pigz-native:do_populate_sysroot" do_configure_prepend () { rm -f ${S}/conftools/libtool.m4 diff --git a/meta/recipes-extended/gzip/gzip_1.8.bb b/meta/recipes-extended/gzip/gzip_1.8.bb index a19b965399..11be846b21 100644 --- a/meta/recipes-extended/gzip/gzip_1.8.bb +++ b/meta/recipes-extended/gzip/gzip_1.8.bb @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" PROVIDES_append_class-native = " gzip-replacement-native" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/pigz/pigz_2.3.4.bb b/meta/recipes-extended/pigz/pigz_2.3.4.bb index 87b61bfb29..53c56c5947 100644 --- a/meta/recipes-extended/pigz/pigz_2.3.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.3.4.bb @@ -7,7 +7,5 @@ SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz" SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - BBCLASSEXTEND = "native nativesdk" |