diff options
| -rw-r--r-- | meta/classes/gzipnative.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-core/expat/expat.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/gzip/gzip_1.4.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/pigz/pigz_2.2.4.bb | 4 |
6 files changed, 13 insertions, 4 deletions
diff --git a/meta/classes/gzipnative.bbclass b/meta/classes/gzipnative.bbclass new file mode 100644 index 0000000000..4a411434a4 --- /dev/null +++ b/meta/classes/gzipnative.bbclass @@ -0,0 +1,3 @@ +PATH_prepend = "${STAGING_BINDIR_NATIVE}/pigz-native:${STAGING_BINDIR_NATIVE}/gzip-native:" +DEPENDS += "gzip-native" + diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ccfcaba40e..907c59ba0f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -3,6 +3,8 @@ inherit rootfs_${IMAGE_PKGTYPE} IMAGETEST ?= "dummy" inherit imagetest-${IMAGETEST} +inherit gzipnative + LICENSE = "MIT" PACKAGES = "" RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}" diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 871dda0426..ffab971cbb 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -77,7 +77,7 @@ baselib = "lib" # Libtool's default paths are correct for the native machine lt_cv_sys_lib_dlsearch_path_spec[unexport] = "1" -NATIVE_PACKAGE_PATH_SUFFIX = "" +NATIVE_PACKAGE_PATH_SUFFIX ?= "" bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc index d902b7afdf..459ccb3b5b 100644 --- a/meta/recipes-core/expat/expat.inc +++ b/meta/recipes-core/expat/expat.inc @@ -7,7 +7,7 @@ LICENSE = "MIT" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ file://autotools.patch" -inherit autotools lib_package +inherit autotools lib_package gzipnative # This package uses an archive format known to have issue with some # versions of gzip diff --git a/meta/recipes-extended/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb index ab8a744327..8f4a237ec3 100644 --- a/meta/recipes-extended/gzip/gzip_1.4.bb +++ b/meta/recipes-extended/gzip/gzip_1.4.bb @@ -1,6 +1,8 @@ require gzip.inc -PR = "r0" +PR = "r1" + +NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/pigz/pigz_2.2.4.bb b/meta/recipes-extended/pigz/pigz_2.2.4.bb index 598bbe35ba..eaf00c6705 100644 --- a/meta/recipes-extended/pigz/pigz_2.2.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.2.4.bb @@ -1,6 +1,8 @@ require pigz.inc -PR = "r0" +PR = "r1" + +NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native" |