diff options
| -rw-r--r-- | meta/classes-global/base.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes-recipe/image_types.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes-recipe/populate_sdk_base.bbclass | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 988bdbcf0f..924f319999 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass | |||
| @@ -645,9 +645,9 @@ python () { | |||
| 645 | elif path.endswith('.deb'): | 645 | elif path.endswith('.deb'): |
| 646 | d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot') | 646 | d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot') |
| 647 | 647 | ||
| 648 | # *.7z should DEPEND on p7zip-native for unpacking | 648 | # *.7z should DEPEND on 7zip-native for unpacking |
| 649 | elif path.endswith('.7z'): | 649 | elif path.endswith('.7z'): |
| 650 | d.appendVarFlag('do_unpack', 'depends', ' p7zip-native:do_populate_sysroot') | 650 | d.appendVarFlag('do_unpack', 'depends', ' 7zip-native:do_populate_sysroot') |
| 651 | 651 | ||
| 652 | set_packagetriplet(d) | 652 | set_packagetriplet(d) |
| 653 | 653 | ||
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 87d6effc6c..e6ef0ce11e 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass | |||
| @@ -367,7 +367,7 @@ CONVERSION_DEPENDS_xz = "xz-native" | |||
| 367 | CONVERSION_DEPENDS_lz4 = "lz4-native" | 367 | CONVERSION_DEPENDS_lz4 = "lz4-native" |
| 368 | CONVERSION_DEPENDS_lzo = "lzop-native" | 368 | CONVERSION_DEPENDS_lzo = "lzop-native" |
| 369 | CONVERSION_DEPENDS_zip = "zip-native" | 369 | CONVERSION_DEPENDS_zip = "zip-native" |
| 370 | CONVERSION_DEPENDS_7zip = "p7zip-native" | 370 | CONVERSION_DEPENDS_7zip = "7zip-native" |
| 371 | CONVERSION_DEPENDS_zst = "zstd-native" | 371 | CONVERSION_DEPENDS_zst = "zstd-native" |
| 372 | CONVERSION_DEPENDS_sum = "mtd-utils-native" | 372 | CONVERSION_DEPENDS_sum = "mtd-utils-native" |
| 373 | CONVERSION_DEPENDS_bmap = "bmaptool-native" | 373 | CONVERSION_DEPENDS_bmap = "bmaptool-native" |
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 98ac723552..f111466b4c 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass | |||
| @@ -94,7 +94,7 @@ python () { | |||
| 94 | # recommand to cd into input dir first to avoid archive with buildpath | 94 | # recommand to cd into input dir first to avoid archive with buildpath |
| 95 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') | 95 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') |
| 96 | elif d.getVar('SDK_ARCHIVE_TYPE') == '7zip': | 96 | elif d.getVar('SDK_ARCHIVE_TYPE') == '7zip': |
| 97 | d.setVar('SDK_ARCHIVE_DEPENDS', 'p7zip-native') | 97 | d.setVar('SDK_ARCHIVE_DEPENDS', '7zip-native') |
| 98 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; 7za a -r ${SDK_7ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_7ZIP_TYPE} .') | 98 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; 7za a -r ${SDK_7ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_7ZIP_TYPE} .') |
| 99 | elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.zst': | 99 | elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.zst': |
| 100 | d.setVar('SDK_ARCHIVE_DEPENDS', 'zstd-native') | 100 | d.setVar('SDK_ARCHIVE_DEPENDS', 'zstd-native') |
